Phase 2 options not required when not verifying in control (#74)

* phase 2 options not required when not verifying in control

* changed authors

Co-authored-by: Kobi Gurkan <kobigurk@gmail.com>

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "snark-setup-operator"
 version = "0.1.0"
-authors = ["Kobi Gurkan <kobigurk@gmail.com>"]
+authors = ["Kobi Gurkan <kobigurk@gmail.com>", "Michael Straka <mstraka100@gmail.com>"]
 edition = "2018"
 
 [dependencies]

e2e/e2ephase2.sh

@@ -25,7 +25,7 @@ echo 1 | RUST_LOG=info cargo run --release  --bin contribute -- --unsafe-passphr
 echo 1 | RUST_LOG=info cargo run --release  --bin contribute -- --unsafe-passphrase --exit-when-finished-contributing --keys-file $BASE_DIR/plumo-verifier.keys --participation-mode verify --coordinator-url http://localhost:8080
 # Control used to run only 1 round
 #echo 1 | RUST_LOG=info cargo run --release  --bin control -- --phase phase2 -i new_challenge.query -I new_challenge.full --unsafe-passphrase --keys-file $BASE_DIR/plumo-verifier.keys  --chunk-size 10 --phase1-powers 12 --phase1-filename phase2_init --circuit-filename circuit_2992c --coordinator-url http://localhost:8080 apply-beacon --beacon-hash 0000000000000000000000000000000000000000000000000000000000000000 --expected-participant 0xc31130dc73f078f99fac28e250535cbc3407608d
-echo 1 | RUST_LOG=info cargo run --release  --bin control -- --phase phase2 -i new_challenge.query -I new_challenge.full --unsafe-passphrase --keys-file $BASE_DIR/plumo-verifier.keys --chunk-size 10 --phase1-powers 12 --phase1-filename phase2_init --circuit-filename circuit_2992c --coordinator-url http://localhost:8080 new-round --expected-participant 0xc31130dc73f078f99fac28e250535cbc3407608d --new-participant 0x31e598a18069f75983dc00c39aafc7e9f7b71aee --publish --shutdown-delay-time-in-secs 10
+echo 1 | RUST_LOG=info cargo run --release  --bin control -- --phase phase2 -i new_challenge.query -I new_challenge.full --unsafe-passphrase --keys-file $BASE_DIR/plumo-verifier.keys --chunk-size 10 --phase1-powers 12 --phase1-filename phase2_init --circuit-filename circuit_2992c --coordinator-url http://localhost:8080 new-round --verify-transcript --expected-participant 0xc31130dc73f078f99fac28e250535cbc3407608d --new-participant 0x31e598a18069f75983dc00c39aafc7e9f7b71aee --publish --shutdown-delay-time-in-secs 10
 echo 1 | RUST_LOG=info cargo run --release  --bin contribute -- --unsafe-passphrase --exit-when-finished-contributing --keys-file $BASE_DIR/plumo-contributor-2.keys --coordinator-url http://localhost:8080
 echo 1 | RUST_LOG=info cargo run --release  --bin contribute -- --unsafe-passphrase --exit-when-finished-contributing --keys-file $BASE_DIR/plumo-verifier.keys --participation-mode verify --coordinator-url http://localhost:8080
 echo 1 | RUST_LOG=info cargo run --release  --bin control -- --phase phase2 -i new_challenge.query -I new_challenge.full --unsafe-passphrase --keys-file $BASE_DIR/plumo-verifier.keys  --chunk-size 10 --phase1-powers 12 --phase1-filename phase2_init --circuit-filename circuit_2992c --coordinator-url http://localhost:8080 apply-beacon --beacon-hash 0000000000000000000000000000000000000000000000000000000000000000 --expected-participant 0x31e598a18069f75983dc00c39aafc7e9f7b71aee

src/bin/control.rs

@@ -235,11 +235,20 @@ impl Control {
             Some(phase) => string_to_phase(&phase)?,
             _ => string_to_phase(&ceremony.phase)?,
         };
-        let phase2_opts = if phase == Phase::Phase2 {
-            Some(Phase2Opts::new(opts).await?)
-        } else {
-            None
+        let phase2_opts = match (&phase, opts.command.as_ref().expect("No command found")) {
+            (Phase::Phase2, Command::NewRound(round_opts)) => {
+                if round_opts.verify_transcript {
+                    Some(Phase2Opts::new(opts).await?)
+                } else {
+                    None
+                }
+            }
+            (Phase::Phase2, Command::ApplyBeacon(_round_opts)) => {
+                Some(Phase2Opts::new(opts).await?)
+            }
+            (_, _) => None,
         };
+
         let private_key = LocalWallet::from(SigningKey::new(private_key)?);
         let control = Self {
             phase: phase,
@@ -410,7 +419,6 @@ impl Control {
             .enumerate()
             .map(|(chunk_index, chunk)| (chunk_index, chunk.contributions.iter().last().unwrap()))
         {
-            //let parameters = create_parameters_for_chunk::<E>(&ceremony.parameters, chunk_index)?;
             remove_file_if_exists(RESPONSE_FILENAME)?;
             let contributed_location = contribution.contributed_location()?;
             info!("Downloading chunk {}", chunk_index);