Merge ee0c78b into eb00830

AztecProtocol · Jun 27, 2024 · ac0b832 · ac0b832
2 parents eb00830 + ee0c78b
commit ac0b832
Show file tree

Hide file tree

Showing 452 changed files with 13,589 additions and 1,518 deletions.
diff --git a/.noir-sync-commit b/.noir-sync-commit
@@ -1 +1 @@
-2e543b40eb83ef2080e4d8f870f525fadd631099
+f2f8ecc833d4725d0829f9c339389c90d1a4fbcd
diff --git a/avm-transpiler/Cargo.lock b/avm-transpiler/Cargo.lock
diff --git a/avm-transpiler/scripts/compile_then_transpile.sh b/avm-transpiler/scripts/compile_then_transpile.sh
@@ -18,7 +18,7 @@ fi
 shift # remove the compile arg so we can inject --show-artifact-paths
 
 # Forward all arguments to nargo, tee output to console
-artifacts_to_transpile=$($NARGO compile --show-artifact-paths $@ | tee /dev/tty | grep -oP 'Saved contract artifact to: \K.*')
+artifacts_to_transpile=$($NARGO compile --use-legacy --show-artifact-paths $@ | tee /dev/tty | grep -oP 'Saved contract artifact to: \K.*')
 
 # NOTE: the output that is teed to /dev/tty will normally not be redirectable by the caller.
 # If the script is run via docker, however, the user will see this output on stdout and will be able to redirect.

diff --git a/boxes/boxes/react/package.json b/boxes/boxes/react/package.json
@@ -6,7 +6,7 @@
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
-    "compile": "cd src/contracts && ${AZTEC_NARGO:-aztec-nargo} compile --silence-warnings",
+    "compile": "cd src/contracts && ${AZTEC_NARGO:-aztec-nargo} compile --use-legacy --silence-warnings",
     "codegen": "${AZTEC_BUILDER:-aztec-builder} codegen src/contracts/target -o artifacts",
     "clean": "rm -rf ./dist .tsbuildinfo ./artifacts ./src/contracts/target",
     "prep": "yarn clean && yarn compile && yarn codegen",

