Update domain separator values.

Author: LeilaWang

barretenberg/cpp/pil/vm2/bytecode/update_check.pil

@@ -57,11 +57,13 @@ namespace update_check;
     // TODO: Remove this as a column when we can lookup with constants
     pol commit updated_class_ids_slot;
     sel * (constants.UPDATED_CLASS_IDS_SLOT - updated_class_ids_slot) = 0;
+    pol commit dom_sep_public_storage_map_slot;
+    sel * (constants.DOM_SEP__PUBLIC_STORAGE_MAP_SLOT - dom_sep_public_storage_map_slot) = 0;
 
     pol commit delayed_public_mutable_slot;
 
     #[DELAYED_PUBLIC_MUTABLE_SLOT_POSEIDON2]
-    sel { sel /* =1 */, updated_class_ids_slot, address, precomputed.zero, delayed_public_mutable_slot }
+    sel { sel /* =1 */, dom_sep_public_storage_map_slot, updated_class_ids_slot, address, delayed_public_mutable_slot }
     in poseidon2_hash.end { poseidon2_hash.start, poseidon2_hash.input_0, poseidon2_hash.input_1, poseidon2_hash.input_2, poseidon2_hash.output };
 
     pol commit delayed_public_mutable_hash_slot;

barretenberg/cpp/pil/vm2/constants_gen.pil

@@ -165,15 +165,16 @@ namespace constants;
     pol UPDATES_DELAYED_PUBLIC_MUTABLE_METADATA_BIT_SIZE = 144;
     pol GRUMPKIN_ONE_X = 1;
     pol GRUMPKIN_ONE_Y = 17631683881184975370165255887551781615748388533673675138860;
-    pol DOM_SEP__NOTE_HASH_NONCE = 2;
-    pol DOM_SEP__UNIQUE_NOTE_HASH = 3;
-    pol DOM_SEP__SILOED_NOTE_HASH = 4;
-    pol DOM_SEP__OUTER_NULLIFIER = 7;
-    pol DOM_SEP__PUBLIC_LEAF_INDEX = 23;
-    pol DOM_SEP__PUBLIC_BYTECODE = 60;
-    pol DOM_SEP__CONTRACT_CLASS_ID = 16;
-    pol DOM_SEP__PUBLIC_KEYS_HASH = 52;
-    pol DOM_SEP__PARTIAL_ADDRESS = 27;
-    pol DOM_SEP__CONTRACT_ADDRESS_V1 = 15;
-    pol DOM_SEP__PUBLIC_CALLDATA = 43;
+    pol DOM_SEP__NOTE_HASH_NONCE = 4040695053;
+    pol DOM_SEP__UNIQUE_NOTE_HASH = 1615905817;
+    pol DOM_SEP__SILOED_NOTE_HASH = 3552985968;
+    pol DOM_SEP__OUTER_NULLIFIER = 3537029706;
+    pol DOM_SEP__PUBLIC_LEAF_SLOT = 2853865602;
+    pol DOM_SEP__PUBLIC_STORAGE_MAP_SLOT = 1106049611;
+    pol DOM_SEP__PUBLIC_BYTECODE = 4245021897;
+    pol DOM_SEP__CONTRACT_CLASS_ID = 1134959961;
+    pol DOM_SEP__PUBLIC_KEYS_HASH = 349301051;
+    pol DOM_SEP__PARTIAL_ADDRESS = 1453969891;
+    pol DOM_SEP__CONTRACT_ADDRESS_V1 = 2091531360;
+    pol DOM_SEP__PUBLIC_CALLDATA = 388853507;
 

barretenberg/cpp/pil/vm2/trees/public_data_check.pil

@@ -149,7 +149,7 @@ namespace public_data_check;
 
     // TODO: We need this temporarily while we do not allow for aliases in the lookup tuple
     pol commit siloing_separator;
-    sel * (constants.DOM_SEP__PUBLIC_LEAF_INDEX - siloing_separator) = 0;
+    sel * (constants.DOM_SEP__PUBLIC_LEAF_SLOT - siloing_separator) = 0;
 
     #[SILO_POSEIDON2]
     sel { sel, siloing_separator, address, slot, leaf_slot }

barretenberg/cpp/pil/vm2/trees/written_public_data_slots_tree_check.pil

@@ -81,7 +81,7 @@ namespace written_public_data_slots_tree_check;
 
     // TODO: We need this temporarily while we do not allow for aliases in the lookup tuple
     pol commit siloing_separator;
-    sel * (constants.DOM_SEP__PUBLIC_LEAF_INDEX - siloing_separator) = 0;
+    sel * (constants.DOM_SEP__PUBLIC_LEAF_SLOT - siloing_separator) = 0;
 
     #[SILO_POSEIDON2]
     sel { sel, siloing_separator, address, slot, leaf_slot }

