chore: Merge changes to testnet (#13861)

PR containing the changesets for updating alpha-testnet

---------

Co-authored-by: Santiago Palladino <santiago@aztecprotocol.com>
Co-authored-by: spypsy <spypsy@users.noreply.github.com>
Co-authored-by: Gregorio Juliana <gregojquiros@gmail.com>
Co-authored-by: ludamad <adam.domurad@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: maramihali <mara@aztecprotocol.com>
Co-authored-by: ledwards2225 <l.edwards.d@gmail.com>
Co-authored-by: Nicolás Venturo <nicolas.venturo@gmail.com>
Co-authored-by: saleel <saleel@aztecprotocol.com>
Co-authored-by: Alex Gherghisan <alexghr@users.noreply.github.com>

Author: 11 people

.test_patterns.yml

@@ -41,9 +41,6 @@ tests:
     error_regex: "field_t::range_constraint"
     owners:
       - *luke
-  - regex: "barretenberg/acir_tests/scripts/run_test_browser.sh"
-    owners:
-      - *luke
   - regex: "barretenberg/acir_tests/scripts/run_test_browser.sh"
     error_regex: "Failed to fetch"
     owners:
@@ -189,11 +186,6 @@ tests:
     owners:
       - *grego
 
-  - regex: "boxes/scripts/run_test.sh"
-    error_regex: "expect(locator).toBeVisible()"
-    owners:
-      - *esau
-
   # kind tests
   - regex: "spartan/bootstrap.sh"
     # Will skip all kind tests for now. Too unstable, blocking merge queue.

aztec-up/bin/.aztec-run

@@ -141,6 +141,7 @@ function run {
     ${arg_env_vars:-} \
     ${arg_host_binds:-} \
     ${arg_user:-} \
+    --entrypoint "" \
     aztecprotocol/aztec:$VERSION "${args[@]}"
 }
 

aztec-up/bin/aztec

@@ -22,6 +22,10 @@ while [ "$#" -gt 0 ]; do
       ANVIL_PORT="$2"
       shift 2
       ;;
+    --admin-port)
+      ADMIN_PORT="$2"
+      shift 2
+      ;;
     --pxe.network)
       # Set version to user-specified network (e.g. 'devnet')
       VERSION="$2"
@@ -99,6 +103,12 @@ case ${1:-} in
 
       PORTS_TO_EXPOSE="${PORTS_TO_EXPOSE:-} $P2P_TCP_LISTEN_MAPPING $P2P_UDP_LISTEN_MAPPING"
 
+      if [ -n "${ADMIN_PORT:-}" ]; then
+        export ADMIN_PORT
+        ADMIN_MAPPING="$ADMIN_PORT:$ADMIN_PORT"
+        PORTS_TO_EXPOSE="${PORTS_TO_EXPOSE:-} $ADMIN_MAPPING"
+      fi
+
       exec $(dirname $0)/.aztec-run aztec-start \
         node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js "$@"
     fi

barretenberg/README.md

@@ -477,7 +477,7 @@ To do a single benchmark you can do e.g.
 `IVC_BENCH=amm-add-liquidity ./bootstrap.sh bench_ivc origin/master~3`
 
 If one doesn't provide the commit, it generates these IVC inputs on the fly (depends on yarn-project having been bootstrapped).
-To use these inputs manually, just abort after input download and run ClientIVC proving with --input runtime_stack on those inputs (stored in `yarn-project/end-to-end/example-app-ivc-inputs-out`).
+To use these inputs manually, just abort after input download and run ClientIVC proving on those inputs (stored in `yarn-project/end-to-end/example-app-ivc-inputs-out`).
 
 #### Using Tracy to Profile Memory/CPU/Gate Counts
 
@@ -532,7 +532,7 @@ By default, the barretenberg.wasm.gz that is used by bb.js (aka barretenberg/ts)
 One can get stack traces working from WASM by running root level ./bootstrap.sh (or otherwise building what you need) and then doing:
 ```
 cmake --build --preset wasm-threads --target barretenberg-debug.wasm.gz
-mv build-wasm-threads/barretenberg-debug.wasm.gz build-wasm-threads/barretenberg.wasm.gz
+cp build-wasm-threads/bin/barretenberg-debug.wasm.gz ../ts/dest/node/barretenberg_wasm/barretenberg-threads.wasm.gz
 ```
 
 This will mean that any yarn-project or barretenberg/ts tests that run will get stack traces with function names.