diff --git a/boxes/boxes/vanilla/package.json b/boxes/boxes/vanilla/package.json
@@ -5,7 +5,7 @@
   "version": "0.1.0",
   "type": "module",
   "scripts": {
-    "compile": "cd src/contracts && ${AZTEC_NARGO:-aztec-nargo} compile --silence-warnings",
+    "compile": "cd src/contracts && ${AZTEC_NARGO:-aztec-nargo} compile --use-legacy --silence-warnings",
     "codegen": "${AZTEC_BUILDER:-aztec-builder} codegen src/contracts/target -o artifacts",
     "clean": "rm -rf ./dest .tsbuildinfo ./artifacts ./src/contracts/target",
     "prep": "yarn clean && yarn compile && yarn codegen && tsc -b",

diff --git a/noir-projects/Dockerfile b/noir-projects/Dockerfile
@@ -19,7 +19,7 @@ RUN ./bootstrap.sh
 WORKDIR /usr/src/noir-projects/noir-protocol-circuits
 RUN ./bootstrap.sh
 WORKDIR /usr/src/noir-projects/aztec-nr
-RUN nargo compile --silence-warnings
+RUN nargo compile --use-legacy --silence-warnings
 
 FROM scratch
 COPY --from=builder /usr/src/noir-projects /usr/src/noir-projects
diff --git a/noir-projects/Dockerfile.test b/noir-projects/Dockerfile.test
@@ -22,19 +22,19 @@ WORKDIR /usr/src/noir-projects
 COPY . .
 
 # Build & test
-RUN cd ./noir-protocol-circuits && ./bootstrap.sh && nargo test --silence-warnings
+RUN cd ./noir-protocol-circuits && ./bootstrap.sh && nargo test --use-legacy --silence-warnings
 
 RUN cd /usr/src/yarn-project/txe && yarn start & echo $! > /tmp/txe.pid && \ 
     # Wait for TXE to initialize
     sleep 5 && \ 
     cd ./noir-contracts && \
     # We need to increase the timeout since all tests running in parallel hammer TXE at the same time, and processing slows down leading to timeouts
     # The only way we currently have to batch tests is via RAYON_NUM_THREADS, which is not ideal
-    ./bootstrap.sh && NARGO_FOREIGN_CALL_TIMEOUT=300000 nargo test --silence-warnings --oracle-resolver http://localhost:8080 ; \
+    ./bootstrap.sh && NARGO_FOREIGN_CALL_TIMEOUT=300000 nargo test  --use-legacy --silence-warnings --oracle-resolver http://localhost:8080 ; \
     kill $(cat /tmp/txe.pid)
 
 RUN cd /usr/src/yarn-project/txe && yarn start & echo $! > /tmp/txe.pid && \ 
     # Wait for TXE to initialize
     sleep 5 && \ 
     cd ./aztec-nr && \
-    nargo test --silence-warnings --oracle-resolver http://localhost:8080
+    nargo test --use-legacy --silence-warnings --oracle-resolver http://localhost:8080
diff --git a/noir-projects/Earthfile b/noir-projects/Earthfile
@@ -52,7 +52,7 @@ test:
   RUN cd /usr/src/yarn-project/txe && yarn start & echo $! > /tmp/txe.pid && \
       # Wait for TXE to initialize
       sleep 5 && \
-      cd /usr/src/noir-projects/aztec-nr && nargo test --silence-warnings --oracle-resolver http://localhost:8080 ; \
+      cd /usr/src/noir-projects/aztec-nr && nargo test --use-legacy --silence-warnings --oracle-resolver http://localhost:8080 ; \
       kill $(cat /tmp/txe.pid)
 
   RUN cd /usr/src/yarn-project/txe && yarn start & echo $! > /tmp/txe.pid && \
@@ -61,7 +61,7 @@ test:
       cd /usr/src/noir-projects/noir-contracts && \
       # We need to increase the timeout since all tests running in parallel hammer TXE at the same time and processing slows down, leading to timeouts
       # The only way we currently have to batch tests is via RAYON_NUM_THREADS, which is not ideal
-      NARGO_FOREIGN_CALL_TIMEOUT=300000 nargo test --silence-warnings --oracle-resolver http://localhost:8080 ; \
+      NARGO_FOREIGN_CALL_TIMEOUT=300000 nargo test --use-legacy --silence-warnings --oracle-resolver http://localhost:8080 ; \
       kill $(cat /tmp/txe.pid)
 
 format:

diff --git a/noir-projects/aztec-nr/aztec/src/context/unconstrained_context.nr b/noir-projects/aztec-nr/aztec/src/context/unconstrained_context.nr
@@ -8,7 +8,7 @@ struct UnconstrainedContext {
 }
 
 impl UnconstrainedContext {
-    fn new() -> Self {
+    unconstrained fn new() -> Self {
         // We could call these oracles on the getters instead of at creation, which makes sense given that they might
         // not even be accessed. However any performance gains are minimal, and we'd rather fail early if a user
         // incorrectly attempts to create an UnconstrainedContext in an environment in which these oracles are not

diff --git a/noir-projects/aztec-nr/aztec/src/oracle/get_contract_instance.nr b/noir-projects/aztec-nr/aztec/src/oracle/get_contract_instance.nr
@@ -14,7 +14,7 @@ unconstrained fn get_contract_instance_internal(address: AztecAddress) -> [Field
     get_contract_instance_oracle(address)
 }
 
-unconstrained fn get_contract_instance_internal_avm(address: AztecAddress) -> [Field; CONTRACT_INSTANCE_LENGTH + 1] {
+unconstrained pub fn get_contract_instance_internal_avm(address: AztecAddress) -> [Field; CONTRACT_INSTANCE_LENGTH + 1] {
     get_contract_instance_oracle_avm(address)
 }
 

diff --git a/noir-projects/noir-contracts/bootstrap.sh b/noir-projects/noir-contracts/bootstrap.sh
@@ -17,7 +17,7 @@ fi
 
 echo "Compiling contracts..."
 NARGO=${NARGO:-../../noir/noir-repo/target/release/nargo}
-$NARGO compile --silence-warnings
+$NARGO compile --silence-warnings --use-legacy
 
 echo "Transpiling contracts..."
 scripts/transpile.sh
diff --git a/noir-projects/noir-protocol-circuits/bootstrap.sh b/noir-projects/noir-protocol-circuits/bootstrap.sh
@@ -20,4 +20,4 @@ node ./index.js
 
 echo "Compiling protocol circuits..."
 NARGO=${NARGO:-../../noir/noir-repo/target/release/nargo}
-$NARGO compile --silence-warnings
+$NARGO compile --silence-warnings --use-legacy
diff --git a/noir/noir-repo/.release-please-manifest.json b/noir/noir-repo/.release-please-manifest.json
@@ -1,4 +1,4 @@
 {
-  ".": "0.30.0",
-  "acvm-repo": "0.46.0"
+  ".": "0.31.0",
+  "acvm-repo": "0.47.0"
 }