fix: stop squashing storage accesses in avm simulator - all need to be validated in kernel

barretenberg/cpp/pil/avm/avm_kernel.pil

@@ -32,14 +32,14 @@ namespace avm_kernel(256);
     pol START_L1_TO_L2_MSG_EXISTS_WRITE_OFFSET = 96; //  START_NULLIFIER_EXISTS_OFFET + (MAX_NULLIFIER_READ_REQUESTS_PER_CALL + MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL)
 
     // Public storage requests
-    pol START_SSTORE_WRITE_OFFSET = 128; // START_L1_TO_L2_MSG_EXISTS_WRITE_OFFSET  + MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL
-    pol START_SLOAD_WRITE_OFFSET = 144; // START_SSTORE_WRITE_OFFSET  + MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL
+    pol START_SSTORE_WRITE_OFFSET = 112; // START_L1_TO_L2_MSG_EXISTS_WRITE_OFFSET  + MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL
+    pol START_SLOAD_WRITE_OFFSET = 144; // START_SSTORE_WRITE_OFFSET  + MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL
 
     // Emit data 
-    pol START_EMIT_NOTE_HASH_WRITE_OFFSET = 160; // START_SLOAD_WRITE_OFFSET + MAX_PUBLIC_DATA_READS_PER_CALL
-    pol START_EMIT_NULLIFIER_WRITE_OFFSET = 176; // START_EMIT_NOTE_HASH_WRITE_OFFSET + MAX_NEW_NOTE_HASHES_PER_CALL
-    pol START_EMIT_L2_TO_l1_MSG = 192; // START_EMIT_NULLIFIER_WRITE_OFFSET + MAX_NEW_NULLIFIERS_PER_CALL
-    pol START_EMIT_UNENCRYPTED_LOG_WRITE_OFFSET = 194; // START_EMIT_L2_TO_L1_MSG + MAX_NEW_L2_TO_L1_MSGS_PER_CALL
+    pol START_EMIT_NOTE_HASH_WRITE_OFFSET = 176; // START_SLOAD_WRITE_OFFSET + MAX_PUBLIC_DATA_READS_PER_CALL
+    pol START_EMIT_NULLIFIER_WRITE_OFFSET = 192; // START_EMIT_NOTE_HASH_WRITE_OFFSET + MAX_NEW_NOTE_HASHES_PER_CALL
+    pol START_EMIT_L2_TO_l1_MSG = 208; // START_EMIT_NULLIFIER_WRITE_OFFSET + MAX_NEW_NULLIFIERS_PER_CALL
+    pol START_EMIT_UNENCRYPTED_LOG_WRITE_OFFSET = 210; // START_EMIT_L2_TO_L1_MSG + MAX_NEW_L2_TO_L1_MSGS_PER_CALL
 
 
     // TODO(https://github.com/AztecProtocol/aztec-packages/issues/6465): Must constrain write_offset counters to be less than side effect MAX

barretenberg/cpp/pil/avm/constants.pil

@@ -36,7 +36,7 @@ namespace constants(256);
     pol MAX_NULLIFIER_READ_REQUESTS_PER_CALL = 32;
     pol MAX_NOTE_HASH_READ_REQUESTS_PER_CALL = 32;
     pol MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL = 32;
-    pol MAX_PUBLIC_DATA_READS_PER_CALL = 16;
+    pol MAX_PUBLIC_DATA_READS_PER_CALL = 32;
 
     // Emitting Data
     pol MAX_NEW_NOTE_HASHES_PER_CALL = 16;

barretenberg/cpp/src/barretenberg/relations/generated/avm/avm_main.hpp

@@ -1471,7 +1471,7 @@ template <typename FF_> class avm_mainImpl {
             Avm_DECLARE_VIEWS(126);
 
             auto tmp = (avm_main_sel_op_emit_note_hash *
-                        (avm_kernel_kernel_out_offset - (avm_kernel_emit_note_hash_write_offset + FF(160))));
+                        (avm_kernel_kernel_out_offset - (avm_kernel_emit_note_hash_write_offset + FF(176))));
             tmp *= scaling_factor;
             std::get<126>(evals) += tmp;
         }