@@ -541,5 +541,5 @@ To get more detailed information use the following (NOTE: takes >10 minutes!):
 ```
 cmake --preset wasm-threads-dbg
 cmake --build --preset wasm-threads-dbg --target barretenberg-debug.wasm.gz
-mv build-wasm-threads-dbg/barretenberg-debug.wasm.gz build-wasm-threads/barretenberg.wasm.gz
+cp build-wasm-threads-dbg/bin/barretenberg-debug.wasm.gz ../ts/dest/node/barretenberg_wasm/barretenberg-threads.wasm.gz
 ```

barretenberg/acir_tests/bbjs-test/src/index.ts

@@ -109,7 +109,7 @@ program
   .option("-w, --witness-path <path>", "witness path")
   .option("-o, --output-directory <path>", "output directory")
   .option("-h, --oracle-hash <hash>", "oracle hash")
-  .option("-multi-threaded", "multi-threaded")
+  .option("--multi-threaded", "multi-threaded")
   .action((args) => generateProof(args));
 
 program

barretenberg/acir_tests/bootstrap.sh

@@ -149,10 +149,10 @@ function test_cmds_internal {
 
   # barretenberg-acir-tests-bb.js:
   # Browser tests.
-  echo BROWSER=chrome THREAD_MODEL=mt $run_test_browser verify_honk_proof
-  echo BROWSER=chrome THREAD_MODEL=st $run_test_browser 1_mul
-  echo BROWSER=webkit THREAD_MODEL=mt $run_test_browser verify_honk_proof
-  echo BROWSER=webkit THREAD_MODEL=st $run_test_browser 1_mul
+  echo BROWSER=chrome $run_test_browser verify_honk_proof
+  echo BROWSER=chrome $run_test_browser 1_mul
+  echo BROWSER=webkit $run_test_browser verify_honk_proof
+  echo BROWSER=webkit $run_test_browser 1_mul
   # echo ecdsa_secp256r1_3x through bb.js on node to check 256k support.
   echo BIN=$bbjs_bin FLOW=prove_then_verify $run_test ecdsa_secp256r1_3x
   # echo the prove then verify flow for UltraHonk. This makes sure we have the same circuit for different witness inputs.
@@ -186,7 +186,7 @@ function test_cmds_internal {
 
   # prove and verify using bb.js classes
   echo SYS=ultra_honk FLOW=bbjs_prove_verify $run_test 1_mul
-  echo SYS=ultra_honk FLOW=bbjs_prove_verify THREAD_MODEL=mt $run_test assert_statement
+  echo SYS=ultra_honk FLOW=bbjs_prove_verify $run_test assert_statement
 
   # prove with bb.js and verify with solidity verifier
   echo SYS=ultra_honk FLOW=bbjs_prove_sol_verify $run_test 1_mul
@@ -215,9 +215,6 @@ function run_benchmark {
 
 # TODO(https://github.com/AztecProtocol/barretenberg/issues/1254): More complete testing, including failure tests
 function bench {
-  # TODO(https://github.com/AztecProtocol/barretenberg/issues/1265) fix acir benchmarking
-  # LOG_FILE=bench-acir.jsonl ./bench_acir_tests.sh
-
   export HARDWARE_CONCURRENCY=16
 
   rm -rf bench-out && mkdir -p bench-out

barretenberg/acir_tests/browser-test-app/package.json

@@ -6,8 +6,7 @@
   "type": "module",
   "scripts": {
     "build": "rm -rf dest && webpack",
-    "serve:dest:st": "serve -n -L -p ${PORT:-8080} -c ../serve.json dest",
-    "serve:dest:mt": "serve -n -L -p ${PORT:-8080} -c ../serve.json dest"
+    "serve": "serve -n -L -p ${PORT:-8080} -c ../serve.json dest"
   },
   "devDependencies": {
     "@aztec/bb.js": "portal:../../ts",
@@ -19,9 +18,9 @@
     "serve": "^14.2.1",
     "ts-loader": "^9.5.1",
     "typescript": "^5.4.2",
-    "webpack": "^5.90.3",
-    "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^5.2.0"
+    "webpack": "^5.99.6",
+    "webpack-cli": "^6.0.1",
+    "webpack-dev-server": "^5.2.1"
   },
   "packageManager": "yarn@4.5.2"
 }

barretenberg/acir_tests/browser-test-app/serve.json

@@ -10,6 +10,18 @@
         {
           "key": "Cross-Origin-Opener-Policy",
           "value": "same-origin"
+        },
+        {
+          "key": "Access-Control-Allow-Origin",
+          "value": "*"
+        },
+        {
+          "key": "Access-Control-Allow-Methods",
+          "value": "GET, POST, PUT, DELETE, OPTIONS"
+        },
+        {
+          "key": "Access-Control-Allow-Headers",
+          "value": "Content-Type, Authorization"
         }
       ]
     }

barretenberg/acir_tests/browser-test-app/src/index.ts

@@ -11,6 +11,7 @@
     "inlineSourceMap": true,
     "declarationMap": true,
     "importHelpers": true,
+    "isolatedModules": true,
     "resolveJsonModule": true,
     "composite": true,
     "outDir": "dest",

barretenberg/acir_tests/browser-test-app/tsconfig.json

@@ -13,22 +13,25 @@ export default {
     rules: [
       {
         test: /\.tsx?$/,
-        use: [{ loader: "ts-loader" }],
+        loader: 'ts-loader',
       },
     ],
   },
   output: {
     path: resolve(dirname(fileURLToPath(import.meta.url)), "./dest"),
-    publicPath: "/",
     filename: "[name].js",
-    library: {
-      type: 'module',
-    },
     chunkFormat: 'module',
   },
   experiments: {
     outputModule: true,
   },
+  optimization: {
+    splitChunks: {
+      // Cannot use async due to https://github.com/webpack/webpack/issues/17014
+      // messing with module workers loaded asynchronously.
+      chunks: /barretenberg.*.js/,
+    },
+  },
   plugins: [
     new HtmlWebpackPlugin({ inject: false, template: "./src/index.html" }),
     new webpack.DefinePlugin({ "process.env.NODE_DEBUG": false }),
@@ -42,9 +45,5 @@ export default {
       logging: "none",
       overlay: false,
     },
-    headers: {
-      "Cross-Origin-Opener-Policy": "same-origin",
-      "Cross-Origin-Embedder-Policy": "require-corp",
-    },
   },
 };

