Parent data is_mod_extension witness store fix; constraint added.

privacy-scaling-explorations · Aug 2, 2023 · 9a76442 · 9a76442
1 parent 9fb4668
commit 9a76442
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/zkevm-circuits/src/mpt_circuit/extension_branch.rs b/zkevm-circuits/src/mpt_circuit/extension_branch.rs
@@ -288,7 +288,7 @@ impl<F: Field> ExtensionBranchConfig<F> {
                     mod_node_hash_rlc[is_s.idx()],
                     false,
                     false,
-                    parent_data[is_s.idx()].is_mod_extension,
+                    extension_branch.is_mod_extension[is_s.idx()],
                     0.scalar(),
                 )?;
             } else {
@@ -310,7 +310,7 @@ impl<F: Field> ExtensionBranchConfig<F> {
                     parent_data[is_s.idx()].rlc,
                     parent_data[is_s.idx()].is_root,
                     true,
-                    parent_data[is_s.idx()].is_mod_extension,
+                    extension_branch.is_mod_extension[is_s.idx()],
                     mod_node_hash_rlc[is_s.idx()],
                 )?;
             }

diff --git a/zkevm-circuits/src/mpt_circuit/helpers.rs b/zkevm-circuits/src/mpt_circuit/helpers.rs
@@ -1055,7 +1055,7 @@ impl<F: Field> DriftedGadget<F> {
             ifx! {parent_data[true.idx()].is_placeholder.expr() + parent_data[false.idx()].is_placeholder.expr() => {
                 config.drifted_rlp_key = ListKeyGadget::construct(cb, drifted_item);
                 for is_s in [true, false] {
-                    ifx! {parent_data[is_s.idx()].is_placeholder.expr() => {
+                    ifx! {and::expr(&[parent_data[is_s.idx()].is_placeholder.expr(), not!(parent_data[is_s.idx()].is_mod_extension.expr())]) => {
                         // Check that the drifted leaf is unchanged and is stored at `drifted_index`.
                         // TODO(Brecht): Length can change so need to add RLP consistency checks?