chore: bump maximum nullifier read requests (necessary for e2e tests …

…in AVM)
AztecProtocol · May 16, 2024 · f6a5484 · f6a5484
1 parent bee85a9
commit f6a5484
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/l1-contracts/src/core/libraries/ConstantsGen.sol b/l1-contracts/src/core/libraries/ConstantsGen.sol
@@ -23,8 +23,8 @@ library Constants {
   uint256 internal constant MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL = 16;
   uint256 internal constant MAX_PUBLIC_DATA_READS_PER_CALL = 16;
   uint256 internal constant MAX_NOTE_HASH_READ_REQUESTS_PER_CALL = 32;
-  uint256 internal constant MAX_NULLIFIER_READ_REQUESTS_PER_CALL = 2;
-  uint256 internal constant MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL = 2;
+  uint256 internal constant MAX_NULLIFIER_READ_REQUESTS_PER_CALL = 32;
+  uint256 internal constant MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL = 32;
   uint256 internal constant MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL = 16;
   uint256 internal constant MAX_NOTE_ENCRYPTED_LOGS_PER_CALL = 16;
   uint256 internal constant MAX_ENCRYPTED_LOGS_PER_CALL = 4;
@@ -37,8 +37,8 @@ library Constants {
   uint256 internal constant MAX_PUBLIC_DATA_READS_PER_TX = 32;
   uint256 internal constant MAX_NEW_L2_TO_L1_MSGS_PER_TX = 2;
   uint256 internal constant MAX_NOTE_HASH_READ_REQUESTS_PER_TX = 128;
-  uint256 internal constant MAX_NULLIFIER_READ_REQUESTS_PER_TX = 8;
-  uint256 internal constant MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX = 8;
+  uint256 internal constant MAX_NULLIFIER_READ_REQUESTS_PER_TX = 128;
+  uint256 internal constant MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX = 128;
   uint256 internal constant MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX = 64;
   uint256 internal constant MAX_NOTE_ENCRYPTED_LOGS_PER_TX = 64;
   uint256 internal constant MAX_ENCRYPTED_LOGS_PER_TX = 8;

diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr b/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr
@@ -30,8 +30,8 @@ global MAX_NEW_L2_TO_L1_MSGS_PER_CALL: u64 = 2;
 global MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL: u64 = 16;
 global MAX_PUBLIC_DATA_READS_PER_CALL: u64 = 16;
 global MAX_NOTE_HASH_READ_REQUESTS_PER_CALL: u64 = 32;
-global MAX_NULLIFIER_READ_REQUESTS_PER_CALL: u64 = 2; // Change it to a larger value when there's a seperate reset circuit.
-global MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL: u64 = 2;
+global MAX_NULLIFIER_READ_REQUESTS_PER_CALL: u64 = 32;
+global MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL: u64 = 32;
 global MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL: u64 = 16;
 global MAX_NOTE_ENCRYPTED_LOGS_PER_CALL: u64 = 16;
 global MAX_ENCRYPTED_LOGS_PER_CALL: u64 = 4; // If modifying, update DEPLOYER_CONTRACT_ADDRESS.
@@ -46,8 +46,8 @@ global MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX: u64 = 32;
 global MAX_PUBLIC_DATA_READS_PER_TX: u64 = 32;
 global MAX_NEW_L2_TO_L1_MSGS_PER_TX: u64 = 2;
 global MAX_NOTE_HASH_READ_REQUESTS_PER_TX: u64 = 128;
-global MAX_NULLIFIER_READ_REQUESTS_PER_TX: u64 = 8; // Change it to a larger value when there's a seperate reset circuit.
-global MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX: u64 = 8;
+global MAX_NULLIFIER_READ_REQUESTS_PER_TX: u64 = 128;
+global MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX: u64 = 128;
 global MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX: u64 = 64;
 global MAX_NOTE_ENCRYPTED_LOGS_PER_TX: u64 = 64;
 global MAX_ENCRYPTED_LOGS_PER_TX: u64 = 8;

diff --git a/yarn-project/circuits.js/src/constants.gen.ts b/yarn-project/circuits.js/src/constants.gen.ts
@@ -9,8 +9,8 @@ export const MAX_NEW_L2_TO_L1_MSGS_PER_CALL = 2;
 export const MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL = 16;
 export const MAX_PUBLIC_DATA_READS_PER_CALL = 16;
 export const MAX_NOTE_HASH_READ_REQUESTS_PER_CALL = 32;
-export const MAX_NULLIFIER_READ_REQUESTS_PER_CALL = 2;
-export const MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL = 2;
+export const MAX_NULLIFIER_READ_REQUESTS_PER_CALL = 32;
+export const MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL = 32;
 export const MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL = 16;
 export const MAX_NOTE_ENCRYPTED_LOGS_PER_CALL = 16;
 export const MAX_ENCRYPTED_LOGS_PER_CALL = 4;
@@ -23,8 +23,8 @@ export const MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX = 32;
 export const MAX_PUBLIC_DATA_READS_PER_TX = 32;
 export const MAX_NEW_L2_TO_L1_MSGS_PER_TX = 2;
 export const MAX_NOTE_HASH_READ_REQUESTS_PER_TX = 128;
-export const MAX_NULLIFIER_READ_REQUESTS_PER_TX = 8;
-export const MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX = 8;
+export const MAX_NULLIFIER_READ_REQUESTS_PER_TX = 128;
+export const MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX = 128;
 export const MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX = 64;
 export const MAX_NOTE_ENCRYPTED_LOGS_PER_TX = 64;
 export const MAX_ENCRYPTED_LOGS_PER_TX = 8;