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

…in AVM)

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

@@ -23,10 +23,16 @@ 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;
+<<<<<<< Updated upstream
   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_KEY_VALIDATION_REQUESTS_PER_CALL = 16;
   uint256 internal constant MAX_NOTE_ENCRYPTED_LOGS_PER_CALL = 16;
+=======
+  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 = 1;
+>>>>>>> Stashed changes
   uint256 internal constant MAX_ENCRYPTED_LOGS_PER_CALL = 4;
   uint256 internal constant MAX_UNENCRYPTED_LOGS_PER_CALL = 4;
   uint256 internal constant MAX_NEW_NOTE_HASHES_PER_TX = 64;
@@ -37,10 +43,16 @@ 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;
+<<<<<<< Updated upstream
   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_KEY_VALIDATION_REQUESTS_PER_TX = 64;
   uint256 internal constant MAX_NOTE_ENCRYPTED_LOGS_PER_TX = 64;
+=======
+  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 = 4;
+>>>>>>> Stashed changes
   uint256 internal constant MAX_ENCRYPTED_LOGS_PER_TX = 8;
   uint256 internal constant MAX_UNENCRYPTED_LOGS_PER_TX = 8;
   uint256 internal constant NUM_ENCRYPTED_LOGS_HASHES_PER_TX = 1;

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

@@ -30,10 +30,16 @@ 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;
+<<<<<<< Updated upstream
 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_KEY_VALIDATION_REQUESTS_PER_CALL: u64 = 16;
 global MAX_NOTE_ENCRYPTED_LOGS_PER_CALL: u64 = 16;
+=======
+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 = 1;
+>>>>>>> Stashed changes
 global MAX_ENCRYPTED_LOGS_PER_CALL: u64 = 4; // If modifying, update DEPLOYER_CONTRACT_ADDRESS.
 global MAX_UNENCRYPTED_LOGS_PER_CALL: u64 = 4; // If modifying, update DEPLOYER_CONTRACT_ADDRESS.
 
@@ -46,10 +52,16 @@ 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;
+<<<<<<< Updated upstream
 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_KEY_VALIDATION_REQUESTS_PER_TX: u64 = 64;
 global MAX_NOTE_ENCRYPTED_LOGS_PER_TX: u64 = 64;
+=======
+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 = 4;
+>>>>>>> Stashed changes
 global MAX_ENCRYPTED_LOGS_PER_TX: u64 = 8;
 global MAX_UNENCRYPTED_LOGS_PER_TX: u64 = 8;
 global NUM_ENCRYPTED_LOGS_HASHES_PER_TX: u64 = 1;

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

@@ -9,10 +9,16 @@ 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;
+<<<<<<< Updated upstream
 export const MAX_NULLIFIER_READ_REQUESTS_PER_CALL = 2;
 export const MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL = 2;
 export const MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL = 16;
 export const MAX_NOTE_ENCRYPTED_LOGS_PER_CALL = 16;
+=======
+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 = 1;
+>>>>>>> Stashed changes
 export const MAX_ENCRYPTED_LOGS_PER_CALL = 4;
 export const MAX_UNENCRYPTED_LOGS_PER_CALL = 4;
 export const MAX_NEW_NOTE_HASHES_PER_TX = 64;
@@ -23,10 +29,16 @@ 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;
+<<<<<<< Updated upstream
 export const MAX_NULLIFIER_READ_REQUESTS_PER_TX = 8;
 export const MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX = 8;
 export const MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX = 64;
 export const MAX_NOTE_ENCRYPTED_LOGS_PER_TX = 64;
+=======
+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 = 4;
+>>>>>>> Stashed changes
 export const MAX_ENCRYPTED_LOGS_PER_TX = 8;
 export const MAX_UNENCRYPTED_LOGS_PER_TX = 8;
 export const NUM_ENCRYPTED_LOGS_HASHES_PER_TX = 1;