Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions avm-transpiler/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions avm-transpiler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ acvm = { path = "../noir/noir-repo/acvm-repo/acvm", features = ["bn254"] }
noirc_errors = { path = "../noir/noir-repo/compiler/noirc_errors" }
noirc_abi = { path = "../noir/noir-repo/tooling/noirc_abi" }
noirc_evaluator = { path = "../noir/noir-repo/compiler/noirc_evaluator", features = ["bn254"] }
noirc_frontend = { path = "../noir/noir-repo/compiler/noirc_frontend", features = ["test_utils"] }

# external
base64 = "0.21"
Expand Down
2 changes: 2 additions & 0 deletions avm-transpiler/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#![warn(clippy::semicolon_if_nothing_returned)]
#![cfg_attr(not(test), warn(unused_crate_dependencies, unused_extern_crates))]

use noirc_frontend as _;

use log::warn;
use std::env;
use std::fs;
Expand Down
8 changes: 4 additions & 4 deletions barretenberg/acir_tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@ You can specify which proving system to use with the `SYS` variable (ultra_honk,
If not specified it defaults to plonk (TODO: Make explicit).

```
$ SYS=ultra_honk BIN=bb.js VERBOSE=1 ./run_test.sh 1_mul
$ SYS=ultra_honk BIN=bb.js VERBOSE=1 ./run_test.sh a_1_mul
```

You can use a relative path to an executable. e.g. if bb.js-dev is not symlinked into your PATH:

```
$ BIN=../ts/bb.js-dev VERBOSE=1 ./run_test.sh 1_mul
$ BIN=../ts/bb.js-dev VERBOSE=1 ./run_test.sh a_1_mul
```

```
$ BIN=./headless-test/bb.js.browser VERBOSE=1 ./run_test.sh 1_mul
$ BIN=./headless-test/bb.js.browser VERBOSE=1 ./run_test.sh a_1_mul
```

You can specify a different testing "flow" with `FLOW` environment variable. Flows are in the `flows` dir.
Expand All @@ -59,7 +59,7 @@ test vectors actually all pass in whichever version of the backend is being run.
The `all_cmds` flow tests all the supported commands on the binary. Slower, but is there to test the cli.

```
$ FLOW=all_cmds ./run_acir_tests.sh 1_mul
$ FLOW=all_cmds ./run_acir_tests.sh a_1_mul
```

We currently have to use a separate flow script to run client_ivc scheme as opposed to just setting `SYS` due to
Expand Down
20 changes: 10 additions & 10 deletions barretenberg/acir_tests/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -134,31 +134,31 @@ function test_cmds {
# Solidity tests. Isolate because anvil.
local prefix="$tests_hash:ISOLATE=1"
echo "$prefix FLOW=sol_honk $run_test assert_statement"
echo "$prefix FLOW=sol_honk $run_test 1_mul"
echo "$prefix FLOW=sol_honk $run_test a_1_mul"
echo "$prefix FLOW=sol_honk $run_test slices"
echo "$prefix FLOW=sol_honk $run_test verify_honk_proof"
echo "$prefix FLOW=sol_honk_zk $run_test assert_statement"
echo "$prefix FLOW=sol_honk_zk $run_test 1_mul"
echo "$prefix FLOW=sol_honk_zk $run_test a_1_mul"
echo "$prefix FLOW=sol_honk_zk $run_test slices"
echo "$prefix FLOW=sol_honk_zk $run_test verify_honk_proof"

# bb.js browser tests. Isolate because server.
local prefix="$tests_hash:ISOLATE=1:NET=1:CPUS=8"
echo "$prefix:NAME=chrome_verify_honk_proof BROWSER=chrome $run_test_browser verify_honk_proof"
echo "$prefix:NAME=chrome_1_mul BROWSER=chrome $run_test_browser 1_mul"
echo "$prefix:NAME=chrome_a_1_mul BROWSER=chrome $run_test_browser a_1_mul"
echo "$prefix:NAME=webkit_verify_honk_proof BROWSER=webkit $run_test_browser verify_honk_proof"
echo "$prefix:NAME=webkit_1_mul BROWSER=webkit $run_test_browser 1_mul"
echo "$prefix:NAME=webkit_a_1_mul BROWSER=webkit $run_test_browser a_1_mul"

# bb.js tests.
local prefix=$tests_hash
# ecdsa_secp256r1_3x through bb.js on node to check 256k support.
echo "$prefix BIN=$bbjs_bin SYS=ultra_honk_deprecated FLOW=prove_then_verify $run_test ecdsa_secp256r1_3x"
# the prove then verify flow for UltraHonk. This makes sure we have the same circuit for different witness inputs.
echo "$prefix BIN=$bbjs_bin SYS=ultra_honk_deprecated FLOW=prove_then_verify $run_test 6_array"
echo "$prefix BIN=$bbjs_bin SYS=ultra_honk_deprecated FLOW=prove_then_verify $run_test a_6_array"

# barretenberg-acir-tests-bb:
# Fold and verify an ACIR program stack using ClientIVC, recursively verify as part of the Tube circuit and produce and verify a Honk proof
echo "$prefix FLOW=prove_then_verify_tube $run_test 6_array"
echo "$prefix FLOW=prove_then_verify_tube $run_test a_6_array"

# barretenberg-acir-tests-bb-ultra-honk:
# SYS decides which scheme will be used for the test.
Expand All @@ -184,19 +184,19 @@ function test_cmds {
echo "$prefix SYS=ultra_honk FLOW=prove_then_verify DISABLE_ZK=true $run_test assert_statement"

# prove and verify using bb.js classes
echo "$prefix SYS=ultra_honk FLOW=bbjs_prove_verify $run_test 1_mul"
echo "$prefix SYS=ultra_honk FLOW=bbjs_prove_verify $run_test a_1_mul"
echo "$prefix SYS=ultra_honk FLOW=bbjs_prove_verify $run_test assert_statement"

# prove with bb.js and verify with solidity verifier
echo "$prefix SYS=ultra_honk FLOW=bbjs_prove_sol_verify $run_test 1_mul"
echo "$prefix SYS=ultra_honk FLOW=bbjs_prove_sol_verify $run_test a_1_mul"
echo "$prefix SYS=ultra_honk FLOW=bbjs_prove_sol_verify $run_test assert_statement"

# prove with bb cli and verify with bb.js classes
echo "$prefix SYS=ultra_honk FLOW=bb_prove_bbjs_verify $run_test 1_mul"
echo "$prefix SYS=ultra_honk FLOW=bb_prove_bbjs_verify $run_test a_1_mul"
echo "$prefix SYS=ultra_honk FLOW=bb_prove_bbjs_verify $run_test assert_statement"

# prove with bb.js and verify with bb cli
echo "$prefix SYS=ultra_honk FLOW=bbjs_prove_bb_verify $run_test 1_mul"
echo "$prefix SYS=ultra_honk FLOW=bbjs_prove_bb_verify $run_test a_1_mul"
echo "$prefix SYS=ultra_honk FLOW=bbjs_prove_bb_verify $run_test assert_statement"
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,15 @@ TEST_P(AcirIntegrationSingleTest, DISABLED_ProveAndVerifyProgram)
INSTANTIATE_TEST_SUITE_P(AcirTests,
AcirIntegrationSingleTest,
testing::Values("1327_concrete_in_generic",
"1_mul",
"2_div",
"3_add",
"4_sub",
"5_over",
"6",
"6_array",
"7",
"7_function",
"a_1_mul",
"a_2_div",
"a_3_add",
"a_4_sub",
"a_5_over",
"a_6",
"a_6_array",
"a_7",
"a_7_function",
"aes128_encrypt",
"arithmetic_binary_operations",
"array_dynamic",
Expand Down
2 changes: 1 addition & 1 deletion noir/noir-repo-ref
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2025-06-19
nightly-2025-06-23
Loading