barretenberg/cpp/pil/vm2/tx.pil

@@ -652,11 +652,13 @@ namespace tx;
     is_collect_fee * (constants.FEE_JUICE_ADDRESS - fee_juice_contract_address) = 0;
     pol commit fee_juice_balances_slot_constant;
     is_collect_fee * (constants.FEE_JUICE_BALANCES_SLOT - fee_juice_balances_slot_constant) = 0;
+    pol commit dom_sep_public_storage_map_slot;
+    is_collect_fee * (constants.DOM_SEP__PUBLIC_STORAGE_MAP_SLOT - dom_sep_public_storage_map_slot) = 0;
 
     pol commit fee_juice_balance_slot;
 
     #[BALANCE_SLOT_POSEIDON2]
-    is_collect_fee { is_collect_fee, fee_juice_balances_slot_constant, fee_payer, precomputed.zero, fee_juice_balance_slot }
+    is_collect_fee { is_collect_fee, dom_sep_public_storage_map_slot, fee_juice_balances_slot_constant, fee_payer, fee_juice_balance_slot }
     in poseidon2_hash.end { poseidon2_hash.start, poseidon2_hash.input_0, poseidon2_hash.input_1, poseidon2_hash.input_2, poseidon2_hash.output };
 
     pol commit fee_payer_balance;

barretenberg/cpp/src/barretenberg/avm_fuzzer/common/interfaces/dbs.cpp

@@ -196,7 +196,7 @@ void FuzzerWorldStateManager::initialize_world_state()
         { simulation::MerkleTreeId::NULLIFIER_TREE, 128 },
         { simulation::MerkleTreeId::PUBLIC_DATA_TREE, 128 },
     };
-    uint32_t initial_header_generator_point = 28; // GeneratorIndex.BLOCK_HASH
+    uint32_t initial_header_generator_point = 2064783670; // GeneratorIndex.BLOCK_HEADER_HASH
     ws = std::make_unique<world_state::WorldState>(
         /*thread_pool_size=*/4, DATA_DIR, MAP_SIZE_KB, tree_heights, tree_prefill, initial_header_generator_point);
 
