From b39008c18e0aa8b9e8b5c508f2ffdcbd3ab8fdab Mon Sep 17 00:00:00 2001 From: cheethas Date: Thu, 27 Apr 2023 14:49:33 +0000 Subject: [PATCH 1/4] fix: throw -> throw_or_abort in sol gen --- .../solidity_helpers/circuits/recursive_circuit.hpp | 6 +++--- cpp/src/barretenberg/solidity_helpers/proof_gen.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp b/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp index 077427af51..a6dcc0b87c 100644 --- a/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp +++ b/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp @@ -88,7 +88,7 @@ template class RecursiveCircuit { } auto native_result = native_verifier.verify_proof(recursive_proof); if (native_result == false) { - throw std::runtime_error("Native verification failed"); + throw_or_abort("Native verification failed"); } } @@ -122,13 +122,13 @@ template class RecursiveCircuit { P, circuit_output.verification_key->reference_string->get_precomputed_g2_lines(), 2); if (inner_proof_result != barretenberg::fq12::one()) { - throw std::runtime_error("inner proof result != 1"); + throw_or_abort("inner proof result != 1"); } circuit_output.aggregation_state.add_proof_outputs_as_public_inputs(); if (outer_composer.failed()) { - throw std::runtime_error("outer composer failed"); + throw_or_abort("outer composer failed"); } return outer_composer; diff --git a/cpp/src/barretenberg/solidity_helpers/proof_gen.cpp b/cpp/src/barretenberg/solidity_helpers/proof_gen.cpp index 1448597c32..4765895ec5 100644 --- a/cpp/src/barretenberg/solidity_helpers/proof_gen.cpp +++ b/cpp/src/barretenberg/solidity_helpers/proof_gen.cpp @@ -24,7 +24,7 @@ template void generate_proof(std::string s auto verifier = composer.create_ultra_with_keccak_verifier(); if (!verifier.verify_proof(proof)) { - throw std::runtime_error("Verification failed"); + throw_or_abort("Verification failed"); } std::string proof_bytes = bytes_to_hex_string(proof.proof_data); From 3a52359e419786dcf1ba11a01697f6f3dd5b1604 Mon Sep 17 00:00:00 2001 From: cheethas Date: Thu, 27 Apr 2023 15:00:49 +0000 Subject: [PATCH 2/4] toggle nix build --- .github/workflows/nix.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 40c37ad659..8e2cd5a223 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -1,9 +1,9 @@ name: Nix builds on: - push: - branches: - - master + push + # branches: + # - master schedule: - cron: "0 2 * * *" # run at 2 AM UTC workflow_dispatch: From de5b76ce62238d46b9271e882c4979413304cfa3 Mon Sep 17 00:00:00 2001 From: cheethas Date: Thu, 27 Apr 2023 15:02:01 +0000 Subject: [PATCH 3/4] fix: toggle nix build --- .github/workflows/nix.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 8e2cd5a223..f5e42b4a5f 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -1,9 +1,10 @@ name: Nix builds on: - push - # branches: - # - master + push: + branches: + - master + - md/* schedule: - cron: "0 2 * * *" # run at 2 AM UTC workflow_dispatch: From 269ff45cff81589acf5085baf06dc02bc6e962ba Mon Sep 17 00:00:00 2001 From: cheethas Date: Thu, 27 Apr 2023 15:21:57 +0000 Subject: [PATCH 4/4] chore: revert toggle --- .github/workflows/nix.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index f5e42b4a5f..40c37ad659 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -4,7 +4,6 @@ on: push: branches: - master - - md/* schedule: - cron: "0 2 * * *" # run at 2 AM UTC workflow_dispatch: