From 842e15d348a428cf6318b5ac2a25430ca07fa66d Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Mon, 18 Mar 2024 21:51:13 +0000 Subject: [PATCH 1/4] fix ZM issue; no builder on evaluation --- .../commitment_schemes/zeromorph/zeromorph.hpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.hpp index 5f444c877920..cd3b3bb99538 100644 --- a/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.hpp +++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.hpp @@ -704,8 +704,16 @@ template class ZeroMorphVerifier_ { C_zeta_Z = C_zeta_x + C_Z_x * z_challenge; } + // Define the evaluation (always zero in this case by constructing) for the PCS opening + FF evaluation{ 0 }; + if constexpr (Curve::is_stdlib_type) { // add builder if in circuit context + auto builder = z_challenge.get_context(); + evaluation = FF(builder, 0); + } + return PCS::reduce_verify( - { .opening_pair = { .challenge = x_challenge, .evaluation = FF(0) }, .commitment = C_zeta_Z }, transcript); + { .opening_pair = { .challenge = x_challenge, .evaluation = evaluation }, .commitment = C_zeta_Z }, + transcript); } }; From 003a1abd11e792a5f0aa74fa84f336ea4cabf66b Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Mon, 18 Mar 2024 22:00:25 +0000 Subject: [PATCH 2/4] reinstate --- .circleci/config.yml | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 01726da680ba..b91bc4e34a5b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -71,9 +71,9 @@ setup_env: &setup_env command: ./build-system/scripts/setup_env "$CIRCLE_SHA1" "$CIRCLE_TAG" "$CIRCLE_JOB" "$CIRCLE_REPOSITORY_URL" "$CIRCLE_BRANCH" "$CIRCLE_PULL_REQUEST" defaults_e2e_test: &defaults_e2e_test - docker: - - image: aztecprotocol/alpine-build-image - resource_class: small + docker: + - image: aztecprotocol/alpine-build-image + resource_class: small jobs: # Dynamically filter our code, quickly figuring out which jobs we can skip. @@ -344,7 +344,7 @@ jobs: command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 1 proof_system_tests aztec_manifest_key: barretenberg-x86_64-linux-clang-assert - barretenberg-stdlib-recursion-ultra-tests: + barretenberg-stdlib-plonk-recursion-ultra-tests: docker: - image: aztecprotocol/alpine-build-image resource_class: small @@ -356,6 +356,18 @@ jobs: command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 3 stdlib_plonk_recursion_tests --gtest_filter=-*turbo* aztec_manifest_key: barretenberg-x86_64-linux-clang-assert + barretenberg-stdlib-honk-recursion-ultra-tests: + docker: + - image: aztecprotocol/alpine-build-image + resource_class: small + steps: + - *checkout + - *setup_env + - run: + name: "Test" + command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 3 stdlib_honk_recursion_tests + aztec_manifest_key: barretenberg-x86_64-linux-clang-assert + barretenberg-acir-tests-bb: docker: - image: aztecprotocol/alpine-build-image @@ -868,7 +880,6 @@ jobs: aztec_manifest_key: end-to-end <<: *defaults_e2e_test - e2e-outbox: docker: - image: aztecprotocol/alpine-build-image @@ -1221,7 +1232,7 @@ defaults: &defaults - slack/notify: event: fail branch_pattern: "master" - + bb_acir_tests: &bb_acir_tests requires: - barretenberg-x86_64-linux-clang-assert From 954c29999c050210ac8a436203aa38c48fdf666e Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Mon, 18 Mar 2024 22:51:07 +0000 Subject: [PATCH 3/4] woops --- .circleci/config.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b91bc4e34a5b..90a3798c7831 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1312,7 +1312,8 @@ workflows: - barretenberg-dsl-tests: *bb_test - barretenberg-tests: *bb_test - barretenberg-stdlib-tests: *bb_test - - barretenberg-stdlib-recursion-ultra-tests: *bb_test + - barretenberg-stdlib-plonk-recursion-ultra-tests: *bb_test + - barretenberg-stdlib-honk-recursion-ultra-tests: *bb_test - barretenberg-acir-tests-bb: *bb_acir_tests - barretenberg-acir-tests-bb-sol: requires: @@ -1450,7 +1451,8 @@ workflows: - barretenberg-dsl-tests - barretenberg-tests - barretenberg-stdlib-tests - - barretenberg-stdlib-recursion-ultra-tests + - barretenberg-stdlib-plonk-recursion-ultra-tests + - barretenberg-stdlib-honk-recursion-ultra-tests - barretenberg-acir-tests-bb - barretenberg-acir-tests-bb-sol - barretenberg-docs From 14882d635b9078f95aed19a7476750026d3aabd0 Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Mon, 18 Mar 2024 23:00:00 +0000 Subject: [PATCH 4/4] fix comment --- .../src/barretenberg/commitment_schemes/zeromorph/zeromorph.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.hpp index cd3b3bb99538..f7f6089020f1 100644 --- a/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.hpp +++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.hpp @@ -704,7 +704,7 @@ template class ZeroMorphVerifier_ { C_zeta_Z = C_zeta_x + C_Z_x * z_challenge; } - // Define the evaluation (always zero in this case by constructing) for the PCS opening + // Define the evaluation (always zero by construction in this case) for the PCS opening FF evaluation{ 0 }; if constexpr (Curve::is_stdlib_type) { // add builder if in circuit context auto builder = z_challenge.get_context();