Merge branch 'master' into gd/constant_blackblox_input

AztecProtocol · Jul 4, 2024 · 20f9026 · 20f9026
2 parents 7bcfdb0 + e431b6f
commit 20f9026
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 16 deletions.
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-reset/src/main.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-reset/src/main.nr
@@ -7,9 +7,9 @@ use dep::types::{
 }
 };
 
-global NOTE_HASH_PENDING_AMOUNT = MAX_NOTE_HASH_READ_REQUESTS_PER_TX; // 128
+global NOTE_HASH_PENDING_AMOUNT = MAX_NOTE_HASH_READ_REQUESTS_PER_TX; // 64
 global NOTE_HASH_SETTLED_AMOUNT = MAX_NOTE_HASH_READ_REQUESTS_PER_TX;
-global NULLIFIER_PENDING_AMOUNT = MAX_NULLIFIER_READ_REQUESTS_PER_TX; // 128
+global NULLIFIER_PENDING_AMOUNT = MAX_NULLIFIER_READ_REQUESTS_PER_TX; // 64
 global NULLIFIER_SETTLED_AMOUNT = MAX_NULLIFIER_READ_REQUESTS_PER_TX;
 global NULLIFIER_KEYS = MAX_KEY_VALIDATION_REQUESTS_PER_TX; // 64
 

diff --git a/noir-projects/noir-protocol-circuits/reset_variants.json b/noir-projects/noir-protocol-circuits/reset_variants.json
@@ -3,32 +3,32 @@
     "tag": "big",
     "priority": 98,
     "replacements": {
-      "NOTE_HASH_PENDING_AMOUNT": 64,
-      "NOTE_HASH_SETTLED_AMOUNT": 64,
-      "NULLIFIER_PENDING_AMOUNT": 64,
-      "NULLIFIER_SETTLED_AMOUNT": 64,
+      "NOTE_HASH_PENDING_AMOUNT": 32,
+      "NOTE_HASH_SETTLED_AMOUNT": 32,
+      "NULLIFIER_PENDING_AMOUNT": 32,
+      "NULLIFIER_SETTLED_AMOUNT": 32,
       "NULLIFIER_KEYS": 32
     }
   },
   {
     "tag": "medium",
     "priority": 99,
     "replacements": {
-      "NOTE_HASH_PENDING_AMOUNT": 32,
-      "NOTE_HASH_SETTLED_AMOUNT": 32,
-      "NULLIFIER_PENDING_AMOUNT": 32,
-      "NULLIFIER_SETTLED_AMOUNT": 32,
+      "NOTE_HASH_PENDING_AMOUNT": 16,
+      "NOTE_HASH_SETTLED_AMOUNT": 16,
+      "NULLIFIER_PENDING_AMOUNT": 16,
+      "NULLIFIER_SETTLED_AMOUNT": 16,
       "NULLIFIER_KEYS": 16
     }
   },
   {
     "tag": "small",
     "priority": 100,
     "replacements": {
-      "NOTE_HASH_PENDING_AMOUNT": 16,
-      "NOTE_HASH_SETTLED_AMOUNT": 16,
-      "NULLIFIER_PENDING_AMOUNT": 16,
-      "NULLIFIER_SETTLED_AMOUNT": 16,
+      "NOTE_HASH_PENDING_AMOUNT": 8,
+      "NOTE_HASH_SETTLED_AMOUNT": 8,
+      "NULLIFIER_PENDING_AMOUNT": 8,
+      "NULLIFIER_SETTLED_AMOUNT": 8,
       "NULLIFIER_KEYS": 8
     }
   }

diff --git a/yarn-project/noir-contracts.js/package.json b/yarn-project/noir-contracts.js/package.json
@@ -67,10 +67,11 @@
   "files": [
     "dest",
     "src",
+    "artifacts",
     "!*.test.*"
   ],
   "types": "./dest/types/index.d.ts",
   "engines": {
     "node": ">=18"
   }
-}
+}
diff --git a/yarn-project/noir-contracts.js/package.local.json b/yarn-project/noir-contracts.js/package.local.json
@@ -4,5 +4,11 @@
     "generate": "yarn generate:noir-contracts",
     "generate:noir-contracts": "./scripts/generate-types.sh && run -T prettier -w ./src --loglevel warn",
     "clean": "rm -rf ./dest .tsbuildinfo ./artifacts ./src ./codegenCache.json"
-  }
+  },
+  "files": [
+    "dest",
+    "src",
+    "artifacts",
+    "!*.test.*"
+  ]
 }