diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4117a34390..1f8205006c0 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: diff --git a/barretenberg/cpp/src/barretenberg/aztec_ivc/aztec_ivc.cpp b/barretenberg/cpp/src/barretenberg/aztec_ivc/aztec_ivc.cpp index 98c960ac125..62b1975d1e5 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_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 5350919c8f5..52f2ac8867c 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 9c51d6125c8..b295604904e 100644 --- a/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/sorted_msm.cpp +++ b/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/sorted_msm.cpp @@ -1,4 +1,6 @@ #include "barretenberg/ecc/scalar_multiplication/sorted_msm.hpp" +#include +#include 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 5ef1cc1bbbd..d830b8fa1a5 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/permutation_library.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/permutation_library.hpp @@ -2,6 +2,7 @@ #include "barretenberg/common/ref_vector.hpp" #include "barretenberg/common/zip_view.hpp" #include "barretenberg/relations/relation_parameters.hpp" +#include #include namespace bb { @@ -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