fix mpt table assignment

Author: lispc

src/lib.rs

@@ -158,7 +158,9 @@ impl<Fp: FieldExt> Circuit<Fp> for SimpleTrie<Fp> {
     }
 
     fn configure(meta: &mut ConstraintSystem<Fp>) -> Self::Config {
-        let layer = LayerGadget::configure(meta, 2, 
+        let layer = LayerGadget::configure(
+            meta,
+            2,
             MPTOpGadget::min_free_cols(),
             MPTOpGadget::min_ctrl_types(),
         );
@@ -440,11 +442,12 @@ impl EthTrieConfig {
         rows: usize,
     ) -> Result<(), Error> {
         let mpt_entries = tbl_tips.into_iter().zip(ops).map(|(proof_type, op)| {
-            if let Some(rand) = randomness {
-                MPTEntry::from_op(proof_type, op, rand)
-            } else {
-                MPTEntry::from_op_no_base(proof_type, op)
-            }
+            MPTEntry::from_op(proof_type, op, randomness.unwrap_or_default())
+            //if let Some(rand) = randomness {
+            //    MPTEntry::from_op(proof_type, op, rand)
+            //} else {
+            //    MPTEntry::from_op_no_base(proof_type, op)
+            //}
         });
 
         let mpt_tbl = MPTTable::construct(

src/mpt_table.rs

@@ -502,7 +502,7 @@ impl<F: FieldExt> MPTTable<F> {
         RangeCheckChip::construct(config.range_check_u8.clone()).load(layouter)?;
 
         layouter.assign_region(
-            || "mpt table",
+            || "mpt table inside",
             |mut region| {
                 for (offset, entry) in self.entries.iter().enumerate() {
                     for (index, col) in config.proof_sel.as_slice().iter().copied().enumerate() {
@@ -520,26 +520,29 @@ impl<F: FieldExt> MPTTable<F> {
                         )?;
                     }
 
-                    if let Some(base_entries) = entry.base {
-                        for (val, col) in base_entries.iter().zip(
-                            [
-                                config.address,
-                                config.storage_key,
-                                config.proof_type,
-                                config.new_root,
-                                config.old_root,
-                                config.new_value,
-                                config.old_value,
-                            ]
-                            .as_slice(),
-                        ) {
-                            region.assign_advice(
-                                || format!("assign for mpt table offset {}", offset),
-                                *col,
-                                offset,
-                                || Value::known(*val),
-                            )?;
-                        }
+                    let values = match entry.base {
+                        Some(base_entries) => base_entries.map(|x| Value::known(x)),
+                        None => [Value::unknown(); 7],
+                    };
+
+                    for (val, col) in values.iter().zip(
+                        [
+                            config.address,
+                            config.storage_key,
+                            config.proof_type,
+                            config.new_root,
+                            config.old_root,
+                            config.new_value,
+                            config.old_value,
+                        ]
+                        .as_slice(),
+                    ) {
+                        region.assign_advice(
+                            || format!("assign for mpt table offset {}", offset),
+                            *col,
+                            offset,
+                            || *val,
+                        )?;
                     }
 
                     config.storage_key_2.assign(