fix: merge issue

AztecProtocol · Feb 28, 2024 · 800b9e3 · 800b9e3
1 parent ef9a36c
commit 800b9e3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/l1-contracts/src/core/libraries/ConstantsGen.sol b/l1-contracts/src/core/libraries/ConstantsGen.sol
@@ -123,4 +123,5 @@ library Constants {
   uint256 internal constant CONTRACT_DATA_NUM_BYTES_PER_BASE_ROLLUP_UNPADDED = 52;
   uint256 internal constant L2_TO_L1_MSGS_NUM_BYTES_PER_BASE_ROLLUP = 64;
   uint256 internal constant LOGS_HASHES_NUM_BYTES_PER_BASE_ROLLUP = 64;
+  uint256 internal constant APPEND_ONLY_TREE_SNAPSHOT_LENGTH = 2;
 }
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/constants.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/constants.nr
@@ -143,6 +143,7 @@ global AZTEC_ADDRESS_LENGTH = 1;
 global CALL_CONTEXT_LENGTH: u32 = 8;
 global CONTENT_COMMITMENT_LENGTH: u32 = 7;
 global CONTRACT_DEPLOYMENT_DATA_LENGTH: u32 = 6;
+global CONTRACT_INSTANCE_LENGTH: u32 = 6;
 global CONTRACT_STORAGE_READ_LENGTH: u32 = 2;
 global CONTRACT_STORAGE_UPDATE_REQUEST_LENGTH: u32 = 2;
 global ETH_ADDRESS_LENGTH = 1;

diff --git a/yarn-project/circuits.js/src/constants.gen.ts b/yarn-project/circuits.js/src/constants.gen.ts
@@ -108,6 +108,7 @@ export const CONTRACT_DATA_NUM_BYTES_PER_BASE_ROLLUP = 64;
 export const CONTRACT_DATA_NUM_BYTES_PER_BASE_ROLLUP_UNPADDED = 52;
 export const L2_TO_L1_MSGS_NUM_BYTES_PER_BASE_ROLLUP = 64;
 export const LOGS_HASHES_NUM_BYTES_PER_BASE_ROLLUP = 64;
+export const APPEND_ONLY_TREE_SNAPSHOT_LENGTH = 2;
 export enum GeneratorIndex {
   NOTE_HASH = 1,
   NOTE_HASH_NONCE = 2,

diff --git a/yarn-project/simulator/src/avm/journal/trace.test.ts b/yarn-project/simulator/src/avm/journal/trace.test.ts
@@ -57,7 +57,7 @@ describe('world state access trace', () => {
     const commitment = new Fr(10);
 
     let counter = 0;
-    trace.tracePublicStorageWrite(contractAddress, slot, value);
+    trace.tracePublicStorageWrite(contractAddress, slot, [value]);
     counter++;
     trace.tracePublicStorageRead(contractAddress, slot, value);
     counter++;
@@ -67,7 +67,7 @@ describe('world state access trace', () => {
     counter++;
     trace.traceNewNullifier(contractAddress, commitment);
     counter++;
-    trace.tracePublicStorageWrite(contractAddress, slot, value);
+    trace.tracePublicStorageWrite(contractAddress, slot, [value]);
     counter++;
     trace.tracePublicStorageRead(contractAddress, slot, value);
     counter++;