rebase latest main and fix

privacy-scaling-explorations · Jan 14, 2022 · 723912d · 723912d
1 parent 515b084
commit 723912d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/bus-mapping/src/circuit_input_builder.rs b/bus-mapping/src/circuit_input_builder.rs
@@ -1332,7 +1332,10 @@ impl<P: JsonRpcClient> BuilderClient<P> {
             code_db,
             eth_block,
             self.constants.clone(),
-            BlockConstants::from_eth_block(&eth_block, &Word::from(self.constants.chain_id)),
+            BlockConstants::from_eth_block(
+                eth_block,
+                &Word::from(self.constants.chain_id),
+            ),
         );
         for (tx_index, tx) in eth_block.transactions.iter().enumerate() {
             let geth_trace = &geth_traces[tx_index];

diff --git a/bus-mapping/src/external_tracer.rs b/bus-mapping/src/external_tracer.rs
@@ -31,10 +31,7 @@ pub struct BlockConstants {
 
 impl BlockConstants {
     /// Generate a BlockConstants from an ethereum block, useful for testing.
-    pub fn from_eth_block<TX>(
-        block: &Block<TX>,
-        chain_id: &Word,
-    ) -> Self {
+    pub fn from_eth_block<TX>(block: &Block<TX>, chain_id: &Word) -> Self {
         Self {
             hash: block.hash.unwrap(),
             coinbase: block.author,

diff --git a/integration-tests/tests/circuits.rs b/integration-tests/tests/circuits.rs
@@ -186,6 +186,7 @@ mod test_evm_circuit {
             let tx_table = [(); 4].map(|_| meta.advice_column());
             let rw_table = [(); 8].map(|_| meta.advice_column());
             let bytecode_table = [(); 4].map(|_| meta.advice_column());
+            let block_table = [(); 3].map(|_| meta.advice_column());
             let randomness = meta.instance_column();
 
             Self::Config {
@@ -198,6 +199,7 @@ mod test_evm_circuit {
                     tx_table,
                     rw_table,
                     bytecode_table,
+                    block_table,
                 ),
             }
         }

diff --git a/zkevm-circuits/src/evm_circuit/execution/begin_tx.rs b/zkevm-circuits/src/evm_circuit/execution/begin_tx.rs
@@ -548,6 +548,7 @@ mod test {
             ]
             .concat(),
             bytecodes: vec![bytecode],
+            ..Default::default()
         };
         assert_eq!(run_test_circuit_incomplete_fixed_table(block), Ok(()));
     }

diff --git a/zkevm-circuits/src/evm_circuit/witness.rs b/zkevm-circuits/src/evm_circuit/witness.rs
@@ -3,7 +3,8 @@ use crate::evm_circuit::{
     param::STACK_CAPACITY,
     step::ExecutionState,
     table::{
-        AccountFieldTag, CallContextFieldTag, RwTableTag, TxContextFieldTag,BlockContextFieldTag
+        AccountFieldTag, BlockContextFieldTag, CallContextFieldTag, RwTableTag,
+        TxContextFieldTag,
     },
     util::RandomLinearCombination,
 };