@@ -1515,7 +1515,7 @@ template <typename FF_> class avm_mainImpl {
             Avm_DECLARE_VIEWS(131);
 
             auto tmp = (avm_main_sel_op_emit_nullifier *
-                        (avm_kernel_kernel_out_offset - (avm_kernel_emit_nullifier_write_offset + FF(176))));
+                        (avm_kernel_kernel_out_offset - (avm_kernel_emit_nullifier_write_offset + FF(192))));
             tmp *= scaling_factor;
             std::get<131>(evals) += tmp;
         }
@@ -1549,7 +1549,7 @@ template <typename FF_> class avm_mainImpl {
             Avm_DECLARE_VIEWS(135);
 
             auto tmp = (avm_main_sel_op_emit_unencrypted_log *
-                        (avm_kernel_kernel_out_offset - (avm_kernel_emit_unencrypted_log_write_offset + FF(194))));
+                        (avm_kernel_kernel_out_offset - (avm_kernel_emit_unencrypted_log_write_offset + FF(210))));
             tmp *= scaling_factor;
             std::get<135>(evals) += tmp;
         }
@@ -1566,7 +1566,7 @@ template <typename FF_> class avm_mainImpl {
             Avm_DECLARE_VIEWS(137);
 
             auto tmp = (avm_main_sel_op_emit_l2_to_l1_msg *
-                        (avm_kernel_kernel_out_offset - (avm_kernel_emit_l2_to_l1_msg_write_offset + FF(192))));
+                        (avm_kernel_kernel_out_offset - (avm_kernel_emit_l2_to_l1_msg_write_offset + FF(208))));
             tmp *= scaling_factor;
             std::get<137>(evals) += tmp;
         }
@@ -1600,7 +1600,7 @@ template <typename FF_> class avm_mainImpl {
             Avm_DECLARE_VIEWS(141);
 
             auto tmp =
-                (avm_main_sel_op_sstore * (avm_kernel_kernel_out_offset - (avm_kernel_sstore_write_offset + FF(128))));
+                (avm_main_sel_op_sstore * (avm_kernel_kernel_out_offset - (avm_kernel_sstore_write_offset + FF(112))));
             tmp *= scaling_factor;
             std::get<141>(evals) += tmp;
         }

barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_kernel_trace.hpp

