From bb8a6257ccbfbdc39a2e0806730b7882b94dcddf Mon Sep 17 00:00:00 2001 From: miha-stopar Date: Fri, 19 Apr 2024 12:02:45 +0200 Subject: [PATCH 1/7] debugging logs --- geth-utils/gethutil/mpt/state/statedb.go | 19 ++++++ .../gethutil/mpt/witness/prepare_witness.go | 59 +++++++++++++++++++ .../src/mpt_circuit/mod_extension.rs | 13 ++++ 3 files changed, 91 insertions(+) diff --git a/geth-utils/gethutil/mpt/state/statedb.go b/geth-utils/gethutil/mpt/state/statedb.go index 51f1f53115..4bff3087ec 100644 --- a/geth-utils/gethutil/mpt/state/statedb.go +++ b/geth-utils/gethutil/mpt/state/statedb.go @@ -458,8 +458,27 @@ func (s *StateDB) SetStateObjectIfExists(addr common.Address) { if len(ap) > 0 { ret, _ := hex.DecodeString(ap[len(ap)-1][2:]) + fmt.Println("=========== SetStateObjectIfExists ==================") + for i := 0; i < len(ap); i++ { + fmt.Println(ap[i]) + fmt.Println("") + } + + fmt.Println("===------=====") + fmt.Println(ret) + data := new(Account) keyLen := ret[2] - 128 + + if int(3 + keyLen + 2) > len(ret) { + // Not account leaf, it's extension node + fmt.Println("") + fmt.Println("") + fmt.Println("extension node") + fmt.Println("") + return + } + accData := ret[3+keyLen+2:] if err := rlp.DecodeBytes(accData, data); err != nil { diff --git a/geth-utils/gethutil/mpt/witness/prepare_witness.go b/geth-utils/gethutil/mpt/witness/prepare_witness.go index 82926358ff..780c35bc68 100644 --- a/geth-utils/gethutil/mpt/witness/prepare_witness.go +++ b/geth-utils/gethutil/mpt/witness/prepare_witness.go @@ -1,6 +1,7 @@ package witness import ( + "fmt" "math/big" "main/gethutil/mpt/oracle" @@ -226,6 +227,41 @@ func obtainTwoProofsAndConvertToWitness(trieModifications []TrieModification, st storageProof1, neighbourNode2, extNibbles2, isLastLeaf2, isNeighbourNodeHashed2, err := statedb.GetStorageProof(addr, tMod.Key) check(err) + fmt.Println("==== ??? ===== ?????????????????????????") + fmt.Println(tMod.Type) + fmt.Println(tMod.Value) + + fmt.Println("") + fmt.Println("account proof 1") + for i := 0; i < len(accountProof); i++ { + fmt.Println(accountProof[i]) + fmt.Println("") + } + + fmt.Println("") + fmt.Println("storage proof 1") + for i := 0; i < len(storageProof); i++ { + fmt.Println(storageProof[i]) + fmt.Println("") + } + fmt.Println("") + + fmt.Println("") + fmt.Println("account proof 2") + for i := 0; i < len(accountProof1); i++ { + fmt.Println(accountProof1[i]) + fmt.Println("") + } + + fmt.Println("") + fmt.Println("storage proof 2") + for i := 0; i < len(storageProof1); i++ { + fmt.Println(storageProof1[i]) + fmt.Println("") + } + fmt.Println("") + + aNode := aNeighbourNode2 aIsLastLeaf := aIsLastLeaf1 aIsNeighbourNodeHashed := aIsNeighbourNodeHashed2 @@ -441,6 +477,29 @@ func convertProofToWitness(statedb *state.StateDB, addr common.Address, addrh [] leafRow0, key, keyIndex, isShorterProofLastLeaf) + if isModifiedExtNode { + fmt.Println("===========================================") + fmt.Println("") + fmt.Println(isAccountProof) + fmt.Println(nonExistingAccountProof) + fmt.Println(nonExistingStorageProof) + + fmt.Println("") + fmt.Println("isModExtNode proof 1") + for i := 0; i < len(proof1); i++ { + fmt.Println(proof1[i]) + fmt.Println("") + } + + fmt.Println("") + fmt.Println("isModExtNode proof 2") + for i := 0; i < len(proof2); i++ { + fmt.Println(proof2[i]) + fmt.Println("") + } + fmt.Println("") + } + nodes = append(nodes, bNode) var leafNode Node diff --git a/zkevm-circuits/src/mpt_circuit/mod_extension.rs b/zkevm-circuits/src/mpt_circuit/mod_extension.rs index c1ea30addd..ad7d19970e 100644 --- a/zkevm-circuits/src/mpt_circuit/mod_extension.rs +++ b/zkevm-circuits/src/mpt_circuit/mod_extension.rs @@ -305,6 +305,19 @@ impl ModExtensionGadget { if is_key_part_odd { assert!(first_key_byte < 0b10_0000); } else { + if first_key_byte != 0 { + println!(""); + for r in rlp_values { + println!("{:?}", r.bytes); + println!(""); + } + /* + println!("{:?}", key_items[0]); + println!(""); + println!("{:?}", key_items[1]); + println!(""); + */ + } assert!(first_key_byte == 0); } From 96ee4256af5d07b2cc403ecc6da724466510104a Mon Sep 17 00:00:00 2001 From: miha-stopar Date: Mon, 22 Apr 2024 09:45:05 +0200 Subject: [PATCH 2/7] ModExtension assign fix --- geth-utils/gethutil/mpt/state/statedb.go | 14 -------- .../src/mpt_circuit/account_leaf.rs | 2 +- .../src/mpt_circuit/mod_extension.rs | 36 ++++++++++++------- .../src/mpt_circuit/storage_leaf.rs | 2 +- 4 files changed, 25 insertions(+), 29 deletions(-) diff --git a/geth-utils/gethutil/mpt/state/statedb.go b/geth-utils/gethutil/mpt/state/statedb.go index 4bff3087ec..f230e3cd36 100644 --- a/geth-utils/gethutil/mpt/state/statedb.go +++ b/geth-utils/gethutil/mpt/state/statedb.go @@ -457,25 +457,11 @@ func (s *StateDB) SetStateObjectIfExists(addr common.Address) { ap := oracle.PrefetchAccount(s.Db.BlockNumber, addr, nil) if len(ap) > 0 { ret, _ := hex.DecodeString(ap[len(ap)-1][2:]) - - fmt.Println("=========== SetStateObjectIfExists ==================") - for i := 0; i < len(ap); i++ { - fmt.Println(ap[i]) - fmt.Println("") - } - - fmt.Println("===------=====") - fmt.Println(ret) - data := new(Account) keyLen := ret[2] - 128 if int(3 + keyLen + 2) > len(ret) { // Not account leaf, it's extension node - fmt.Println("") - fmt.Println("") - fmt.Println("extension node") - fmt.Println("") return } diff --git a/zkevm-circuits/src/mpt_circuit/account_leaf.rs b/zkevm-circuits/src/mpt_circuit/account_leaf.rs index 1c1b9af253..6641398658 100644 --- a/zkevm-circuits/src/mpt_circuit/account_leaf.rs +++ b/zkevm-circuits/src/mpt_circuit/account_leaf.rs @@ -836,7 +836,7 @@ impl AccountLeafConfig { &account.mod_list_rlp_bytes[1], ]; self.mod_extension - .assign(region, offset, rlp_values, mod_list_rlp_bytes)?; + .assign(region, offset, rlp_values, mod_list_rlp_bytes, true)?; } let mut new_value = value[false.idx()]; diff --git a/zkevm-circuits/src/mpt_circuit/mod_extension.rs b/zkevm-circuits/src/mpt_circuit/mod_extension.rs index ad7d19970e..1f2bf49608 100644 --- a/zkevm-circuits/src/mpt_circuit/mod_extension.rs +++ b/zkevm-circuits/src/mpt_circuit/mod_extension.rs @@ -5,9 +5,7 @@ use halo2_proofs::plonk::{Error, VirtualCells}; use super::{ helpers::{ ext_key_rlc_calc_value, KeyData, ListKeyGadget, ListKeyWitness, MPTConstraintBuilder, - }, - rlp_gadgets::RLPItemWitness, - MPTContext, + }, rlp_gadgets::RLPItemWitness, witness_row::AccountRowType, MPTContext }; use crate::{ circuit, @@ -271,23 +269,41 @@ impl ModExtensionGadget { offset: usize, rlp_values: &[RLPItemWitness], list_rlp_bytes: [&[u8]; 2], + is_account: bool, ) -> Result<(), Error> { - let key_items = [ + let mut key_items = [ rlp_values[StorageRowType::LongExtNodeKey as usize].clone(), rlp_values[StorageRowType::ShortExtNodeKey as usize].clone(), - ]; + ]; let mut rlp_key = vec![ListKeyWitness::default(); 2]; let mut key_rlc = vec![]; - let items_s = [ + let mut items_s = [ rlp_values[StorageRowType::LongExtNodeKey as usize].clone(), rlp_values[StorageRowType::LongExtNodeNibbles as usize].clone(), ]; - let items_c = [ + let mut items_c = [ rlp_values[StorageRowType::ShortExtNodeKey as usize].clone(), rlp_values[StorageRowType::ShortExtNodeNibbles as usize].clone(), ]; + + if is_account { + key_items = [ + rlp_values[AccountRowType::LongExtNodeKey as usize].clone(), + rlp_values[AccountRowType::ShortExtNodeKey as usize].clone(), + ]; + + items_s = [ + rlp_values[AccountRowType::LongExtNodeKey as usize].clone(), + rlp_values[AccountRowType::LongExtNodeNibbles as usize].clone(), + ]; + items_c = [ + rlp_values[AccountRowType::ShortExtNodeKey as usize].clone(), + rlp_values[AccountRowType::ShortExtNodeNibbles as usize].clone(), + ]; + } + let items = vec![items_s, items_c]; for is_s in [true, false] { @@ -311,12 +327,6 @@ impl ModExtensionGadget { println!("{:?}", r.bytes); println!(""); } - /* - println!("{:?}", key_items[0]); - println!(""); - println!("{:?}", key_items[1]); - println!(""); - */ } assert!(first_key_byte == 0); } diff --git a/zkevm-circuits/src/mpt_circuit/storage_leaf.rs b/zkevm-circuits/src/mpt_circuit/storage_leaf.rs index 000df78221..9da9a830bf 100644 --- a/zkevm-circuits/src/mpt_circuit/storage_leaf.rs +++ b/zkevm-circuits/src/mpt_circuit/storage_leaf.rs @@ -685,7 +685,7 @@ impl StorageLeafConfig { &storage.mod_list_rlp_bytes[1], ]; self.mod_extension - .assign(region, offset, rlp_values, mod_list_rlp_bytes)?; + .assign(region, offset, rlp_values, mod_list_rlp_bytes, false)?; } let mut new_value = value_word[false.idx()]; From 646601defce7b86bd2f51a7708872c32e3e47d43 Mon Sep 17 00:00:00 2001 From: miha-stopar Date: Mon, 22 Apr 2024 11:59:57 +0200 Subject: [PATCH 3/7] ModExtensionGadget: is_account --- .../src/mpt_circuit/account_leaf.rs | 3 +- .../src/mpt_circuit/mod_extension.rs | 34 ++++++++++++++----- .../src/mpt_circuit/storage_leaf.rs | 3 +- 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/zkevm-circuits/src/mpt_circuit/account_leaf.rs b/zkevm-circuits/src/mpt_circuit/account_leaf.rs index 6641398658..7e6a2bbe2c 100644 --- a/zkevm-circuits/src/mpt_circuit/account_leaf.rs +++ b/zkevm-circuits/src/mpt_circuit/account_leaf.rs @@ -359,6 +359,7 @@ impl AccountLeafConfig { ctx.clone(), parent_data, key_data, + true, ); }}; @@ -836,7 +837,7 @@ impl AccountLeafConfig { &account.mod_list_rlp_bytes[1], ]; self.mod_extension - .assign(region, offset, rlp_values, mod_list_rlp_bytes, true)?; + .assign(region, offset, rlp_values, mod_list_rlp_bytes)?; } let mut new_value = value[false.idx()]; diff --git a/zkevm-circuits/src/mpt_circuit/mod_extension.rs b/zkevm-circuits/src/mpt_circuit/mod_extension.rs index 1f2bf49608..bc26de982a 100644 --- a/zkevm-circuits/src/mpt_circuit/mod_extension.rs +++ b/zkevm-circuits/src/mpt_circuit/mod_extension.rs @@ -34,6 +34,7 @@ pub(crate) struct ModExtensionGadget { is_short_branch: IsEqualGadget, is_key_part_odd: [Cell; 2], // Whether the number of nibbles is odd or not. mult_key: Cell, + is_account: bool, } impl ModExtensionGadget { @@ -43,21 +44,39 @@ impl ModExtensionGadget { ctx: MPTContext, parent_data: &mut [ParentData; 2], key_data: &mut [KeyData; 2], + is_account: bool, ) -> Self { let mut config = ModExtensionGadget::default(); + config.is_account = is_account; + + let mut long_ext_node_key = StorageRowType::LongExtNodeKey as usize; + let mut short_ext_node_key = StorageRowType::ShortExtNodeKey as usize; + let mut long_ext_node_nibbles = StorageRowType::LongExtNodeNibbles as usize; + let mut short_ext_node_nibbles = StorageRowType::ShortExtNodeNibbles as usize; + let mut long_ext_node_value = StorageRowType::LongExtNodeValue as usize; + let mut short_ext_node_value = StorageRowType::ShortExtNodeValue as usize; + + if is_account { + long_ext_node_key = AccountRowType::LongExtNodeKey as usize; + short_ext_node_key = AccountRowType::ShortExtNodeKey as usize; + long_ext_node_nibbles = AccountRowType::LongExtNodeNibbles as usize; + short_ext_node_nibbles = AccountRowType::ShortExtNodeNibbles as usize; + long_ext_node_value = AccountRowType::LongExtNodeValue as usize; + short_ext_node_value = AccountRowType::ShortExtNodeValue as usize; + } circuit!([meta, cb], { let key_items = [ ctx.rlp_item( meta, cb, - StorageRowType::LongExtNodeKey as usize, + long_ext_node_key, RlpItemType::Key, ), ctx.rlp_item( meta, cb, - StorageRowType::ShortExtNodeKey as usize, + short_ext_node_key, RlpItemType::Key, ), ]; @@ -65,13 +84,13 @@ impl ModExtensionGadget { ctx.rlp_item( meta, cb, - StorageRowType::LongExtNodeNibbles as usize, + long_ext_node_nibbles, RlpItemType::Nibbles, ), ctx.rlp_item( meta, cb, - StorageRowType::ShortExtNodeNibbles as usize, + short_ext_node_nibbles, RlpItemType::Nibbles, ), ]; @@ -79,13 +98,13 @@ impl ModExtensionGadget { ctx.rlp_item( meta, cb, - StorageRowType::LongExtNodeValue as usize, + long_ext_node_value, RlpItemType::Value, ), ctx.rlp_item( meta, cb, - StorageRowType::ShortExtNodeValue as usize, + short_ext_node_value, RlpItemType::Value, ), ]; @@ -269,7 +288,6 @@ impl ModExtensionGadget { offset: usize, rlp_values: &[RLPItemWitness], list_rlp_bytes: [&[u8]; 2], - is_account: bool, ) -> Result<(), Error> { let mut key_items = [ rlp_values[StorageRowType::LongExtNodeKey as usize].clone(), @@ -288,7 +306,7 @@ impl ModExtensionGadget { rlp_values[StorageRowType::ShortExtNodeNibbles as usize].clone(), ]; - if is_account { + if self.is_account { key_items = [ rlp_values[AccountRowType::LongExtNodeKey as usize].clone(), rlp_values[AccountRowType::ShortExtNodeKey as usize].clone(), diff --git a/zkevm-circuits/src/mpt_circuit/storage_leaf.rs b/zkevm-circuits/src/mpt_circuit/storage_leaf.rs index 9da9a830bf..30bd1858b3 100644 --- a/zkevm-circuits/src/mpt_circuit/storage_leaf.rs +++ b/zkevm-circuits/src/mpt_circuit/storage_leaf.rs @@ -275,6 +275,7 @@ impl StorageLeafConfig { ctx.clone(), parent_data, key_data, + false, ); }}; @@ -685,7 +686,7 @@ impl StorageLeafConfig { &storage.mod_list_rlp_bytes[1], ]; self.mod_extension - .assign(region, offset, rlp_values, mod_list_rlp_bytes, false)?; + .assign(region, offset, rlp_values, mod_list_rlp_bytes)?; } let mut new_value = value_word[false.idx()]; From d0d26145f981ea95819aca7a96c1d85aa956feb1 Mon Sep 17 00:00:00 2001 From: miha-stopar Date: Mon, 22 Apr 2024 12:02:34 +0200 Subject: [PATCH 4/7] gofmt --- geth-utils/gethutil/mpt/state/statedb.go | 2 +- geth-utils/gethutil/mpt/witness/prepare_witness.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/geth-utils/gethutil/mpt/state/statedb.go b/geth-utils/gethutil/mpt/state/statedb.go index f230e3cd36..31b15ac2f1 100644 --- a/geth-utils/gethutil/mpt/state/statedb.go +++ b/geth-utils/gethutil/mpt/state/statedb.go @@ -460,7 +460,7 @@ func (s *StateDB) SetStateObjectIfExists(addr common.Address) { data := new(Account) keyLen := ret[2] - 128 - if int(3 + keyLen + 2) > len(ret) { + if int(3+keyLen+2) > len(ret) { // Not account leaf, it's extension node return } diff --git a/geth-utils/gethutil/mpt/witness/prepare_witness.go b/geth-utils/gethutil/mpt/witness/prepare_witness.go index 780c35bc68..7c7102821e 100644 --- a/geth-utils/gethutil/mpt/witness/prepare_witness.go +++ b/geth-utils/gethutil/mpt/witness/prepare_witness.go @@ -261,7 +261,6 @@ func obtainTwoProofsAndConvertToWitness(trieModifications []TrieModification, st } fmt.Println("") - aNode := aNeighbourNode2 aIsLastLeaf := aIsLastLeaf1 aIsNeighbourNodeHashed := aIsNeighbourNodeHashed2 From 8d028925339bd5a01eb22978d6f5828bc873ae1c Mon Sep 17 00:00:00 2001 From: miha-stopar Date: Wed, 24 Apr 2024 09:08:19 +0200 Subject: [PATCH 5/7] log message removed --- .../gethutil/mpt/witness/prepare_witness.go | 59 ------------------- .../src/mpt_circuit/mod_extension.rs | 7 --- 2 files changed, 66 deletions(-) diff --git a/geth-utils/gethutil/mpt/witness/prepare_witness.go b/geth-utils/gethutil/mpt/witness/prepare_witness.go index 7c7102821e..912e85248d 100644 --- a/geth-utils/gethutil/mpt/witness/prepare_witness.go +++ b/geth-utils/gethutil/mpt/witness/prepare_witness.go @@ -1,7 +1,6 @@ package witness import ( - "fmt" "math/big" "main/gethutil/mpt/oracle" @@ -227,40 +226,6 @@ func obtainTwoProofsAndConvertToWitness(trieModifications []TrieModification, st storageProof1, neighbourNode2, extNibbles2, isLastLeaf2, isNeighbourNodeHashed2, err := statedb.GetStorageProof(addr, tMod.Key) check(err) - fmt.Println("==== ??? ===== ?????????????????????????") - fmt.Println(tMod.Type) - fmt.Println(tMod.Value) - - fmt.Println("") - fmt.Println("account proof 1") - for i := 0; i < len(accountProof); i++ { - fmt.Println(accountProof[i]) - fmt.Println("") - } - - fmt.Println("") - fmt.Println("storage proof 1") - for i := 0; i < len(storageProof); i++ { - fmt.Println(storageProof[i]) - fmt.Println("") - } - fmt.Println("") - - fmt.Println("") - fmt.Println("account proof 2") - for i := 0; i < len(accountProof1); i++ { - fmt.Println(accountProof1[i]) - fmt.Println("") - } - - fmt.Println("") - fmt.Println("storage proof 2") - for i := 0; i < len(storageProof1); i++ { - fmt.Println(storageProof1[i]) - fmt.Println("") - } - fmt.Println("") - aNode := aNeighbourNode2 aIsLastLeaf := aIsLastLeaf1 aIsNeighbourNodeHashed := aIsNeighbourNodeHashed2 @@ -475,30 +440,6 @@ func convertProofToWitness(statedb *state.StateDB, addr common.Address, addrh [] extensionNibblesS, extensionNibblesC, leafRow0, key, keyIndex, isShorterProofLastLeaf) - - if isModifiedExtNode { - fmt.Println("===========================================") - fmt.Println("") - fmt.Println(isAccountProof) - fmt.Println(nonExistingAccountProof) - fmt.Println(nonExistingStorageProof) - - fmt.Println("") - fmt.Println("isModExtNode proof 1") - for i := 0; i < len(proof1); i++ { - fmt.Println(proof1[i]) - fmt.Println("") - } - - fmt.Println("") - fmt.Println("isModExtNode proof 2") - for i := 0; i < len(proof2); i++ { - fmt.Println(proof2[i]) - fmt.Println("") - } - fmt.Println("") - } - nodes = append(nodes, bNode) var leafNode Node diff --git a/zkevm-circuits/src/mpt_circuit/mod_extension.rs b/zkevm-circuits/src/mpt_circuit/mod_extension.rs index bc26de982a..266f4d21a6 100644 --- a/zkevm-circuits/src/mpt_circuit/mod_extension.rs +++ b/zkevm-circuits/src/mpt_circuit/mod_extension.rs @@ -339,13 +339,6 @@ impl ModExtensionGadget { if is_key_part_odd { assert!(first_key_byte < 0b10_0000); } else { - if first_key_byte != 0 { - println!(""); - for r in rlp_values { - println!("{:?}", r.bytes); - println!(""); - } - } assert!(first_key_byte == 0); } From 34e42e6f021f30046589b61820af65568a5574c8 Mon Sep 17 00:00:00 2001 From: miha-stopar Date: Wed, 24 Apr 2024 09:10:28 +0200 Subject: [PATCH 6/7] formatting --- bin/mpt-test/src/circuit/witness.rs | 2 - .../src/mpt_circuit/mod_extension.rs | 49 +++++-------------- 2 files changed, 11 insertions(+), 40 deletions(-) diff --git a/bin/mpt-test/src/circuit/witness.rs b/bin/mpt-test/src/circuit/witness.rs index 214ed206b3..b45d2b5599 100644 --- a/bin/mpt-test/src/circuit/witness.rs +++ b/bin/mpt-test/src/circuit/witness.rs @@ -7,8 +7,6 @@ use std::{ time::Duration, }; - - use eth_types::{Field, ToScalar}; use ethers::{ diff --git a/zkevm-circuits/src/mpt_circuit/mod_extension.rs b/zkevm-circuits/src/mpt_circuit/mod_extension.rs index 266f4d21a6..6219dd3b77 100644 --- a/zkevm-circuits/src/mpt_circuit/mod_extension.rs +++ b/zkevm-circuits/src/mpt_circuit/mod_extension.rs @@ -5,7 +5,10 @@ use halo2_proofs::plonk::{Error, VirtualCells}; use super::{ helpers::{ ext_key_rlc_calc_value, KeyData, ListKeyGadget, ListKeyWitness, MPTConstraintBuilder, - }, rlp_gadgets::RLPItemWitness, witness_row::AccountRowType, MPTContext + }, + rlp_gadgets::RLPItemWitness, + witness_row::AccountRowType, + MPTContext, }; use crate::{ circuit, @@ -67,46 +70,16 @@ impl ModExtensionGadget { circuit!([meta, cb], { let key_items = [ - ctx.rlp_item( - meta, - cb, - long_ext_node_key, - RlpItemType::Key, - ), - ctx.rlp_item( - meta, - cb, - short_ext_node_key, - RlpItemType::Key, - ), + ctx.rlp_item(meta, cb, long_ext_node_key, RlpItemType::Key), + ctx.rlp_item(meta, cb, short_ext_node_key, RlpItemType::Key), ]; let key_nibbles = [ - ctx.rlp_item( - meta, - cb, - long_ext_node_nibbles, - RlpItemType::Nibbles, - ), - ctx.rlp_item( - meta, - cb, - short_ext_node_nibbles, - RlpItemType::Nibbles, - ), + ctx.rlp_item(meta, cb, long_ext_node_nibbles, RlpItemType::Nibbles), + ctx.rlp_item(meta, cb, short_ext_node_nibbles, RlpItemType::Nibbles), ]; let rlp_value = [ - ctx.rlp_item( - meta, - cb, - long_ext_node_value, - RlpItemType::Value, - ), - ctx.rlp_item( - meta, - cb, - short_ext_node_value, - RlpItemType::Value, - ), + ctx.rlp_item(meta, cb, long_ext_node_value, RlpItemType::Value), + ctx.rlp_item(meta, cb, short_ext_node_value, RlpItemType::Value), ]; let is_insert = parent_data[0].is_placeholder.expr(); // insert or delete @@ -292,7 +265,7 @@ impl ModExtensionGadget { let mut key_items = [ rlp_values[StorageRowType::LongExtNodeKey as usize].clone(), rlp_values[StorageRowType::ShortExtNodeKey as usize].clone(), - ]; + ]; let mut rlp_key = vec![ListKeyWitness::default(); 2]; let mut key_rlc = vec![]; From 66f7e8ed987c7996ad4c0437f31d56c3e7390f4c Mon Sep 17 00:00:00 2001 From: miha-stopar Date: Wed, 24 Apr 2024 10:59:11 +0200 Subject: [PATCH 7/7] Tests regenerated --- .../tests/AccountAfterFirstLevel.json | 12 +++++----- .../tests/AccountBranchPlaceholder.json | 12 +++++----- ...countExtensionThreeNibblesInEvenLevel.json | 12 +++++----- ...ccountExtensionThreeNibblesInOddLevel.json | 12 +++++----- ...AccountExtensionTwoNibblesInEvenLevel.json | 20 ++++++++-------- .../tests/AccountWrongExtensionNode.json | 12 +++++----- .../tests/ExtNodeDeletedBefore4After1.json | 24 +++++++++---------- ...ExtNodeDeletedBefore6After1FirstLevel.json | 24 +++++++++---------- ...ExtNodeDeletedBranchDeletedFirstLevel.json | 24 +++++++++---------- ...NodeDeletedExtShortIsBranchFirstLevel.json | 24 +++++++++---------- .../tests/ExtNodeInsertedBefore4After1.json | 24 +++++++++---------- ...xtNodeInsertedBefore5After1FirstLevel.json | 24 +++++++++---------- ...xtNodeInsertedBefore5After2FirstLevel.json | 24 +++++++++---------- ...xtNodeInsertedBefore5After3FirstLevel.json | 24 +++++++++---------- ...xtNodeInsertedBefore6After1FirstLevel.json | 24 +++++++++---------- ...xtNodeInsertedBefore6After2FirstLevel.json | 24 +++++++++---------- ...xtNodeInsertedBefore6After4FirstLevel.json | 24 +++++++++---------- ...odeInsertedExtShortIsBranchFirstLevel.json | 24 +++++++++---------- .../ExtNodeInsertedInNewBranchFirstLevel.json | 24 +++++++++---------- .../tests/ExtensionIntoBranch.json | 24 +++++++++---------- .../NonExistingAccountAfterFirstLevel.json | 12 +++++----- ...nExistingAccountNilObjectInFirstLevel.json | 12 +++++----- .../tests/StorageInFirstLevelNonExisting.json | 12 +++++----- .../StorageInFirstLevelNonExistingLong.json | 12 +++++----- 24 files changed, 232 insertions(+), 232 deletions(-) diff --git a/zkevm-circuits/src/mpt_circuit/tests/AccountAfterFirstLevel.json b/zkevm-circuits/src/mpt_circuit/tests/AccountAfterFirstLevel.json index c8d7121710..53191148bd 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/AccountAfterFirstLevel.json +++ b/zkevm-circuits/src/mpt_circuit/tests/AccountAfterFirstLevel.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a0468d1a8b37720df40231d2a87c72b2ba41b6083102bf9dea6376d06129d33ae900", - "a0f27607e62c4a7a95dd1d5d63a72a129b1e42d14a59421045d8c11c29c7f8f70900" + "a043f881dc1d2c6d659d99d6d7a6f604c1cefab65f5d738ba36a2c4dcc17f38b6d00", + "a02447928309640f105342a5f255406deed3fede83875c31678bdb5e8dbf8ca86800" ], "keccak_data": [] }, @@ -45,7 +45,7 @@ "values": [ "a0a47179bacb2563d64a4da3bfd1a3afc4e15e58cb7671232a1393aa56e84e210700", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf100", + "a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a9558900", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a0400", @@ -57,7 +57,7 @@ "a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb00", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a085880d90258c3f5cfb586bc74bcde6c0a28149e7b7fa6bf6a69c08ae0836cd1400", + "a01b7779e149cadf24d4ffb77ca7e11314b8db7097e4d70b2a173493153ca2e5a000", "a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f00900", "80000000000000000000000000000000000000000000000000000000000000000000", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a085880d90258c3f5cfb586bc74bcde6c0a28149e7b7fa6bf6a69c08ae0836cd14a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", - "f9013180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a085880d90258c3f5cfb586bc74bcde6c0a28149e7b7fa6bf6a69c08ae0836cd14a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f009a0a47179bacb2563d64a4da3bfd1a3afc4e15e58cb7671232a1393aa56e84e210780" + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a01b7779e149cadf24d4ffb77ca7e11314b8db7097e4d70b2a173493153ca2e5a0a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", + "f9013180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a01b7779e149cadf24d4ffb77ca7e11314b8db7097e4d70b2a173493153ca2e5a0a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f009a0a47179bacb2563d64a4da3bfd1a3afc4e15e58cb7671232a1393aa56e84e210780" ] }, { diff --git a/zkevm-circuits/src/mpt_circuit/tests/AccountBranchPlaceholder.json b/zkevm-circuits/src/mpt_circuit/tests/AccountBranchPlaceholder.json index 0c6e83923e..de78c3cd09 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/AccountBranchPlaceholder.json +++ b/zkevm-circuits/src/mpt_circuit/tests/AccountBranchPlaceholder.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a0468d1a8b37720df40231d2a87c72b2ba41b6083102bf9dea6376d06129d33ae900", - "a0b220559455e7817aad815d51c2e1455060ddaaf60eeb300b69345eb407714c7e00" + "a043f881dc1d2c6d659d99d6d7a6f604c1cefab65f5d738ba36a2c4dcc17f38b6d00", + "a044f2c8ed463d2907429451b4f93d6c5e309247f253784b23c953fb269ec1440300" ], "keccak_data": [] }, @@ -45,7 +45,7 @@ "values": [ "a0f5668715bad00d67745187cb0ca429735ffd25f9c22ea8a96b90752b9f11cde500", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf100", + "a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a9558900", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a0400", @@ -57,7 +57,7 @@ "a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb00", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a085880d90258c3f5cfb586bc74bcde6c0a28149e7b7fa6bf6a69c08ae0836cd1400", + "a01b7779e149cadf24d4ffb77ca7e11314b8db7097e4d70b2a173493153ca2e5a000", "a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f00900", "80000000000000000000000000000000000000000000000000000000000000000000", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a085880d90258c3f5cfb586bc74bcde6c0a28149e7b7fa6bf6a69c08ae0836cd14a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a085880d90258c3f5cfb586bc74bcde6c0a28149e7b7fa6bf6a69c08ae0836cd14a0f5668715bad00d67745187cb0ca429735ffd25f9c22ea8a96b90752b9f11cde58080" + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a01b7779e149cadf24d4ffb77ca7e11314b8db7097e4d70b2a173493153ca2e5a0a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a01b7779e149cadf24d4ffb77ca7e11314b8db7097e4d70b2a173493153ca2e5a0a0f5668715bad00d67745187cb0ca429735ffd25f9c22ea8a96b90752b9f11cde58080" ] }, { diff --git a/zkevm-circuits/src/mpt_circuit/tests/AccountExtensionThreeNibblesInEvenLevel.json b/zkevm-circuits/src/mpt_circuit/tests/AccountExtensionThreeNibblesInEvenLevel.json index c94725c45f..ccd1e5f8b2 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/AccountExtensionThreeNibblesInEvenLevel.json +++ b/zkevm-circuits/src/mpt_circuit/tests/AccountExtensionThreeNibblesInEvenLevel.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a0d4f83e51c78aeae92abfa769bc9eecf8a5dd361c2aa4b9219b49f73b4ea3531500", - "a09483cae1f3d6f923e9f3d6d387e9b65ac74190fddf26259ac020afbef5d0c80000" + "a0fa98baf657246ea9f24d13c399d85ef737b059a6bcff6cf938e016b9d7d1c7b700", + "a005448c93c662145ad3d9d8ebd4f3fc4a1e7a32b2f2fe05842780950ba6a37f9f00" ], "keccak_data": [] }, @@ -45,7 +45,7 @@ "values": [ "a00165d78eb2d06873f7a076909093b34881dc3527b63cd33f0c19ae635eb15fc100", "a0d14c2a3a9c74f61ceb04bd565a49c5a86741af97d3dbeca89be38e45095c9b2f00", - "a073d08631b39e07893b9683591a1c973427918568ff5e8c196d5db4042176509300", + "a058019de2db42635c82691cd376bf4310d2feebb9848fc76c0d8da9fdb74aa4a100", "a011c2fa9aaf9b6829428025c76a44111c3c437d7772acfcb31aa5f0be47d7a72a00", "a0c3cfe012315dafc735d5ad92ab18f28b77218dc3193723053beacc462ea9397700", "a05d92fbe7525079b8250886a5d33dbbc12c14aae59e598f7be2e2d96d5e7b614900", @@ -57,7 +57,7 @@ "a05247e1e89587276142445f2235dfccbef844df7432098e5217f395913390588600", "a00b1058936f5b4aba5fae64e5c1a2aefc465649049a9acdc45dbed9377a7a2b3000", "a03ffa83af97358081ddbf06a0da6fedc7b2490d89d83646a5b34953a81ff1034700", - "a0e966e706e85e1ec5954cb87a48ac9205c1bf013059acbd85e07bb9423d637ef700", + "a061c387163a9bddfec70a358a871a998355673598e3c16df94d63b61acdd6ca0400", "a082adcb70b6e04c04aedb3a33df449da0fc4433ecc3c19a000e3f9c38cddb84b900", "a04f75d42fba5715dfd873aa6891c82a545878730a40bfa2fc719b392b0a3b045800", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f90211a0d14c2a3a9c74f61ceb04bd565a49c5a86741af97d3dbeca89be38e45095c9b2fa073d08631b39e07893b9683591a1c973427918568ff5e8c196d5db40421765093a011c2fa9aaf9b6829428025c76a44111c3c437d7772acfcb31aa5f0be47d7a72aa0c3cfe012315dafc735d5ad92ab18f28b77218dc3193723053beacc462ea93977a05d92fbe7525079b8250886a5d33dbbc12c14aae59e598f7be2e2d96d5e7b6149a0d83523d2d6afddb1fd2e102db5ace42416b34c9e358219cc9d8edadc98a57f78a01090721fd280068a53c6355e798d684d5ebe25e12549462d3c1b1a8ffca3726da0e84157cbb9325309c11240d3640fa216bacb4948b522336c183b2131d81a38e1a0e64f5ffa8a4e174c70166816a4d5657fa8c7774737ccc5e57350ea6100880218a0a82fea9cb305037869a6284f800ad7c0a26f3b6c08acc8dd6bd01be1a8a4d332a05247e1e89587276142445f2235dfccbef844df7432098e5217f3959133905886a00b1058936f5b4aba5fae64e5c1a2aefc465649049a9acdc45dbed9377a7a2b30a03ffa83af97358081ddbf06a0da6fedc7b2490d89d83646a5b34953a81ff10347a0e966e706e85e1ec5954cb87a48ac9205c1bf013059acbd85e07bb9423d637ef7a082adcb70b6e04c04aedb3a33df449da0fc4433ecc3c19a000e3f9c38cddb84b9a04f75d42fba5715dfd873aa6891c82a545878730a40bfa2fc719b392b0a3b045880", - "f90211a00165d78eb2d06873f7a076909093b34881dc3527b63cd33f0c19ae635eb15fc1a073d08631b39e07893b9683591a1c973427918568ff5e8c196d5db40421765093a011c2fa9aaf9b6829428025c76a44111c3c437d7772acfcb31aa5f0be47d7a72aa0c3cfe012315dafc735d5ad92ab18f28b77218dc3193723053beacc462ea93977a05d92fbe7525079b8250886a5d33dbbc12c14aae59e598f7be2e2d96d5e7b6149a0d83523d2d6afddb1fd2e102db5ace42416b34c9e358219cc9d8edadc98a57f78a01090721fd280068a53c6355e798d684d5ebe25e12549462d3c1b1a8ffca3726da0e84157cbb9325309c11240d3640fa216bacb4948b522336c183b2131d81a38e1a0e64f5ffa8a4e174c70166816a4d5657fa8c7774737ccc5e57350ea6100880218a0a82fea9cb305037869a6284f800ad7c0a26f3b6c08acc8dd6bd01be1a8a4d332a05247e1e89587276142445f2235dfccbef844df7432098e5217f3959133905886a00b1058936f5b4aba5fae64e5c1a2aefc465649049a9acdc45dbed9377a7a2b30a03ffa83af97358081ddbf06a0da6fedc7b2490d89d83646a5b34953a81ff10347a0e966e706e85e1ec5954cb87a48ac9205c1bf013059acbd85e07bb9423d637ef7a082adcb70b6e04c04aedb3a33df449da0fc4433ecc3c19a000e3f9c38cddb84b9a04f75d42fba5715dfd873aa6891c82a545878730a40bfa2fc719b392b0a3b045880" + "f90211a0d14c2a3a9c74f61ceb04bd565a49c5a86741af97d3dbeca89be38e45095c9b2fa058019de2db42635c82691cd376bf4310d2feebb9848fc76c0d8da9fdb74aa4a1a011c2fa9aaf9b6829428025c76a44111c3c437d7772acfcb31aa5f0be47d7a72aa0c3cfe012315dafc735d5ad92ab18f28b77218dc3193723053beacc462ea93977a05d92fbe7525079b8250886a5d33dbbc12c14aae59e598f7be2e2d96d5e7b6149a0d83523d2d6afddb1fd2e102db5ace42416b34c9e358219cc9d8edadc98a57f78a01090721fd280068a53c6355e798d684d5ebe25e12549462d3c1b1a8ffca3726da0e84157cbb9325309c11240d3640fa216bacb4948b522336c183b2131d81a38e1a0e64f5ffa8a4e174c70166816a4d5657fa8c7774737ccc5e57350ea6100880218a0a82fea9cb305037869a6284f800ad7c0a26f3b6c08acc8dd6bd01be1a8a4d332a05247e1e89587276142445f2235dfccbef844df7432098e5217f3959133905886a00b1058936f5b4aba5fae64e5c1a2aefc465649049a9acdc45dbed9377a7a2b30a03ffa83af97358081ddbf06a0da6fedc7b2490d89d83646a5b34953a81ff10347a061c387163a9bddfec70a358a871a998355673598e3c16df94d63b61acdd6ca04a082adcb70b6e04c04aedb3a33df449da0fc4433ecc3c19a000e3f9c38cddb84b9a04f75d42fba5715dfd873aa6891c82a545878730a40bfa2fc719b392b0a3b045880", + "f90211a00165d78eb2d06873f7a076909093b34881dc3527b63cd33f0c19ae635eb15fc1a058019de2db42635c82691cd376bf4310d2feebb9848fc76c0d8da9fdb74aa4a1a011c2fa9aaf9b6829428025c76a44111c3c437d7772acfcb31aa5f0be47d7a72aa0c3cfe012315dafc735d5ad92ab18f28b77218dc3193723053beacc462ea93977a05d92fbe7525079b8250886a5d33dbbc12c14aae59e598f7be2e2d96d5e7b6149a0d83523d2d6afddb1fd2e102db5ace42416b34c9e358219cc9d8edadc98a57f78a01090721fd280068a53c6355e798d684d5ebe25e12549462d3c1b1a8ffca3726da0e84157cbb9325309c11240d3640fa216bacb4948b522336c183b2131d81a38e1a0e64f5ffa8a4e174c70166816a4d5657fa8c7774737ccc5e57350ea6100880218a0a82fea9cb305037869a6284f800ad7c0a26f3b6c08acc8dd6bd01be1a8a4d332a05247e1e89587276142445f2235dfccbef844df7432098e5217f3959133905886a00b1058936f5b4aba5fae64e5c1a2aefc465649049a9acdc45dbed9377a7a2b30a03ffa83af97358081ddbf06a0da6fedc7b2490d89d83646a5b34953a81ff10347a061c387163a9bddfec70a358a871a998355673598e3c16df94d63b61acdd6ca04a082adcb70b6e04c04aedb3a33df449da0fc4433ecc3c19a000e3f9c38cddb84b9a04f75d42fba5715dfd873aa6891c82a545878730a40bfa2fc719b392b0a3b045880" ] }, { diff --git a/zkevm-circuits/src/mpt_circuit/tests/AccountExtensionThreeNibblesInOddLevel.json b/zkevm-circuits/src/mpt_circuit/tests/AccountExtensionThreeNibblesInOddLevel.json index e8054eec45..cbad97db58 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/AccountExtensionThreeNibblesInOddLevel.json +++ b/zkevm-circuits/src/mpt_circuit/tests/AccountExtensionThreeNibblesInOddLevel.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a06076a491d6fbf97d076a4db1836aa8c9fbf474b980546a2bc7d11ac14d9ebf1500", - "a0dc1cd18f4227f78b445f0896a39da3f2411bec6a4a34b857d9c1a7ba74a53f5500" + "a0151a67ac1fe2c92263453f9dbbec8a8b03cf0cc8bea09c7a1bf2c34af62cc52900", + "a05e7c30bab6f1a7f4f08afe99a533ad839623b10d2625b9412fc372bbcd70c0bc00" ], "keccak_data": [] }, @@ -45,7 +45,7 @@ "values": [ "a029bc928d4b56e3e88d97c4ad644b1e96c3a0e830ab73584555e53d1267c6e34200", "a0a0285aea56abee8f5e3a5691fea65b8b92b6a248765b58306e0117054afb0e6900", - "a0f3be87c206a0ac0b58f1c381ae4d4c4d744a528a1155bd8190bfb849cd91f31700", + "a0ff14cea598d8e120c1a4050198de903495abceff266b95d55b663e693ff0364d00", "a06fcd9c4bafaee2236668d7d089beb52907a52b1e1eee05e4b87c4b86f4ab8c2900", "a056ef4d2c325d968478c53bd2ce6bdbe46d6fe3e263842631d6eb7e0a97b1983700", "a0f107a60415d7a99f6ab7a4a737658d53709ac1bdbe3596c5211da0b50d78db2d00", @@ -57,7 +57,7 @@ "a058f0dc1daca97d4ea8997446b3f59853855c71e475051797c8d78737c8a159a200", "a0ea6755d14077974e5b54341a729adb1570259e7293a05bd1d949eb116b53eee700", "a09b4316f410a639b3cb061e96e18586cb2e6c013a50457481739ecf2be0a5b57c00", - "a0ed068762642f09bde1608aedb9422d576a8a030875e900c6228bc6f10809223200", + "a0cf24dddebca06787d76f2ec01e0769b774b974c4a0046527ea34e1fc9bcc4ec900", "a0cab13ba74c00b7e56f4ab691800e5d525f0b7d6be2786623c0160ae345bbebdf00", "a0935313b17bc9e6533f500754e297c1945bf8eb5b22c67ff6b01ed442ecc6ed5300", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f90211a0a0285aea56abee8f5e3a5691fea65b8b92b6a248765b58306e0117054afb0e69a0f3be87c206a0ac0b58f1c381ae4d4c4d744a528a1155bd8190bfb849cd91f317a06fcd9c4bafaee2236668d7d089beb52907a52b1e1eee05e4b87c4b86f4ab8c29a056ef4d2c325d968478c53bd2ce6bdbe46d6fe3e263842631d6eb7e0a97b19837a0f107a60415d7a99f6ab7a4a737658d53709ac1bdbe3596c5211da0b50d78db2da086c0369e7547cb8e999cc44707d0b296adcfec7a906e472a4bcfe25378f4f8e0a0e8a83ed5093d0257a5dcbe0bfa96b7ea967536dc76225f48146e19318abfcf17a097031d6df833bae2b4ef4b16a8b437de822c5853415babb79dba4cce16e52bb5a022e344678f6bd7cef8ebba50252fe401c0edf0543665338624bcbc277fba1592a0bac352dbaeaa1339687e9731e9ed4d68e4ae4ec1308622032697406779dada28a058f0dc1daca97d4ea8997446b3f59853855c71e475051797c8d78737c8a159a2a0ea6755d14077974e5b54341a729adb1570259e7293a05bd1d949eb116b53eee7a09b4316f410a639b3cb061e96e18586cb2e6c013a50457481739ecf2be0a5b57ca0ed068762642f09bde1608aedb9422d576a8a030875e900c6228bc6f108092232a0cab13ba74c00b7e56f4ab691800e5d525f0b7d6be2786623c0160ae345bbebdfa0935313b17bc9e6533f500754e297c1945bf8eb5b22c67ff6b01ed442ecc6ed5380", - "f90211a0a0285aea56abee8f5e3a5691fea65b8b92b6a248765b58306e0117054afb0e69a0f3be87c206a0ac0b58f1c381ae4d4c4d744a528a1155bd8190bfb849cd91f317a06fcd9c4bafaee2236668d7d089beb52907a52b1e1eee05e4b87c4b86f4ab8c29a056ef4d2c325d968478c53bd2ce6bdbe46d6fe3e263842631d6eb7e0a97b19837a0f107a60415d7a99f6ab7a4a737658d53709ac1bdbe3596c5211da0b50d78db2da086c0369e7547cb8e999cc44707d0b296adcfec7a906e472a4bcfe25378f4f8e0a029bc928d4b56e3e88d97c4ad644b1e96c3a0e830ab73584555e53d1267c6e342a097031d6df833bae2b4ef4b16a8b437de822c5853415babb79dba4cce16e52bb5a022e344678f6bd7cef8ebba50252fe401c0edf0543665338624bcbc277fba1592a0bac352dbaeaa1339687e9731e9ed4d68e4ae4ec1308622032697406779dada28a058f0dc1daca97d4ea8997446b3f59853855c71e475051797c8d78737c8a159a2a0ea6755d14077974e5b54341a729adb1570259e7293a05bd1d949eb116b53eee7a09b4316f410a639b3cb061e96e18586cb2e6c013a50457481739ecf2be0a5b57ca0ed068762642f09bde1608aedb9422d576a8a030875e900c6228bc6f108092232a0cab13ba74c00b7e56f4ab691800e5d525f0b7d6be2786623c0160ae345bbebdfa0935313b17bc9e6533f500754e297c1945bf8eb5b22c67ff6b01ed442ecc6ed5380" + "f90211a0a0285aea56abee8f5e3a5691fea65b8b92b6a248765b58306e0117054afb0e69a0ff14cea598d8e120c1a4050198de903495abceff266b95d55b663e693ff0364da06fcd9c4bafaee2236668d7d089beb52907a52b1e1eee05e4b87c4b86f4ab8c29a056ef4d2c325d968478c53bd2ce6bdbe46d6fe3e263842631d6eb7e0a97b19837a0f107a60415d7a99f6ab7a4a737658d53709ac1bdbe3596c5211da0b50d78db2da086c0369e7547cb8e999cc44707d0b296adcfec7a906e472a4bcfe25378f4f8e0a0e8a83ed5093d0257a5dcbe0bfa96b7ea967536dc76225f48146e19318abfcf17a097031d6df833bae2b4ef4b16a8b437de822c5853415babb79dba4cce16e52bb5a022e344678f6bd7cef8ebba50252fe401c0edf0543665338624bcbc277fba1592a0bac352dbaeaa1339687e9731e9ed4d68e4ae4ec1308622032697406779dada28a058f0dc1daca97d4ea8997446b3f59853855c71e475051797c8d78737c8a159a2a0ea6755d14077974e5b54341a729adb1570259e7293a05bd1d949eb116b53eee7a09b4316f410a639b3cb061e96e18586cb2e6c013a50457481739ecf2be0a5b57ca0cf24dddebca06787d76f2ec01e0769b774b974c4a0046527ea34e1fc9bcc4ec9a0cab13ba74c00b7e56f4ab691800e5d525f0b7d6be2786623c0160ae345bbebdfa0935313b17bc9e6533f500754e297c1945bf8eb5b22c67ff6b01ed442ecc6ed5380", + "f90211a0a0285aea56abee8f5e3a5691fea65b8b92b6a248765b58306e0117054afb0e69a0ff14cea598d8e120c1a4050198de903495abceff266b95d55b663e693ff0364da06fcd9c4bafaee2236668d7d089beb52907a52b1e1eee05e4b87c4b86f4ab8c29a056ef4d2c325d968478c53bd2ce6bdbe46d6fe3e263842631d6eb7e0a97b19837a0f107a60415d7a99f6ab7a4a737658d53709ac1bdbe3596c5211da0b50d78db2da086c0369e7547cb8e999cc44707d0b296adcfec7a906e472a4bcfe25378f4f8e0a029bc928d4b56e3e88d97c4ad644b1e96c3a0e830ab73584555e53d1267c6e342a097031d6df833bae2b4ef4b16a8b437de822c5853415babb79dba4cce16e52bb5a022e344678f6bd7cef8ebba50252fe401c0edf0543665338624bcbc277fba1592a0bac352dbaeaa1339687e9731e9ed4d68e4ae4ec1308622032697406779dada28a058f0dc1daca97d4ea8997446b3f59853855c71e475051797c8d78737c8a159a2a0ea6755d14077974e5b54341a729adb1570259e7293a05bd1d949eb116b53eee7a09b4316f410a639b3cb061e96e18586cb2e6c013a50457481739ecf2be0a5b57ca0cf24dddebca06787d76f2ec01e0769b774b974c4a0046527ea34e1fc9bcc4ec9a0cab13ba74c00b7e56f4ab691800e5d525f0b7d6be2786623c0160ae345bbebdfa0935313b17bc9e6533f500754e297c1945bf8eb5b22c67ff6b01ed442ecc6ed5380" ] }, { diff --git a/zkevm-circuits/src/mpt_circuit/tests/AccountExtensionTwoNibblesInEvenLevel.json b/zkevm-circuits/src/mpt_circuit/tests/AccountExtensionTwoNibblesInEvenLevel.json index 3652a7babb..2d2daed89c 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/AccountExtensionTwoNibblesInEvenLevel.json +++ b/zkevm-circuits/src/mpt_circuit/tests/AccountExtensionTwoNibblesInEvenLevel.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a09af29d59e28fdc38fdab99c7196bb57abef45b1d7d519a86258166a8b76cda9f00", - "a07c235c242e7a8665065b9c5badd2fb00e224a8cda2be750086875af5c3857b2600" + "a04b5eae54cadb027b90ec178fa35747d6ba31b6eadb83bb5ae876d9d03976e53700", + "a0b6007a1c074f435e1505d3d13e239dc9fe17169d684109a8f7e7dd63795d355200" ], "keccak_data": [] }, @@ -43,9 +43,9 @@ "storage": null, "mod_extension": null, "values": [ - "a050ecd22fad9c981f1659378fa2592c14cea949f0d7399f369ba5fa3797baa1e100", + "a04a3f22eee25b6c568e5c90a30620f4d83bbcf25603ea8ce8c9ca0c98b7f15cca00", "a03df0ec6238f74744cb77157c19dd73f4e332fded781ed8876230d9859431b75900", - "a005394ea3697f0d1a4b1a491780d3ec90bc36c3bcf303d1fb4db14fb4dc33b7f100", + "a0553bd6d0bbebaa6aa8057144286a224cce39f15e09a6f85d8a2eba8694d17b9a00", "a0d8a8744381662bf8f66c693e0f25669099e3d504a69caf7d0d9c787f1517b94400", "a09275065b8b5736e752fffa139b045bf544fb01db8ef9900ee622f9c40266b73800", "a059669363292d9f0c8806794621457b8ee9c4e76237b2a1510c6efb1e6664c2be00", @@ -57,7 +57,7 @@ "a0427dc608dabea2de3a1607af6934804b544e44f586744e3bac855638424a0a3b00", "a05b490ab2800ad7f5c0e3a3f910c948b1c8fcbcc84f85b0bbeb18829678c707ef00", "a07c92720df095623f9dd7ce389fc7374d87936f747fdeca5b67d6f79cf242578800", - "a0ea2daebfd939a3b71bb40e163c69dbf58ffb231717379c9ffe28fc46ada8f46500", + "a0897708188be3c96ab9662a9a088f4424ca8a2900c9a30e0d1d5d15645c980e9900", "a00ac7fec7b6bcc2f9a06978922b93d28ca68924d9421ce3350b58225890c93a1b00", "a060324b2eb29958143c699646192ba7423726dd6ffe395c4fd1a40e5ff08d125700", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f90211a03df0ec6238f74744cb77157c19dd73f4e332fded781ed8876230d9859431b759a005394ea3697f0d1a4b1a491780d3ec90bc36c3bcf303d1fb4db14fb4dc33b7f1a0d8a8744381662bf8f66c693e0f25669099e3d504a69caf7d0d9c787f1517b944a09275065b8b5736e752fffa139b045bf544fb01db8ef9900ee622f9c40266b738a059669363292d9f0c8806794621457b8ee9c4e76237b2a1510c6efb1e6664c2bea0286a8fb8d081e4549ef670fdb82d03c29328f1fe5df262b33ac0898c19c0519fa06bdd07754d71c759de3cc3b158b6d562d790b7ffd417ceb6692da5178f183bf9a087f6cca1455dded7aaaf4dedc687e4aff0f02329d3fd1f7e65aab6f37dcbf7bca0cfedb8c8c4a27a8d2d3bf8b7d5364fc05d0d140d6ea899e6794ead88949f85e4a0b395721bef01e57d767ca8f77dcd57f49e81fe28b06764218c05e3171bc70445a0427dc608dabea2de3a1607af6934804b544e44f586744e3bac855638424a0a3ba05b490ab2800ad7f5c0e3a3f910c948b1c8fcbcc84f85b0bbeb18829678c707efa07c92720df095623f9dd7ce389fc7374d87936f747fdeca5b67d6f79cf2425788a0ea2daebfd939a3b71bb40e163c69dbf58ffb231717379c9ffe28fc46ada8f465a00ac7fec7b6bcc2f9a06978922b93d28ca68924d9421ce3350b58225890c93a1ba060324b2eb29958143c699646192ba7423726dd6ffe395c4fd1a40e5ff08d125780", - "f90211a03df0ec6238f74744cb77157c19dd73f4e332fded781ed8876230d9859431b759a050ecd22fad9c981f1659378fa2592c14cea949f0d7399f369ba5fa3797baa1e1a0d8a8744381662bf8f66c693e0f25669099e3d504a69caf7d0d9c787f1517b944a09275065b8b5736e752fffa139b045bf544fb01db8ef9900ee622f9c40266b738a059669363292d9f0c8806794621457b8ee9c4e76237b2a1510c6efb1e6664c2bea0286a8fb8d081e4549ef670fdb82d03c29328f1fe5df262b33ac0898c19c0519fa06bdd07754d71c759de3cc3b158b6d562d790b7ffd417ceb6692da5178f183bf9a087f6cca1455dded7aaaf4dedc687e4aff0f02329d3fd1f7e65aab6f37dcbf7bca0cfedb8c8c4a27a8d2d3bf8b7d5364fc05d0d140d6ea899e6794ead88949f85e4a0b395721bef01e57d767ca8f77dcd57f49e81fe28b06764218c05e3171bc70445a0427dc608dabea2de3a1607af6934804b544e44f586744e3bac855638424a0a3ba05b490ab2800ad7f5c0e3a3f910c948b1c8fcbcc84f85b0bbeb18829678c707efa07c92720df095623f9dd7ce389fc7374d87936f747fdeca5b67d6f79cf2425788a0ea2daebfd939a3b71bb40e163c69dbf58ffb231717379c9ffe28fc46ada8f465a00ac7fec7b6bcc2f9a06978922b93d28ca68924d9421ce3350b58225890c93a1ba060324b2eb29958143c699646192ba7423726dd6ffe395c4fd1a40e5ff08d125780" + "f90211a03df0ec6238f74744cb77157c19dd73f4e332fded781ed8876230d9859431b759a0553bd6d0bbebaa6aa8057144286a224cce39f15e09a6f85d8a2eba8694d17b9aa0d8a8744381662bf8f66c693e0f25669099e3d504a69caf7d0d9c787f1517b944a09275065b8b5736e752fffa139b045bf544fb01db8ef9900ee622f9c40266b738a059669363292d9f0c8806794621457b8ee9c4e76237b2a1510c6efb1e6664c2bea0286a8fb8d081e4549ef670fdb82d03c29328f1fe5df262b33ac0898c19c0519fa06bdd07754d71c759de3cc3b158b6d562d790b7ffd417ceb6692da5178f183bf9a087f6cca1455dded7aaaf4dedc687e4aff0f02329d3fd1f7e65aab6f37dcbf7bca0cfedb8c8c4a27a8d2d3bf8b7d5364fc05d0d140d6ea899e6794ead88949f85e4a0b395721bef01e57d767ca8f77dcd57f49e81fe28b06764218c05e3171bc70445a0427dc608dabea2de3a1607af6934804b544e44f586744e3bac855638424a0a3ba05b490ab2800ad7f5c0e3a3f910c948b1c8fcbcc84f85b0bbeb18829678c707efa07c92720df095623f9dd7ce389fc7374d87936f747fdeca5b67d6f79cf2425788a0897708188be3c96ab9662a9a088f4424ca8a2900c9a30e0d1d5d15645c980e99a00ac7fec7b6bcc2f9a06978922b93d28ca68924d9421ce3350b58225890c93a1ba060324b2eb29958143c699646192ba7423726dd6ffe395c4fd1a40e5ff08d125780", + "f90211a03df0ec6238f74744cb77157c19dd73f4e332fded781ed8876230d9859431b759a04a3f22eee25b6c568e5c90a30620f4d83bbcf25603ea8ce8c9ca0c98b7f15ccaa0d8a8744381662bf8f66c693e0f25669099e3d504a69caf7d0d9c787f1517b944a09275065b8b5736e752fffa139b045bf544fb01db8ef9900ee622f9c40266b738a059669363292d9f0c8806794621457b8ee9c4e76237b2a1510c6efb1e6664c2bea0286a8fb8d081e4549ef670fdb82d03c29328f1fe5df262b33ac0898c19c0519fa06bdd07754d71c759de3cc3b158b6d562d790b7ffd417ceb6692da5178f183bf9a087f6cca1455dded7aaaf4dedc687e4aff0f02329d3fd1f7e65aab6f37dcbf7bca0cfedb8c8c4a27a8d2d3bf8b7d5364fc05d0d140d6ea899e6794ead88949f85e4a0b395721bef01e57d767ca8f77dcd57f49e81fe28b06764218c05e3171bc70445a0427dc608dabea2de3a1607af6934804b544e44f586744e3bac855638424a0a3ba05b490ab2800ad7f5c0e3a3f910c948b1c8fcbcc84f85b0bbeb18829678c707efa07c92720df095623f9dd7ce389fc7374d87936f747fdeca5b67d6f79cf2425788a0897708188be3c96ab9662a9a088f4424ca8a2900c9a30e0d1d5d15645c980e99a00ac7fec7b6bcc2f9a06978922b93d28ca68924d9421ce3350b58225890c93a1ba060324b2eb29958143c699646192ba7423726dd6ffe395c4fd1a40e5ff08d125780" ] }, { @@ -109,7 +109,7 @@ "a03389e99389ffb99cefa1c10f5436ab5fb4ac697dcb33406bdb1232c1d0b4891c00", "a0431f631c6887fe4d739084bd70ab50934de6056d2281e296b98a9d55defd614000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0293fc617c219ec31062a02a066441138cb714382981c1ce308d3702541cc5fb100", + "a01f2c91679f1d68982769f41d65a95fa46171e633d82c1510d143e9786932915e00", "a04c0705584ebbdf8264d405f20f4b9fffd10740dc268e01cf0ad1dada7190322900", "a029fe65684b7bb5b7e3d2fa1f12f6880aa145a22bff022cebdc57f1ecd14f338400", "80000000000000000000000000000000000000000000000000000000000000000000", @@ -122,8 +122,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f901b1a0221d77aabcb9ed06e05176de90ac76818c8ce40dff8b3ddc5ffd0f3f2fe2797ea07f3caf8c68642f9a0806f64320a4d4564514bc6e4655fcd35ff543e50d08d90aa09ad52fce3b0fa5eff66200e72befd1ce0c38a59657dc4a564edf16aa5fb27c7ca009ae21e7dd55ee8e8e4699ad5f68248c94b6b0e5d129e3be1157dcb70f6cb3cca0ada9ad5e1b579771416dd317da2d1bc1f69917c57eff9d2b085ac324688b4e5f80a03389e99389ffb99cefa1c10f5436ab5fb4ac697dcb33406bdb1232c1d0b4891ca0431f631c6887fe4d739084bd70ab50934de6056d2281e296b98a9d55defd614080a0293fc617c219ec31062a02a066441138cb714382981c1ce308d3702541cc5fb1a04c0705584ebbdf8264d405f20f4b9fffd10740dc268e01cf0ad1dada71903229a029fe65684b7bb5b7e3d2fa1f12f6880aa145a22bff022cebdc57f1ecd14f338480a006e250110f996db660cebbc6a9f25ad2f6c5e4ac03240ecd0d46e0dcde4d4519a05994cad19aa5046d4f66c4e91c6bf9161ef703c742da20f39ecd4c267a2b3a58a0d2a0b7e3fccc73ed0e6f3f2fa1a3110e0e99fe65f03934ef0d55c1418e2a775580", - "f901b1a0221d77aabcb9ed06e05176de90ac76818c8ce40dff8b3ddc5ffd0f3f2fe2797ea07f3caf8c68642f9a0806f64320a4d4564514bc6e4655fcd35ff543e50d08d90aa09ad52fce3b0fa5eff66200e72befd1ce0c38a59657dc4a564edf16aa5fb27c7ca009ae21e7dd55ee8e8e4699ad5f68248c94b6b0e5d129e3be1157dcb70f6cb3cca0ada9ad5e1b579771416dd317da2d1bc1f69917c57eff9d2b085ac324688b4e5f80a03389e99389ffb99cefa1c10f5436ab5fb4ac697dcb33406bdb1232c1d0b4891ca00a7380aac550dfda2853f080f38a4318a666f3dae230083c5994454fd575f3a080a0293fc617c219ec31062a02a066441138cb714382981c1ce308d3702541cc5fb1a04c0705584ebbdf8264d405f20f4b9fffd10740dc268e01cf0ad1dada71903229a029fe65684b7bb5b7e3d2fa1f12f6880aa145a22bff022cebdc57f1ecd14f338480a006e250110f996db660cebbc6a9f25ad2f6c5e4ac03240ecd0d46e0dcde4d4519a05994cad19aa5046d4f66c4e91c6bf9161ef703c742da20f39ecd4c267a2b3a58a0d2a0b7e3fccc73ed0e6f3f2fa1a3110e0e99fe65f03934ef0d55c1418e2a775580" + "f901b1a0221d77aabcb9ed06e05176de90ac76818c8ce40dff8b3ddc5ffd0f3f2fe2797ea07f3caf8c68642f9a0806f64320a4d4564514bc6e4655fcd35ff543e50d08d90aa09ad52fce3b0fa5eff66200e72befd1ce0c38a59657dc4a564edf16aa5fb27c7ca009ae21e7dd55ee8e8e4699ad5f68248c94b6b0e5d129e3be1157dcb70f6cb3cca0ada9ad5e1b579771416dd317da2d1bc1f69917c57eff9d2b085ac324688b4e5f80a03389e99389ffb99cefa1c10f5436ab5fb4ac697dcb33406bdb1232c1d0b4891ca0431f631c6887fe4d739084bd70ab50934de6056d2281e296b98a9d55defd614080a01f2c91679f1d68982769f41d65a95fa46171e633d82c1510d143e9786932915ea04c0705584ebbdf8264d405f20f4b9fffd10740dc268e01cf0ad1dada71903229a029fe65684b7bb5b7e3d2fa1f12f6880aa145a22bff022cebdc57f1ecd14f338480a006e250110f996db660cebbc6a9f25ad2f6c5e4ac03240ecd0d46e0dcde4d4519a05994cad19aa5046d4f66c4e91c6bf9161ef703c742da20f39ecd4c267a2b3a58a0d2a0b7e3fccc73ed0e6f3f2fa1a3110e0e99fe65f03934ef0d55c1418e2a775580", + "f901b1a0221d77aabcb9ed06e05176de90ac76818c8ce40dff8b3ddc5ffd0f3f2fe2797ea07f3caf8c68642f9a0806f64320a4d4564514bc6e4655fcd35ff543e50d08d90aa09ad52fce3b0fa5eff66200e72befd1ce0c38a59657dc4a564edf16aa5fb27c7ca009ae21e7dd55ee8e8e4699ad5f68248c94b6b0e5d129e3be1157dcb70f6cb3cca0ada9ad5e1b579771416dd317da2d1bc1f69917c57eff9d2b085ac324688b4e5f80a03389e99389ffb99cefa1c10f5436ab5fb4ac697dcb33406bdb1232c1d0b4891ca00a7380aac550dfda2853f080f38a4318a666f3dae230083c5994454fd575f3a080a01f2c91679f1d68982769f41d65a95fa46171e633d82c1510d143e9786932915ea04c0705584ebbdf8264d405f20f4b9fffd10740dc268e01cf0ad1dada71903229a029fe65684b7bb5b7e3d2fa1f12f6880aa145a22bff022cebdc57f1ecd14f338480a006e250110f996db660cebbc6a9f25ad2f6c5e4ac03240ecd0d46e0dcde4d4519a05994cad19aa5046d4f66c4e91c6bf9161ef703c742da20f39ecd4c267a2b3a58a0d2a0b7e3fccc73ed0e6f3f2fa1a3110e0e99fe65f03934ef0d55c1418e2a775580" ] }, { diff --git a/zkevm-circuits/src/mpt_circuit/tests/AccountWrongExtensionNode.json b/zkevm-circuits/src/mpt_circuit/tests/AccountWrongExtensionNode.json index ad17df2223..3198df66d7 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/AccountWrongExtensionNode.json +++ b/zkevm-circuits/src/mpt_circuit/tests/AccountWrongExtensionNode.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a0e2da51be53d789e31efedb5dd6dec64935937dbcc23ad5b811c74f112ed13b3400", - "a0e2da51be53d789e31efedb5dd6dec64935937dbcc23ad5b811c74f112ed13b3400" + "a073ebe265b3dba2f6daff9d048db197a1dff3fd19d84f3e57fc77f66a8dc30f1600", + "a073ebe265b3dba2f6daff9d048db197a1dff3fd19d84f3e57fc77f66a8dc30f1600" ], "keccak_data": [] }, @@ -45,7 +45,7 @@ "values": [ "a0c5038909ca72e592efce930e006679592871afe7fa8dd187d52f2066ab05b09700", "a0c5038909ca72e592efce930e006679592871afe7fa8dd187d52f2066ab05b09700", - "a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf100", + "a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a9558900", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a0400", @@ -57,7 +57,7 @@ "a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb00", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a085880d90258c3f5cfb586bc74bcde6c0a28149e7b7fa6bf6a69c08ae0836cd1400", + "a01b7779e149cadf24d4ffb77ca7e11314b8db7097e4d70b2a173493153ca2e5a000", "a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f00900", "80000000000000000000000000000000000000000000000000000000000000000000", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f90131a0c5038909ca72e592efce930e006679592871afe7fa8dd187d52f2066ab05b097a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a085880d90258c3f5cfb586bc74bcde6c0a28149e7b7fa6bf6a69c08ae0836cd14a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", - "f90131a0c5038909ca72e592efce930e006679592871afe7fa8dd187d52f2066ab05b097a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a085880d90258c3f5cfb586bc74bcde6c0a28149e7b7fa6bf6a69c08ae0836cd14a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" + "f90131a0c5038909ca72e592efce930e006679592871afe7fa8dd187d52f2066ab05b097a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a01b7779e149cadf24d4ffb77ca7e11314b8db7097e4d70b2a173493153ca2e5a0a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", + "f90131a0c5038909ca72e592efce930e006679592871afe7fa8dd187d52f2066ab05b097a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a01b7779e149cadf24d4ffb77ca7e11314b8db7097e4d70b2a173493153ca2e5a0a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" ] }, { diff --git a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeDeletedBefore4After1.json b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeDeletedBefore4After1.json index 3877179b67..10f1ee6ffb 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeDeletedBefore4After1.json +++ b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeDeletedBefore4After1.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a01fb27c5dcb862f9c34bbe7d1d3f6820dd1c11177b0189c9fbce5697b26894b7600", - "a0fe93777900dd532b0109e40174eed05cfe84757ae3117cb54417975424e8cd7300" + "a080d32e5720575865a69fc8b9976028815593cb6105653be379b1fdf6c6f8331d00", + "a0dfb1b27841b8a583ffbf12a335059e9b59260568ab4714e2e68bdfaa5641149400" ], "keccak_data": [] }, @@ -43,9 +43,9 @@ "storage": null, "mod_extension": null, "values": [ - "a0df515bc15d60f45cd9284e2a153d7f308e0fd544a83f95b6a60d361a0432941d00", + "a06a55593fb3193f7f8995cc0b5a163105647dd6c962d7f2e43a43a47e6199be0100", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf100", + "a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a9558900", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a0400", @@ -57,7 +57,7 @@ "a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb00", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0335feb3b6b6a653d0af79dc2ff84e5c8d9a516733b99735e1d484d9330ca3b0100", + "a041e524ea6ef62f8199c2c62ad00f980ce78893c5b23a01a665345422484bca3e00", "a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f00900", "80000000000000000000000000000000000000000000000000000000000000000000", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0335feb3b6b6a653d0af79dc2ff84e5c8d9a516733b99735e1d484d9330ca3b01a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0df515bc15d60f45cd9284e2a153d7f308e0fd544a83f95b6a60d361a0432941da066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a041e524ea6ef62f8199c2c62ad00f980ce78893c5b23a01a665345422484bca3ea066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a06a55593fb3193f7f8995cc0b5a163105647dd6c962d7f2e43a43a47e6199be01a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" ] }, { @@ -90,8 +90,8 @@ "modified_index": 14, "drifted_index": 14, "list_rlp_bytes": [ - "f871", - "f871" + "f851", + "f851" ] } }, @@ -112,7 +112,7 @@ "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a00", + "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a0dea586a1e6eb20f0a627a0d8ead570bda5697058bb069cd60aea20d1ad6f063600", "80000000000000000000000000000000000000000000000000000000000000000000", @@ -122,8 +122,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a0dea586a1e6eb20f0a627a0d8ead570bda5697058bb069cd60aea20d1ad6f06368080", - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a00bb152c057dd4b0eed88e46b34e669d455e19e89681c0532a8fa31ed6e86568c8080" + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a0dea586a1e6eb20f0a627a0d8ead570bda5697058bb069cd60aea20d1ad6f06368080", + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a00bb152c057dd4b0eed88e46b34e669d455e19e89681c0532a8fa31ed6e86568c8080" ] }, { diff --git a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeDeletedBefore6After1FirstLevel.json b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeDeletedBefore6After1FirstLevel.json index 31d0d87a84..e9f96981bb 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeDeletedBefore6After1FirstLevel.json +++ b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeDeletedBefore6After1FirstLevel.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a0dce3bb893ac0a04cd76e6c16beeb687c890038aaacaaff5ec6dd6081bfae521a00", - "a0804cc8e814123034ea541bf1505a53ba97826d2cc0563a00af086e77ee32d9e100" + "a0a7f43004685a0bd2c5e3920d956dfcedaa1dfef25517d096ed4b63273327ee4700", + "a09397e31b842e26c8eb538abf2cafaec10030cd0eb445f2d57c0a5e556d5532f200" ], "keccak_data": [] }, @@ -43,9 +43,9 @@ "storage": null, "mod_extension": null, "values": [ - "a03b84c68c5c2f0ae57338b04bef9d84c6a60460988de0ec8431243fafb061bf5b00", + "a09fa7da5945e312a62501a28b587c166662de34380ca8b658a37fd0500ff504ea00", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf100", + "a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a9558900", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a0400", @@ -57,7 +57,7 @@ "a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb00", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0243ffa5e3afe85967fa2c3898411f282321ee7d71120bbd7968902a47c55b39700", + "a063ccd6cd927659baddf18b3aa31a313efd3435095d3b3255f3c79d0ab792874a00", "a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f00900", "80000000000000000000000000000000000000000000000000000000000000000000", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0243ffa5e3afe85967fa2c3898411f282321ee7d71120bbd7968902a47c55b397a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a03b84c68c5c2f0ae57338b04bef9d84c6a60460988de0ec8431243fafb061bf5ba066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a063ccd6cd927659baddf18b3aa31a313efd3435095d3b3255f3c79d0ab792874aa066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a09fa7da5945e312a62501a28b587c166662de34380ca8b658a37fd0500ff504eaa066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" ] }, { @@ -90,8 +90,8 @@ "modified_index": 14, "drifted_index": 14, "list_rlp_bytes": [ - "f871", - "f871" + "f851", + "f851" ] } }, @@ -112,7 +112,7 @@ "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a00", + "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a0227294955a65f5106b2bc9c8335b80f82aa191e65eac7311ff5bfa4bd74e44e000", "80000000000000000000000000000000000000000000000000000000000000000000", @@ -122,8 +122,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a0227294955a65f5106b2bc9c8335b80f82aa191e65eac7311ff5bfa4bd74e44e08080", - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a02f21ee785f3f4945b398869b9fdbf80a988cd4638080c534138c6c0b125880cc8080" + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a0227294955a65f5106b2bc9c8335b80f82aa191e65eac7311ff5bfa4bd74e44e08080", + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a02f21ee785f3f4945b398869b9fdbf80a988cd4638080c534138c6c0b125880cc8080" ] }, { diff --git a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeDeletedBranchDeletedFirstLevel.json b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeDeletedBranchDeletedFirstLevel.json index bc01711e18..c8efd7c8b1 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeDeletedBranchDeletedFirstLevel.json +++ b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeDeletedBranchDeletedFirstLevel.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a07be7d711537387ab3d6be9621914205468460f0c0b46de4d1be1ede954afefa900", - "a038c92d7251e37ffcea5311631d7aa1f7e23fb8df348f7869014b71211bb0fcd000" + "a0882c4c505c1b779ba32cf3d7d118fb0507a8de9c530f36af81333ad112c8740400", + "a086fd4e9646ad0f20251fcb355e3404f6497eb136476ad0304bfdd7f2e9218ac600" ], "keccak_data": [] }, @@ -43,9 +43,9 @@ "storage": null, "mod_extension": null, "values": [ - "a090534306b8c80895754213d368972c5f2765bef4b20215538620535d61ae22d200", + "a0b4cef5ba7a4a42b0e6bc23d70ac8d20775482ecaa2ba1e9325c258098b387c1200", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf100", + "a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a9558900", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a0400", @@ -57,7 +57,7 @@ "a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb00", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a005cda6d36afe72e82e7ebef45272d0d69910f0bedd476dccd09a1e6f0b7c9b6400", + "a0a659e862fa10933c607c7fe06fe604aeef297aec137df792c05a14ed40ae8f8e00", "a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f00900", "80000000000000000000000000000000000000000000000000000000000000000000", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a005cda6d36afe72e82e7ebef45272d0d69910f0bedd476dccd09a1e6f0b7c9b64a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a090534306b8c80895754213d368972c5f2765bef4b20215538620535d61ae22d2a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0a659e862fa10933c607c7fe06fe604aeef297aec137df792c05a14ed40ae8f8ea066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0b4cef5ba7a4a42b0e6bc23d70ac8d20775482ecaa2ba1e9325c258098b387c12a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" ] }, { @@ -90,8 +90,8 @@ "modified_index": 14, "drifted_index": 14, "list_rlp_bytes": [ - "f871", - "f871" + "f851", + "f851" ] } }, @@ -112,7 +112,7 @@ "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a00", + "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a06601698b2b1c3b46d2a7e55874787a0b6e268334ec067878ec9bac45a410914e00", "80000000000000000000000000000000000000000000000000000000000000000000", @@ -122,8 +122,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a06601698b2b1c3b46d2a7e55874787a0b6e268334ec067878ec9bac45a410914e8080", - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a0751966489311a3dd4da8d174c746f800fbbc5a014ff95ba8a266934548786a458080" + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a06601698b2b1c3b46d2a7e55874787a0b6e268334ec067878ec9bac45a410914e8080", + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a0751966489311a3dd4da8d174c746f800fbbc5a014ff95ba8a266934548786a458080" ] }, { diff --git a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeDeletedExtShortIsBranchFirstLevel.json b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeDeletedExtShortIsBranchFirstLevel.json index b6b8d98c73..c5e3044ef9 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeDeletedExtShortIsBranchFirstLevel.json +++ b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeDeletedExtShortIsBranchFirstLevel.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a00165aa0af332543a0d3fe661211bc5994ce5a3e614b425e64ecb1b2501b5417e00", - "a038c92d7251e37ffcea5311631d7aa1f7e23fb8df348f7869014b71211bb0fcd000" + "a0b5d3f684222342882a35b1b411c274ce0895f66aa644b4b16ed140224f1fd02000", + "a086fd4e9646ad0f20251fcb355e3404f6497eb136476ad0304bfdd7f2e9218ac600" ], "keccak_data": [] }, @@ -43,9 +43,9 @@ "storage": null, "mod_extension": null, "values": [ - "a090534306b8c80895754213d368972c5f2765bef4b20215538620535d61ae22d200", + "a0b4cef5ba7a4a42b0e6bc23d70ac8d20775482ecaa2ba1e9325c258098b387c1200", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf100", + "a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a9558900", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a0400", @@ -57,7 +57,7 @@ "a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb00", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0f4bb652318a0f15d555739d1ee4c32fd859663c3e2f381a993fc071921a0339900", + "a09b03fc2de3c936329b8e84ebabd633ed2a96122774237005e6b3e71a12002efc00", "a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f00900", "80000000000000000000000000000000000000000000000000000000000000000000", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0f4bb652318a0f15d555739d1ee4c32fd859663c3e2f381a993fc071921a03399a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a090534306b8c80895754213d368972c5f2765bef4b20215538620535d61ae22d2a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a09b03fc2de3c936329b8e84ebabd633ed2a96122774237005e6b3e71a12002efca066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0b4cef5ba7a4a42b0e6bc23d70ac8d20775482ecaa2ba1e9325c258098b387c12a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" ] }, { @@ -90,8 +90,8 @@ "modified_index": 14, "drifted_index": 14, "list_rlp_bytes": [ - "f871", - "f871" + "f851", + "f851" ] } }, @@ -112,7 +112,7 @@ "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a00", + "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a0dd0d00c17fc4aeebf18a10b1c38bc63db7c507845addb89b38fb968de0bec2b700", "80000000000000000000000000000000000000000000000000000000000000000000", @@ -122,8 +122,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a0dd0d00c17fc4aeebf18a10b1c38bc63db7c507845addb89b38fb968de0bec2b78080", - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a0751966489311a3dd4da8d174c746f800fbbc5a014ff95ba8a266934548786a458080" + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a0dd0d00c17fc4aeebf18a10b1c38bc63db7c507845addb89b38fb968de0bec2b78080", + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a0751966489311a3dd4da8d174c746f800fbbc5a014ff95ba8a266934548786a458080" ] }, { diff --git a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore4After1.json b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore4After1.json index 9dd0cfe35a..94cbabb531 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore4After1.json +++ b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore4After1.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a0fe93777900dd532b0109e40174eed05cfe84757ae3117cb54417975424e8cd7300", - "a0d5ab09aa0d188ce13d5401bb55f9849dc86433836f4c7f96c6b6326e5691919d00" + "a0dfb1b27841b8a583ffbf12a335059e9b59260568ab4714e2e68bdfaa5641149400", + "a0273ae919d2cf18b3bf9577a5676dbe170c7170b09256344a42205b7ed5455f6100" ], "keccak_data": [] }, @@ -43,9 +43,9 @@ "storage": null, "mod_extension": null, "values": [ - "a0720800eb9ebbb16205f1b83e2c427f3d503241ba170980ac4a01800c931e699500", + "a04707f71ed290b8e5be8b779a82c05a4a14fec40ae63fd283b1a9fe6f15e2a45700", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf100", + "a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a9558900", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a0400", @@ -57,7 +57,7 @@ "a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb00", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0df515bc15d60f45cd9284e2a153d7f308e0fd544a83f95b6a60d361a0432941d00", + "a06a55593fb3193f7f8995cc0b5a163105647dd6c962d7f2e43a43a47e6199be0100", "a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f00900", "80000000000000000000000000000000000000000000000000000000000000000000", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0df515bc15d60f45cd9284e2a153d7f308e0fd544a83f95b6a60d361a0432941da066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0720800eb9ebbb16205f1b83e2c427f3d503241ba170980ac4a01800c931e6995a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a06a55593fb3193f7f8995cc0b5a163105647dd6c962d7f2e43a43a47e6199be01a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a04707f71ed290b8e5be8b779a82c05a4a14fec40ae63fd283b1a9fe6f15e2a457a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" ] }, { @@ -90,8 +90,8 @@ "modified_index": 14, "drifted_index": 14, "list_rlp_bytes": [ - "f871", - "f871" + "f851", + "f851" ] } }, @@ -112,7 +112,7 @@ "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a00", + "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a00bb152c057dd4b0eed88e46b34e669d455e19e89681c0532a8fa31ed6e86568c00", "80000000000000000000000000000000000000000000000000000000000000000000", @@ -122,8 +122,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a00bb152c057dd4b0eed88e46b34e669d455e19e89681c0532a8fa31ed6e86568c8080", - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a07fbdf0e81a0cf7826d6ef80d68dd85f91e51876f51f0c6ea1daf42f3162ca2798080" + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a00bb152c057dd4b0eed88e46b34e669d455e19e89681c0532a8fa31ed6e86568c8080", + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a07fbdf0e81a0cf7826d6ef80d68dd85f91e51876f51f0c6ea1daf42f3162ca2798080" ] }, { diff --git a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore5After1FirstLevel.json b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore5After1FirstLevel.json index ff4a566d99..6d49afb89a 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore5After1FirstLevel.json +++ b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore5After1FirstLevel.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a009abc55243b91fe2e9d7487de1352bebfb625a7f34867a9fd47d585fd56c1c2b00", - "a0126b65c7395cd5e5be4e5d56de943a2451fa937e8bf58a07329a527cdb98937e00" + "a07d8fcc6f56c377cf562ed713fd73bebcb8287e4c97f07cf5188f70c9b2f276eb00", + "a0cc8ce0262d03fe429df4e0e33e036cde1db4731f231b41661c18a6e2398d7b4f00" ], "keccak_data": [] }, @@ -43,9 +43,9 @@ "storage": null, "mod_extension": null, "values": [ - "a0de59aa84090924e14019ddc7a474760b00c6bde8826e060533c20e473ab9e4d600", + "a0f3cad22d55741b5a02cb06cf2c3c789879ad70025271f7348a4eed8a2996a4d600", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf100", + "a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a9558900", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a0400", @@ -57,7 +57,7 @@ "a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb00", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0defa1c3003dcada0cc4ed2f383678e49e90c883f27d21691a8fcfbf43498379e00", + "a093be033937b76ae8d9a81a36c953577db5cda57279e6894d08313a38ca651d6300", "a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f00900", "80000000000000000000000000000000000000000000000000000000000000000000", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0defa1c3003dcada0cc4ed2f383678e49e90c883f27d21691a8fcfbf43498379ea066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0de59aa84090924e14019ddc7a474760b00c6bde8826e060533c20e473ab9e4d6a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a093be033937b76ae8d9a81a36c953577db5cda57279e6894d08313a38ca651d63a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0f3cad22d55741b5a02cb06cf2c3c789879ad70025271f7348a4eed8a2996a4d6a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" ] }, { @@ -90,8 +90,8 @@ "modified_index": 14, "drifted_index": 14, "list_rlp_bytes": [ - "f871", - "f871" + "f851", + "f851" ] } }, @@ -112,7 +112,7 @@ "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a00", + "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a0b3dd78df961fd98733c40ac332dcdfd4eb782d0b53d4c4e498f57d06eaf06b9c00", "80000000000000000000000000000000000000000000000000000000000000000000", @@ -122,8 +122,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a0b3dd78df961fd98733c40ac332dcdfd4eb782d0b53d4c4e498f57d06eaf06b9c8080", - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a0a86128fac4cc091de8c60624410647010871a342aeb8845e664ce5ea5f9026d08080" + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a0b3dd78df961fd98733c40ac332dcdfd4eb782d0b53d4c4e498f57d06eaf06b9c8080", + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a0a86128fac4cc091de8c60624410647010871a342aeb8845e664ce5ea5f9026d08080" ] }, { diff --git a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore5After2FirstLevel.json b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore5After2FirstLevel.json index aaf45c75c2..a38ebe6e6f 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore5After2FirstLevel.json +++ b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore5After2FirstLevel.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a009abc55243b91fe2e9d7487de1352bebfb625a7f34867a9fd47d585fd56c1c2b00", - "a02ebdc563953203aa4d483ec0b4c155279d3d67dd094f69b7287c1c5e6f57bb7200" + "a07d8fcc6f56c377cf562ed713fd73bebcb8287e4c97f07cf5188f70c9b2f276eb00", + "a05c6fc0b664701e3418d7a1d178b09a79607b2c14f2c0c480eaa64790ec713a5000" ], "keccak_data": [] }, @@ -43,9 +43,9 @@ "storage": null, "mod_extension": null, "values": [ - "a0ce2011879023724bf7232bbb674dcdb4bc08979934bc7c977b2daa454daa2bc800", + "a02d2c27804cae1cabc7d2e9cfc855e23e1b7e1ef1dcb7ca2e6bc39c1d21c053fb00", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf100", + "a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a9558900", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a0400", @@ -57,7 +57,7 @@ "a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb00", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0defa1c3003dcada0cc4ed2f383678e49e90c883f27d21691a8fcfbf43498379e00", + "a093be033937b76ae8d9a81a36c953577db5cda57279e6894d08313a38ca651d6300", "a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f00900", "80000000000000000000000000000000000000000000000000000000000000000000", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0defa1c3003dcada0cc4ed2f383678e49e90c883f27d21691a8fcfbf43498379ea066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0ce2011879023724bf7232bbb674dcdb4bc08979934bc7c977b2daa454daa2bc8a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a093be033937b76ae8d9a81a36c953577db5cda57279e6894d08313a38ca651d63a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a02d2c27804cae1cabc7d2e9cfc855e23e1b7e1ef1dcb7ca2e6bc39c1d21c053fba066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" ] }, { @@ -90,8 +90,8 @@ "modified_index": 14, "drifted_index": 14, "list_rlp_bytes": [ - "f871", - "f871" + "f851", + "f851" ] } }, @@ -112,7 +112,7 @@ "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a00", + "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a0b3dd78df961fd98733c40ac332dcdfd4eb782d0b53d4c4e498f57d06eaf06b9c00", "80000000000000000000000000000000000000000000000000000000000000000000", @@ -122,8 +122,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a0b3dd78df961fd98733c40ac332dcdfd4eb782d0b53d4c4e498f57d06eaf06b9c8080", - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a0fb279ae949a1f68e723fd9859135fcefa3e37f46a8130aef66ffceedd475cd6a8080" + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a0b3dd78df961fd98733c40ac332dcdfd4eb782d0b53d4c4e498f57d06eaf06b9c8080", + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a0fb279ae949a1f68e723fd9859135fcefa3e37f46a8130aef66ffceedd475cd6a8080" ] }, { diff --git a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore5After3FirstLevel.json b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore5After3FirstLevel.json index 62ff36016f..992530f786 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore5After3FirstLevel.json +++ b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore5After3FirstLevel.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a009abc55243b91fe2e9d7487de1352bebfb625a7f34867a9fd47d585fd56c1c2b00", - "a08d65425f1cbb59252a336d8dbade50f0d6b2bbcc01283d0f6042895db60d443d00" + "a07d8fcc6f56c377cf562ed713fd73bebcb8287e4c97f07cf5188f70c9b2f276eb00", + "a015c624bd14e8ee15833f2bc44786a3a2c7c7e361d541c3079f0e3eea500c64cc00" ], "keccak_data": [] }, @@ -43,9 +43,9 @@ "storage": null, "mod_extension": null, "values": [ - "a0ba0b9d83deb6b898f1db064694abe5bb19e71f60309284408570c1701847615d00", + "a0ac674d1b703b8824b26c9f9a9ffa957c517a9f6d6b36dbaacdc4253df9a9f32000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf100", + "a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a9558900", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a0400", @@ -57,7 +57,7 @@ "a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb00", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0defa1c3003dcada0cc4ed2f383678e49e90c883f27d21691a8fcfbf43498379e00", + "a093be033937b76ae8d9a81a36c953577db5cda57279e6894d08313a38ca651d6300", "a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f00900", "80000000000000000000000000000000000000000000000000000000000000000000", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0defa1c3003dcada0cc4ed2f383678e49e90c883f27d21691a8fcfbf43498379ea066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0ba0b9d83deb6b898f1db064694abe5bb19e71f60309284408570c1701847615da066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a093be033937b76ae8d9a81a36c953577db5cda57279e6894d08313a38ca651d63a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0ac674d1b703b8824b26c9f9a9ffa957c517a9f6d6b36dbaacdc4253df9a9f320a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" ] }, { @@ -90,8 +90,8 @@ "modified_index": 14, "drifted_index": 14, "list_rlp_bytes": [ - "f871", - "f871" + "f851", + "f851" ] } }, @@ -112,7 +112,7 @@ "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a00", + "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a0b3dd78df961fd98733c40ac332dcdfd4eb782d0b53d4c4e498f57d06eaf06b9c00", "80000000000000000000000000000000000000000000000000000000000000000000", @@ -122,8 +122,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a0b3dd78df961fd98733c40ac332dcdfd4eb782d0b53d4c4e498f57d06eaf06b9c8080", - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a0a270fe8b519da58761d8ad2a550ba083db50fc30c625260ed1cab8a5348c59198080" + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a0b3dd78df961fd98733c40ac332dcdfd4eb782d0b53d4c4e498f57d06eaf06b9c8080", + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a0a270fe8b519da58761d8ad2a550ba083db50fc30c625260ed1cab8a5348c59198080" ] }, { diff --git a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore6After1FirstLevel.json b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore6After1FirstLevel.json index cba3d93dbc..821ff1197f 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore6After1FirstLevel.json +++ b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore6After1FirstLevel.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a0f2cd1783c504f66b8f37c580aaceb5dab5e84497572177995e861e22e3bce5df00", - "a0983976070bc780ea0729aabc34034e80f4521f8612258e654a2d7ee7593df32200" + "a025654b25279d598682d9dd93e814f23cae2aa06e1a9fcd5e2c9281c3f0805be600", + "a0d912ed0d8c10ad894c8cd2cd8a4f756b3999f46a5dd4f174906024535b9f134d00" ], "keccak_data": [] }, @@ -43,9 +43,9 @@ "storage": null, "mod_extension": null, "values": [ - "a04624f128fd7c40d4f870ab0d0fdae13453d31bb332a6178a5297f1948320c3ae00", + "a0bfe0c7caab351f5da526b2901d3616ec01278a814f4599ce2d840a9aa1c9ad1b00", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf100", + "a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a9558900", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a0400", @@ -57,7 +57,7 @@ "a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb00", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a08956506a7edd00ca1a8836500cff58e0465759556d67b26d8a6c9ec187eb5b2e00", + "a007d98b211f874588a89b8947aa9bf9ef722458aa0d5514fd1a608b104cb5738b00", "a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f00900", "80000000000000000000000000000000000000000000000000000000000000000000", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a08956506a7edd00ca1a8836500cff58e0465759556d67b26d8a6c9ec187eb5b2ea066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a04624f128fd7c40d4f870ab0d0fdae13453d31bb332a6178a5297f1948320c3aea066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a007d98b211f874588a89b8947aa9bf9ef722458aa0d5514fd1a608b104cb5738ba066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0bfe0c7caab351f5da526b2901d3616ec01278a814f4599ce2d840a9aa1c9ad1ba066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" ] }, { @@ -90,8 +90,8 @@ "modified_index": 14, "drifted_index": 14, "list_rlp_bytes": [ - "f871", - "f871" + "f851", + "f851" ] } }, @@ -112,7 +112,7 @@ "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a00", + "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a0321934b620a646a275a2df20f6ea1e8f53c0a25389966335874e0f6291a2edc000", "80000000000000000000000000000000000000000000000000000000000000000000", @@ -122,8 +122,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a0321934b620a646a275a2df20f6ea1e8f53c0a25389966335874e0f6291a2edc08080", - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a03f0edc47ed07bac0b4f417e10d989deb422bfbd832cf994f5c04e2df50dfc4768080" + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a0321934b620a646a275a2df20f6ea1e8f53c0a25389966335874e0f6291a2edc08080", + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a03f0edc47ed07bac0b4f417e10d989deb422bfbd832cf994f5c04e2df50dfc4768080" ] }, { diff --git a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore6After2FirstLevel.json b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore6After2FirstLevel.json index 9076e3d177..b20ea1a441 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore6After2FirstLevel.json +++ b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore6After2FirstLevel.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a0f2cd1783c504f66b8f37c580aaceb5dab5e84497572177995e861e22e3bce5df00", - "a03a6e6c9094f96af3099ccc150b7154cb0f1d9e0b86d243b92cbd8a36fa91436800" + "a025654b25279d598682d9dd93e814f23cae2aa06e1a9fcd5e2c9281c3f0805be600", + "a048cca8cc646aa94be75ce256014e0e8702054772b03d1a6d02c6edc4f18b191f00" ], "keccak_data": [] }, @@ -43,9 +43,9 @@ "storage": null, "mod_extension": null, "values": [ - "a04776885f8215cc721fb6022eda3c960690e8a0b6dbbc214511e7e7e0027de4f200", + "a080ba1e579a6f530f3f5ef6e4f4ab90bbb0ad7021b958a445c778ba1223c3b6c900", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf100", + "a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a9558900", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a0400", @@ -57,7 +57,7 @@ "a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb00", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a08956506a7edd00ca1a8836500cff58e0465759556d67b26d8a6c9ec187eb5b2e00", + "a007d98b211f874588a89b8947aa9bf9ef722458aa0d5514fd1a608b104cb5738b00", "a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f00900", "80000000000000000000000000000000000000000000000000000000000000000000", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a08956506a7edd00ca1a8836500cff58e0465759556d67b26d8a6c9ec187eb5b2ea066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a04776885f8215cc721fb6022eda3c960690e8a0b6dbbc214511e7e7e0027de4f2a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a007d98b211f874588a89b8947aa9bf9ef722458aa0d5514fd1a608b104cb5738ba066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a080ba1e579a6f530f3f5ef6e4f4ab90bbb0ad7021b958a445c778ba1223c3b6c9a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" ] }, { @@ -90,8 +90,8 @@ "modified_index": 14, "drifted_index": 14, "list_rlp_bytes": [ - "f871", - "f871" + "f851", + "f851" ] } }, @@ -112,7 +112,7 @@ "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a00", + "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a0321934b620a646a275a2df20f6ea1e8f53c0a25389966335874e0f6291a2edc000", "80000000000000000000000000000000000000000000000000000000000000000000", @@ -122,8 +122,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a0321934b620a646a275a2df20f6ea1e8f53c0a25389966335874e0f6291a2edc08080", - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a07bd180a06d9476ff8a19a22be57c8a41ecc57b27b57e9c83aafe050929e485e88080" + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a0321934b620a646a275a2df20f6ea1e8f53c0a25389966335874e0f6291a2edc08080", + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a07bd180a06d9476ff8a19a22be57c8a41ecc57b27b57e9c83aafe050929e485e88080" ] }, { diff --git a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore6After4FirstLevel.json b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore6After4FirstLevel.json index 9d3abf8df9..9e854aa43e 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore6After4FirstLevel.json +++ b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedBefore6After4FirstLevel.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a0f2cd1783c504f66b8f37c580aaceb5dab5e84497572177995e861e22e3bce5df00", - "a0c146b6beed1fa6da815e9d20bd312e0a5dce7b0bfa8f876007e73171aee75ead00" + "a025654b25279d598682d9dd93e814f23cae2aa06e1a9fcd5e2c9281c3f0805be600", + "a0653aee0fd6a4737d8a0a964fe41ec35754c0f9d901eb00309ffb0e833616d68200" ], "keccak_data": [] }, @@ -43,9 +43,9 @@ "storage": null, "mod_extension": null, "values": [ - "a0dba517c04418b0e35c17fb1db2698283882f72fbdd68f7562006648db5afc7f000", + "a04d805944bb5a1e60c04931be76b0f2164b7a52e9a73cb9b7094f873b31bdfe0500", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf100", + "a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a9558900", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a0400", @@ -57,7 +57,7 @@ "a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb00", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a08956506a7edd00ca1a8836500cff58e0465759556d67b26d8a6c9ec187eb5b2e00", + "a007d98b211f874588a89b8947aa9bf9ef722458aa0d5514fd1a608b104cb5738b00", "a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f00900", "80000000000000000000000000000000000000000000000000000000000000000000", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a08956506a7edd00ca1a8836500cff58e0465759556d67b26d8a6c9ec187eb5b2ea066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0dba517c04418b0e35c17fb1db2698283882f72fbdd68f7562006648db5afc7f0a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a007d98b211f874588a89b8947aa9bf9ef722458aa0d5514fd1a608b104cb5738ba066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a04d805944bb5a1e60c04931be76b0f2164b7a52e9a73cb9b7094f873b31bdfe05a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" ] }, { @@ -90,8 +90,8 @@ "modified_index": 14, "drifted_index": 14, "list_rlp_bytes": [ - "f871", - "f871" + "f851", + "f851" ] } }, @@ -112,7 +112,7 @@ "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a00", + "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a0321934b620a646a275a2df20f6ea1e8f53c0a25389966335874e0f6291a2edc000", "80000000000000000000000000000000000000000000000000000000000000000000", @@ -122,8 +122,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a0321934b620a646a275a2df20f6ea1e8f53c0a25389966335874e0f6291a2edc08080", - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a03fb632d1b373bfe19c0b83f1f62fbfc631dda6c1d02e16d98ffa6968209c5c428080" + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a0321934b620a646a275a2df20f6ea1e8f53c0a25389966335874e0f6291a2edc08080", + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a03fb632d1b373bfe19c0b83f1f62fbfc631dda6c1d02e16d98ffa6968209c5c428080" ] }, { diff --git a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedExtShortIsBranchFirstLevel.json b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedExtShortIsBranchFirstLevel.json index 0ebf597ebc..5b98c2fe85 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedExtShortIsBranchFirstLevel.json +++ b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedExtShortIsBranchFirstLevel.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a009abc55243b91fe2e9d7487de1352bebfb625a7f34867a9fd47d585fd56c1c2b00", - "a0e1583fd2dcb686b942aa7f2b9ce00d874e77b3abf54c4103ce6cf768707322c900" + "a07d8fcc6f56c377cf562ed713fd73bebcb8287e4c97f07cf5188f70c9b2f276eb00", + "a0ccb9764c225c7cf3d25ea59340bfb8d1b9a462dd16be8968d659c7cacf1b145900" ], "keccak_data": [] }, @@ -43,9 +43,9 @@ "storage": null, "mod_extension": null, "values": [ - "a0ad2bedbc0f8c43da33f5211dd8a01f8df97c4f1a21690c9a14970adf41860bfa00", + "a04302d4fa284e1825678b91c7f7a21ce8e450049efeb512c5969b890b39e6f01300", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf100", + "a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a9558900", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a0400", @@ -57,7 +57,7 @@ "a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb00", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0defa1c3003dcada0cc4ed2f383678e49e90c883f27d21691a8fcfbf43498379e00", + "a093be033937b76ae8d9a81a36c953577db5cda57279e6894d08313a38ca651d6300", "a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f00900", "80000000000000000000000000000000000000000000000000000000000000000000", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0defa1c3003dcada0cc4ed2f383678e49e90c883f27d21691a8fcfbf43498379ea066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0ad2bedbc0f8c43da33f5211dd8a01f8df97c4f1a21690c9a14970adf41860bfaa066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a093be033937b76ae8d9a81a36c953577db5cda57279e6894d08313a38ca651d63a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a04302d4fa284e1825678b91c7f7a21ce8e450049efeb512c5969b890b39e6f013a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" ] }, { @@ -90,8 +90,8 @@ "modified_index": 14, "drifted_index": 14, "list_rlp_bytes": [ - "f871", - "f871" + "f851", + "f851" ] } }, @@ -112,7 +112,7 @@ "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a00", + "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a0b3dd78df961fd98733c40ac332dcdfd4eb782d0b53d4c4e498f57d06eaf06b9c00", "80000000000000000000000000000000000000000000000000000000000000000000", @@ -122,8 +122,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a0b3dd78df961fd98733c40ac332dcdfd4eb782d0b53d4c4e498f57d06eaf06b9c8080", - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a03c376d903a16b0f15fc878e3cf248541c0195d256ae44ccda3861ed784a327f78080" + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a0b3dd78df961fd98733c40ac332dcdfd4eb782d0b53d4c4e498f57d06eaf06b9c8080", + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a03c376d903a16b0f15fc878e3cf248541c0195d256ae44ccda3861ed784a327f78080" ] }, { diff --git a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedInNewBranchFirstLevel.json b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedInNewBranchFirstLevel.json index c6dd9ff696..640874473f 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedInNewBranchFirstLevel.json +++ b/zkevm-circuits/src/mpt_circuit/tests/ExtNodeInsertedInNewBranchFirstLevel.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a009abc55243b91fe2e9d7487de1352bebfb625a7f34867a9fd47d585fd56c1c2b00", - "a0b56337f1538767ab36ed8256c14420eea15d3c1a6b4ec6cab35d41154087bff100" + "a07d8fcc6f56c377cf562ed713fd73bebcb8287e4c97f07cf5188f70c9b2f276eb00", + "a01356117fa999b7322b8b1ee02cd8cd81a53f79dec172de97fcf4766839ac806300" ], "keccak_data": [] }, @@ -43,9 +43,9 @@ "storage": null, "mod_extension": null, "values": [ - "a09bd74bc59a41096445c13404fdd1ecc6da241a20356ad3d204222e791afbbc0d00", + "a090b0b99e6bfda6f21367140879cf5bab6e8e3dc87075f3556a33dfc722536b4c00", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf100", + "a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a9558900", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a0400", @@ -57,7 +57,7 @@ "a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb00", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0defa1c3003dcada0cc4ed2f383678e49e90c883f27d21691a8fcfbf43498379e00", + "a093be033937b76ae8d9a81a36c953577db5cda57279e6894d08313a38ca651d6300", "a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f00900", "80000000000000000000000000000000000000000000000000000000000000000000", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0defa1c3003dcada0cc4ed2f383678e49e90c883f27d21691a8fcfbf43498379ea066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a09bd74bc59a41096445c13404fdd1ecc6da241a20356ad3d204222e791afbbc0da066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a093be033937b76ae8d9a81a36c953577db5cda57279e6894d08313a38ca651d63a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a090b0b99e6bfda6f21367140879cf5bab6e8e3dc87075f3556a33dfc722536b4ca066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" ] }, { @@ -90,8 +90,8 @@ "modified_index": 14, "drifted_index": 14, "list_rlp_bytes": [ - "f871", - "f871" + "f851", + "f851" ] } }, @@ -112,7 +112,7 @@ "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a00", + "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a0b3dd78df961fd98733c40ac332dcdfd4eb782d0b53d4c4e498f57d06eaf06b9c00", "80000000000000000000000000000000000000000000000000000000000000000000", @@ -122,8 +122,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a0b3dd78df961fd98733c40ac332dcdfd4eb782d0b53d4c4e498f57d06eaf06b9c8080", - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a06d02ace83a9377574bc546acce6ae3264e34e0d09294116f102263e5a36039a38080" + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a0b3dd78df961fd98733c40ac332dcdfd4eb782d0b53d4c4e498f57d06eaf06b9c8080", + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a06d02ace83a9377574bc546acce6ae3264e34e0d09294116f102263e5a36039a38080" ] }, { diff --git a/zkevm-circuits/src/mpt_circuit/tests/ExtensionIntoBranch.json b/zkevm-circuits/src/mpt_circuit/tests/ExtensionIntoBranch.json index c9b1a51072..680aacaa48 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/ExtensionIntoBranch.json +++ b/zkevm-circuits/src/mpt_circuit/tests/ExtensionIntoBranch.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a0198ecef2b1da18c37fa6e435336eafdd4a7955ebf9dcb61f8a486c64ccc61eb900", - "a0104d2b3a224f2a20987a5d9bf81f5d8fd3f61f1de4c6cc48b0d7934fa330a0c100" + "a02096015af040f6e43934428edb1848f85db4563b8b8903d8d76e5e86719f5dd300", + "a0c99601e7f6a0edaeed09ef78fb8b6e5064b2a63b1a981c79b768026151e1b25900" ], "keccak_data": [] }, @@ -43,9 +43,9 @@ "storage": null, "mod_extension": null, "values": [ - "a0df9727eeee3dbaceec09f27569ca580783fb93f4eabce11d5667d8f6a70fb3e600", + "a07be86d309a4bf1c143e74fae9689bd566daa7c1b0528156430c6aebf307a364d00", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf100", + "a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a9558900", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a0400", @@ -57,7 +57,7 @@ "a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb00", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a02ac00ba4cde24327d8f82b45197129b9911da57cdd16a7cefe0a524bcd7345e200", + "a0d273c0435594c39eeb1d7815caf7c071d79b4e635dc35e3fafa5b02d442b2f7200", "a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f00900", "80000000000000000000000000000000000000000000000000000000000000000000", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a02ac00ba4cde24327d8f82b45197129b9911da57cdd16a7cefe0a524bcd7345e2a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0df9727eeee3dbaceec09f27569ca580783fb93f4eabce11d5667d8f6a70fb3e6a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a0d273c0435594c39eeb1d7815caf7c071d79b4e635dc35e3fafa5b02d442b2f72a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a07be86d309a4bf1c143e74fae9689bd566daa7c1b0528156430c6aebf307a364da066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" ] }, { @@ -90,8 +90,8 @@ "modified_index": 14, "drifted_index": 14, "list_rlp_bytes": [ - "f871", - "f871" + "f851", + "f851" ] } }, @@ -112,7 +112,7 @@ "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a00", + "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a0444f38b75c480b42c37fa40b55a95411c163fd1d675363c70f1ca2f15a8ae0db00", "80000000000000000000000000000000000000000000000000000000000000000000", @@ -122,8 +122,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a0444f38b75c480b42c37fa40b55a95411c163fd1d675363c70f1ca2f15a8ae0db8080", - "f8718080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e0808080808080a04404fa72ce297220deb39c91d9343df502d5c911d708b9fadc0526c043d0a50a80a03904685eec6d8d3e6357c1a7c0e34fbb9bbe036eb34d88b4187e5f73acd122148080" + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a0444f38b75c480b42c37fa40b55a95411c163fd1d675363c70f1ca2f15a8ae0db8080", + "f8518080808080a0ed2fba131fadeadeb1082f565fff16ceb008f693056e3140204716c0739cf1e08080808080808080a03904685eec6d8d3e6357c1a7c0e34fbb9bbe036eb34d88b4187e5f73acd122148080" ] }, { diff --git a/zkevm-circuits/src/mpt_circuit/tests/NonExistingAccountAfterFirstLevel.json b/zkevm-circuits/src/mpt_circuit/tests/NonExistingAccountAfterFirstLevel.json index 79afcb98d9..5437ef727a 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/NonExistingAccountAfterFirstLevel.json +++ b/zkevm-circuits/src/mpt_circuit/tests/NonExistingAccountAfterFirstLevel.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a0468d1a8b37720df40231d2a87c72b2ba41b6083102bf9dea6376d06129d33ae900", - "a0468d1a8b37720df40231d2a87c72b2ba41b6083102bf9dea6376d06129d33ae900" + "a043f881dc1d2c6d659d99d6d7a6f604c1cefab65f5d738ba36a2c4dcc17f38b6d00", + "a043f881dc1d2c6d659d99d6d7a6f604c1cefab65f5d738ba36a2c4dcc17f38b6d00" ], "keccak_data": [] }, @@ -45,7 +45,7 @@ "values": [ "a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f00900", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf100", + "a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a9558900", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a0400", @@ -57,7 +57,7 @@ "a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb00", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a085880d90258c3f5cfb586bc74bcde6c0a28149e7b7fa6bf6a69c08ae0836cd1400", + "a01b7779e149cadf24d4ffb77ca7e11314b8db7097e4d70b2a173493153ca2e5a000", "a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f00900", "80000000000000000000000000000000000000000000000000000000000000000000", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a085880d90258c3f5cfb586bc74bcde6c0a28149e7b7fa6bf6a69c08ae0836cd14a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a085880d90258c3f5cfb586bc74bcde6c0a28149e7b7fa6bf6a69c08ae0836cd14a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a01b7779e149cadf24d4ffb77ca7e11314b8db7097e4d70b2a173493153ca2e5a0a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a01b7779e149cadf24d4ffb77ca7e11314b8db7097e4d70b2a173493153ca2e5a0a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" ] }, { diff --git a/zkevm-circuits/src/mpt_circuit/tests/NonExistingAccountNilObjectInFirstLevel.json b/zkevm-circuits/src/mpt_circuit/tests/NonExistingAccountNilObjectInFirstLevel.json index 9bb03688d6..f23a20b043 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/NonExistingAccountNilObjectInFirstLevel.json +++ b/zkevm-circuits/src/mpt_circuit/tests/NonExistingAccountNilObjectInFirstLevel.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a0468d1a8b37720df40231d2a87c72b2ba41b6083102bf9dea6376d06129d33ae900", - "a0468d1a8b37720df40231d2a87c72b2ba41b6083102bf9dea6376d06129d33ae900" + "a043f881dc1d2c6d659d99d6d7a6f604c1cefab65f5d738ba36a2c4dcc17f38b6d00", + "a043f881dc1d2c6d659d99d6d7a6f604c1cefab65f5d738ba36a2c4dcc17f38b6d00" ], "keccak_data": [] }, @@ -45,7 +45,7 @@ "values": [ "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf100", + "a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a9558900", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a0400", @@ -57,7 +57,7 @@ "a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb00", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a085880d90258c3f5cfb586bc74bcde6c0a28149e7b7fa6bf6a69c08ae0836cd1400", + "a01b7779e149cadf24d4ffb77ca7e11314b8db7097e4d70b2a173493153ca2e5a000", "a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f00900", "80000000000000000000000000000000000000000000000000000000000000000000", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a085880d90258c3f5cfb586bc74bcde6c0a28149e7b7fa6bf6a69c08ae0836cd14a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", - "f9011180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a085880d90258c3f5cfb586bc74bcde6c0a28149e7b7fa6bf6a69c08ae0836cd14a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a01b7779e149cadf24d4ffb77ca7e11314b8db7097e4d70b2a173493153ca2e5a0a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080", + "f9011180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a01b7779e149cadf24d4ffb77ca7e11314b8db7097e4d70b2a173493153ca2e5a0a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f0098080" ] }, { diff --git a/zkevm-circuits/src/mpt_circuit/tests/StorageInFirstLevelNonExisting.json b/zkevm-circuits/src/mpt_circuit/tests/StorageInFirstLevelNonExisting.json index 728de076eb..a10e2c5eae 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/StorageInFirstLevelNonExisting.json +++ b/zkevm-circuits/src/mpt_circuit/tests/StorageInFirstLevelNonExisting.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a0e36357ff21583b48c9625a721f0f546330d24c6c0d239108cc21217cd61406c900", - "a0e36357ff21583b48c9625a721f0f546330d24c6c0d239108cc21217cd61406c900" + "a0be426f4e737ee64c8976d3820e1ffdab809e5010e6f00d00c50fcf51a12c863700", + "a0be426f4e737ee64c8976d3820e1ffdab809e5010e6f00d00c50fcf51a12c863700" ], "keccak_data": [] }, @@ -45,7 +45,7 @@ "values": [ "a01cff8afad6e714b666a0cd19b7118d6a87fe86563570e15c5bd8c06aa4fad27d00", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf100", + "a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a9558900", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a0400", @@ -57,7 +57,7 @@ "a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb00", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a085880d90258c3f5cfb586bc74bcde6c0a28149e7b7fa6bf6a69c08ae0836cd1400", + "a01b7779e149cadf24d4ffb77ca7e11314b8db7097e4d70b2a173493153ca2e5a000", "a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f00900", "a01cff8afad6e714b666a0cd19b7118d6a87fe86563570e15c5bd8c06aa4fad27d00", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f9013180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a085880d90258c3f5cfb586bc74bcde6c0a28149e7b7fa6bf6a69c08ae0836cd14a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f009a01cff8afad6e714b666a0cd19b7118d6a87fe86563570e15c5bd8c06aa4fad27d80", - "f9013180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a085880d90258c3f5cfb586bc74bcde6c0a28149e7b7fa6bf6a69c08ae0836cd14a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f009a01cff8afad6e714b666a0cd19b7118d6a87fe86563570e15c5bd8c06aa4fad27d80" + "f9013180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a01b7779e149cadf24d4ffb77ca7e11314b8db7097e4d70b2a173493153ca2e5a0a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f009a01cff8afad6e714b666a0cd19b7118d6a87fe86563570e15c5bd8c06aa4fad27d80", + "f9013180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a01b7779e149cadf24d4ffb77ca7e11314b8db7097e4d70b2a173493153ca2e5a0a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f009a01cff8afad6e714b666a0cd19b7118d6a87fe86563570e15c5bd8c06aa4fad27d80" ] }, { diff --git a/zkevm-circuits/src/mpt_circuit/tests/StorageInFirstLevelNonExistingLong.json b/zkevm-circuits/src/mpt_circuit/tests/StorageInFirstLevelNonExistingLong.json index b5dbd034e0..c39570bd66 100644 --- a/zkevm-circuits/src/mpt_circuit/tests/StorageInFirstLevelNonExistingLong.json +++ b/zkevm-circuits/src/mpt_circuit/tests/StorageInFirstLevelNonExistingLong.json @@ -9,8 +9,8 @@ "storage": null, "mod_extension": null, "values": [ - "a0601c8ae613f946a293f9aacd219cc6ca8d572b2654c55f06d100d3ed1e0490fd00", - "a0601c8ae613f946a293f9aacd219cc6ca8d572b2654c55f06d100d3ed1e0490fd00" + "a063dad463a661c32f57f2690edf19f5019302486704a1f1f7625aea372e21e75100", + "a063dad463a661c32f57f2690edf19f5019302486704a1f1f7625aea372e21e75100" ], "keccak_data": [] }, @@ -45,7 +45,7 @@ "values": [ "a0e7a5cbffa7c7d4d2fd18b246e712139596ce40ab56cba10a2510db9e5a6e381100", "80000000000000000000000000000000000000000000000000000000000000000000", - "a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf100", + "a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a9558900", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", "a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a0400", @@ -57,7 +57,7 @@ "a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb00", "80000000000000000000000000000000000000000000000000000000000000000000", "80000000000000000000000000000000000000000000000000000000000000000000", - "a085880d90258c3f5cfb586bc74bcde6c0a28149e7b7fa6bf6a69c08ae0836cd1400", + "a01b7779e149cadf24d4ffb77ca7e11314b8db7097e4d70b2a173493153ca2e5a000", "a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f00900", "a0e7a5cbffa7c7d4d2fd18b246e712139596ce40ab56cba10a2510db9e5a6e381100", "00000000000000000000000000000000000000000000000000000000000000000000", @@ -66,8 +66,8 @@ "00000000000000000000000000000000000000000000000000000000000000000000" ], "keccak_data": [ - "f9013180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a085880d90258c3f5cfb586bc74bcde6c0a28149e7b7fa6bf6a69c08ae0836cd14a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f009a0e7a5cbffa7c7d4d2fd18b246e712139596ce40ab56cba10a2510db9e5a6e381180", - "f9013180a0ab8cdb808c8303bb61fb48e276217be9770fa83ecf3f90f2234d558885f5abf18080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a085880d90258c3f5cfb586bc74bcde6c0a28149e7b7fa6bf6a69c08ae0836cd14a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f009a0e7a5cbffa7c7d4d2fd18b246e712139596ce40ab56cba10a2510db9e5a6e381180" + "f9013180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a01b7779e149cadf24d4ffb77ca7e11314b8db7097e4d70b2a173493153ca2e5a0a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f009a0e7a5cbffa7c7d4d2fd18b246e712139596ce40ab56cba10a2510db9e5a6e381180", + "f9013180a068b9c3ec22d2659defc34853ff95aac099b725449193be0ab7a61029a0a955898080a01a697e814758281972fcd13bc9707dbcd2f195986b05463d7b78426508445a04a0b5d7a91be5ee273cce27e2ad9a160d2faadd5a6ba518d384019b68728a4f62f4a0c2c799b60a0cd6acd42c1015512872e86c186bcf196e85061e76842f3b7cf86080a02e0d86c3befd177f574a20ac63804532889077e955320c9361cd10b7cc6f580980a06301b39b2ea8a44df8b0356120db64b788e71f52e1d7a6309d0d2e5b86fee7cb8080a01b7779e149cadf24d4ffb77ca7e11314b8db7097e4d70b2a173493153ca2e5a0a066a7662811491b3d352e969506b420d269e8b51a224f574b3b38b3463f43f009a0e7a5cbffa7c7d4d2fd18b246e712139596ce40ab56cba10a2510db9e5a6e381180" ] }, {