)->/* vary the circuit size */ DenseRange(14, 20)->Unit(kMillisecond);
} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_rounds_bench/protogalaxy_rounds.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_rounds_bench/protogalaxy_rounds.bench.cpp
index 70ce12e3aab..1266c029abb 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_rounds_bench/protogalaxy_rounds.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_rounds_bench/protogalaxy_rounds.bench.cpp
@@ -51,10 +51,9 @@ void bench_round_ultra(::benchmark::State& state, void (*F)(ProtoGalaxyProver_(state, F);
}
-void bench_round_goblin_ultra(::benchmark::State& state,
- void (*F)(ProtoGalaxyProver_>&))
+void bench_round_mega(::benchmark::State& state, void (*F)(ProtoGalaxyProver_>&))
{
- _bench_round(state, F);
+ _bench_round(state, F);
}
BENCHMARK_CAPTURE(bench_round_ultra, preparation, [](auto& prover) { prover.preparation_round(); })
@@ -66,13 +65,13 @@ BENCHMARK_CAPTURE(bench_round_ultra, combiner_quotient, [](auto& prover) { prove
BENCHMARK_CAPTURE(bench_round_ultra, accumulator_update, [](auto& prover) { prover.accumulator_update_round(); })
-> DenseRange(14, 20) -> Unit(kMillisecond);
-BENCHMARK_CAPTURE(bench_round_goblin_ultra, preparation, [](auto& prover) { prover.preparation_round(); })
+BENCHMARK_CAPTURE(bench_round_mega, preparation, [](auto& prover) { prover.preparation_round(); }) -> DenseRange(14, 20)
+ -> Unit(kMillisecond);
+BENCHMARK_CAPTURE(bench_round_mega, perturbator, [](auto& prover) { prover.perturbator_round(); }) -> DenseRange(14, 20)
+ -> Unit(kMillisecond);
+BENCHMARK_CAPTURE(bench_round_mega, combiner_quotient, [](auto& prover) { prover.combiner_quotient_round(); })
-> DenseRange(14, 20) -> Unit(kMillisecond);
-BENCHMARK_CAPTURE(bench_round_goblin_ultra, perturbator, [](auto& prover) { prover.perturbator_round(); })
- -> DenseRange(14, 20) -> Unit(kMillisecond);
-BENCHMARK_CAPTURE(bench_round_goblin_ultra, combiner_quotient, [](auto& prover) { prover.combiner_quotient_round(); })
- -> DenseRange(14, 20) -> Unit(kMillisecond);
-BENCHMARK_CAPTURE(bench_round_goblin_ultra, accumulator_update, [](auto& prover) { prover.accumulator_update_round(); })
+BENCHMARK_CAPTURE(bench_round_mega, accumulator_update, [](auto& prover) { prover.accumulator_update_round(); })
-> DenseRange(14, 20) -> Unit(kMillisecond);
} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp
index 0ad1bcc8490..a1877668a7f 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp
@@ -1,6 +1,6 @@
#include "barretenberg/eccvm/eccvm_flavor.hpp"
#include "barretenberg/protogalaxy/protogalaxy_prover.hpp"
-#include "barretenberg/stdlib_circuit_builders/goblin_ultra_flavor.hpp"
+#include "barretenberg/stdlib_circuit_builders/mega_flavor.hpp"
#include "barretenberg/stdlib_circuit_builders/ultra_flavor.hpp"
#include "barretenberg/translator_vm/translator_flavor.hpp"
#include
@@ -69,10 +69,10 @@ BENCHMARK(execute_relation_for_pg_univariates>);
BENCHMARK(execute_relation_for_pg_univariates>);
// Goblin-Ultra only relations (PG prover combiner work)
-BENCHMARK(execute_relation_for_pg_univariates>);
-BENCHMARK(execute_relation_for_pg_univariates>);
-BENCHMARK(execute_relation_for_pg_univariates>);
-BENCHMARK(execute_relation_for_pg_univariates>);
+BENCHMARK(execute_relation_for_pg_univariates>);
+BENCHMARK(execute_relation_for_pg_univariates>);
+BENCHMARK(execute_relation_for_pg_univariates>);
+BENCHMARK(execute_relation_for_pg_univariates>);
// Ultra relations (Sumcheck prover work)
BENCHMARK(execute_relation_for_univariates>);
@@ -83,10 +83,10 @@ BENCHMARK(execute_relation_for_univariates>);
BENCHMARK(execute_relation_for_univariates>);
// Goblin-Ultra only relations (Sumcheck prover work)
-BENCHMARK(execute_relation_for_univariates>);
-BENCHMARK(execute_relation_for_univariates>);
-BENCHMARK(execute_relation_for_univariates>);
-BENCHMARK(execute_relation_for_univariates>);
+BENCHMARK(execute_relation_for_univariates>);
+BENCHMARK(execute_relation_for_univariates>);
+BENCHMARK(execute_relation_for_univariates>);
+BENCHMARK(execute_relation_for_univariates>);
// Ultra relations (verifier work)
BENCHMARK(execute_relation_for_values>);
@@ -97,10 +97,10 @@ BENCHMARK(execute_relation_for_values>);
BENCHMARK(execute_relation_for_values>);
// Goblin-Ultra only relations (verifier work)
-BENCHMARK(execute_relation_for_values>);
-BENCHMARK(execute_relation_for_values>);
-BENCHMARK(execute_relation_for_values>);
-BENCHMARK(execute_relation_for_values>);
+BENCHMARK(execute_relation_for_values>);
+BENCHMARK(execute_relation_for_values>);
+BENCHMARK(execute_relation_for_values>);
+BENCHMARK(execute_relation_for_values>);
// Translator VM
BENCHMARK(execute_relation_for_values>);
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/simulator_bench/simulator.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/simulator_bench/simulator.bench.cpp
index a8aee11c099..135f8b46ca0 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/simulator_bench/simulator.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/simulator_bench/simulator.bench.cpp
@@ -28,7 +28,7 @@ template class SimulatorFixture : public benchmark::F
}
/**
- * @brief Create a Honk proof (either Ultra or GoblinUltra) for a non-trivial circuit.
+ * @brief Create a Honk proof (either Ultra or Mega) for a non-trivial circuit.
*
* @param large determines whether the circuit is 2^17 or 2^19
*/
@@ -83,7 +83,7 @@ template class SimulatorFixture : public benchmark::F
}
};
-BENCHMARK_TEMPLATE_F(SimulatorFixture, GoblinNative, bb::GoblinUltraRecursiveFlavor_)
+BENCHMARK_TEMPLATE_F(SimulatorFixture, GoblinNative, bb::MegaRecursiveFlavor_)
(benchmark::State& state)
{
auto verifier_input = SimulatorFixture::create_proof();
@@ -93,7 +93,7 @@ BENCHMARK_TEMPLATE_F(SimulatorFixture, GoblinNative, bb::GoblinUltraRecursiveFla
}
}
-BENCHMARK_TEMPLATE_F(SimulatorFixture, GoblinSimulated, bb::GoblinUltraRecursiveFlavor_)
+BENCHMARK_TEMPLATE_F(SimulatorFixture, GoblinSimulated, bb::MegaRecursiveFlavor_)
(benchmark::State& state)
{
auto verifier_input = SimulatorFixture::create_proof();
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/goblin_ultra_honk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/mega_honk.bench.cpp
similarity index 54%
rename from barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/goblin_ultra_honk.bench.cpp
rename to barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/mega_honk.bench.cpp
index f0b1ca9142c..57ed50a6da3 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/goblin_ultra_honk.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/mega_honk.bench.cpp
@@ -1,7 +1,7 @@
#include
#include "barretenberg/benchmark/ultra_bench/mock_circuits.hpp"
-#include "barretenberg/stdlib_circuit_builders/goblin_ultra_circuit_builder.hpp"
+#include "barretenberg/stdlib_circuit_builders/mega_circuit_builder.hpp"
using namespace benchmark;
using namespace bb;
@@ -9,43 +9,38 @@ using namespace bb;
/**
* @brief Benchmark: Construction of a Ultra Honk proof for a circuit determined by the provided circuit function
*/
-static void construct_proof_goblinultrahonk(State& state,
- void (*test_circuit_function)(GoblinUltraCircuitBuilder&, size_t)) noexcept
+static void construct_proof_megahonk(State& state, void (*test_circuit_function)(MegaCircuitBuilder&, size_t)) noexcept
{
size_t num_iterations = 10; // 10x the circuit
- bb::mock_circuits::construct_proof_with_specified_num_iterations(
+ bb::mock_circuits::construct_proof_with_specified_num_iterations(
state, test_circuit_function, num_iterations);
}
/**
* @brief Benchmark: Construction of a Ultra Plonk proof with 2**n gates
*/
-static void construct_proof_goblinultrahonk_power_of_2(State& state) noexcept
+static void construct_proof_megahonk_power_of_2(State& state) noexcept
{
auto log2_of_gates = static_cast(state.range(0));
- bb::mock_circuits::construct_proof_with_specified_num_iterations(
- state, &bb::mock_circuits::generate_basic_arithmetic_circuit, log2_of_gates);
+ bb::mock_circuits::construct_proof_with_specified_num_iterations(
+ state, &bb::mock_circuits::generate_basic_arithmetic_circuit, log2_of_gates);
}
// Define benchmarks
-BENCHMARK_CAPTURE(construct_proof_goblinultrahonk,
- sha256,
- &stdlib::generate_sha256_test_circuit)
+BENCHMARK_CAPTURE(construct_proof_megahonk, sha256, &stdlib::generate_sha256_test_circuit)
->Unit(kMillisecond);
-BENCHMARK_CAPTURE(construct_proof_goblinultrahonk,
- keccak,
- &stdlib::generate_keccak_test_circuit)
+BENCHMARK_CAPTURE(construct_proof_megahonk, keccak, &stdlib::generate_keccak_test_circuit)
->Unit(kMillisecond);
-BENCHMARK_CAPTURE(construct_proof_goblinultrahonk,
+BENCHMARK_CAPTURE(construct_proof_megahonk,
ecdsa_verification,
- &stdlib::generate_ecdsa_verification_test_circuit)
+ &stdlib::generate_ecdsa_verification_test_circuit)
->Unit(kMillisecond);
-BENCHMARK_CAPTURE(construct_proof_goblinultrahonk,
+BENCHMARK_CAPTURE(construct_proof_megahonk,
merkle_membership,
- &stdlib::generate_merkle_membership_test_circuit)
+ &stdlib::generate_merkle_membership_test_circuit)
->Unit(kMillisecond);
-BENCHMARK(construct_proof_goblinultrahonk_power_of_2)
+BENCHMARK(construct_proof_megahonk_power_of_2)
// 2**15 gates to 2**20 gates
->DenseRange(15, 20)
->Unit(kMillisecond);
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk_rounds.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk_rounds.bench.cpp
index f113305191c..2d8cbe748e3 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk_rounds.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk_rounds.bench.cpp
@@ -30,7 +30,7 @@ enum {
* @param prover - The Goblin ultrahonk prover.
* @param index - The pass to measure.
**/
-BB_PROFILE static void test_round_inner(State& state, GoblinUltraProver& prover, size_t index) noexcept
+BB_PROFILE static void test_round_inner(State& state, MegaProver& prover, size_t index) noexcept
{
auto time_if_index = [&](size_t target_index, auto&& func) -> void {
BB_REPORT_OP_COUNT_IN_BENCH(state);
@@ -46,7 +46,7 @@ BB_PROFILE static void test_round_inner(State& state, GoblinUltraProver& prover,
BB_REPORT_OP_COUNT_BENCH_CANCEL();
}
};
- OinkProver oink_prover(prover.instance->proving_key, prover.transcript);
+ OinkProver oink_prover(prover.instance->proving_key, prover.transcript);
time_if_index(PREAMBLE, [&] { oink_prover.execute_preamble_round(); });
time_if_index(WIRE_COMMITMENTS, [&] { oink_prover.execute_wire_commitments_round(); });
time_if_index(SORTED_LIST_ACCUMULATOR, [&] { oink_prover.execute_sorted_list_accumulator_round(); });
@@ -58,7 +58,7 @@ BB_PROFILE static void test_round_inner(State& state, GoblinUltraProver& prover,
prover.generate_gate_challenges();
- DeciderProver_ decider_prover(prover.instance, prover.transcript);
+ DeciderProver_ decider_prover(prover.instance, prover.transcript);
time_if_index(RELATION_CHECK, [&] { decider_prover.execute_relation_check_rounds(); });
time_if_index(ZEROMORPH, [&] { decider_prover.execute_zeromorph_rounds(); });
}
@@ -68,8 +68,8 @@ BB_PROFILE static void test_round(State& state, size_t index) noexcept
bb::srs::init_crs_factory("../srs_db/ignition");
// TODO(https://github.com/AztecProtocol/barretenberg/issues/761) benchmark both sparse and dense circuits
- auto prover = bb::mock_circuits::get_prover(
- &bb::mock_circuits::generate_basic_arithmetic_circuit, log2_num_gates);
+ auto prover = bb::mock_circuits::get_prover(
+ &bb::mock_circuits::generate_basic_arithmetic_circuit, log2_num_gates);
for (auto _ : state) {
state.PauseTiming();
test_round_inner(state, prover, index);
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/widgets_bench/widget.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/widgets_bench/widget.bench.cpp
index 85244ace0cb..2967a8bf7a6 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/widgets_bench/widget.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/widgets_bench/widget.bench.cpp
@@ -7,7 +7,7 @@
#include "barretenberg/plonk/proof_system/widgets/transition_widgets/genperm_sort_widget.hpp"
#include "barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_arithmetic_widget.hpp"
#include "barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_auxiliary_widget.hpp"
-#include "barretenberg/stdlib_circuit_builders/goblin_ultra_flavor.hpp"
+#include "barretenberg/stdlib_circuit_builders/mega_flavor.hpp"
#include "barretenberg/stdlib_circuit_builders/ultra_flavor.hpp"
// The widgets are implemented in a non-uniform way where the transition widgets provide a per-row execution function
diff --git a/barretenberg/cpp/src/barretenberg/circuit_checker/circuit_checker.hpp b/barretenberg/cpp/src/barretenberg/circuit_checker/circuit_checker.hpp
index 9bec19411a5..5b619776f3a 100644
--- a/barretenberg/cpp/src/barretenberg/circuit_checker/circuit_checker.hpp
+++ b/barretenberg/cpp/src/barretenberg/circuit_checker/circuit_checker.hpp
@@ -12,7 +12,7 @@ concept IsCheckable = bb::IsAnyOf,
StandardCircuitBuilder_,
UltraCircuitBuilder,
- GoblinUltraCircuitBuilder,
+ MegaCircuitBuilder,
CircuitSimulatorBN254>;
/**
@@ -24,7 +24,7 @@ class CircuitChecker {
template static bool check(const Builder& builder)
{
static_assert(IsCheckable);
- if constexpr (IsUltraBuilder || IsGoblinUltraBuilder) {
+ if constexpr (IsUltraBuilder || IsMegaBuilder) {
return UltraCircuitChecker::check(builder);
} else if constexpr (IsStandardBuilder) {
return StandardCircuitChecker::check(builder);
diff --git a/barretenberg/cpp/src/barretenberg/circuit_checker/goblin_ultra_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/circuit_checker/mega_circuit_builder.test.cpp
similarity index 90%
rename from barretenberg/cpp/src/barretenberg/circuit_checker/goblin_ultra_circuit_builder.test.cpp
rename to barretenberg/cpp/src/barretenberg/circuit_checker/mega_circuit_builder.test.cpp
index 3366b4d6c40..ef237747ee0 100644
--- a/barretenberg/cpp/src/barretenberg/circuit_checker/goblin_ultra_circuit_builder.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/circuit_checker/mega_circuit_builder.test.cpp
@@ -1,4 +1,4 @@
-#include "barretenberg/stdlib_circuit_builders/goblin_ultra_circuit_builder.hpp"
+#include "barretenberg/stdlib_circuit_builders/mega_circuit_builder.hpp"
#include "barretenberg/circuit_checker/circuit_checker.hpp"
#include "barretenberg/stdlib/primitives/bigfield/constants.hpp"
#include
@@ -10,9 +10,9 @@ auto& engine = numeric::get_debug_randomness();
}
namespace bb {
-TEST(GoblinUltraCircuitBuilder, CopyConstructor)
+TEST(MegaCircuitBuilder, CopyConstructor)
{
- GoblinUltraCircuitBuilder circuit_constructor = GoblinUltraCircuitBuilder();
+ MegaCircuitBuilder circuit_constructor = MegaCircuitBuilder();
fr a = fr::one();
circuit_constructor.add_public_variable(a);
@@ -44,15 +44,15 @@ TEST(GoblinUltraCircuitBuilder, CopyConstructor)
bool result = CircuitChecker::check(circuit_constructor);
EXPECT_EQ(result, true);
- GoblinUltraCircuitBuilder duplicate_circuit_constructor{ circuit_constructor };
+ MegaCircuitBuilder duplicate_circuit_constructor{ circuit_constructor };
EXPECT_EQ(duplicate_circuit_constructor, circuit_constructor);
EXPECT_TRUE(CircuitChecker::check(duplicate_circuit_constructor));
}
-TEST(GoblinUltraCircuitBuilder, BaseCase)
+TEST(MegaCircuitBuilder, BaseCase)
{
- GoblinUltraCircuitBuilder circuit_constructor = GoblinUltraCircuitBuilder();
+ MegaCircuitBuilder circuit_constructor = MegaCircuitBuilder();
fr a = fr::one();
circuit_constructor.add_public_variable(a);
bool result = CircuitChecker::check(circuit_constructor);
@@ -66,11 +66,11 @@ TEST(GoblinUltraCircuitBuilder, BaseCase)
* encoded in the op_wires, i.e. the operands can be reconstructed as expected.
*
*/
-TEST(GoblinUltraCircuitBuilder, GoblinSimple)
+TEST(MegaCircuitBuilder, GoblinSimple)
{
const size_t CHUNK_SIZE = stdlib::NUM_LIMB_BITS_IN_FIELD_SIMULATION * 2;
- auto builder = GoblinUltraCircuitBuilder();
+ auto builder = MegaCircuitBuilder();
// Compute a simple point accumulation natively
auto P1 = g1::affine_element::random_element();
@@ -132,10 +132,10 @@ TEST(GoblinUltraCircuitBuilder, GoblinSimple)
* @brief Check that the ultra ops are recorded correctly in the EccOpQueue
*
*/
-TEST(GoblinUltraCircuitBuilder, GoblinEccOpQueueUltraOps)
+TEST(MegaCircuitBuilder, GoblinEccOpQueueUltraOps)
{
// Construct a simple circuit with op gates
- auto builder = GoblinUltraCircuitBuilder();
+ auto builder = MegaCircuitBuilder();
// Compute a simple point accumulation natively
auto P1 = g1::affine_element::random_element();
diff --git a/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_checker.cpp b/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_checker.cpp
index 0e647d603c5..e213801cb22 100644
--- a/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_checker.cpp
+++ b/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_checker.cpp
@@ -1,5 +1,5 @@
#include "ultra_circuit_checker.hpp"
-#include "barretenberg/stdlib_circuit_builders/goblin_ultra_flavor.hpp"
+#include "barretenberg/stdlib_circuit_builders/mega_flavor.hpp"
#include
#include
@@ -10,9 +10,9 @@ template <> auto UltraCircuitChecker::init_empty_values auto UltraCircuitChecker::init_empty_values>()
+template <> auto UltraCircuitChecker::init_empty_values>()
{
- return GoblinUltraFlavor::AllValues{};
+ return MegaFlavor::AllValues{};
}
template bool UltraCircuitChecker::check(const Builder& builder_in)
@@ -102,7 +102,7 @@ bool UltraCircuitChecker::check_block(Builder& builder,
info("Failed Lookup check relation at row idx = ", idx);
return false;
}
- if constexpr (IsGoblinUltraBuilder) {
+ if constexpr (IsMegaBuilder) {
result = result && check_relation(values, params);
if (result == false) {
info("Failed PoseidonInternal relation at row idx = ", idx);
@@ -285,7 +285,7 @@ void UltraCircuitChecker::populate_values(
values.q_elliptic = block.q_elliptic()[idx];
values.q_aux = block.q_aux()[idx];
values.q_lookup = block.q_lookup_type()[idx];
- if constexpr (IsGoblinUltraBuilder) {
+ if constexpr (IsMegaBuilder) {
values.q_busread = block.q_busread()[idx];
values.q_poseidon2_internal = block.q_poseidon2_internal()[idx];
values.q_poseidon2_external = block.q_poseidon2_external()[idx];
@@ -295,6 +295,5 @@ void UltraCircuitChecker::populate_values(
// Template method instantiations for each check method
template bool UltraCircuitChecker::check>>(
const UltraCircuitBuilder_>& builder_in);
-template bool UltraCircuitChecker::check>(
- const GoblinUltraCircuitBuilder_& builder_in);
+template bool UltraCircuitChecker::check>(const MegaCircuitBuilder_& builder_in);
} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_checker.hpp b/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_checker.hpp
index 30a8ca708fd..0201c6fdf1c 100644
--- a/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_checker.hpp
+++ b/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_checker.hpp
@@ -102,7 +102,7 @@ class UltraCircuitChecker {
/**
* @brief Helper for initializing an empty AllValues container of the right Flavor based on Builder
* @details We construct a Flavor::AllValues object from each row of circuit data so that we can use the Relations
- * to check correctness. UltraFlavor is used for the Ultra builder and GoblinUltraFlavor is used for the GoblinUltra
+ * to check correctness. UltraFlavor is used for the Ultra builder and MegaFlavor is used for the Mega
* builder
*
* @tparam Builder
diff --git a/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.cpp b/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.cpp
index 71b2ef0f9dd..5f7df7163c3 100644
--- a/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.cpp
+++ b/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.cpp
@@ -83,7 +83,7 @@ bool ClientIVC::verify(Proof& proof, const std::vector;
using ProverInstance = ProverInstance_;
using VerifierInstance = VerifierInstance_;
- using ClientCircuit = GoblinUltraCircuitBuilder; // can only be GoblinUltra
+ using ClientCircuit = MegaCircuitBuilder; // can only be Mega
using DeciderProver = DeciderProver_;
using DeciderVerifier = DeciderVerifier_;
using ProverInstances = ProverInstances_;
@@ -33,7 +33,7 @@ class ClientIVC {
using VerifierInstances = VerifierInstances_;
using FoldingVerifier = ProtoGalaxyVerifier_;
- using GURecursiveFlavor = GoblinUltraRecursiveFlavor_;
+ using GURecursiveFlavor = MegaRecursiveFlavor_;
using RecursiveVerifierInstances = bb::stdlib::recursion::honk::RecursiveVerifierInstances_;
using FoldingRecursiveVerifier =
bb::stdlib::recursion::honk::ProtoGalaxyRecursiveVerifier_;
diff --git a/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.test.cpp b/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.test.cpp
index ee6ce59f760..8ad78f0ac0b 100644
--- a/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.test.cpp
@@ -1,7 +1,7 @@
#include "barretenberg/client_ivc/client_ivc.hpp"
#include "barretenberg/goblin/goblin.hpp"
#include "barretenberg/goblin/mock_circuits.hpp"
-#include "barretenberg/stdlib_circuit_builders/goblin_ultra_circuit_builder.hpp"
+#include "barretenberg/stdlib_circuit_builders/mega_circuit_builder.hpp"
#include "barretenberg/stdlib_circuit_builders/ultra_circuit_builder.hpp"
#include
@@ -56,7 +56,7 @@ class ClientIVCTests : public ::testing::Test {
// TODO(https://github.com/AztecProtocol/barretenberg/issues/911): We require goblin ops to be added to the
// function circuit because we cannot support zero commtiments. While the builder handles this at
- // finalisation stage via the add_gates_to_ensure_all_polys_are_non_zero function for other UGH
+ // finalisation stage via the add_gates_to_ensure_all_polys_are_non_zero function for other MegaHonk
// circuits (where we don't explicitly need to add goblin ops), in ClientIVC merge proving happens prior to
// folding where the absense of goblin ecc ops will result in zero commitments.
MockCircuits::construct_goblin_ecc_op_circuit(circuit);
diff --git a/barretenberg/cpp/src/barretenberg/client_ivc/mock_kernel_pinning.test.cpp b/barretenberg/cpp/src/barretenberg/client_ivc/mock_kernel_pinning.test.cpp
index bb11e2cc670..b19261d153a 100644
--- a/barretenberg/cpp/src/barretenberg/client_ivc/mock_kernel_pinning.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/client_ivc/mock_kernel_pinning.test.cpp
@@ -1,6 +1,6 @@
#include "barretenberg/client_ivc/client_ivc.hpp"
#include "barretenberg/goblin/mock_circuits.hpp"
-#include "barretenberg/stdlib_circuit_builders/goblin_ultra_circuit_builder.hpp"
+#include "barretenberg/stdlib_circuit_builders/mega_circuit_builder.hpp"
#include
@@ -13,7 +13,7 @@ using namespace bb;
*/
class MockKernelTest : public ::testing::Test {
public:
- using Builder = GoblinUltraCircuitBuilder;
+ using Builder = MegaCircuitBuilder;
protected:
static void SetUpTestSuite() { srs::init_crs_factory("../srs_db/ignition"); }
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp
index b61834c593e..878920afdb0 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp
@@ -1,13 +1,13 @@
#include "acir_format.hpp"
#include "barretenberg/common/log.hpp"
-#include "barretenberg/stdlib_circuit_builders/goblin_ultra_circuit_builder.hpp"
+#include "barretenberg/stdlib_circuit_builders/mega_circuit_builder.hpp"
#include "barretenberg/stdlib_circuit_builders/ultra_circuit_builder.hpp"
#include
namespace acir_format {
template class DSLBigInts;
-template class DSLBigInts;
+template class DSLBigInts;
template
void build_constraints(Builder& builder,
@@ -122,9 +122,9 @@ void build_constraints(Builder& builder,
}
// RecursionConstraint
- // TODO(https://github.com/AztecProtocol/barretenberg/issues/817): disable these for UGH for now since we're not yet
- // dealing with proper recursion
- if constexpr (IsGoblinUltraBuilder) {
+ // TODO(https://github.com/AztecProtocol/barretenberg/issues/817): disable these for MegaHonk for now since we're
+ // not yet dealing with proper recursion
+ if constexpr (IsMegaBuilder) {
if (!constraint_system.recursion_constraints.empty()) {
info("WARNING: this circuit contains recursion_constraints!");
}
@@ -212,9 +212,9 @@ void build_constraints(Builder& builder,
}
// HonkRecursionConstraint
- // TODO(https://github.com/AztecProtocol/barretenberg/issues/817): disable these for UGH for now since we're not yet
- // dealing with proper recursion
- if constexpr (IsGoblinUltraBuilder) {
+ // TODO(https://github.com/AztecProtocol/barretenberg/issues/817): disable these for MegaHonk for now since we're
+ // not yet dealing with proper recursion
+ if constexpr (IsMegaBuilder) {
if (!constraint_system.honk_recursion_constraints.empty()) {
info("WARNING: this circuit contains honk_recursion_constraints!");
}
@@ -353,7 +353,7 @@ UltraCircuitBuilder create_circuit(const AcirFormat& constraint_system,
};
/**
- * @brief Specialization for creating GoblinUltra circuit from acir constraints and optionally a witness
+ * @brief Specialization for creating Mega circuit from acir constraints and optionally a witness
*
* @tparam Builder
* @param constraint_system
@@ -362,15 +362,14 @@ UltraCircuitBuilder create_circuit(const AcirFormat& constraint_system,
* @return Builder
*/
template <>
-GoblinUltraCircuitBuilder create_circuit(const AcirFormat& constraint_system,
- [[maybe_unused]] size_t size_hint,
- WitnessVector const& witness,
- bool honk_recursion)
+MegaCircuitBuilder create_circuit(const AcirFormat& constraint_system,
+ [[maybe_unused]] size_t size_hint,
+ WitnessVector const& witness,
+ bool honk_recursion)
{
// Construct a builder using the witness and public input data from acir and with the goblin-owned op_queue
auto op_queue = std::make_shared(); // instantiate empty op_queue
- auto builder =
- GoblinUltraCircuitBuilder{ op_queue, witness, constraint_system.public_inputs, constraint_system.varnum };
+ auto builder = MegaCircuitBuilder{ op_queue, witness, constraint_system.public_inputs, constraint_system.varnum };
// Populate constraints in the builder via the data in constraint_system
bool has_valid_witness_assignments = !witness.empty();
@@ -379,6 +378,6 @@ GoblinUltraCircuitBuilder create_circuit(const AcirFormat& constraint_system,
return builder;
};
-template void build_constraints(GoblinUltraCircuitBuilder&, AcirFormat const&, bool, bool);
+template void build_constraints(MegaCircuitBuilder&, AcirFormat const&, bool, bool);
} // namespace acir_format
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_integration.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_integration.test.cpp
index 81c02043a28..e54a29eb238 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_integration.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_integration.test.cpp
@@ -80,7 +80,7 @@ class AcirIntegrationFoldingTest : public AcirIntegrationTest, public testing::W
TEST_P(AcirIntegrationSingleTest, ProveAndVerifyProgram)
{
- using Flavor = GoblinUltraFlavor;
+ using Flavor = MegaFlavor;
using Builder = Flavor::CircuitBuilder;
std::string test_name = GetParam();
@@ -301,7 +301,7 @@ INSTANTIATE_TEST_SUITE_P(AcirTests,
TEST_P(AcirIntegrationFoldingTest, ProveAndVerifyProgramStack)
{
- using Flavor = GoblinUltraFlavor;
+ using Flavor = MegaFlavor;
using Builder = Flavor::CircuitBuilder;
std::string test_name = GetParam();
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.cpp
index 51c554489e8..6756d17f132 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.cpp
@@ -432,7 +432,7 @@ BlockConstraint handle_memory_init(Program::Opcode::MemoryInit const& mem_init)
}
// Databus is only supported for Goblin, non Goblin builders will treat call_data and return_data as normal array.
- if (IsGoblinUltraBuilder) {
+ if (IsMegaBuilder) {
if (std::holds_alternative(mem_init.block_type.value)) {
block.type = BlockType::CallData;
} else if (std::holds_alternative(mem_init.block_type.value)) {
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/aes128_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/aes128_constraint.cpp
index 48777aa8136..41169d1f614 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/aes128_constraint.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/aes128_constraint.cpp
@@ -71,7 +71,7 @@ template void create_aes128_constraints(Builder& builder, con
template void create_aes128_constraints(UltraCircuitBuilder& builder,
const AES128Constraint& constraint);
-template void create_aes128_constraints(GoblinUltraCircuitBuilder& builder,
- const AES128Constraint& constraint);
+template void create_aes128_constraints(MegaCircuitBuilder& builder,
+ const AES128Constraint& constraint);
} // namespace acir_format
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.cpp
index b97ff7db265..1a7813e085a 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.cpp
@@ -41,28 +41,27 @@ ModulusId modulus_param_to_id(ModulusParam param)
template void create_bigint_operations_constraint(const BigIntOperation& input,
DSLBigInts& dsl_bigint,
bool has_valid_witness_assignments);
-template void create_bigint_operations_constraint(
- const BigIntOperation& input,
- DSLBigInts& dsl_bigint,
- bool has_valid_witness_assignments);
+template void create_bigint_operations_constraint(const BigIntOperation& input,
+ DSLBigInts& dsl_bigint,
+ bool has_valid_witness_assignments);
template void create_bigint_addition_constraint(const BigIntOperation& input,
DSLBigInts& dsl_bigint);
-template void create_bigint_addition_constraint(
- const BigIntOperation& input, DSLBigInts& dsl_bigint);
+template void create_bigint_addition_constraint(const BigIntOperation& input,
+ DSLBigInts& dsl_bigint);
template void create_bigint_sub_constraint(const BigIntOperation& input,
DSLBigInts& dsl_bigint);
-template void create_bigint_sub_constraint(
- const BigIntOperation& input, DSLBigInts& dsl_bigint);
+template void create_bigint_sub_constraint(const BigIntOperation& input,
+ DSLBigInts& dsl_bigint);
template void create_bigint_mul_constraint(const BigIntOperation& input,
DSLBigInts& dsl_bigint);
-template void create_bigint_mul_constraint(
- const BigIntOperation& input, DSLBigInts& dsl_bigint);
+template void create_bigint_mul_constraint(const BigIntOperation& input,
+ DSLBigInts& dsl_bigint);
template void create_bigint_div_constraint(const BigIntOperation& input,
DSLBigInts& dsl_bigint,
bool has_valid_witness_assignments);
-template void create_bigint_div_constraint(const BigIntOperation& input,
- DSLBigInts& dsl_bigint,
- bool has_valid_witness_assignments);
+template void create_bigint_div_constraint(const BigIntOperation& input,
+ DSLBigInts& dsl_bigint,
+ bool has_valid_witness_assignments);
template
void create_bigint_addition_constraint(const BigIntOperation& input, DSLBigInts& dsl_bigint)
@@ -457,17 +456,15 @@ void create_bigint_to_le_bytes_constraint(Builder& builder,
template void create_bigint_from_le_bytes_constraint(UltraCircuitBuilder& builder,
const BigIntFromLeBytes& input,
DSLBigInts& dsl_bigints);
-template void create_bigint_from_le_bytes_constraint(
- GoblinUltraCircuitBuilder& builder,
- const BigIntFromLeBytes& input,
- DSLBigInts& dsl_bigints);
+template void create_bigint_from_le_bytes_constraint(MegaCircuitBuilder& builder,
+ const BigIntFromLeBytes& input,
+ DSLBigInts& dsl_bigints);
template void create_bigint_to_le_bytes_constraint(UltraCircuitBuilder& builder,
const BigIntToLeBytes& input,
DSLBigInts& dsl_bigints);
-template void create_bigint_to_le_bytes_constraint(
- GoblinUltraCircuitBuilder& builder,
- const BigIntToLeBytes& input,
- DSLBigInts& dsl_bigints);
+template void create_bigint_to_le_bytes_constraint(MegaCircuitBuilder& builder,
+ const BigIntToLeBytes& input,
+ DSLBigInts& dsl_bigints);
} // namespace acir_format
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.cpp
index 7b7553d30d5..d1446231482 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.cpp
@@ -38,7 +38,7 @@ template void create_blake2s_constraints(Builder& builder, co
template void create_blake2s_constraints(UltraCircuitBuilder& builder,
const Blake2sConstraint& constraint);
-template void create_blake2s_constraints(GoblinUltraCircuitBuilder& builder,
- const Blake2sConstraint& constraint);
+template void create_blake2s_constraints(MegaCircuitBuilder& builder,
+ const Blake2sConstraint& constraint);
} // namespace acir_format
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake3_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake3_constraint.cpp
index 45bcb6c89c8..9771efc2421 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake3_constraint.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake3_constraint.cpp
@@ -38,7 +38,7 @@ template void create_blake3_constraints(Builder& builder, con
template void create_blake3_constraints(UltraCircuitBuilder& builder,
const Blake3Constraint& constraint);
-template void create_blake3_constraints(GoblinUltraCircuitBuilder& builder,
- const Blake3Constraint& constraint);
+template void create_blake3_constraints(MegaCircuitBuilder& builder,
+ const Blake3Constraint& constraint);
} // namespace acir_format
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp
index af567e63b96..bb97cb2c4df 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp
@@ -79,7 +79,7 @@ void create_block_constraints(Builder& builder, const BlockConstraint constraint
}
} break;
case BlockType::CallData: {
- if constexpr (IsGoblinUltraBuilder) {
+ if constexpr (IsMegaBuilder) {
databus_ct databus;
// Populate the calldata in the databus
databus.calldata.set_values(init);
@@ -99,7 +99,7 @@ void create_block_constraints(Builder& builder, const BlockConstraint constraint
}
} break;
case BlockType::ReturnData: {
- if constexpr (IsGoblinUltraBuilder) {
+ if constexpr (IsMegaBuilder) {
databus_ct databus;
// Populate the returndata in the databus
databus.return_data.set_values(init);
@@ -127,8 +127,8 @@ void create_block_constraints(Builder& builder, const BlockConstraint constraint
template void create_block_constraints(UltraCircuitBuilder& builder,
const BlockConstraint constraint,
bool has_valid_witness_assignments);
-template void create_block_constraints(GoblinUltraCircuitBuilder& builder,
- const BlockConstraint constraint,
- bool has_valid_witness_assignments);
+template void create_block_constraints(MegaCircuitBuilder& builder,
+ const BlockConstraint constraint,
+ bool has_valid_witness_assignments);
} // namespace acir_format
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp
index 103ddfdd7d1..98557d8146a 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp
@@ -13,15 +13,15 @@ class UltraPlonkRAM : public ::testing::Test {
static void SetUpTestSuite() { bb::srs::init_crs_factory("../srs_db/ignition"); }
};
-class UltraGoblinHonk : public ::testing::Test {
+class MegaHonk : public ::testing::Test {
public:
- using Flavor = GoblinUltraFlavor;
+ using Flavor = MegaFlavor;
using Builder = Flavor::CircuitBuilder;
using Prover = UltraProver_;
using Verifier = UltraVerifier_;
using VerificationKey = Flavor::VerificationKey;
- // Construct and verify an UltraGoblinHonk proof for the provided circuit
+ // Construct and verify an MegaHonk proof for the provided circuit
static bool prove_and_verify(Builder& circuit)
{
Prover prover{ circuit };
@@ -174,7 +174,7 @@ TEST_F(UltraPlonkRAM, TestBlockConstraint)
EXPECT_EQ(verifier.verify_proof(proof), true);
}
-TEST_F(UltraGoblinHonk, Databus)
+TEST_F(MegaHonk, Databus)
{
BlockConstraint block;
WitnessVector witness_values;
@@ -219,7 +219,7 @@ TEST_F(UltraGoblinHonk, Databus)
EXPECT_TRUE(prove_and_verify(circuit));
}
-TEST_F(UltraGoblinHonk, DatabusReturn)
+TEST_F(MegaHonk, DatabusReturn)
{
BlockConstraint block;
WitnessVector witness_values;
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ec_operations.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ec_operations.cpp
index 4894537b659..54c1f71d925 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ec_operations.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ec_operations.cpp
@@ -47,8 +47,8 @@ void create_ec_add_constraint(Builder& builder, const EcAdd& input, bool has_val
template void create_ec_add_constraint(UltraCircuitBuilder& builder,
const EcAdd& input,
bool has_valid_witness_assignments);
-template void create_ec_add_constraint(GoblinUltraCircuitBuilder& builder,
- const EcAdd& input,
- bool has_valid_witness_assignments);
+template void create_ec_add_constraint(MegaCircuitBuilder& builder,
+ const EcAdd& input,
+ bool has_valid_witness_assignments);
} // namespace acir_format
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.cpp
index c402c94a954..2b6c84ca795 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.cpp
@@ -165,9 +165,9 @@ template void dummy_ecdsa_constraint(Builder& builder, EcdsaS
template void create_ecdsa_k1_verify_constraints(UltraCircuitBuilder& builder,
const EcdsaSecp256k1Constraint& input,
bool has_valid_witness_assignments);
-template void create_ecdsa_k1_verify_constraints(GoblinUltraCircuitBuilder& builder,
- const EcdsaSecp256k1Constraint& input,
- bool has_valid_witness_assignments);
+template void create_ecdsa_k1_verify_constraints(MegaCircuitBuilder& builder,
+ const EcdsaSecp256k1Constraint& input,
+ bool has_valid_witness_assignments);
template void dummy_ecdsa_constraint(UltraCircuitBuilder& builder,
EcdsaSecp256k1Constraint const& input);
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.cpp
index 9554c269d5f..6d05950e09c 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.cpp
@@ -146,9 +146,9 @@ template void dummy_ecdsa_constraint(Builder& builder, EcdsaS
template void create_ecdsa_r1_verify_constraints(UltraCircuitBuilder& builder,
const EcdsaSecp256r1Constraint& input,
bool has_valid_witness_assignments);
-template void create_ecdsa_r1_verify_constraints(GoblinUltraCircuitBuilder& builder,
- const EcdsaSecp256r1Constraint& input,
- bool has_valid_witness_assignments);
+template void create_ecdsa_r1_verify_constraints(MegaCircuitBuilder& builder,
+ const EcdsaSecp256r1Constraint& input,
+ bool has_valid_witness_assignments);
template void dummy_ecdsa_constraint(UltraCircuitBuilder& builder,
EcdsaSecp256r1Constraint const& input);
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.cpp
index 2563204adde..c2e0359d4da 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.cpp
@@ -65,10 +65,10 @@ template void create_keccak_constraints(UltraCircuitBuilder
template void create_keccak_permutations(UltraCircuitBuilder& builder,
const Keccakf1600& constraint);
-template void create_keccak_constraints(GoblinUltraCircuitBuilder& builder,
- const KeccakConstraint& constraint);
+template void create_keccak_constraints(MegaCircuitBuilder& builder,
+ const KeccakConstraint& constraint);
-template void create_keccak_permutations(GoblinUltraCircuitBuilder& builder,
- const Keccakf1600& constraint);
+template void create_keccak_permutations(MegaCircuitBuilder& builder,
+ const Keccakf1600& constraint);
} // namespace acir_format
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.cpp
index fb6adae8571..70826ef4ef0 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.cpp
@@ -23,12 +23,12 @@ void create_logic_gate(Builder& builder,
res.assert_equal(our_res);
}
-template void create_logic_gate(GoblinUltraCircuitBuilder& builder,
- const uint32_t a,
- const uint32_t b,
- const uint32_t result,
- const size_t num_bits,
- const bool is_xor_gate);
+template void create_logic_gate(MegaCircuitBuilder& builder,
+ const uint32_t a,
+ const uint32_t b,
+ const uint32_t result,
+ const size_t num_bits,
+ const bool is_xor_gate);
template void create_logic_gate(UltraCircuitBuilder& builder,
const uint32_t a,
const uint32_t b,
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/multi_scalar_mul.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/multi_scalar_mul.cpp
index 83d7395bafa..94f2def1d62 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/multi_scalar_mul.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/multi_scalar_mul.cpp
@@ -44,7 +44,7 @@ template void create_multi_scalar_mul_constraint(Builder& bui
template void create_multi_scalar_mul_constraint(UltraCircuitBuilder& builder,
const MultiScalarMul& input);
-template void create_multi_scalar_mul_constraint(GoblinUltraCircuitBuilder& builder,
- const MultiScalarMul& input);
+template void create_multi_scalar_mul_constraint(MegaCircuitBuilder& builder,
+ const MultiScalarMul& input);
} // namespace acir_format
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp
index 8aac54f2d97..ce6948ee0cf 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp
@@ -43,9 +43,9 @@ template void create_pedersen_constraint(UltraCircuitBuilde
const PedersenConstraint& input);
template void create_pedersen_hash_constraint(UltraCircuitBuilder& builder,
const PedersenHashConstraint& input);
-template void create_pedersen_constraint(GoblinUltraCircuitBuilder& builder,
- const PedersenConstraint& input);
-template void create_pedersen_hash_constraint(GoblinUltraCircuitBuilder& builder,
- const PedersenHashConstraint& input);
+template void create_pedersen_constraint(MegaCircuitBuilder& builder,
+ const PedersenConstraint& input);
+template void create_pedersen_hash_constraint(MegaCircuitBuilder& builder,
+ const PedersenHashConstraint& input);
} // namespace acir_format
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/poseidon2_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/poseidon2_constraint.cpp
index 5380b48becc..e84fb6e052b 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/poseidon2_constraint.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/poseidon2_constraint.cpp
@@ -36,6 +36,6 @@ template void create_poseidon2_permutations(Builder& builder,
template void create_poseidon2_permutations(UltraCircuitBuilder& builder,
const Poseidon2Constraint& constraint);
-template void create_poseidon2_permutations(GoblinUltraCircuitBuilder& builder,
- const Poseidon2Constraint& constraint);
+template void create_poseidon2_permutations(MegaCircuitBuilder& builder,
+ const Poseidon2Constraint& constraint);
} // namespace acir_format
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.cpp
index bcb6e026490..e4dae9ca089 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.cpp
@@ -104,7 +104,7 @@ template void create_schnorr_verify_constraints(Builder& buil
template void create_schnorr_verify_constraints(UltraCircuitBuilder& builder,
const SchnorrConstraint& input);
-template void create_schnorr_verify_constraints