@@ -114,9 +114,9 @@ class AvmKernelTraceBuilder {
         START_NULLIFIER_NON_EXISTS_OFFSET + MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL;
 
     static const uint32_t START_SSTORE_WRITE_OFFSET =
-        START_L1_TO_L2_MSG_EXISTS_WRITE_OFFSET + MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL;
+        START_L1_TO_L2_MSG_EXISTS_WRITE_OFFSET + MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL;
     static const uint32_t START_SLOAD_WRITE_OFFSET =
-        START_SSTORE_WRITE_OFFSET + MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL;
+        START_SSTORE_WRITE_OFFSET + MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL;
 
     static const uint32_t START_EMIT_NOTE_HASH_WRITE_OFFSET = START_SLOAD_WRITE_OFFSET + MAX_PUBLIC_DATA_READS_PER_CALL;
     static const uint32_t START_EMIT_NULLIFIER_WRITE_OFFSET =

barretenberg/cpp/src/barretenberg/vm/avm_trace/aztec_constants.hpp

@@ -6,7 +6,7 @@
 #define MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL 16
 #define MAX_NEW_L2_TO_L1_MSGS_PER_CALL 2
 #define MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL 32
-#define MAX_PUBLIC_DATA_READS_PER_CALL 16
+#define MAX_PUBLIC_DATA_READS_PER_CALL 32
 #define MAX_NOTE_HASH_READ_REQUESTS_PER_CALL 32
 #define MAX_NULLIFIER_READ_REQUESTS_PER_CALL 32
 #define MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL 32
@@ -30,5 +30,5 @@
 #define STATE_REFERENCE_LENGTH 8
 #define TOTAL_FEES_LENGTH 1
 #define HEADER_LENGTH 23
-#define PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH 530
+#define PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH 578
 #define PUBLIC_CONTEXT_INPUTS_LENGTH 41

l1-contracts/src/core/libraries/ConstantsGen.sol

@@ -21,7 +21,7 @@ library Constants {
   uint256 internal constant MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL = 16;
   uint256 internal constant MAX_NEW_L2_TO_L1_MSGS_PER_CALL = 2;
   uint256 internal constant MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL = 32;
-  uint256 internal constant MAX_PUBLIC_DATA_READS_PER_CALL = 16;
+  uint256 internal constant MAX_PUBLIC_DATA_READS_PER_CALL = 32;
   uint256 internal constant MAX_NOTE_HASH_READ_REQUESTS_PER_CALL = 32;
   uint256 internal constant MAX_NULLIFIER_READ_REQUESTS_PER_CALL = 32;
   uint256 internal constant MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL = 32;
@@ -37,7 +37,7 @@ library Constants {
   uint256 internal constant MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX = 63;
   uint256 internal constant PROTOCOL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX = 1;
   uint256 internal constant MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX = 64;
-  uint256 internal constant MAX_PUBLIC_DATA_READS_PER_TX = 32;
+  uint256 internal constant MAX_PUBLIC_DATA_READS_PER_TX = 64;
   uint256 internal constant MAX_NEW_L2_TO_L1_MSGS_PER_TX = 8;
   uint256 internal constant MAX_NOTE_HASH_READ_REQUESTS_PER_TX = 128;
   uint256 internal constant MAX_NULLIFIER_READ_REQUESTS_PER_TX = 128;
@@ -47,7 +47,7 @@ library Constants {
   uint256 internal constant MAX_NOTE_ENCRYPTED_LOGS_PER_TX = 64;
   uint256 internal constant MAX_ENCRYPTED_LOGS_PER_TX = 8;
   uint256 internal constant MAX_UNENCRYPTED_LOGS_PER_TX = 8;
-  uint256 internal constant MAX_PUBLIC_DATA_HINTS = 64;
+  uint256 internal constant MAX_PUBLIC_DATA_HINTS = 128;
   uint256 internal constant NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP = 16;
   uint256 internal constant VK_TREE_HEIGHT = 3;
   uint256 internal constant FUNCTION_TREE_HEIGHT = 5;
@@ -148,21 +148,21 @@ library Constants {
   uint256 internal constant TOTAL_FEES_LENGTH = 1;
   uint256 internal constant HEADER_LENGTH = 23;
   uint256 internal constant PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH = 457;
-  uint256 internal constant PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH = 530;
+  uint256 internal constant PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH = 578;
   uint256 internal constant PRIVATE_CALL_STACK_ITEM_LENGTH = 460;
   uint256 internal constant PUBLIC_CONTEXT_INPUTS_LENGTH = 41;
   uint256 internal constant AGGREGATION_OBJECT_LENGTH = 16;
   uint256 internal constant SCOPED_READ_REQUEST_LEN = 3;
   uint256 internal constant PUBLIC_DATA_READ_LENGTH = 2;
-  uint256 internal constant VALIDATION_REQUESTS_LENGTH = 1538;
+  uint256 internal constant VALIDATION_REQUESTS_LENGTH = 1602;
   uint256 internal constant PUBLIC_DATA_UPDATE_REQUEST_LENGTH = 3;
   uint256 internal constant COMBINED_ACCUMULATED_DATA_LENGTH = 333;
   uint256 internal constant COMBINED_CONSTANT_DATA_LENGTH = 40;
   uint256 internal constant CALL_REQUEST_LENGTH = 7;
   uint256 internal constant PRIVATE_ACCUMULATED_DATA_LENGTH = 1152;
-  uint256 internal constant PRIVATE_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 2739;
+  uint256 internal constant PRIVATE_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 2803;
   uint256 internal constant PUBLIC_ACCUMULATED_DATA_LENGTH = 983;
-  uint256 internal constant PUBLIC_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 3770;
+  uint256 internal constant PUBLIC_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 3834;
   uint256 internal constant KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 383;
   uint256 internal constant CONSTANT_ROLLUP_DATA_LENGTH = 14;
   uint256 internal constant BASE_OR_MERGE_PUBLIC_INPUTS_LENGTH = 31;

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 = 0x124a62189073cc551fea148d735d1e8b452e38537e075895b02ccfd9c9901819;
+        let test_data_call_stack_item_request_hash = 0x2751111aa213d9d21279da53531bf90c2da272cf3f959e2a2a1dfceb487bf102;
         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 = 0x2cbb07062730bfc4933f5e8d533d5b62ac6e1b7922b831993377cd85d7445399;
+        let test_data_call_stack_item_hash = 0x1860d00d9602966e398c6d585216baba2ffa8c5eddda5faee041136665d8482a;
         assert_eq(call_stack_item.hash(), test_data_call_stack_item_hash);
     }
 }

noir-projects/noir-protocol-circuits/crates/types/src/abis/public_circuit_public_inputs.nr

@@ -201,6 +201,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 = 0x03ab5026ab5b3e6b81be5c3ec31c7937f293180c25a240eb75693cda81bb2a05;
+    let test_data_empty_hash = 0x01681b19fb7fe21aa9c2cf9fb47520149f46edd679b2e7c2b2c4a279fd685125;
     assert_eq(hash, test_data_empty_hash);
 }

noir-projects/noir-protocol-circuits/crates/types/src/constants.nr

@@ -22,14 +22,14 @@ global ARGS_LENGTH: u32 = 16;
 
 // docs:start:constants
 // "PER CALL" CONSTANTS
-// If modifiying, update avm_kernel.pil / avm_constants.pil offset values (our pil does not yet support constant evaluation so values are hardcoded)
+// If modifiying, update avm_kernel.pil / constants.pil offset values (our pil does not yet support constant evaluation so values are hardcoded)
 global MAX_NEW_NOTE_HASHES_PER_CALL: u32 = 16;
 global MAX_NEW_NULLIFIERS_PER_CALL: u32 = 16;
 global MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL: u32 = 4;
 global MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL: u32 = 16;
 global MAX_NEW_L2_TO_L1_MSGS_PER_CALL: u32 = 2;
 global MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL: u32 = 32;
-global MAX_PUBLIC_DATA_READS_PER_CALL: u32 = 16;
+global MAX_PUBLIC_DATA_READS_PER_CALL: u32 = 32;
 global MAX_NOTE_HASH_READ_REQUESTS_PER_CALL: u32 = 32;
 global MAX_NULLIFIER_READ_REQUESTS_PER_CALL: u32 = 32;
 global MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL: u32 = 32;
@@ -51,7 +51,7 @@ global PROTOCOL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX: u32 = 1;
 // would then result in the type of the constant be a number and not a literal type. This would mess up the types.
 // Pain.
 global MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX: u32 = 64; // MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX + PROTOCOL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX;
-global MAX_PUBLIC_DATA_READS_PER_TX: u32 = 32;
+global MAX_PUBLIC_DATA_READS_PER_TX: u32 = 64;
 global MAX_NEW_L2_TO_L1_MSGS_PER_TX: u32 = 8;
 global MAX_NOTE_HASH_READ_REQUESTS_PER_TX: u32 = 128;
 global MAX_NULLIFIER_READ_REQUESTS_PER_TX: u32 = 128;
@@ -68,7 +68,7 @@ global MAX_UNENCRYPTED_LOGS_PER_TX: u32 = 8;
 // KERNEL CIRCUIT PRIVATE INPUTS CONSTANTS
 // global MAX_PUBLIC_DATA_HINTS: u32 = MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX + MAX_PUBLIC_DATA_READS_PER_TX;
 // FIX: Sadly, writing this as above causes a type error in type_conversion.ts.
-global MAX_PUBLIC_DATA_HINTS: u32 = 64;
+global MAX_PUBLIC_DATA_HINTS: u32 = 128;
 
 // ROLLUP CONTRACT CONSTANTS - constants used only in l1-contracts
 global NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP: u32 = 16;

yarn-project/circuits.js/src/constants.gen.ts

@@ -7,7 +7,7 @@ export const MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL = 4;
 export const MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL = 16;
 export const MAX_NEW_L2_TO_L1_MSGS_PER_CALL = 2;
 export const MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL = 32;
-export const MAX_PUBLIC_DATA_READS_PER_CALL = 16;
+export const MAX_PUBLIC_DATA_READS_PER_CALL = 32;
 export const MAX_NOTE_HASH_READ_REQUESTS_PER_CALL = 32;
 export const MAX_NULLIFIER_READ_REQUESTS_PER_CALL = 32;
 export const MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL = 32;
@@ -23,7 +23,7 @@ export const MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX = 32;
 export const MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX = 63;
 export const PROTOCOL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX = 1;
 export const MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX = 64;
-export const MAX_PUBLIC_DATA_READS_PER_TX = 32;
+export const MAX_PUBLIC_DATA_READS_PER_TX = 64;
 export const MAX_NEW_L2_TO_L1_MSGS_PER_TX = 8;
 export const MAX_NOTE_HASH_READ_REQUESTS_PER_TX = 128;
 export const MAX_NULLIFIER_READ_REQUESTS_PER_TX = 128;
@@ -33,7 +33,7 @@ export const MAX_KEY_VALIDATION_REQUESTS_PER_TX = 64;
 export const MAX_NOTE_ENCRYPTED_LOGS_PER_TX = 64;
 export const MAX_ENCRYPTED_LOGS_PER_TX = 8;
 export const MAX_UNENCRYPTED_LOGS_PER_TX = 8;
-export const MAX_PUBLIC_DATA_HINTS = 64;
+export const MAX_PUBLIC_DATA_HINTS = 128;
 export const NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP = 16;
 export const VK_TREE_HEIGHT = 3;
 export const FUNCTION_TREE_HEIGHT = 5;
@@ -132,21 +132,21 @@ export const TX_REQUEST_LENGTH = 13;
 export const TOTAL_FEES_LENGTH = 1;
 export const HEADER_LENGTH = 23;
 export const PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH = 457;
-export const PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH = 530;
+export const PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH = 578;
 export const PRIVATE_CALL_STACK_ITEM_LENGTH = 460;
 export const PUBLIC_CONTEXT_INPUTS_LENGTH = 41;
 export const AGGREGATION_OBJECT_LENGTH = 16;
 export const SCOPED_READ_REQUEST_LEN = 3;
 export const PUBLIC_DATA_READ_LENGTH = 2;
-export const VALIDATION_REQUESTS_LENGTH = 1538;
+export const VALIDATION_REQUESTS_LENGTH = 1602;
 export const PUBLIC_DATA_UPDATE_REQUEST_LENGTH = 3;
 export const COMBINED_ACCUMULATED_DATA_LENGTH = 333;
 export const COMBINED_CONSTANT_DATA_LENGTH = 40;
 export const CALL_REQUEST_LENGTH = 7;
 export const PRIVATE_ACCUMULATED_DATA_LENGTH = 1152;
-export const PRIVATE_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 2739;
+export const PRIVATE_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 2803;
 export const PUBLIC_ACCUMULATED_DATA_LENGTH = 983;
-export const PUBLIC_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 3770;
+export const PUBLIC_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 3834;
 export const KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 383;
 export const CONSTANT_ROLLUP_DATA_LENGTH = 14;
 export const BASE_OR_MERGE_PUBLIC_INPUTS_LENGTH = 31;

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`] = `"0x2cbb07062730bfc4933f5e8d533d5b62ac6e1b7922b831993377cd85d7445399"`;
+exports[`PublicCallStackItem Computes a callstack item hash 1`] = `"0x1860d00d9602966e398c6d585216baba2ffa8c5eddda5faee041136665d8482a"`;
 
-exports[`PublicCallStackItem Computes a callstack item request hash 1`] = `"0x124a62189073cc551fea148d735d1e8b452e38537e075895b02ccfd9c9901819"`;
+exports[`PublicCallStackItem Computes a callstack item request hash 1`] = `"0x2751111aa213d9d21279da53531bf90c2da272cf3f959e2a2a1dfceb487bf102"`;
 
-exports[`PublicCallStackItem computes empty item hash 1`] = `Fr<0x1553af0f4023e449e888c744485ea429955449a81d58598f8d63db48c321cbc7>`;
+exports[`PublicCallStackItem computes empty item hash 1`] = `Fr<0x2c9346c79caabece80bfe330b9e45ed4dde78099e01a013da690485738a42af2>`;
 
-exports[`PublicCallStackItem computes hash 1`] = `Fr<0x1943f02bfc111012aa1f28688425817d45653586f0c4665feb6723c9b539e147>`;
+exports[`PublicCallStackItem computes hash 1`] = `Fr<0x272aa1a005b7839cdc8b72f50d2020529da11a5245f3c11481c29ce8b55e0da2>`;

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<0x03ab5026ab5b3e6b81be5c3ec31c7937f293180c25a240eb75693cda81bb2a05>`;
+exports[`PublicCircuitPublicInputs computes empty inputs hash 1`] = `Fr<0x01681b19fb7fe21aa9c2cf9fb47520149f46edd679b2e7c2b2c4a279fd685125>`;
 
-exports[`PublicCircuitPublicInputs hash matches snapshot 1`] = `Fr<0x17c2cd1141dbec7dd8598fee17e90627d0e843e7991533d4378191cea7c2abad>`;
+exports[`PublicCircuitPublicInputs hash matches snapshot 1`] = `Fr<0x162be1c50854010ab8ab30efde30e9fb05c8d441c0d5942bb0eace875f584c64>`;

yarn-project/end-to-end/src/e2e_blacklist_token_contract/burn.test.ts

@@ -14,7 +14,7 @@ describe('e2e_blacklist_token_contract burn', () => {
     await t.setup();
     // Have to destructure again to ensure we have latest refs.
     ({ asset, tokenSim, wallets, blacklisted } = t);
-  });
+  }, 600_000);
 
   afterAll(async () => {
     await t.teardown();

yarn-project/end-to-end/src/e2e_blacklist_token_contract/minting.test.ts

@@ -14,7 +14,7 @@ describe('e2e_blacklist_token_contract mint', () => {
     await t.setup();
     // Have to destructure again to ensure we have latest refs.
     ({ asset, tokenSim, wallets, blacklisted } = t);
-  }, 300_000);
+  }, 600_000);
 
   afterAll(async () => {
     await t.teardown();

yarn-project/end-to-end/src/e2e_blacklist_token_contract/shielding.test.ts

@@ -13,7 +13,7 @@ describe('e2e_blacklist_token_contract shield + redeem_shield', () => {
     await t.setup();
     // Have to destructure again to ensure we have latest refs.
     ({ asset, tokenSim, wallets, blacklisted } = t);
-  });
+  }, 600_000);
 
   afterAll(async () => {
     await t.teardown();

yarn-project/end-to-end/src/e2e_blacklist_token_contract/transfer_private.test.ts

@@ -14,7 +14,7 @@ describe('e2e_blacklist_token_contract transfer private', () => {
     await t.setup();
     // Have to destructure again to ensure we have latest refs.
     ({ asset, tokenSim, wallets, blacklisted } = t);
-  });
+  }, 600_000);
 
   afterAll(async () => {
     await t.teardown();

yarn-project/end-to-end/src/e2e_blacklist_token_contract/transfer_public.test.ts

@@ -14,7 +14,7 @@ describe('e2e_blacklist_token_contract transfer public', () => {
     await t.setup();
     // Have to destructure again to ensure we have latest refs.
     ({ asset, tokenSim, wallets, blacklisted } = t);
-  });
+  }, 600_000);
 
   afterAll(async () => {
     await t.teardown();

yarn-project/end-to-end/src/e2e_blacklist_token_contract/unshielding.test.ts

@@ -14,7 +14,7 @@ describe('e2e_blacklist_token_contract unshielding', () => {
     await t.setup();
     // Have to destructure again to ensure we have latest refs.
     ({ asset, tokenSim, wallets, blacklisted } = t);
-  });
+  }, 600_000);
 
   afterAll(async () => {
     await t.teardown();