From 19e408e9d262553ec2388d2464c921f7aeac0ada Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Fri, 3 Nov 2023 00:04:40 +0000 Subject: [PATCH 1/3] bug: run acir tests will fail on all cmds --- barretenberg/acir_tests/Dockerfile.bb | 2 +- barretenberg/build-system | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 160000 barretenberg/build-system diff --git a/barretenberg/acir_tests/Dockerfile.bb b/barretenberg/acir_tests/Dockerfile.bb index ce0d274c2ec..7f7357fd6b1 100644 --- a/barretenberg/acir_tests/Dockerfile.bb +++ b/barretenberg/acir_tests/Dockerfile.bb @@ -6,6 +6,6 @@ COPY --from=0 /usr/src/barretenberg/cpp/build /usr/src/barretenberg/cpp/build WORKDIR /usr/src/barretenberg/acir_tests COPY . . # Run every acir test through native bb build "prove_and_verify". -RUN ./run_acir_tests.sh +RUN VERBOSE=1 FLOW=all_cmds ./run_acir_tests.sh # Run 1_mul through native bb build, all_cmds flow, to test all cli args. RUN VERBOSE=1 FLOW=all_cmds ./run_acir_tests.sh 1_mul diff --git a/barretenberg/build-system b/barretenberg/build-system new file mode 160000 index 00000000000..a109f3aef28 --- /dev/null +++ b/barretenberg/build-system @@ -0,0 +1 @@ +Subproject commit a109f3aef28cea4a50481cdf2d74fc3909212c0b From 6340fd57b2288205fd972d3a09f282d7bf2a7019 Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Fri, 3 Nov 2023 17:51:59 +0000 Subject: [PATCH 2/3] fix: proofs --- barretenberg/acir_tests/Dockerfile.bb | 2 +- barretenberg/cpp/src/barretenberg/bb/main.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/barretenberg/acir_tests/Dockerfile.bb b/barretenberg/acir_tests/Dockerfile.bb index 7f7357fd6b1..3afa93c0ed9 100644 --- a/barretenberg/acir_tests/Dockerfile.bb +++ b/barretenberg/acir_tests/Dockerfile.bb @@ -6,6 +6,6 @@ COPY --from=0 /usr/src/barretenberg/cpp/build /usr/src/barretenberg/cpp/build WORKDIR /usr/src/barretenberg/acir_tests COPY . . # Run every acir test through native bb build "prove_and_verify". -RUN VERBOSE=1 FLOW=all_cmds ./run_acir_tests.sh +RUN FLOW=all_cmds ./run_acir_tests.sh # Run 1_mul through native bb build, all_cmds flow, to test all cli args. RUN VERBOSE=1 FLOW=all_cmds ./run_acir_tests.sh 1_mul diff --git a/barretenberg/cpp/src/barretenberg/bb/main.cpp b/barretenberg/cpp/src/barretenberg/bb/main.cpp index 61c15c7f372..c996c90063e 100644 --- a/barretenberg/cpp/src/barretenberg/bb/main.cpp +++ b/barretenberg/cpp/src/barretenberg/bb/main.cpp @@ -116,6 +116,7 @@ void prove(const std::string& bytecodePath, auto constraint_system = get_constraint_system(bytecodePath); auto witness = get_witness(witnessPath); auto acir_composer = init(constraint_system); + acir_composer.init_proving_key(constraint_system); auto proof = acir_composer.create_proof(constraint_system, witness, recursive); if (outputPath == "-") { From 454541f0fbb08b9751747df85cbab0c35349405c Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Fri, 3 Nov 2023 22:26:37 +0000 Subject: [PATCH 3/3] remove accidental build system commit --- barretenberg/build-system | 1 - 1 file changed, 1 deletion(-) delete mode 160000 barretenberg/build-system diff --git a/barretenberg/build-system b/barretenberg/build-system deleted file mode 160000 index a109f3aef28..00000000000 --- a/barretenberg/build-system +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a109f3aef28cea4a50481cdf2d74fc3909212c0b