[WIP] feat/#1369 withdraw from beacon chain part 2

zkevm-circuits/src/lib.rs

@@ -38,6 +38,7 @@ pub mod test_util;
 pub mod instance;
 pub mod tx_circuit;
 pub mod util;
+pub mod wd_circuit;
 pub mod witness;
 
 pub use gadgets::impl_expr;

zkevm-circuits/src/mpt_circuit.rs

@@ -16,14 +16,16 @@ mod account_leaf;
 mod branch;
 mod extension;
 mod extension_branch;
-mod helpers;
+pub mod helpers;
 mod param;
 mod rlp_gadgets;
 mod start;
 mod storage_leaf;
 /// MPT witness row
 pub mod witness_row;
 
+pub use helpers::MainRLPGadget;
+
 use self::{
     account_leaf::AccountLeafConfig,
     helpers::RLPItemView,
@@ -43,7 +45,7 @@ use crate::{
         memory::{Memory, RwBank},
     },
     mpt_circuit::{
-        helpers::{MPTConstraintBuilder, MainRLPGadget, MptCellType, MptTableType},
+        helpers::{MPTConstraintBuilder, MptCellType, MptTableType},
         start::StartConfig,
         storage_leaf::StorageLeafConfig,
     },

zkevm-circuits/src/mpt_circuit/helpers.rs

@@ -1301,12 +1301,12 @@ pub struct MainRLPGadget<F> {
     bytes: Vec<Cell<F>>,
     rlp: RLPItemGadget<F>,
     below_limit: LtGadget<F, 1>,
-    num_bytes: Cell<F>,
+    pub num_bytes: Cell<F>,
     len: Cell<F>,
     mult_inv: Cell<F>,
     mult_diff: Cell<F>,
     hash_rlc: Cell<F>,
-    rlc_rlp: Cell<F>,
+    pub rlc_rlp: Cell<F>,
     word: WordCell<F>,
     tag: Cell<F>,
     max_len: Cell<F>,

zkevm-circuits/src/mpt_circuit/lib.rs

@@ -7,4 +7,4 @@ pub mod helpers;
 pub mod mpt;
 pub mod param;
 pub mod storage_leaf;
-pub mod witness_row;
+pub mod witness_row;

zkevm-circuits/src/table/keccak_table.rs

@@ -125,7 +125,7 @@ impl KeccakTable {
     }
 
     /// returns matchings between the circuit columns passed as parameters and
-    /// the table collumns
+    /// the table columns
     pub fn match_columns(
         &self,
         value_rlc: Column<Advice>,