Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(bb): mac build #8255

Merged
merged 3 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 5 additions & 3 deletions barretenberg/cpp/src/barretenberg/aztec_ivc/aztec_ivc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -201,4 +203,4 @@ bool AztecIVC::prove_and_verify()
return verify(proof, { this->verifier_accumulator, verifier_inst });
}

} // namespace bb
} // namespace bb
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -56,4 +56,4 @@ MDB_env* LMDBEnvironment::underlying() const
{
return _mdbEnv;
}
} // namespace bb::crypto::merkle_tree
} // namespace bb::crypto::merkle_tree
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#include "barretenberg/ecc/scalar_multiplication/sorted_msm.hpp"
#include <algorithm>
#include <execution>

namespace bb {

Expand Down Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -197,4 +198,4 @@ void compute_translator_range_constraint_ordered_polynomials(typename Flavor::Pr
[](uint32_t in) { return FF(in); });
}

} // namespace bb
} // namespace bb
Loading