fix: naming inconsistency in private kernel (#3384)

AztecProtocol · Nov 21, 2023 · 4743486 · 4743486
1 parent 683a0f3
commit 4743486
Show file tree

Hide file tree

Showing 24 changed files with 34 additions and 34 deletions.
diff --git a/circuits/cpp/src/aztec3/circuits/hash.hpp b/circuits/cpp/src/aztec3/circuits/hash.hpp
@@ -130,14 +130,14 @@ template <typename NCT> typename NCT::fr compute_block_hash(typename NCT::fr con
                                                             typename NCT::fr const& note_hash_tree_root,
                                                             typename NCT::fr const& nullifier_tree_root,
                                                             typename NCT::fr const& contract_tree_root,
-                                                            typename NCT::fr const& l1_to_l2_data_tree_root,
+                                                            typename NCT::fr const& l1_to_l2_messages_tree_root,
                                                             typename NCT::fr const& public_data_tree_root)
 {
     using fr = typename NCT::fr;
 
     std::vector<fr> const inputs = {
-        globals_hash,       note_hash_tree_root,     nullifier_tree_root,
-        contract_tree_root, l1_to_l2_data_tree_root, public_data_tree_root,
+        globals_hash,       note_hash_tree_root,         nullifier_tree_root,
+        contract_tree_root, l1_to_l2_messages_tree_root, public_data_tree_root,
     };
 
     return NCT::hash(inputs, aztec3::GeneratorIndex::BLOCK_HASH);
@@ -148,14 +148,14 @@ typename NCT::fr compute_block_hash_with_globals(abis::GlobalVariables<NCT> cons
                                                  typename NCT::fr const& note_hash_tree_root,
                                                  typename NCT::fr const& nullifier_tree_root,
                                                  typename NCT::fr const& contract_tree_root,
-                                                 typename NCT::fr const& l1_to_l2_data_tree_root,
+                                                 typename NCT::fr const& l1_to_l2_messages_tree_root,
                                                  typename NCT::fr const& public_data_tree_root)
 {
     using fr = typename NCT::fr;
 
     std::vector<fr> const inputs = {
-        globals.hash(),     note_hash_tree_root,     nullifier_tree_root,
-        contract_tree_root, l1_to_l2_data_tree_root, public_data_tree_root,
+        globals.hash(),     note_hash_tree_root,         nullifier_tree_root,
+        contract_tree_root, l1_to_l2_messages_tree_root, public_data_tree_root,
     };
 
     return NCT::hash(inputs, aztec3::GeneratorIndex::BLOCK_HASH);

diff --git a/circuits/cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.cpp b/circuits/cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.cpp
@@ -144,14 +144,14 @@ void perform_historical_blocks_tree_membership_checks(DummyBuilder& builder, Bas
         auto note_hash_tree_root = historic_block.note_hash_tree_root;
         auto nullifier_tree_root = historic_block.nullifier_tree_root;
         auto contract_tree_root = historic_block.contract_tree_root;
-        auto l1_to_l2_data_tree_root = historic_block.l1_to_l2_messages_tree_root;
+        auto l1_to_l2_messages_tree_root = historic_block.l1_to_l2_messages_tree_root;
         auto public_data_tree_root = historic_block.public_data_tree_root;
 
         auto previous_block_hash = compute_block_hash<NT>(historic_block.global_variables_hash,
                                                           note_hash_tree_root,
                                                           nullifier_tree_root,
                                                           contract_tree_root,
-                                                          l1_to_l2_data_tree_root,
+                                                          l1_to_l2_messages_tree_root,
                                                           public_data_tree_root);
 
         abis::MembershipWitness<NT, HISTORIC_BLOCKS_TREE_HEIGHT> const historic_root_witness =

diff --git a/yarn-project/noir-protocol-circuits/src/crates/rollup-lib/src/hash.nr b/yarn-project/noir-protocol-circuits/src/crates/rollup-lib/src/hash.nr
@@ -6,10 +6,10 @@ pub fn compute_block_hash_with_globals(
     note_hash_tree_root : Field,
     nullifier_tree_root : Field,
     contract_tree_root : Field,
-    l1_to_l2_data_tree_root : Field,
+    l1_to_l2_messages_tree_root : Field,
     public_data_tree_root : Field) -> Field {
 
-    let inputs = [globals.hash(), note_hash_tree_root, nullifier_tree_root, contract_tree_root, l1_to_l2_data_tree_root, public_data_tree_root];
+    let inputs = [globals.hash(), note_hash_tree_root, nullifier_tree_root, contract_tree_root, l1_to_l2_messages_tree_root, public_data_tree_root];
 
     dep::std::hash::pedersen_hash_with_separator(inputs, constants_gen::GENERATOR_INDEX__BLOCK_HASH)
 }
diff --git a/yarn-project/noir-protocol-circuits/src/crates/types/src/abis/historical_block_data.nr b/yarn-project/noir-protocol-circuits/src/crates/types/src/abis/historical_block_data.nr
@@ -23,7 +23,7 @@ impl HistoricalBlockData {
             self.block.note_hash_tree_root,
             self.block.nullifier_tree_root,
             self.block.contract_tree_root,
-            self.block.l1_to_l2_data_tree_root,
+            self.block.l1_to_l2_messages_tree_root,
             self.blocks_tree_root,
             self.block.public_data_tree_root,
             self.block.global_variables_hash

diff --git a/yarn-project/noir-protocol-circuits/src/crates/types/src/block.nr b/yarn-project/noir-protocol-circuits/src/crates/types/src/block.nr
@@ -6,7 +6,7 @@ struct Block {
     note_hash_tree_root : Field,
     nullifier_tree_root : Field,
     contract_tree_root : Field,
-    l1_to_l2_data_tree_root : Field,
+    l1_to_l2_messages_tree_root : Field,
 
     // Public data
     public_data_tree_root : Field,
@@ -19,7 +19,7 @@ impl Block {
         assert(self.note_hash_tree_root == 0);
         assert(self.nullifier_tree_root == 0);
         assert(self.contract_tree_root == 0);
-        assert(self.l1_to_l2_data_tree_root == 0);
+        assert(self.l1_to_l2_messages_tree_root == 0);
         assert(self.public_data_tree_root == 0);
     }
 
@@ -29,7 +29,7 @@ impl Block {
             self.note_hash_tree_root,
             self.nullifier_tree_root,
             self.contract_tree_root,
-            self.l1_to_l2_data_tree_root,
+            self.l1_to_l2_messages_tree_root,
             self.public_data_tree_root,
         ], constants_gen::GENERATOR_INDEX__BLOCK_HASH)
     }

diff --git a/yarn-project/noir-protocol-circuits/src/crates/types/src/tests/fixtures.nr b/yarn-project/noir-protocol-circuits/src/crates/types/src/tests/fixtures.nr
@@ -20,7 +20,7 @@ global HISTORICAL_BLOCK_DATA = HistoricalBlockData {
         note_hash_tree_root: fixtures::note_hash_tree::ROOT,
         nullifier_tree_root: 0,
         contract_tree_root: fixtures::contract_tree::ROOT,
-        l1_to_l2_data_tree_root: 0,
+        l1_to_l2_messages_tree_root: 0,
         public_data_tree_root: 0,
         global_variables_hash: 0,
     },

diff --git a/yarn-project/noir-protocol-circuits/src/target/private_kernel_init.json b/yarn-project/noir-protocol-circuits/src/target/private_kernel_init.json
diff --git a/yarn-project/noir-protocol-circuits/src/target/private_kernel_init_simulated.json b/yarn-project/noir-protocol-circuits/src/target/private_kernel_init_simulated.json
diff --git a/yarn-project/noir-protocol-circuits/src/target/private_kernel_inner.json b/yarn-project/noir-protocol-circuits/src/target/private_kernel_inner.json
diff --git a/yarn-project/noir-protocol-circuits/src/target/private_kernel_inner_simulated.json b/yarn-project/noir-protocol-circuits/src/target/private_kernel_inner_simulated.json
diff --git a/yarn-project/noir-protocol-circuits/src/target/private_kernel_ordering.json b/yarn-project/noir-protocol-circuits/src/target/private_kernel_ordering.json
diff --git a/yarn-project/noir-protocol-circuits/src/target/private_kernel_ordering_simulated.json b/yarn-project/noir-protocol-circuits/src/target/private_kernel_ordering_simulated.json
diff --git a/yarn-project/noir-protocol-circuits/src/target/public_kernel_private_previous.json b/yarn-project/noir-protocol-circuits/src/target/public_kernel_private_previous.json
diff --git a/yarn-project/noir-protocol-circuits/src/target/public_kernel_private_previous_simulated.json b/yarn-project/noir-protocol-circuits/src/target/public_kernel_private_previous_simulated.json
diff --git a/yarn-project/noir-protocol-circuits/src/target/public_kernel_public_previous.json b/yarn-project/noir-protocol-circuits/src/target/public_kernel_public_previous.json
diff --git a/yarn-project/noir-protocol-circuits/src/target/public_kernel_public_previous_simulated.json b/yarn-project/noir-protocol-circuits/src/target/public_kernel_public_previous_simulated.json
diff --git a/yarn-project/noir-protocol-circuits/src/target/rollup_base.json b/yarn-project/noir-protocol-circuits/src/target/rollup_base.json
diff --git a/yarn-project/noir-protocol-circuits/src/type_conversion.ts b/yarn-project/noir-protocol-circuits/src/type_conversion.ts
@@ -356,7 +356,7 @@ export function mapHistoricalBlockDataToNoir(historicalBlockData: HistoricBlockD
       note_hash_tree_root: mapFieldToNoir(historicalBlockData.noteHashTreeRoot),
       nullifier_tree_root: mapFieldToNoir(historicalBlockData.nullifierTreeRoot),
       contract_tree_root: mapFieldToNoir(historicalBlockData.contractTreeRoot),
-      l1_to_l2_data_tree_root: mapFieldToNoir(historicalBlockData.l1ToL2MessagesTreeRoot),
+      l1_to_l2_messages_tree_root: mapFieldToNoir(historicalBlockData.l1ToL2MessagesTreeRoot),
       public_data_tree_root: mapFieldToNoir(historicalBlockData.publicDataTreeRoot),
       global_variables_hash: mapFieldToNoir(historicalBlockData.globalVariablesHash),
     },
@@ -374,7 +374,7 @@ export function mapHistoricalBlockDataFromNoir(historicalBlockData: HistoricalBl
     mapFieldFromNoir(historicalBlockData.block.note_hash_tree_root),
     mapFieldFromNoir(historicalBlockData.block.nullifier_tree_root),
     mapFieldFromNoir(historicalBlockData.block.contract_tree_root),
-    mapFieldFromNoir(historicalBlockData.block.l1_to_l2_data_tree_root),
+    mapFieldFromNoir(historicalBlockData.block.l1_to_l2_messages_tree_root),
     mapFieldFromNoir(historicalBlockData.blocks_tree_root),
     mapFieldFromNoir(historicalBlockData.private_kernel_vk_tree_root),
     mapFieldFromNoir(historicalBlockData.block.public_data_tree_root),

diff --git a/yarn-project/noir-protocol-circuits/src/types/private_kernel_init_types.ts b/yarn-project/noir-protocol-circuits/src/types/private_kernel_init_types.ts
@@ -69,7 +69,7 @@ export interface Block {
   note_hash_tree_root: Field;
   nullifier_tree_root: Field;
   contract_tree_root: Field;
-  l1_to_l2_data_tree_root: Field;
+  l1_to_l2_messages_tree_root: Field;
   public_data_tree_root: Field;
   global_variables_hash: Field;
 }

diff --git a/yarn-project/noir-protocol-circuits/src/types/private_kernel_inner_types.ts b/yarn-project/noir-protocol-circuits/src/types/private_kernel_inner_types.ts
@@ -80,7 +80,7 @@ export interface Block {
   note_hash_tree_root: Field;
   nullifier_tree_root: Field;
   contract_tree_root: Field;
-  l1_to_l2_data_tree_root: Field;
+  l1_to_l2_messages_tree_root: Field;
   public_data_tree_root: Field;
   global_variables_hash: Field;
 }

diff --git a/yarn-project/noir-protocol-circuits/src/types/private_kernel_ordering_types.ts b/yarn-project/noir-protocol-circuits/src/types/private_kernel_ordering_types.ts
@@ -80,7 +80,7 @@ export interface Block {
   note_hash_tree_root: Field;
   nullifier_tree_root: Field;
   contract_tree_root: Field;
-  l1_to_l2_data_tree_root: Field;
+  l1_to_l2_messages_tree_root: Field;
   public_data_tree_root: Field;
   global_variables_hash: Field;
 }

diff --git a/yarn-project/noir-protocol-circuits/src/types/public_kernel_private_previous_types.ts b/yarn-project/noir-protocol-circuits/src/types/public_kernel_private_previous_types.ts
@@ -80,7 +80,7 @@ export interface Block {
   note_hash_tree_root: Field;
   nullifier_tree_root: Field;
   contract_tree_root: Field;
-  l1_to_l2_data_tree_root: Field;
+  l1_to_l2_messages_tree_root: Field;
   public_data_tree_root: Field;
   global_variables_hash: Field;
 }

diff --git a/yarn-project/noir-protocol-circuits/src/types/public_kernel_public_previous_types.ts b/yarn-project/noir-protocol-circuits/src/types/public_kernel_public_previous_types.ts
@@ -80,7 +80,7 @@ export interface Block {
   note_hash_tree_root: Field;
   nullifier_tree_root: Field;
   contract_tree_root: Field;
-  l1_to_l2_data_tree_root: Field;
+  l1_to_l2_messages_tree_root: Field;
   public_data_tree_root: Field;
   global_variables_hash: Field;
 }

diff --git a/yarn-project/noir-protocol-circuits/src/types/rollup_base_types.ts b/yarn-project/noir-protocol-circuits/src/types/rollup_base_types.ts
@@ -80,7 +80,7 @@ export interface Block {
   note_hash_tree_root: Field;
   nullifier_tree_root: Field;
   contract_tree_root: Field;
-  l1_to_l2_data_tree_root: Field;
+  l1_to_l2_messages_tree_root: Field;
   public_data_tree_root: Field;
   global_variables_hash: Field;
 }