feat: merge-train/spartan

.test_patterns.yml

@@ -56,27 +56,6 @@ tests:
     error_regex: "field_t::range_constraint"
     owners:
       - *luke
-  - regex: "barretenberg/acir_tests/scripts/browser_prove.sh"
-    error_regex: "Failed to fetch"
-    owners:
-      - *adam
-  - regex: "barretenberg/acir_tests/scripts/browser_prove.sh"
-    error_regex: "RuntimeError: Out of bounds memory access"
-    owners:
-      - *adam
-  - regex: "barretenberg/acir_tests/scripts/browser_prove.sh"
-    error_regex: "call_indirect to a null table entry"
-    owners:
-      - *adam
-  - regex: "barretenberg/acir_tests/scripts/browser_prove.sh"
-    error_regex: "Input is not large enough"
-    owners:
-      - *adam
-  # https://gist.github.com/spalladino/4fd3d2abd7b7fb05be2e556649868626
-  - regex: "barretenberg/acir_tests/scripts/browser_prove.sh"
-    error_regex: "sending signal TERM to command"
-    owners:
-      - *adam
   - regex: "barretenberg/cpp/scripts/run_bench.sh wasm bb-micro-bench/wasm/ultra_honk"
     error_regex: "Aborted.*core dumped"
     owners:

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

@@ -15,7 +15,7 @@
     "pako": "^2.1.0",
     "pino": "^9.5.0",
     "process": "^0.11.10",
-    "serve": "^14.2.1",
+    "serve": "^14.2.6",
     "ts-loader": "^9.5.1",
     "typescript": "^5.4.2",
     "webpack": "^5.99.6",

barretenberg/acir_tests/package.json

@@ -12,6 +12,9 @@
     "pino": "^9.5.0"
   },
   "resolutions": {
-    "ws": "^8.17.1"
+    "ws": "^8.17.1",
+    "basic-ftp": "^5.2.0",
+    "node-forge": "^1.3.2",
+    "serialize-javascript": "^7.0.3"
   }
 }

barretenberg/acir_tests/scripts/bb_prove.sh

@@ -12,31 +12,31 @@ shift
 # Base flags + our commandline args
 flags="-v --scheme ultra_honk $*"
 
-mkdir -p output-$$
-trap "rm -rf output-$$" EXIT
+output_dir=$(mktemp -d ./output-XXXXXX)
+trap "rm -rf $output_dir" EXIT
 
 # Tests prefixed with failing_ are expected to fail.
 if [[ $test_name == failing_* ]]; then
-  if $bb write_vk $flags -b target/program.json -o output-$$ && \
-     $bb prove $flags -b target/program.json -k output-$$/vk -o output-$$ && \
+  if $bb write_vk $flags -b target/program.json -o $output_dir && \
+     $bb prove $flags -b target/program.json -k $output_dir/vk -o $output_dir && \
      $bb verify $flags \
-       -k output-$$/vk \
-       -p output-$$/proof \
-       -i output-$$/public_inputs; then
+       -k $output_dir/vk \
+       -p $output_dir/proof \
+       -i $output_dir/public_inputs; then
     echo "ERROR: Expected test '$test_name' to fail, but it passed!"
     exit 1
   fi
 else
     # Generate VK
-    $bb write_vk $flags -b target/program.json -o output-$$
+    $bb write_vk $flags -b target/program.json -o $output_dir
 
     # Prove
-    $bb prove $flags -b target/program.json -k output-$$/vk -o output-$$
+    $bb prove $flags -b target/program.json -k $output_dir/vk -o $output_dir
 
     # Verify
     $bb verify $flags \
-        -k output-$$/vk \
-        -p output-$$/proof \
-        -i output-$$/public_inputs
+        -k $output_dir/vk \
+        -p $output_dir/proof \
+        -i $output_dir/public_inputs
 fi
 

barretenberg/acir_tests/scripts/bb_prove_bbjs_verify.sh

@@ -7,23 +7,23 @@ export HARDWARE_CONCURRENCY=8
 
 bb=$(../../../cpp/scripts/find-bb)
 
-mkdir -p output-$$
-trap "rm -rf output-$$" EXIT
+output_dir=$(mktemp -d ./output-XXXXXX)
+trap "rm -rf $output_dir" EXIT
 
 # Generate the VK using BB CLI
 $bb write_vk \
   --scheme ultra_honk \
   -b target/program.json \
-  -o output-$$
+  -o $output_dir
 
 # Generate the proof using BB CLI (save as both bytes and fields)
 $bb prove \
   --scheme ultra_honk \
   -b target/program.json \
   -w target/witness.gz \
-  -k output-$$/vk \
-  -o output-$$
+  -k $output_dir/vk \
+  -o $output_dir
 
 # Verify the proof with bb.js classes
 node ../../bbjs-test verify \
-  -d output-$$
+  -d $output_dir

barretenberg/acir_tests/scripts/bb_prove_sol_verify.sh

@@ -30,21 +30,21 @@ else
     has_zk="true"
 fi
 
-mkdir -p output-$$
-trap "rm -rf output-$$" EXIT
+output_dir=$(mktemp -d ./output-XXXXXX)
+trap "rm -rf $output_dir" EXIT
 
 # Create a proof, write the solidity contract, write the proof as fields in order to extract the public inputs
