remake-constants

AztecProtocol · May 17, 2024 · 0e1196b · 0e1196b
1 parent c265455
commit 0e1196b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 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
@@ -11,8 +11,8 @@ const size_t MAX_NEW_L2_TO_L1_MSGS_PER_CALL = 2;
 const size_t MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL = 16;
 const size_t MAX_PUBLIC_DATA_READS_PER_CALL = 16;
 const size_t MAX_NOTE_HASH_READ_REQUESTS_PER_CALL = 32;
-const size_t MAX_NULLIFIER_READ_REQUESTS_PER_CALL = 2;
-const size_t MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL = 2;
+const size_t MAX_NULLIFIER_READ_REQUESTS_PER_CALL = 32;
+const size_t MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL = 32;
 const size_t MAX_KEY_VALIDATION_REQUESTS_PER_CALL = 16;
 const size_t MAX_NOTE_ENCRYPTED_LOGS_PER_CALL = 16;
 const size_t MAX_ENCRYPTED_LOGS_PER_CALL = 4;
@@ -25,8 +25,8 @@ const size_t MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX = 32;
 const size_t MAX_PUBLIC_DATA_READS_PER_TX = 32;
 const size_t MAX_NEW_L2_TO_L1_MSGS_PER_TX = 2;
 const size_t MAX_NOTE_HASH_READ_REQUESTS_PER_TX = 128;
-const size_t MAX_NULLIFIER_READ_REQUESTS_PER_TX = 8;
-const size_t MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX = 8;
+const size_t MAX_NULLIFIER_READ_REQUESTS_PER_TX = 128;
+const size_t MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX = 128;
 const size_t MAX_KEY_VALIDATION_REQUESTS_PER_TX = 64;
 const size_t MAX_NOTE_ENCRYPTED_LOGS_PER_TX = 64;
 const size_t MAX_ENCRYPTED_LOGS_PER_TX = 8;

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_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_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;
@@ -120,8 +120,7 @@ library Constants {
   uint256 internal constant SCOPED_L2_TO_L1_MESSAGE_LENGTH = L2_TO_L1_MESSAGE_LENGTH + 1;
   uint256 internal constant MAX_BLOCK_NUMBER_LENGTH = 2;
   uint256 internal constant KEY_VALIDATION_REQUEST_LENGTH = 3;
-  uint256 internal constant SCOPED_KEY_VALIDATION_REQUEST_LENGTH =
-    KEY_VALIDATION_REQUEST_LENGTH + 1;
+  uint256 internal constant SCOPED_KEY_VALIDATION_REQUEST_LENGTH = KEY_VALIDATION_REQUEST_LENGTH + 1;
   uint256 internal constant PARTIAL_STATE_REFERENCE_LENGTH = 6;
   uint256 internal constant READ_REQUEST_LENGTH = 2;
   uint256 internal constant LOG_HASH_LENGTH = 3;

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_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_KEY_VALIDATION_REQUESTS_PER_TX = 64;
 export const MAX_NOTE_ENCRYPTED_LOGS_PER_TX = 64;
 export const MAX_ENCRYPTED_LOGS_PER_TX = 8;

diff --git a/yarn-project/circuits.js/src/keys/derivation.ts b/yarn-project/circuits.js/src/keys/derivation.ts
@@ -88,4 +88,4 @@ export function deriveKeys(secretKey: Fr) {
     masterTaggingSecretKey,
     publicKeys,
   };
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -88,4 +88,4 @@ export function deriveKeys(secretKey: Fr) { @@
         masterTaggingSecretKey,
         publicKeys,
       };
-    }
+    }