feat: add totalFees to global variables

AztecProtocol · May 16, 2024 · 7c310f1 · 7c310f1
1 parent 7c4c822
commit 7c310f1
Show file tree

Hide file tree

Showing 31 changed files with 171 additions and 64 deletions.
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/aztec_constants.hpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/aztec_constants.hpp
@@ -84,7 +84,7 @@ const size_t CONTRACT_STORAGE_UPDATE_REQUEST_LENGTH = 2;
 const size_t ETH_ADDRESS_LENGTH = 1;
 const size_t FUNCTION_DATA_LENGTH = 2;
 const size_t FUNCTION_LEAF_PREIMAGE_LENGTH = 5;
-const size_t GLOBAL_VARIABLES_LENGTH = 6 + GAS_FEES_LENGTH;
+const size_t GLOBAL_VARIABLES_LENGTH = 6 + GAS_FEES_LENGTH + 1;
 const size_t APPEND_ONLY_TREE_SNAPSHOT_LENGTH = 2;
 const size_t L1_TO_L2_MESSAGE_LENGTH = 6;
 const size_t L2_TO_L1_MESSAGE_LENGTH = 3;

diff --git a/l1-contracts/src/core/libraries/ConstantsGen.sol b/l1-contracts/src/core/libraries/ConstantsGen.sol
@@ -112,7 +112,7 @@ library Constants {
   uint256 internal constant ETH_ADDRESS_LENGTH = 1;
   uint256 internal constant FUNCTION_DATA_LENGTH = 2;
   uint256 internal constant FUNCTION_LEAF_PREIMAGE_LENGTH = 5;
-  uint256 internal constant GLOBAL_VARIABLES_LENGTH = 6 + GAS_FEES_LENGTH;
+  uint256 internal constant GLOBAL_VARIABLES_LENGTH = 6 + GAS_FEES_LENGTH + 1;
   uint256 internal constant APPEND_ONLY_TREE_SNAPSHOT_LENGTH = 2;
   uint256 internal constant L1_TO_L2_MESSAGE_LENGTH = 6;
   uint256 internal constant L2_TO_L1_MESSAGE_LENGTH = 3;

diff --git a/l1-contracts/src/core/libraries/HeaderLib.sol b/l1-contracts/src/core/libraries/HeaderLib.sol
@@ -50,6 +50,7 @@ import {Hash} from "./Hash.sol";
  *  | 0x01c8                                                                           | 0x20         |     feeRecipient
  *  | 0x01e8                                                                           | 0x20         |     gasFees.feePerDaGas
  *  | 0x0208                                                                           | 0x20         |     gasFees.feePerL2Gas
+ *  | 0x0228                                                                           | 0x20         |     totalFees
  *  |                                                                                  |              |   }
  *  |                                                                                  |              | }
  *  | ---                                                                              | ---          | ---
@@ -86,6 +87,7 @@ library HeaderLib {
     address coinbase;
     bytes32 feeRecipient;
     GasFees gasFees;
+    uint256 totalFees;
   }
 
   struct ContentCommitment {
@@ -102,7 +104,7 @@ library HeaderLib {
     GlobalVariables globalVariables;
   }
 
-  uint256 private constant HEADER_LENGTH = 0x228; // Header byte length
+  uint256 private constant HEADER_LENGTH = 0x248; // Header byte length
 
   /**
    * @notice Validates the header
@@ -189,6 +191,7 @@ library HeaderLib {
     header.globalVariables.feeRecipient = bytes32(_header[0x01c8:0x01e8]);
     header.globalVariables.gasFees.feePerDaGas = uint256(bytes32(_header[0x01e8:0x0208]));
     header.globalVariables.gasFees.feePerL2Gas = uint256(bytes32(_header[0x0208:0x0228]));
+    header.globalVariables.totalFees = uint256(bytes32(_header[0x0228:0x0248]));
 
     return header;
   }

diff --git a/l1-contracts/test/fixtures/empty_block_0.json b/l1-contracts/test/fixtures/empty_block_0.json
@@ -8,7 +8,7 @@
     "l2ToL1Messages": []
   },
   "block": {
-    "archive": "0x092e7b5812f430a11de252abb67ba28c237b78aa717cf67a0a7d13ac229cb476",
+    "archive": "0x2546170bbabcdfcbd246a795d75ce1ce4c29fa7925454ddf08ac3aef2c14856b",
     "body": "0x00000000",
     "txsEffectsHash": "0x0041e05321b3603fcde9458e9c664d50a08187c7fdeeb6a1cf39932849df577c",
     "decodedHeader": {
@@ -23,16 +23,16 @@
         "chainId": 31337,
         "timestamp": 0,
         "version": 1,
-        "coinbase": "0xb35cee29ec094ab8b8be05b158e0bf50d2432952",
-        "feeRecipient": "0x2e318034e3a2c52d895e8af8e14f8b95c5e49c461d12b4657ab8c85539013b02",
+        "coinbase": "0x6fb671695b5b2f747b2156b1f9fc0a912e6d4e07",
+        "feeRecipient": "0x207397f042487a77b4c0158ce83698c31f0308454f10a227cf5a67074a89514d",
         "gasFees": {
           "feePerDaGas": 0,
           "feePerL2Gas": 0
         }
       },
       "lastArchive": {
         "nextAvailableLeafIndex": 1,
-        "root": "0x067a48e3140b6f15d71751ededfa0cccde3d436bb71aa7fec226b0bfe51dc5cf"
+        "root": "0x05b0b6df52f1d47d0406318558052c89a174fbc9d615def82b3cc9ccc1937db8"
       },
       "stateReference": {
         "l1ToL2MessageTree": {
@@ -55,8 +55,8 @@
         }
       }
     },
-    "header": "0x067a48e3140b6f15d71751ededfa0cccde3d436bb71aa7fec226b0bfe51dc5cf0000000100000000000000000000000000000000000000000000000000000000000000010041e05321b3603fcde9458e9c664d50a08187c7fdeeb6a1cf39932849df577c00089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c0007638bb56b6dda2b64b8f76841114ac3a87a1820030e2e16772c4d294879c31864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000001016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000000800bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000001000572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000000800000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000b35cee29ec094ab8b8be05b158e0bf50d24329522e318034e3a2c52d895e8af8e14f8b95c5e49c461d12b4657ab8c85539013b0200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-    "publicInputsHash": "0x00ae98c27e880d898c1dd0cdb9b2da88de6719f7b3bf0707a4f13381ac22dce8",
+    "header": "0x05b0b6df52f1d47d0406318558052c89a174fbc9d615def82b3cc9ccc1937db80000000100000000000000000000000000000000000000000000000000000000000000010041e05321b3603fcde9458e9c664d50a08187c7fdeeb6a1cf39932849df577c00089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c0007638bb56b6dda2b64b8f76841114ac3a87a1820030e2e16772c4d294879c31864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000001016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000000800bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000001000572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000000800000000000000000000000000000000000000000000000000000000000007a690000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000006fb671695b5b2f747b2156b1f9fc0a912e6d4e07207397f042487a77b4c0158ce83698c31f0308454f10a227cf5a67074a89514d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+    "publicInputsHash": "0x00bf51233b05f3d05d6454f992b46d45bd226b1ee9590e59e8d15f6e5fe8ae7a",
     "numTxs": 0
   }
 }
diff --git a/l1-contracts/test/fixtures/empty_block_1.json b/l1-contracts/test/fixtures/empty_block_1.json
@@ -8,7 +8,7 @@
     "l2ToL1Messages": []
   },
   "block": {
-    "archive": "0x0a195ab304da7c6cf916ff7a40cb570f728481aac14b2d5df776c5306d0671f5",
+    "archive": "0x2daa20c6eb6bf10488e45e3f1a75462810ab1d58fd771b201d0563beace335fe",
     "body": "0x00000000",
     "txsEffectsHash": "0x0041e05321b3603fcde9458e9c664d50a08187c7fdeeb6a1cf39932849df577c",
     "decodedHeader": {
@@ -21,18 +21,18 @@
       "globalVariables": {
         "blockNumber": 2,
         "chainId": 31337,
-        "timestamp": 1714575319,
+        "timestamp": 1715804090,
         "version": 1,
-        "coinbase": "0xb35cee29ec094ab8b8be05b158e0bf50d2432952",
-        "feeRecipient": "0x2e318034e3a2c52d895e8af8e14f8b95c5e49c461d12b4657ab8c85539013b02",
+        "coinbase": "0x6fb671695b5b2f747b2156b1f9fc0a912e6d4e07",
+        "feeRecipient": "0x207397f042487a77b4c0158ce83698c31f0308454f10a227cf5a67074a89514d",
         "gasFees": {
           "feePerDaGas": 0,
           "feePerL2Gas": 0
         }
       },
       "lastArchive": {
         "nextAvailableLeafIndex": 2,
-        "root": "0x092e7b5812f430a11de252abb67ba28c237b78aa717cf67a0a7d13ac229cb476"
+        "root": "0x2546170bbabcdfcbd246a795d75ce1ce4c29fa7925454ddf08ac3aef2c14856b"
       },
       "stateReference": {
         "l1ToL2MessageTree": {
@@ -55,8 +55,8 @@
         }
       }
     },
-    "header": "0x092e7b5812f430a11de252abb67ba28c237b78aa717cf67a0a7d13ac229cb4760000000200000000000000000000000000000000000000000000000000000000000000010041e05321b3603fcde9458e9c664d50a08187c7fdeeb6a1cf39932849df577c00089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c0007638bb56b6dda2b64b8f76841114ac3a87a1820030e2e16772c4d294879c31864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000002016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000001000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000001800572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000000c00000000000000000000000000000000000000000000000000000000000007a690000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000663257d7b35cee29ec094ab8b8be05b158e0bf50d24329522e318034e3a2c52d895e8af8e14f8b95c5e49c461d12b4657ab8c85539013b0200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-    "publicInputsHash": "0x00dde76c303e0e4d99151f2178e0b6cca10687f5a956084cae2fe6d320e3b9ec",
+    "header": "0x2546170bbabcdfcbd246a795d75ce1ce4c29fa7925454ddf08ac3aef2c14856b0000000200000000000000000000000000000000000000000000000000000000000000010041e05321b3603fcde9458e9c664d50a08187c7fdeeb6a1cf39932849df577c00089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c0007638bb56b6dda2b64b8f76841114ac3a87a1820030e2e16772c4d294879c31864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000002016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000001000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000001800572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000000c00000000000000000000000000000000000000000000000000000000000007a690000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000664517ba6fb671695b5b2f747b2156b1f9fc0a912e6d4e07207397f042487a77b4c0158ce83698c31f0308454f10a227cf5a67074a89514d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+    "publicInputsHash": "0x007123d1c7f5c50da8eec3e13998eb8e9741ebc9c2ce17a5df1bc3a390cb7739",
     "numTxs": 0
   }
 }
diff --git a/l1-contracts/test/fixtures/mixed_block_0.json b/l1-contracts/test/fixtures/mixed_block_0.json
diff --git a/l1-contracts/test/fixtures/mixed_block_1.json b/l1-contracts/test/fixtures/mixed_block_1.json
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/global_variables.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/global_variables.nr
@@ -13,7 +13,8 @@ struct GlobalVariables {
     timestamp : u64,
     coinbase : EthAddress,
     fee_recipient : AztecAddress,
-    gas_fees : GasFees
+    gas_fees : GasFees,
+    total_fees : Field
 }
 // docs:end:global-variables
 
@@ -26,6 +27,7 @@ impl GlobalVariables {
             & (self.coinbase.is_zero())
             & (self.fee_recipient.is_zero())
             & (self.gas_fees.is_empty())
+            & (self.total_fees == 0)
     }
 }
 
@@ -40,6 +42,7 @@ impl Serialize<GLOBAL_VARIABLES_LENGTH> for GlobalVariables {
         serialized.push(self.coinbase.to_field());
         serialized.push(self.fee_recipient.to_field());
         serialized.extend_from_array(self.gas_fees.serialize());
+        serialized.push(self.total_fees);
 
         serialized.storage
     }
@@ -55,7 +58,8 @@ impl Deserialize<GLOBAL_VARIABLES_LENGTH> for GlobalVariables {
             timestamp: reader.read() as u64,
             coinbase: EthAddress::from_field(reader.read()),
             fee_recipient: AztecAddress::from_field(reader.read()),
-            gas_fees: reader.read_struct(GasFees::deserialize)
+            gas_fees: reader.read_struct(GasFees::deserialize),
+            total_fees: reader.read()
         }
     }
 }
@@ -68,7 +72,8 @@ impl Eq for GlobalVariables {
         (self.timestamp == other.timestamp) &
         (self.coinbase == other.coinbase) &
         (self.fee_recipient == other.fee_recipient) &
-        (self.gas_fees == other.gas_fees) 
+        (self.gas_fees == other.gas_fees) &
+        (self.total_fees == other.total_fees)
     }
 }
 
@@ -81,7 +86,8 @@ impl Empty for GlobalVariables {
             timestamp: 0,
             coinbase: EthAddress::empty(),
             fee_recipient: AztecAddress::empty(),
-            gas_fees: GasFees::empty()
+            gas_fees: GasFees::empty(),
+            total_fees: 0
         }
     }
 }

diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/private_call_stack_item.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/private_call_stack_item.nr
@@ -85,6 +85,6 @@ fn empty_hash() {
     let hash = item.hash();
 
     // Value from private_call_stack_item.test.ts "computes empty item hash" test
-    let test_data_empty_hash = 0x138c6ad441864ce43487e99d5e1e122c38b4b55d893edec04a32f5aacecc856c;
+    let test_data_empty_hash = 0x25d9c6ba3de2cf8baec904e5c1ba76e130c5181bc2d6c4f1ceea4663287ba9ba;
     assert_eq(hash, test_data_empty_hash);
 }
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/private_circuit_public_inputs.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/private_circuit_public_inputs.nr
@@ -221,6 +221,6 @@ fn empty_hash() {
     let inputs = PrivateCircuitPublicInputs::empty();
     let hash = inputs.hash();
     // Value from private_circuit_public_inputs.test.ts "computes empty item hash" test
-    let test_data_empty_hash = 0x2517b9a84487bde68e18647e59530c6ffe4a7a88c5c556f013d09fd22b84ba35;
+    let test_data_empty_hash = 0x0a61fd8a00a3d160e723b316437484bf643f8ed7952031e493717e1f0f1f9345;
     assert_eq(hash, test_data_empty_hash);
 }
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/public_call_stack_item.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/public_call_stack_item.nr
@@ -69,7 +69,7 @@ mod tests {
         let call_stack_item = PublicCallStackItem { contract_address, public_inputs, is_execution_request: true, function_data };
 
         // Value from public_call_stack_item.test.ts "Computes a callstack item request hash" test
-        let test_data_call_stack_item_request_hash = 0x1177a69fbc37f0ebdf290025414ff72504497840f174896bd427d0f30ec21c55;
+        let test_data_call_stack_item_request_hash = 0x22848497ff97ff3a4517aec32454059030fb5a3ef4f3ca533ee40132d7a63aea;
         assert_eq(call_stack_item.hash(), test_data_call_stack_item_request_hash);
     }
 
@@ -87,7 +87,7 @@ mod tests {
         let call_stack_item = PublicCallStackItem { contract_address, public_inputs, is_execution_request: false, function_data };
 
         // Value from public_call_stack_item.test.ts "Computes a callstack item hash" test
-        let test_data_call_stack_item_hash = 0x0f7624c0d5ea65fcec318c4d34cb3fcbf9c67435aebbf1548b3c90ef641424f8;
+        let test_data_call_stack_item_hash = 0x0e18ddd9aaddae02d45598f0278d925e289913384d6e15057ce5b4a9e8e7488d;
         assert_eq(call_stack_item.hash(), test_data_call_stack_item_hash);
     }
 }
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/public_circuit_public_inputs.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/public_circuit_public_inputs.nr
@@ -195,6 +195,6 @@ fn empty_hash() {
     let hash = inputs.hash();
 
     // Value from public_circuit_public_inputs.test.ts "computes empty item hash" test
-    let test_data_empty_hash = 0x132559f41b7adc7388e0cd52b91fd6837c296b2f9ec1b6d2ed046f7a56db18f8;
+    let test_data_empty_hash = 0x2d91debc43bd6354caef4fd152975e7c6dd44e8623b6b62c21b9f547f2fabd32;
     assert_eq(hash, test_data_empty_hash);
 }
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr b/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr
@@ -152,7 +152,7 @@ global CONTRACT_STORAGE_UPDATE_REQUEST_LENGTH: u64 = 2;
 global ETH_ADDRESS_LENGTH = 1;
 global FUNCTION_DATA_LENGTH: u64 = 2;
 global FUNCTION_LEAF_PREIMAGE_LENGTH: u64 = 5;
-global GLOBAL_VARIABLES_LENGTH: u64 = 6 + GAS_FEES_LENGTH;
+global GLOBAL_VARIABLES_LENGTH: u64 = 6 + GAS_FEES_LENGTH + 1;
 global APPEND_ONLY_TREE_SNAPSHOT_LENGTH = 2;
 global L1_TO_L2_MESSAGE_LENGTH: u64 = 6;
 global L2_TO_L1_MESSAGE_LENGTH: u64 = 3;

diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/header.nr b/noir-projects/noir-protocol-circuits/crates/types/src/header.nr
@@ -100,6 +100,6 @@ fn empty_hash_is_zero() {
     let hash = header.hash();
 
     // Value from new_contract_data.test.ts "computes empty hash" test
-    let test_data_empty_hash = 0x2b2525fb1ae91c903827b8055b9ffaf8444ddf4c2b4dce4a79a3cba426bfbd73;
+    let test_data_empty_hash = 0x124e8c40a6eca2e3ad10c04050b01a3fad00df3cea47b13592c7571b6914c7a7;
     assert_eq(hash, test_data_empty_hash);
 }
diff --git a/yarn-project/circuit-types/src/l2_block_code_to_purge.ts b/yarn-project/circuit-types/src/l2_block_code_to_purge.ts
@@ -94,6 +94,7 @@ export function makeGlobalVariables(seed = 1, blockNumber: number | undefined =
       EthAddress.fromField(new Fr(seed + 4)),
       AztecAddress.fromField(new Fr(seed + 5)),
       new GasFees(new Fr(seed + 6), new Fr(seed + 7)),
+      new Fr(seed + 8),
     );
   }
   return new GlobalVariables(
@@ -104,5 +105,6 @@ export function makeGlobalVariables(seed = 1, blockNumber: number | undefined =
     EthAddress.fromField(new Fr(seed + 4)),
     AztecAddress.fromField(new Fr(seed + 5)),
     new GasFees(new Fr(seed + 6), new Fr(seed + 7)),
+    new Fr(seed + 8),
   );
 }
diff --git a/yarn-project/circuits.js/src/constants.gen.ts b/yarn-project/circuits.js/src/constants.gen.ts
@@ -95,7 +95,7 @@ export const CONTRACT_STORAGE_UPDATE_REQUEST_LENGTH = 2;
 export const ETH_ADDRESS_LENGTH = 1;
 export const FUNCTION_DATA_LENGTH = 2;
 export const FUNCTION_LEAF_PREIMAGE_LENGTH = 5;
-export const GLOBAL_VARIABLES_LENGTH = 6 + GAS_FEES_LENGTH;
+export const GLOBAL_VARIABLES_LENGTH = 6 + GAS_FEES_LENGTH + 1;
 export const APPEND_ONLY_TREE_SNAPSHOT_LENGTH = 2;
 export const L1_TO_L2_MESSAGE_LENGTH = 6;
 export const L2_TO_L1_MESSAGE_LENGTH = 3;

diff --git a/yarn-project/circuits.js/src/structs/__snapshots__/header.test.ts.snap b/yarn-project/circuits.js/src/structs/__snapshots__/header.test.ts.snap
@@ -1,5 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Header computes empty hash 1`] = `Fr<0x2b2525fb1ae91c903827b8055b9ffaf8444ddf4c2b4dce4a79a3cba426bfbd73>`;
+exports[`Header computes empty hash 1`] = `Fr<0x124e8c40a6eca2e3ad10c04050b01a3fad00df3cea47b13592c7571b6914c7a7>`;
 
-exports[`Header computes hash 1`] = `Fr<0x256e19fe5b99a73cce35b5ab67652155919c75aea90b39c2c5b612a8a59cdf15>`;
+exports[`Header computes hash 1`] = `Fr<0x0c614720b42ecb0170de9e9124dec88dea42367a27951d735bd3d0f10f60f467>`;
diff --git a/yarn-project/circuits.js/src/structs/__snapshots__/private_call_stack_item.test.ts.snap b/yarn-project/circuits.js/src/structs/__snapshots__/private_call_stack_item.test.ts.snap
@@ -1,5 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`PrivateCallStackItem computes empty item hash 1`] = `Fr<0x138c6ad441864ce43487e99d5e1e122c38b4b55d893edec04a32f5aacecc856c>`;
+exports[`PrivateCallStackItem computes empty item hash 1`] = `Fr<0x25d9c6ba3de2cf8baec904e5c1ba76e130c5181bc2d6c4f1ceea4663287ba9ba>`;
 
-exports[`PrivateCallStackItem computes hash 1`] = `Fr<0x2078c0fe8fa7dc6d0c4623ec068d3297e027e60131ff4b0e333a99f72503aa32>`;
+exports[`PrivateCallStackItem computes hash 1`] = `Fr<0x0cce99cdad678da16661afd87ab516d3a83a8226b5ee5f7ed9baa702d0f48229>`;
diff --git a/...-project/circuits.js/src/structs/__snapshots__/private_circuit_public_inputs.test.ts.snap b/...-project/circuits.js/src/structs/__snapshots__/private_circuit_public_inputs.test.ts.snap
@@ -1,5 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`PrivateCircuitPublicInputs computes empty inputs hash 1`] = `Fr<0x2517b9a84487bde68e18647e59530c6ffe4a7a88c5c556f013d09fd22b84ba35>`;
+exports[`PrivateCircuitPublicInputs computes empty inputs hash 1`] = `Fr<0x0a61fd8a00a3d160e723b316437484bf643f8ed7952031e493717e1f0f1f9345>`;
 
-exports[`PrivateCircuitPublicInputs hash matches snapshot 1`] = `Fr<0x0e570673c6fee73b2c55d8acff12bdd9084820e6448c32cfb2600847f493bec1>`;
+exports[`PrivateCircuitPublicInputs hash matches snapshot 1`] = `Fr<0x2208bbb123b1d728f557d5221e66d2a1b07fb24615dfc696e480967cfc484e8a>`;
diff --git a/yarn-project/circuits.js/src/structs/__snapshots__/public_call_stack_item.test.ts.snap b/yarn-project/circuits.js/src/structs/__snapshots__/public_call_stack_item.test.ts.snap
@@ -1,9 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`PublicCallStackItem Computes a callstack item hash 1`] = `"0x0f7624c0d5ea65fcec318c4d34cb3fcbf9c67435aebbf1548b3c90ef641424f8"`;
+exports[`PublicCallStackItem Computes a callstack item hash 1`] = `"0x0e18ddd9aaddae02d45598f0278d925e289913384d6e15057ce5b4a9e8e7488d"`;
 
-exports[`PublicCallStackItem Computes a callstack item request hash 1`] = `"0x1177a69fbc37f0ebdf290025414ff72504497840f174896bd427d0f30ec21c55"`;
+exports[`PublicCallStackItem Computes a callstack item request hash 1`] = `"0x22848497ff97ff3a4517aec32454059030fb5a3ef4f3ca533ee40132d7a63aea"`;
 
-exports[`PublicCallStackItem computes empty item hash 1`] = `Fr<0x020b98dcc882881a349edfd43044d58c8703fdcfc9d4b250b799d951608dcd6b>`;
+exports[`PublicCallStackItem computes empty item hash 1`] = `Fr<0x004e1dc292cd5919dcea653efb6d791458a1eee853432e27d385ef56714edce9>`;
 
-exports[`PublicCallStackItem computes hash 1`] = `Fr<0x18d2b726728360b534121bb15accd1059f7df38225e76768e64d3e3040122440>`;
+exports[`PublicCallStackItem computes hash 1`] = `Fr<0x19cd38a81e3858f194c79090faed0c39710fc001186a113aaaf26e76b7c890e1>`;
diff --git a/yarn-project/circuits.js/src/structs/__snapshots__/public_circuit_public_inputs.test.ts.snap b/yarn-project/circuits.js/src/structs/__snapshots__/public_circuit_public_inputs.test.ts.snap
@@ -1,5 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`PublicCircuitPublicInputs computes empty inputs hash 1`] = `Fr<0x132559f41b7adc7388e0cd52b91fd6837c296b2f9ec1b6d2ed046f7a56db18f8>`;
+exports[`PublicCircuitPublicInputs computes empty inputs hash 1`] = `Fr<0x2d91debc43bd6354caef4fd152975e7c6dd44e8623b6b62c21b9f547f2fabd32>`;
 
-exports[`PublicCircuitPublicInputs hash matches snapshot 1`] = `Fr<0x0ac3cb8eb6605fc7aa83e9420eb988c1f6c9a5dcc2457c133216624bc6932619>`;
+exports[`PublicCircuitPublicInputs hash matches snapshot 1`] = `Fr<0x0708792c8b393df421c00a52851e0e734a2757c724183aba8787ca8ca714a7b0>`;