-$bb prove $flags -b target/program.json --oracle_hash keccak --write_vk -o output-$$
-$bb verify $flags --oracle_hash keccak -i output-$$/public_inputs -k output-$$/vk -p output-$$/proof
-$bb write_solidity_verifier $write_contract_flags -k output-$$/vk -o output-$$/Verifier.sol
+$bb prove $flags -b target/program.json --oracle_hash keccak --write_vk -o $output_dir
+$bb verify $flags --oracle_hash keccak -i $output_dir/public_inputs -k $output_dir/vk -p $output_dir/proof
+$bb write_solidity_verifier $write_contract_flags -k $output_dir/vk -o $output_dir/Verifier.sol
 
 # Use solcjs to compile the generated key contract with the template verifier and test contract
 # index.js will start an anvil, on a random port
 # Deploy the verifier then send a test transaction
-PROOF="output-$$/proof" \
-PUBLIC_INPUTS="output-$$/public_inputs" \
-VERIFIER_PATH="output-$$/Verifier.sol" \
+PROOF="$output_dir/proof" \
+PUBLIC_INPUTS="$output_dir/public_inputs" \
+VERIFIER_PATH="$output_dir/Verifier.sol" \
 TEST_PATH="../../sol-test/HonkTest.sol" \
 HAS_ZK="$has_zk" \
-TEST_NAME=$(basename output-$$) \
+TEST_NAME=$(basename $output_dir) \
   node ../../sol-test/src/index.js

barretenberg/acir_tests/scripts/bbjs_legacy_cli_prove.sh

@@ -8,16 +8,16 @@ cd ../acir_tests/$1
 # NOTE The bb.js main file is deprecated!
 bbjs_bin="../../../ts/dest/node/main.js"
 
-mkdir -p output-$$
-trap "rm -rf output-$$" EXIT
+output_dir=$(mktemp -d ./output-XXXXXX)
+trap "rm -rf $output_dir" EXIT
 
 # Generate VK
-node $bbjs_bin write_vk_ultra_honk -v -b target/program.json -o output-$$/vk
+node $bbjs_bin write_vk_ultra_honk -v -b target/program.json -o $output_dir/vk
 
 # Prove
-node $bbjs_bin prove_ultra_honk -o output-$$/proof -v -b target/program.json -k output-$$/vk
+node $bbjs_bin prove_ultra_honk -o $output_dir/proof -v -b target/program.json -k $output_dir/vk
 
 # Verify
 node $bbjs_bin verify_ultra_honk -v \
-    -k output-$$/vk \
-    -p output-$$/proof
+    -k $output_dir/vk \
+    -p $output_dir/proof

barretenberg/acir_tests/scripts/bbjs_prove.sh

@@ -5,16 +5,16 @@ cd ../acir_tests/$1
 
 export HARDWARE_CONCURRENCY=8
 
-mkdir -p output-$$
-trap "rm -rf output-$$" EXIT
+output_dir=$(mktemp -d ./output-XXXXXX)
+trap "rm -rf $output_dir" EXIT
 
 # Writes the proof, public inputs ./target; this also writes the VK
 node ../../bbjs-test prove \
   -b target/program.json \
   -w target/witness.gz \
-  -o output-$$ \
+  -o $output_dir \
   --multi-threaded
 
 # Verify the proof by reading the files in ./target
 node ../../bbjs-test verify \
-  -d output-$$
+  -d $output_dir

barretenberg/acir_tests/scripts/bbjs_prove_bb_verify.sh

@@ -5,21 +5,21 @@ export HARDWARE_CONCURRENCY=8
 
 cd ../acir_tests/$1
 
-mkdir -p output-$$
-trap "rm -rf output-$$" EXIT
+output_dir=$(mktemp -d ./output-XXXXXX)
+trap "rm -rf $output_dir" EXIT
 
 # Writes the proof, public inputs ./target; this also writes the VK
 node ../../bbjs-test prove \
   -b target/program.json \
   -w target/witness.gz \
-  -o output-$$
+  -o $output_dir
 
 # The proof and public_inputs are already in binary format from bbjs-test
 
 bb=$(../../../cpp/scripts/find-bb)
 # Verify the proof with bb cli
 $bb verify \
   --scheme ultra_honk \
-  -k output-$$/vk \
-  -p output-$$/proof \
-  -i output-$$/public_inputs
+  -k $output_dir/vk \
+  -p $output_dir/proof \
+  -i $output_dir/public_inputs

barretenberg/acir_tests/scripts/bbjs_prove_sol_verify.sh

@@ -5,14 +5,14 @@ export HARDWARE_CONCURRENCY=8
 
 cd ../acir_tests/$1
 
-mkdir -p output-$$
-trap "rm -rf output-$$" EXIT
+output_dir=$(mktemp -d ./output-XXXXXX)
+trap "rm -rf $output_dir" EXIT
 
 # Generate the proof and VK
 node ../../bbjs-test prove \
   -b target/program.json \
   -w target/witness.gz \
-  -o output-$$ \
+  -o $output_dir \
   --oracle-hash $oracle_hash
 
 bb=$(../../../cpp/scripts/find-bb)
@@ -31,12 +31,12 @@ for arg in "$@"; do
 done
 
 # Use the BB CLI to write the solidity verifier - this can also be done with bb.js
-$bb write_solidity_verifier --scheme ultra_honk -k output-$$/vk -o output-$$/Verifier.sol
+$bb write_solidity_verifier --scheme ultra_honk -k $output_dir/vk -o $output_dir/Verifier.sol
 
 # Verify the proof using the solidity verifier
-PROOF="output-$$/proof" \
-PUBLIC_INPUTS="output-$$/public_inputs" \
-VERIFIER_PATH="output-$$/Verifier.sol" \
+PROOF="$output_dir/proof" \
+PUBLIC_INPUTS="$output_dir/public_inputs" \
+VERIFIER_PATH="$output_dir/Verifier.sol" \
 TEST_PATH="../../sol-test/HonkTest.sol" \
 HAS_ZK="$has_zk" \
 TEST_NAME=$(basename $(realpath .)) \