@@ -236,8 +236,9 @@ void FuzzerWorldStateManager::write_fee_payer_balance(const AztecAddress& fee_pa
     if (fee_payer == 0) {
         return;
     }
-    FF fee_juice_balance_slot = Poseidon2::hash({ FEE_JUICE_BALANCES_SLOT, fee_payer });
-    FF leaf_slot = Poseidon2::hash({ DOM_SEP__PUBLIC_LEAF_INDEX, FF(FEE_JUICE_ADDRESS), fee_juice_balance_slot });
+    FF fee_juice_balance_slot =
+        Poseidon2::hash({ DOM_SEP__PUBLIC_STORAGE_MAP_SLOT, FEE_JUICE_BALANCES_SLOT, fee_payer });
+    FF leaf_slot = Poseidon2::hash({ DOM_SEP__PUBLIC_LEAF_SLOT, FF(FEE_JUICE_ADDRESS), fee_juice_balance_slot });
 
     // Write to public data tree using current fork
     auto fork_id = fork_ids.top();

barretenberg/cpp/src/barretenberg/avm_fuzzer/mutations/bytecode.cpp

@@ -95,7 +95,8 @@ void mutate_bytecode(std::vector<ContractClassWithCommitment>& contract_classes,
     contract_classes.push_back(new_class);
 
     // Compute public data tree writes for UpdateCheck to pass
-    FF delayed_public_mutable_slot = Poseidon2::hash({ FF(UPDATED_CLASS_IDS_SLOT), address });
+    FF delayed_public_mutable_slot =
+        Poseidon2::hash({ FF(DOM_SEP__PUBLIC_STORAGE_MAP_SLOT), FF(UPDATED_CLASS_IDS_SLOT), address });
 
     // Build preimage
     // todo(ilyas): make this somewhat random but also take into account the mutation on global variables.timestamp
@@ -107,7 +108,7 @@ void mutate_bytecode(std::vector<ContractClassWithCommitment>& contract_classes,
     for (size_t i = 0; i < 4; i++) {
         FF storage_slot = delayed_public_mutable_slot + i;
         FF leaf_slot = Poseidon2::hash(
-            { FF(DOM_SEP__PUBLIC_LEAF_INDEX), FF(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS), storage_slot });
+            { FF(DOM_SEP__PUBLIC_LEAF_SLOT), FF(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS), storage_slot });
         public_data_writes.push_back(bb::crypto::merkle_tree::PublicDataLeafValue{ leaf_slot, values[i] });
     }
 }

barretenberg/cpp/src/barretenberg/vm2/common/aztec_constants.hpp

@@ -17,8 +17,8 @@
 #define MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX 64
 #define MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX 63
 #define MAX_L2_TO_L1_MSGS_PER_TX 8
-#define GENESIS_BLOCK_HEADER_HASH "0x0dc66232e4edff2923217f4fdf80ecc23ed4bd047e743df85a6827878bf6c4d6"
-#define GENESIS_ARCHIVE_ROOT "0x1f8c805403d88ee809d3cb3e52eeba0a104f69968cdb844a9cbdf1e9e00b3a95"
+#define GENESIS_BLOCK_HEADER_HASH "0x20859c34fd7cd64578ba0779e7475e56900de9b95f1b634fbe2d7b266d8d2840"
+#define GENESIS_ARCHIVE_ROOT "0x2b7cc335b4798b4d9b5e88cd6b55b1ce54b1225970ad2adff7820413a3c4ca3c"
 #define MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS 3000
 #define MAX_PROTOCOL_CONTRACTS 11
 #define CANONICAL_AUTH_REGISTRY_ADDRESS 1
@@ -254,14 +254,16 @@
 #define UPDATES_DELAYED_PUBLIC_MUTABLE_VALUES_LEN 3
 #define UPDATES_DELAYED_PUBLIC_MUTABLE_METADATA_BIT_SIZE 144
 #define DEFAULT_MAX_DEBUG_LOG_MEMORY_READS 125000
-#define DOM_SEP__NOTE_HASH_NONCE 2
-#define DOM_SEP__UNIQUE_NOTE_HASH 3
-#define DOM_SEP__SILOED_NOTE_HASH 4
-#define DOM_SEP__OUTER_NULLIFIER 7
-#define DOM_SEP__PUBLIC_LEAF_INDEX 23
-#define DOM_SEP__PUBLIC_BYTECODE 60
-#define DOM_SEP__CONTRACT_CLASS_ID 16
-#define DOM_SEP__PUBLIC_KEYS_HASH 52
-#define DOM_SEP__PARTIAL_ADDRESS 27
-#define DOM_SEP__CONTRACT_ADDRESS_V1 15
-#define DOM_SEP__PUBLIC_CALLDATA 43
+#define DOM_SEP__NOTE_HASH_NONCE 4040695053UL
+#define DOM_SEP__UNIQUE_NOTE_HASH 1615905817UL
+#define DOM_SEP__SILOED_NOTE_HASH 3552985968UL
+#define DOM_SEP__OUTER_NULLIFIER 3537029706UL
+#define DOM_SEP__PUBLIC_LEAF_SLOT 2853865602UL
+#define DOM_SEP__PUBLIC_STORAGE_MAP_SLOT 1106049611UL
+#define DOM_SEP__PUBLIC_BYTECODE 4245021897UL
+#define DOM_SEP__CONTRACT_CLASS_ID 1134959961UL
+#define DOM_SEP__PUBLIC_KEYS_HASH 349301051UL
+#define DOM_SEP__PARTIAL_ADDRESS 1453969891UL
+#define DOM_SEP__CONTRACT_ADDRESS_V1 2091531360UL
+#define DOM_SEP__BLOCK_HEADER_HASH 2064783670UL
+#define DOM_SEP__PUBLIC_CALLDATA 388853507UL

barretenberg/cpp/src/barretenberg/vm2/constraining/relations/bc_hashing.test.cpp

@@ -183,7 +183,7 @@ TEST_F(BytecodeHashingConstrainingTest, SingleBytecodeHashOneRow)
 TEST_F(BytecodeHashingConstrainingTestTraceHelper, SingleBytecodeHash100Fields)
 {
     // The hardcoded value is taken from noir-projects/aztec-nr/aztec/src/hash.nr:
-    FF hash = FF("0x16d621c3387156ef53754679e7b2c9be8f0bceeb44aa59a74991df3b0b42a0bf");
+    FF hash = FF("0x2c5e4c67ad5e1e4d840a6c4db4cee765fe09fbb6dfbb89ab649c295bb01f206e");
 
     std::vector<FF> bytecode_fields = {};
     for (uint32_t i = 1; i < 100; i++) {

barretenberg/cpp/src/barretenberg/vm2/constraining/relations/calldata_hashing.test.cpp

@@ -255,7 +255,7 @@ TEST_F(CalldataHashingConstrainingTestTraceHelper, EmptyCalldataHash)
 TEST_F(CalldataHashingConstrainingTestTraceHelper, SingleCalldataHash100Fields)
 {
     // The hardcoded value is taken from noir-projects/aztec-nr/aztec/src/hash.nr:
-    FF hash = FF("0x191383c9f8964afd3ea8879a03b7dda65d6724773966d18dcf80e452736fc1f3");
+    FF hash = FF("0x0a11986d25a1f1639715047e125db86b0c684b44d736c0aa64c236d3e05c30b0");
 
     std::vector<FF> calldata_fields = {};
     calldata_fields.reserve(100);