update post param for prover address

taikoxyz · Feb 24, 2023 · ce9b833 · ce9b833
1 parent f005d7e
commit ce9b833
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/common/src/prover.rs b/common/src/prover.rs
@@ -50,6 +50,8 @@ pub struct ProofRequestOptions {
     pub block: u64,
     /// the rpc url
     pub rpc: String,
+    /// the prover address
+    pub prover: String,
     /// retry proof computation if error
     pub retry: bool,
     /// Parameters file or directory to use.

diff --git a/coordinator/src/shared_state.rs b/coordinator/src/shared_state.rs
@@ -1059,6 +1059,7 @@ impl SharedState {
             circuit: config.circuit_name.clone(),
             block: block_num.as_u64(),
             rpc: config.l2_rpc_url.to_string(),
+            prover: String::from(""),
             retry: false,
             param: config.params_path.clone(),
             mock: config.mock_prover,

diff --git a/prover/Cargo.toml b/prover/Cargo.toml
@@ -24,6 +24,7 @@ tokio = { version = "1.16.1", features = ["macros", "rt-multi-thread"] }
 zkevm_common = { path = "../common" }
 itertools = "0.10.3"
 clap = { version = "4.0.14", features = ["derive", "env"] }
+hex = "0.4.3"
 
 # autogen
 mock = { git = "https://github.com/smtmfft/zkevm-circuits.git", branch = "feature/root-circuit", optional = true  }

diff --git a/prover/src/circuits.rs b/prover/src/circuits.rs
@@ -9,7 +9,7 @@ use zkevm_circuits::keccak_circuit::keccak_packed_multi::KeccakCircuit;
 use zkevm_circuits::pi_circuit2::PiCircuit;
 use zkevm_circuits::pi_circuit2::PiTestCircuit;
 use zkevm_circuits::state_circuit::StateCircuit;
-use zkevm_circuits::super_circuit::SuperCircuit;
+// use zkevm_circuits::super_circuit::SuperCircuit;
 use zkevm_circuits::tx_circuit::TxCircuit;
 use zkevm_circuits::util::SubCircuit;
 
@@ -55,10 +55,14 @@ pub fn gen_pi_circuit<
     RNG: Rng,
 >(
     witness: &CircuitWitness,
+    prover_address: String,
     mut _rng: RNG,
 ) -> Result<PiTestCircuit<Fr, MAX_TXS, MAX_CALLDATA>, String> {
     let block = witness.evm_witness();
-    let circuit = PiTestCircuit::<Fr, MAX_TXS, MAX_CALLDATA>(PiCircuit::new_from_block(&block));
+    let prover = eth_types::Address::from_slice(
+        &hex::decode(prover_address.as_bytes()).expect("parse_address"),
+    );
+    let circuit = PiTestCircuit::<Fr, MAX_TXS, MAX_CALLDATA>(PiCircuit::new_from_block_with_prover(&block, prover));
 
     Ok(circuit)
 }

diff --git a/prover/src/shared_state.rs b/prover/src/shared_state.rs
@@ -89,8 +89,7 @@ macro_rules! gen_proof {
                 { CIRCUIT_CONFIG.max_txs },
                 { CIRCUIT_CONFIG.max_calldata },
                 { CIRCUIT_CONFIG.max_rws },
-                _,
-            >(&witness, fixed_rng())?;
+                _>(&witness, task_options.prover, fixed_rng())?;
             circuit_proof.k = CIRCUIT_CONFIG.min_k as u8;
             circuit_proof.instance = collect_instance(&circuit.0.instance());
             let prover = MockProver::run(CIRCUIT_CONFIG.min_k as u32, &circuit, circuit.0.instance())
@@ -105,7 +104,7 @@ macro_rules! gen_proof {
                 { CIRCUIT_CONFIG.max_calldata },
                 { CIRCUIT_CONFIG.max_rws },
                 _,
-            >(&witness, fixed_rng())?;
+            >(&witness, task_options.prover, fixed_rng())?;
             // generate and cache the prover key
             let pk = {
                 let cache_key = format!(