switch to latest develop + new mpt circuit (#151)

* build but fail to mock prove * upgrade traces * update * upgrade snark verifier * it works * update deps * misc fix
scroll-tech · Jun 27, 2023 · 0ca5710 · 0ca5710
1 parent 203b834
commit 0ca5710
Show file tree

Hide file tree

Showing 14 changed files with 63 additions and 73 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,9 +13,6 @@ poseidon = { git = "https://github.com/scroll-tech/poseidon.git", branch = "scro
 [patch."https://github.com/privacy-scaling-explorations/halo2wrong.git"]
 halo2wrong = { git = "https://github.com/scroll-tech/halo2wrong.git", branch = "halo2-ecc-snark-verifier-0323" }
 maingate = { git = "https://github.com/scroll-tech/halo2wrong", branch = "halo2-ecc-snark-verifier-0323" }
-[patch."https://github.com/axiom-crypto/halo2-lib.git"]
-halo2-base = { git = "https://github.com/scroll-tech/halo2-lib", branch = "halo2-ecc-snark-verifier-0323" }
-halo2-ecc = { git = "https://github.com/scroll-tech/halo2-lib", branch = "halo2-ecc-snark-verifier-0323" }
 [patch."https://github.com/privacy-scaling-explorations/halo2curves.git"]
 halo2curves = { git = "https://github.com/scroll-tech/halo2curves.git", branch = "0.3.1-derive-serde" }
 

diff --git a/prover/.gitignore b/prover/.gitignore
@@ -15,4 +15,4 @@ Cargo.lock
 test_params*
 test_seed
 
-output_*
+*output_*
diff --git a/prover/Cargo.toml b/prover/Cargo.toml
@@ -10,12 +10,12 @@ halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.gi
 
 bus-mapping = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "develop" }
 eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "develop" }
-zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "develop", default-features = false, features = ["test","scroll","poseidon-codehash-lookup"] }
+zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "develop", default-features = false, features = ["test","scroll","scroll-trace"] }
 mpt-zktrie = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "develop" }
 mock = { git = "https://github.com/scroll-tech/zkevm-circuits", branch = "develop" }
 
-snark-verifier =  { git = "https://github.com/scroll-tech/snark-verifier", branch = "halo2-ecc-snark-verifier-0323" }
-snark-verifier-sdk =  { git = "https://github.com/scroll-tech/snark-verifier", branch = "halo2-ecc-snark-verifier-0323" }
+snark-verifier =  { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop" }
+snark-verifier-sdk =  { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop" }
 
 rand = "0.8"
 rand_xorshift = "0.3"

diff --git a/prover/src/test_util.rs b/prover/src/test_util.rs
@@ -38,14 +38,14 @@ pub fn load_batch_traces(batch_dir: &str) -> (Vec<String>, Vec<types::eth::Block
 pub fn parse_trace_path_from_mode(mode: &str) -> &'static str {
     let trace_path = match mode {
         "empty" => "./tests/traces/empty.json",
-        "greeter" => "./tests/traces/greeter_setValue.json",
-        "single" => "./tests/traces/erc20/erc20_1_transfer.json",
-        "multiple" => "./tests/traces/erc20/erc20_10_transfer.json",
-        "native" => "./tests/traces/native_transfer.json",
-        "dao" => "./tests/traces/dao/dao_dao-Propose.json",
-        "nft" => "./tests/traces/nft/nft_mint.json",
-        "sushi" => "./tests/traces/sushi/sushi_chef-withdraw.json",
-        _ => "./tests/traces/erc20/erc20_10_transfer.json",
+        "greeter" => "./tests/traces/greeter/setValue.json",
+        "single" => "./tests/traces/erc20/1_transfer.json",
+        "multiple" => "./tests/traces/erc20/10_transfer.json",
+        "native" => "./tests/traces/native/transfer.json",
+        "dao" => "./tests/traces/dao/dao-propose.json",
+        "nft" => "./tests/traces/nft/mint.json",
+        "sushi" => "./tests/traces/sushi/chef-withdraw.json",
+        _ => "./tests/traces/erc20/10_transfer.json",
     };
     log::info!("using mode {:?}, testing with {:?}", mode, trace_path);
     trace_path

diff --git a/prover/src/zkevm/circuit/builder.rs b/prover/src/zkevm/circuit/builder.rs
@@ -214,9 +214,10 @@ pub fn block_traces_to_witness_block_with_updated_state(
         max_keccak_rows: MAX_KECCAK_ROWS,
         max_exp_steps: MAX_EXP_STEPS,
         max_mpt_rows: MAX_MPT_ROWS,
+        max_rlp_rows: MAX_CALLDATA,
     };
     let mut builder_block = circuit_input_builder::Block::from_headers(&[], circuit_params);
-    builder_block.chain_id = chain_id;
+    builder_block.chain_id = chain_id.as_u64();
     builder_block.prev_state_root = U256::from(zktrie_state.root());
     let mut builder = CircuitInputBuilder::new(state_db.clone(), code_db, &builder_block);
     for (idx, block_trace) in block_traces.iter().enumerate() {
@@ -228,7 +229,7 @@ pub fn block_traces_to_witness_block_with_updated_state(
             geth_trace.push(result.into());
         }
         // TODO: Get the history_hashes.
-        let mut header = BlockHead::new(chain_id, Vec::new(), &eth_block)?;
+        let mut header = BlockHead::new(chain_id.as_u64(), Vec::new(), &eth_block)?;
         // override zeroed minder field with additional "coinbase" field in blocktrace
         if let Some(address) = block_trace.coinbase.address {
             header.coinbase = address;

diff --git a/prover/src/zkevm/prover/evm.rs b/prover/src/zkevm/prover/evm.rs
@@ -1,9 +1,7 @@
 use super::Prover;
 use halo2_proofs::halo2curves::bn256::G1Affine;
 use halo2_proofs::plonk::VerifyingKey;
-use snark_verifier_sdk::evm::gen_evm_verifier_shplonk;
-use snark_verifier_sdk::halo2::aggregation::AggregationCircuit;
-use snark_verifier_sdk::CircuitExt;
+use snark_verifier_sdk::{gen_evm_verifier_shplonk, AggregationCircuit, CircuitExt};
 use std::path::Path;
 
 impl Prover {

diff --git a/prover/src/zkevm/prover/inner_circuit.rs b/prover/src/zkevm/prover/inner_circuit.rs
@@ -12,7 +12,7 @@ use halo2_proofs::halo2curves::bn256::Fr;
 use log::info;
 use rand::{Rng, SeedableRng};
 use rand_xorshift::XorShiftRng;
-use snark_verifier_sdk::halo2::gen_snark_shplonk;
+use snark_verifier_sdk::gen_snark_shplonk;
 use types::eth::BlockTrace;
 
 impl Prover {

diff --git a/prover/src/zkevm/prover/outer_circuit.rs b/prover/src/zkevm/prover/outer_circuit.rs
@@ -5,9 +5,7 @@ use super::{AggCircuitProof, Prover, TargetCircuitProof};
 use crate::io::{serialize_fr_tensor, serialize_vk};
 use rand::SeedableRng;
 use rand_xorshift::XorShiftRng;
-use snark_verifier_sdk::evm::gen_evm_proof_shplonk;
-use snark_verifier_sdk::halo2::aggregation::AggregationCircuit;
-use snark_verifier_sdk::{gen_pk, CircuitExt};
+use snark_verifier_sdk::{gen_evm_proof_shplonk, gen_pk, AggregationCircuit, CircuitExt};
 use types::eth::BlockTrace;
 
 impl Prover {

diff --git a/prover/src/zkevm/verifier.rs b/prover/src/zkevm/verifier.rs
@@ -16,9 +16,9 @@ use halo2_proofs::poly::kzg::strategy::AccumulatorStrategy;
 use halo2_proofs::poly::VerificationStrategy;
 use halo2_proofs::transcript::TranscriptReadBuffer;
 use snark_verifier::system::halo2::transcript::evm::EvmTranscript;
-use snark_verifier_sdk::evm::evm_verify;
-use snark_verifier_sdk::halo2::aggregation::AggregationCircuit;
-use snark_verifier_sdk::halo2::verify_snark_shplonk;
+use snark_verifier_sdk::evm_verify;
+use snark_verifier_sdk::verify_snark_shplonk;
+use snark_verifier_sdk::AggregationCircuit;
 
 pub struct Verifier {
     params: ParamsKZG<Bn256>,

diff --git a/prover/tests/aggregation_tests.rs b/prover/tests/aggregation_tests.rs
@@ -5,7 +5,7 @@ use prover::zkevm::circuit::{SuperCircuit, TargetCircuit, AGG_DEGREE};
 use prover::zkevm::{EvmVerifier, Prover, TargetCircuitProof};
 use rand::SeedableRng;
 use rand_xorshift::XorShiftRng;
-use snark_verifier_sdk::halo2::aggregation::AggregationCircuit;
+use snark_verifier_sdk::AggregationCircuit;
 use snark_verifier_sdk::CircuitExt;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;

diff --git a/prover/tests/snark_verifier_api.rs b/prover/tests/snark_verifier_api.rs
@@ -6,10 +6,10 @@ use prover::utils::init_env_and_log;
 use prover::zkevm::{EvmVerifier, Prover, Verifier};
 use rand::SeedableRng;
 use rand_xorshift::XorShiftRng;
-use snark_verifier_sdk::evm::{evm_verify, gen_evm_proof_shplonk, gen_evm_verifier_shplonk};
-use snark_verifier_sdk::halo2::aggregation::AggregationCircuit;
+use snark_verifier_sdk::AggregationCircuit;
 use snark_verifier_sdk::CircuitExt;
-use snark_verifier_sdk::{gen_pk, halo2::gen_snark_shplonk};
+use snark_verifier_sdk::{evm_verify, gen_evm_proof_shplonk, gen_evm_verifier_shplonk};
+use snark_verifier_sdk::{gen_pk, gen_snark_shplonk};
 use test_util::mock_plonk;
 
 // This is essentially a same test as snark-verifier/evm-verifier

diff --git a/prover/tests/traces b/prover/tests/traces
diff --git a/types/src/eth.rs b/types/src/eth.rs
@@ -126,8 +126,8 @@ pub type EthBlock = Block<Transaction>;
 
 #[derive(Deserialize, Serialize, Debug, Clone)]
 pub struct ExecutionResult {
-    #[serde(rename = "l1Fee", default)]
-    pub l1_fee: u64,
+    #[serde(rename = "l1DataFee", default)]
+    pub l1_fee: U256,
     pub gas: u64,
     pub failed: bool,
     #[serde(rename = "returnValue", default)]
@@ -154,7 +154,7 @@ impl From<&ExecutionResult> for GethExecTrace {
             struct_logs.push(step)
         }
         GethExecTrace {
-            l1_fee: e.l1_fee,
+            l1_fee: e.l1_fee.as_u64(),
             gas: Gas(e.gas),
             failed: e.failed,
             return_value: e.return_value.clone(),