barretenberg/acir_tests/browser-test-app/webpack.config.js

@@ -20,7 +20,7 @@ node ../../bbjs-test prove \
   -b $artifact_dir/program.json \
   -w $artifact_dir/witness.gz \
   -o $output_dir \
-  ${THREAD_MODEL:-st} = "mt" && echo "--multi-threaded"
+  --multi-threaded
 
 # Verify the proof by reading the files in ./target
 node ../../bbjs-test verify \

barretenberg/acir_tests/flows/bbjs_prove_verify.sh

@@ -6,23 +6,6 @@ BFLAG="-b ./target/program.json"
 FLAGS="-c $CRS_PATH ${VERBOSE:+-v}"
 [ "${RECURSIVE}" = "true" ] && FLAGS+=" --recursive"
 
-# TODO: Use this when client ivc support write_vk. Currently it keeps its own flow.
-# case ${SYS:-} in
-#   "")
-#     prove_cmd=prove
-#     verify_cmd=verify
-#     ;;
-#   "client_ivc")
-#     prove_cmd=prove
-#     verify_cmd=verify
-#     flags+=" --scheme client_ivc --input_type ${INPUT_TYPE:-single_circuit}"
-#     ;;
-#   *)
-#     prove_cmd=prove_$SYS
-#     verify_cmd=verify_$SYS
-#     ;;
-# esac
-
 # Test we can perform the proof/verify flow.
 # This ensures we test independent pk construction through real/garbage witness data paths.
 # We use process substitution pipes to avoid temporary files, which need cleanup, and can collide with parallelism.

barretenberg/acir_tests/flows/prove_then_verify.sh

@@ -1,17 +1,8 @@
 #!/usr/bin/env bash
 # Create intermediate state in a directory. Uses a temp dir to ensure parallel safe and cleans up on exit.
+# TODO this is unused
 set -eux
 
-INFLAG=${INPUT_TYPE:---input_type runtime_stack}
-
-if [ "$INFLAG" = "--input_type runtime_stack" ]; then
-  BFLAG=target/acir.msgpack
-  WFLAG=target/witness.msgpack
-else
-  BFLAG=target/program.json
-  WFLAG=target/witness.gz
-fi
-
 CRS_PATH=${CRS_PATH:-$HOME/.bb-crs}
 BIN=$(realpath ${BIN:-../cpp/build/bin/bb})
 
@@ -23,6 +14,6 @@ trap "rm -rf $outdir" EXIT
 flags="--scheme client_ivc -c $CRS_PATH ${VERBOSE:+-v}"
 
 parallel ::: \
-  "$BIN prove $flags -b $BFLAG -w $WFLAG $INFLAG --output_format proof -o $outdir" \
-  "$BIN write_vk $flags -b $BFLAG $INFLAG --verifier_type ivc -o $outdir"
+  "$BIN prove $flags -i target/ivc-inputs.msgpack $INFLAG --output_format proof -o $outdir" \
+  "$BIN write_vk $flags -i target/ivc-inputs.msgpack $INFLAG --verifier_type ivc -o $outdir"
 $BIN verify $flags -p $outdir/proof -k $outdir/vk

barretenberg/acir_tests/flows/prove_then_verify_client_ivc.sh

@@ -4,7 +4,7 @@ set -eu
 VFLAG=${VERBOSE:+-v}
 BFLAG="-b ./target/program.json"
 FLAGS="-c $CRS_PATH $VFLAG --scheme ultra_honk"
-PROVE_FLAGS="$FLAGS $BFLAG --oracle_hash keccak --output_format bytes_and_fields --write_vk --input_type single_circuit"
+PROVE_FLAGS="$FLAGS $BFLAG --oracle_hash keccak --output_format bytes_and_fields --write_vk"
 VERIFY_FLAGS="$FLAGS --oracle_hash keccak"
 
 outdir=$(mktemp -d)

barretenberg/acir_tests/flows/sol_honk.sh

@@ -3,6 +3,7 @@ import fs from "fs";
 import { Command } from "commander";
 import chalk from "chalk";
 import os from "os";
+import type { ProofData } from "@aztec/bb.js";
 
 const { BROWSER, PORT = "8080" } = process.env;
 
@@ -66,7 +67,7 @@ program
     "Specify the path to the gzip encoded ACIR witness",
     "./target/witness.gz"
   )
-  .action(async ({ bytecodePath, witnessPath, }) => {
+  .action(async ({ bytecodePath, witnessPath }) => {
     const acir = readBytecodeFile(bytecodePath);
     const witness = readWitnessFile(witnessPath);
     const threads = Math.min(os.cpus().length, 16);
@@ -81,28 +82,75 @@ program
       const browser = await browserType.launch();
 
       const context = await browser.newContext();
-      const page = await context.newPage();
+      const provingPage = await context.newPage();
 
       if (program.opts().verbose) {
-        page.on("console", (msg) => formatAndPrintLog(msg.text()));
+        provingPage.on("console", (msg) => formatAndPrintLog(msg.text()));
       }
 
-      await page.goto(`http://localhost:${PORT}`);
-
-      const result: boolean = await page.evaluate(
-        ([acir, witnessData, threads]: [string, number[], number]) => {
+      await provingPage.goto(`http://localhost:${PORT}`);
+
+      const {
+        publicInputs,
+        proof,
+        verificationKey,
+      }: {
+        publicInputs: string[];
+        proof: number[];
+        verificationKey: number[];
+      } = await provingPage.evaluate(
+        async ([acir, witnessData, threads]: [string, number[], number]) => {
           // Convert the input data to Uint8Arrays within the browser context
           const witnessUint8Array = new Uint8Array(witnessData);
 
           // Call the desired function and return the result
-          return (window as any).runTest(acir, witnessUint8Array, threads);
+          const {
+            proofData,
+            verificationKey,
+          }: { proofData: ProofData; verificationKey: Uint8Array } = await (
+            window as any
+          ).prove(acir, witnessUint8Array, threads);
+
+          return {
+            publicInputs: proofData.publicInputs,
+            proof: Array.from(proofData.proof),
+            verificationKey: Array.from(verificationKey),
+          };
         },
         [acir, Array.from(witness), threads]
       );
+      await provingPage.close();
+
+      // Creating a new page to verify the proof, so this bug is avoided
+      // https://bugs.webkit.org/show_bug.cgi?id=245346
+      // Present at least on playwright 1.49.0
+
+      const verificationPage = await context.newPage();
+      await verificationPage.goto(`http://localhost:${PORT}`);
+
+      if (program.opts().verbose) {
+        verificationPage.on("console", (msg) => formatAndPrintLog(msg.text()));
+      }
+
+      const verificationResult: boolean = await verificationPage.evaluate(
+        ([publicInputs, proof, verificationKey]: [
+          string[],
+          number[],
+          number[]
+        ]) => {
+          const verificationKeyUint8Array = new Uint8Array(verificationKey);
+          const proofData: ProofData = {
+            publicInputs,
+            proof: new Uint8Array(proof),
+          };
+          return (window as any).verify(proofData, verificationKeyUint8Array);
+        },
+        [publicInputs, proof, verificationKey]
+      );
 
       await browser.close();
 
-      if (!result) {
+      if (!verificationResult) {
         process.exit(1);
       }
     }