fix(bb): mac build (#8255)

AztecProtocol · Aug 29, 2024 · ac54f5c · ac54f5c
1 parent e03ea0b
commit ac54f5c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git 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
@@ -113,15 +113,17 @@ void AztecIVC::accumulate(ClientCircuit& circuit, const std::shared_ptr<Verifica
         fold_output.accumulator = prover_instance; // initialize the prover accum with the completed instance
 
         // Add oink proof and corresponding verification key to the verification queue
-        verification_queue.emplace_back(oink_prover.transcript->proof_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
         FoldingProver folding_prover({ fold_output.accumulator, prover_instance });
         fold_output = folding_prover.prove();
 
         // Add fold proof and corresponding verification key to the verification queue
-        verification_queue.emplace_back(fold_output.proof, instance_vk, QUEUE_TYPE::PG);
+        verification_queue.push_back(
+            bb::AztecIVC::RecursiveVerifierInputs{ fold_output.proof, instance_vk, QUEUE_TYPE::PG });
     }
 
     // Track the maximum size of each block for all circuits porcessed (for debugging purposes only)
@@ -201,4 +203,4 @@ bool AztecIVC::prove_and_verify()
     return verify(proof, { this->verifier_accumulator, verifier_inst });
 }
 
-} // namespace bb
+} // 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
@@ -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<size_t>(totalMapSize));
         call_lmdb_func("mdb_env_set_maxdbs", mdb_env_set_maxdbs, _mdbEnv, static_cast<MDB_dbi>(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
+} // 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
@@ -1,4 +1,6 @@
 #include "barretenberg/ecc/scalar_multiplication/sorted_msm.hpp"
+#include <algorithm>
+#include <execution>
 
 namespace bb {
 
@@ -215,4 +217,4 @@ template <typename Curve> void MsmSorter<Curve>::batched_affine_add_in_place(Add
 
 template class MsmSorter<curve::Grumpkin>;
 template class MsmSorter<curve::BN254>;
-} // namespace bb
+} // 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
@@ -2,6 +2,7 @@
 #include "barretenberg/common/ref_vector.hpp"
 #include "barretenberg/common/zip_view.hpp"
 #include "barretenberg/relations/relation_parameters.hpp"
+#include <execution>
 #include <typeinfo>
 
 namespace bb {
@@ -197,4 +198,4 @@ void compute_translator_range_constraint_ordered_polynomials(typename Flavor::Pr
                    [](uint32_t in) { return FF(in); });
 }
 
-} // namespace bb
+} // namespace bb