upgrade mpt circuit (scroll-tech#982)

* upgrade mpt circuit * Set minimum of 2049 rows for mpt circuit * Increase max_mpt_rows * Update mpt_circuit.rs * add checks for mpt rows --------- Co-authored-by: Mason Liang <[email protected]>
somayeh021 · Sep 27, 2023 · 428d8fc · 428d8fc
1 parent 21f887d
commit 428d8fc
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bus-mapping/src/circuit_input_builder.rs b/bus-mapping/src/circuit_input_builder.rs
@@ -106,7 +106,7 @@ pub struct CircuitsParams {
     /// In this case it will contain as many rows for all steps + 1 row
     /// for EndBlock.
     pub max_evm_rows: usize,
-    /// Max amount of rows that the CopyCircuit can have.
+    /// Max amount of rows that the MptCircuit can have.
     pub max_mpt_rows: usize,
     /// Pad the keccak circuit with this number of invocations to a static
     /// capacity.  Number of keccak_f that the Keccak circuit will support.
@@ -136,7 +136,7 @@ impl Default for CircuitsParams {
             // TODO: Check whether this value is correct or we should increase/decrease based on
             // this lib tests
             max_copy_rows: 2000,
-            max_mpt_rows: 1000,
+            max_mpt_rows: 2049,
             max_exp_steps: 1000,
             max_bytecode: 512,
             max_evm_rows: 0,

diff --git a/integration-tests/src/integration_test_circuits.rs b/integration-tests/src/integration_test_circuits.rs
@@ -48,7 +48,7 @@ const TEST_MOCK_RANDOMNESS: u64 = 0x100;
 /// MAX_TXS
 const MAX_TXS: usize = 4;
 /// MAX_CALLDATA
-const MAX_CALLDATA: usize = 512;
+const MAX_CALLDATA: usize = 2049;
 /// MAX_RLP_ROWS
 const MAX_RLP_ROWS: usize = 1000;
 /// MAX_RWS

diff --git a/testool/src/statetest/executor.rs b/testool/src/statetest/executor.rs
@@ -486,7 +486,7 @@ fn get_params_for_super_circuit_test() -> CircuitsParams {
         max_calldata: MAX_CALLDATA,
         max_rws: 256,
         max_copy_rows: 256,
-        max_mpt_rows: 256,
+        max_mpt_rows: 2049,
         max_exp_steps: 256,
         max_bytecode: 512,
         max_evm_rows: 0,

diff --git a/zkevm-circuits/src/mpt_circuit.rs b/zkevm-circuits/src/mpt_circuit.rs
@@ -92,6 +92,16 @@ impl SubCircuit<Fr> for MptCircuit<Fr> {
     type Config = MptCircuitConfig<Fr>;
 
     fn new_from_block(block: &witness::Block<Fr>) -> Self {
+        // 0 means "dynamic"
+        if block.circuits_params.max_mpt_rows != 0 {
+            // Fixed byte-bit-index lookup needs 2049 rows.
+            if block.circuits_params.max_mpt_rows < 2049 {
+                panic!(
+                    "invalid max_mpt_rows {}",
+                    block.circuits_params.max_mpt_rows
+                );
+            }
+        }
         let traces: Vec<_> = block
             .mpt_updates
             .proof_types
@@ -112,8 +122,10 @@ impl SubCircuit<Fr> for MptCircuit<Fr> {
         (
             // For an empty storage proof, we may need to lookup the canonical representations of
             // three different keys. Each lookup requires 32 rows.
+            // The key bit lookup within the mpt circuit requires a minimum of 8 * 256 rows. The +1
+            // comes from the fact that the mpt circuit starts assigning at offset = 1.
             3 * 32 * block.mpt_updates.len(),
-            block.circuits_params.max_mpt_rows,
+            block.circuits_params.max_mpt_rows.max(8 * 256 + 1),
         )
     }
 

diff --git a/zkevm-circuits/src/super_circuit/test.rs b/zkevm-circuits/src/super_circuit/test.rs
@@ -238,7 +238,7 @@ fn serial_test_super_circuit_1tx_1max_tx() {
         max_copy_rows: 256,
         max_exp_steps: 256,
         max_bytecode: 512,
-        max_mpt_rows: 512,
+        max_mpt_rows: 2049,
         max_poseidon_rows: 512,
         max_evm_rows: 0,
         max_keccak_rows: 0,
@@ -267,7 +267,7 @@ fn serial_test_super_circuit_1tx_deploy_2max_tx() {
         max_calldata: MAX_CALLDATA,
         max_rws: MAX_RWS,
         max_copy_rows: MAX_COPY_ROWS,
-        max_mpt_rows: 1024,
+        max_mpt_rows: 2049,
         max_poseidon_rows: 1024,
         max_bytecode: 512,
         max_keccak_rows: 0,
@@ -298,7 +298,7 @@ fn serial_test_super_circuit_1tx_2max_tx() {
         max_copy_rows: 256,
         max_exp_steps: 256,
         max_bytecode: 512,
-        max_mpt_rows: 512,
+        max_mpt_rows: 2049,
         max_poseidon_rows: 512,
         max_evm_rows: 0,
         max_keccak_rows: 0,
@@ -328,7 +328,7 @@ fn serial_test_super_circuit_2tx_4max_tx() {
         max_rws: MAX_RWS,
         max_copy_rows: MAX_COPY_ROWS,
         max_bytecode: 512,
-        max_mpt_rows: 512,
+        max_mpt_rows: 2049,
         max_poseidon_rows: 512,
         max_keccak_rows: 0,
         max_inner_blocks: MAX_INNER_BLOCKS,
@@ -356,7 +356,7 @@ fn serial_test_super_circuit_2tx_2max_tx() {
         max_calldata: MAX_CALLDATA,
         max_rws: 256,
         max_copy_rows: 256,
-        max_mpt_rows: 512,
+        max_mpt_rows: 2049,
         max_poseidon_rows: 512,
         max_exp_steps: 256,
         max_bytecode: 512,
@@ -382,7 +382,7 @@ fn precomiple_super_circuits_params(max_txs: usize, max_calldata: usize) -> Circ
         max_rws: MAX_RWS,
         max_copy_rows: MAX_COPY_ROWS,
         max_bytecode: 16384,
-        max_mpt_rows: 2048,
+        max_mpt_rows: 2049,
         max_poseidon_rows: 8192,
         max_evm_rows: 0,
         // modexp ref this to decide its ability, we

diff --git a/zktrie/Cargo.toml b/zktrie/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_02_02" }
-mpt-circuits = { package = "halo2-mpt-circuits", git = "https://github.com/scroll-tech/mpt-circuit.git", tag = "v0.6.5" }
+mpt-circuits = { package = "halo2-mpt-circuits", git = "https://github.com/scroll-tech/mpt-circuit.git", tag = "v0.7.0" }
 zktrie = { git = "https://github.com/scroll-tech/zktrie.git", branch = "v0.6" }
 hash-circuit = { package = "poseidon-circuit", git = "https://github.com/scroll-tech/poseidon-circuit.git", branch = "scroll-dev-0901"}
 eth-types = { path = "../eth-types" }