From 96f4dae01ce0d79744dcde33957247a2c86e0c79 Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 28 Aug 2024 16:36:33 -0400 Subject: [PATCH 1/3] mac bb fixes --- barretenberg/cpp/src/barretenberg/aztec_ivc/aztec_ivc.cpp | 6 +++--- .../crypto/merkle_tree/lmdb_store/lmdb_environment.cpp | 4 ++-- .../barretenberg/ecc/scalar_multiplication/sorted_msm.cpp | 4 +++- .../barretenberg/honk/proof_system/permutation_library.hpp | 3 ++- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/barretenberg/cpp/src/barretenberg/aztec_ivc/aztec_ivc.cpp b/barretenberg/cpp/src/barretenberg/aztec_ivc/aztec_ivc.cpp index 98c960ac1257..8a36e3d18936 100644 --- a/barretenberg/cpp/src/barretenberg/aztec_ivc/aztec_ivc.cpp +++ b/barretenberg/cpp/src/barretenberg/aztec_ivc/aztec_ivc.cpp @@ -113,7 +113,7 @@ void AztecIVC::accumulate(ClientCircuit& circuit, const std::shared_ptrproof_data, instance_vk, QUEUE_TYPE::OINK); + verification_queue.push_back(bb::AztecIVC::RecursiveVerifierInputs {oink_prover.transcript->proof_data, instance_vk, QUEUE_TYPE::OINK}); initialized = true; } else { // Otherwise, fold the new instance into the accumulator @@ -121,7 +121,7 @@ void AztecIVC::accumulate(ClientCircuit& circuit, const std::shared_ptrverifier_accumulator, verifier_inst }); } -} // namespace bb \ No newline at end of file +} // namespace bb diff --git a/barretenberg/cpp/src/barretenberg/crypto/merkle_tree/lmdb_store/lmdb_environment.cpp b/barretenberg/cpp/src/barretenberg/crypto/merkle_tree/lmdb_store/lmdb_environment.cpp index 5350919c8f52..52f2ac8867cd 100644 --- a/barretenberg/cpp/src/barretenberg/crypto/merkle_tree/lmdb_store/lmdb_environment.cpp +++ b/barretenberg/cpp/src/barretenberg/crypto/merkle_tree/lmdb_store/lmdb_environment.cpp @@ -16,7 +16,7 @@ LMDBEnvironment::LMDBEnvironment(const std::string& directory, uint64_t totalMapSize = kb * mapSizeKB; uint32_t flags = MDB_NOTLS; try { - call_lmdb_func("mdb_env_set_mapsize", mdb_env_set_mapsize, _mdbEnv, totalMapSize); + call_lmdb_func("mdb_env_set_mapsize", mdb_env_set_mapsize, _mdbEnv, static_cast(totalMapSize)); call_lmdb_func("mdb_env_set_maxdbs", mdb_env_set_maxdbs, _mdbEnv, static_cast(maxNumDBs)); call_lmdb_func("mdb_env_set_maxreaders", mdb_env_set_maxreaders, _mdbEnv, maxNumReaders); call_lmdb_func("mdb_env_open", @@ -56,4 +56,4 @@ MDB_env* LMDBEnvironment::underlying() const { return _mdbEnv; } -} // namespace bb::crypto::merkle_tree \ No newline at end of file +} // namespace bb::crypto::merkle_tree diff --git a/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/sorted_msm.cpp b/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/sorted_msm.cpp index 9c51d6125c8f..b42e61a5b769 100644 --- a/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/sorted_msm.cpp +++ b/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/sorted_msm.cpp @@ -1,3 +1,5 @@ +#include +#include #include "barretenberg/ecc/scalar_multiplication/sorted_msm.hpp" namespace bb { @@ -215,4 +217,4 @@ template void MsmSorter::batched_affine_add_in_place(Add template class MsmSorter; template class MsmSorter; -} // namespace bb \ No newline at end of file +} // namespace bb diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/permutation_library.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/permutation_library.hpp index 5ef1cc1bbbd1..c33feb459124 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/permutation_library.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/permutation_library.hpp @@ -1,4 +1,5 @@ #pragma once +#include #include "barretenberg/common/ref_vector.hpp" #include "barretenberg/common/zip_view.hpp" #include "barretenberg/relations/relation_parameters.hpp" @@ -197,4 +198,4 @@ void compute_translator_range_constraint_ordered_polynomials(typename Flavor::Pr [](uint32_t in) { return FF(in); }); } -} // namespace bb \ No newline at end of file +} // namespace bb From f8d91734258817cc92cb873dbf817847f898359c Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 28 Aug 2024 21:19:01 +0000 Subject: [PATCH 2/3] format --- barretenberg/cpp/src/barretenberg/aztec_ivc/aztec_ivc.cpp | 6 ++++-- .../barretenberg/ecc/scalar_multiplication/sorted_msm.cpp | 2 +- .../barretenberg/honk/proof_system/permutation_library.hpp | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/barretenberg/cpp/src/barretenberg/aztec_ivc/aztec_ivc.cpp b/barretenberg/cpp/src/barretenberg/aztec_ivc/aztec_ivc.cpp index 8a36e3d18936..62b1975d1e55 100644 --- a/barretenberg/cpp/src/barretenberg/aztec_ivc/aztec_ivc.cpp +++ b/barretenberg/cpp/src/barretenberg/aztec_ivc/aztec_ivc.cpp @@ -113,7 +113,8 @@ void AztecIVC::accumulate(ClientCircuit& circuit, const std::shared_ptrproof_data, instance_vk, QUEUE_TYPE::OINK}); + verification_queue.push_back( + bb::AztecIVC::RecursiveVerifierInputs{ oink_prover.transcript->proof_data, instance_vk, QUEUE_TYPE::OINK }); initialized = true; } else { // Otherwise, fold the new instance into the accumulator @@ -121,7 +122,8 @@ void AztecIVC::accumulate(ClientCircuit& circuit, const std::shared_ptr #include -#include "barretenberg/ecc/scalar_multiplication/sorted_msm.hpp" namespace bb { diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/permutation_library.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/permutation_library.hpp index c33feb459124..d830b8fa1a52 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/permutation_library.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/permutation_library.hpp @@ -1,8 +1,8 @@ #pragma once -#include #include "barretenberg/common/ref_vector.hpp" #include "barretenberg/common/zip_view.hpp" #include "barretenberg/relations/relation_parameters.hpp" +#include #include namespace bb { From dd2539d925213afacca55e8824f551a1ed909d91 Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 28 Aug 2024 19:01:49 -0400 Subject: [PATCH 3/3] hotfix(ci): noir-packages-test timeout --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4117a343909..1f8205006c0c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -472,6 +472,7 @@ jobs: with: concurrency_key: noir-packages-x86 - name: "Test Noir JS packages" + timeout-minutes: 50 run: earthly-ci --no-output ./noir+packages-test noir-projects: