From 3d49145e39e38e9bc9f1e8b49454389dba6da0c8 Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Fri, 28 Mar 2025 14:44:49 +0000 Subject: [PATCH 1/3] use testnet optimized trace --- .../execution_trace/mega_execution_trace.hpp | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/barretenberg/cpp/src/barretenberg/plonk_honk_shared/execution_trace/mega_execution_trace.hpp b/barretenberg/cpp/src/barretenberg/plonk_honk_shared/execution_trace/mega_execution_trace.hpp index 4f02d9dc3c27..e1b989b996e4 100644 --- a/barretenberg/cpp/src/barretenberg/plonk_honk_shared/execution_trace/mega_execution_trace.hpp +++ b/barretenberg/cpp/src/barretenberg/plonk_honk_shared/execution_trace/mega_execution_trace.hpp @@ -332,15 +332,26 @@ static constexpr TraceStructure EXAMPLE_20{ .ecc_op = 1 << 11, */ static constexpr TraceStructure E2E_FULL_TEST_STRUCTURE{ .ecc_op = 1 << 10, .busread = 6000, - .lookup = 200000, - .pub_inputs = 4000, - .arithmetic = 200000, - .delta_range = 25000, - .elliptic = 80000, - .aux = 100000, - .poseidon2_external = 45192, - .poseidon2_internal = 258000, + .lookup = 15000, + .pub_inputs = 5000, + .arithmetic = 56000, + .delta_range = 18000, + .elliptic = 6000, + .aux = 26000, + .poseidon2_external = 17000, + .poseidon2_internal = 92000, .overflow = 0 }; +// static constexpr TraceStructure E2E_FULL_TEST_STRUCTURE{ .ecc_op = 1 << 10, +// .busread = 6000, +// .lookup = 200000, +// .pub_inputs = 4000, +// .arithmetic = 200000, +// .delta_range = 25000, +// .elliptic = 80000, +// .aux = 100000, +// .poseidon2_external = 45192, +// .poseidon2_internal = 258000, +// .overflow = 0 }; template concept HasAdditionalSelectors = IsAnyOf; From 89f38ab17216fd7354fbe2a184037de65485fb85 Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Fri, 28 Mar 2025 17:57:29 +0000 Subject: [PATCH 2/3] test --- .../execution_trace/mega_execution_trace.hpp | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/barretenberg/cpp/src/barretenberg/plonk_honk_shared/execution_trace/mega_execution_trace.hpp b/barretenberg/cpp/src/barretenberg/plonk_honk_shared/execution_trace/mega_execution_trace.hpp index e1b989b996e4..b04267fb443e 100644 --- a/barretenberg/cpp/src/barretenberg/plonk_honk_shared/execution_trace/mega_execution_trace.hpp +++ b/barretenberg/cpp/src/barretenberg/plonk_honk_shared/execution_trace/mega_execution_trace.hpp @@ -330,28 +330,28 @@ static constexpr TraceStructure EXAMPLE_20{ .ecc_op = 1 << 11, /** * @brief Structuring tailored to the full e2e TS test (TO BE UPDATED ACCORDINGLY) */ -static constexpr TraceStructure E2E_FULL_TEST_STRUCTURE{ .ecc_op = 1 << 10, - .busread = 6000, - .lookup = 15000, - .pub_inputs = 5000, - .arithmetic = 56000, - .delta_range = 18000, - .elliptic = 6000, - .aux = 26000, - .poseidon2_external = 17000, - .poseidon2_internal = 92000, - .overflow = 0 }; // static constexpr TraceStructure E2E_FULL_TEST_STRUCTURE{ .ecc_op = 1 << 10, // .busread = 6000, -// .lookup = 200000, -// .pub_inputs = 4000, -// .arithmetic = 200000, -// .delta_range = 25000, -// .elliptic = 80000, -// .aux = 100000, -// .poseidon2_external = 45192, -// .poseidon2_internal = 258000, +// .lookup = 15000, +// .pub_inputs = 5000, +// .arithmetic = 56000, +// .delta_range = 18000, +// .elliptic = 6000, +// .aux = 26000, +// .poseidon2_external = 17000, +// .poseidon2_internal = 92000, // .overflow = 0 }; +static constexpr TraceStructure E2E_FULL_TEST_STRUCTURE{ .ecc_op = 1 << 10, + .busread = 6100, + .lookup = 200000, + .pub_inputs = 4000, + .arithmetic = 200000, + .delta_range = 25000, + .elliptic = 80000, + .aux = 100000, + .poseidon2_external = 45192, + .poseidon2_internal = 258000, + .overflow = 0 }; template concept HasAdditionalSelectors = IsAnyOf; From f55383a0496a6fb1ac0ac42d095d862067ddc646 Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Fri, 28 Mar 2025 18:19:41 +0000 Subject: [PATCH 3/3] fix pinning test and update trace sizes to testnet values --- .../goblin/mock_circuits_pinning.test.cpp | 4 +-- .../execution_trace/mega_execution_trace.hpp | 31 ++++++------------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/barretenberg/cpp/src/barretenberg/goblin/mock_circuits_pinning.test.cpp b/barretenberg/cpp/src/barretenberg/goblin/mock_circuits_pinning.test.cpp index 193535fee322..9b58231bb3fe 100644 --- a/barretenberg/cpp/src/barretenberg/goblin/mock_circuits_pinning.test.cpp +++ b/barretenberg/cpp/src/barretenberg/goblin/mock_circuits_pinning.test.cpp @@ -78,5 +78,5 @@ TEST_F(MegaMockCircuitsPinning, E2EStructuredCircuitSize) MegaCircuitBuilder app_circuit{ goblin.op_queue }; TraceSettings trace_settings{ E2E_FULL_TEST_STRUCTURE }; auto proving_key = std::make_shared(app_circuit, trace_settings); - EXPECT_EQ(proving_key->proving_key.log_circuit_size, 20); -} \ No newline at end of file + EXPECT_EQ(proving_key->proving_key.log_circuit_size, 18); +} diff --git a/barretenberg/cpp/src/barretenberg/plonk_honk_shared/execution_trace/mega_execution_trace.hpp b/barretenberg/cpp/src/barretenberg/plonk_honk_shared/execution_trace/mega_execution_trace.hpp index b04267fb443e..8dcdc62310de 100644 --- a/barretenberg/cpp/src/barretenberg/plonk_honk_shared/execution_trace/mega_execution_trace.hpp +++ b/barretenberg/cpp/src/barretenberg/plonk_honk_shared/execution_trace/mega_execution_trace.hpp @@ -328,29 +328,18 @@ static constexpr TraceStructure EXAMPLE_20{ .ecc_op = 1 << 11, .overflow = 0 }; /** - * @brief Structuring tailored to the full e2e TS test (TO BE UPDATED ACCORDINGLY) + * @brief Structuring tailored to the full e2e TS test (Currently optimized for five key testnet transactions) */ -// static constexpr TraceStructure E2E_FULL_TEST_STRUCTURE{ .ecc_op = 1 << 10, -// .busread = 6000, -// .lookup = 15000, -// .pub_inputs = 5000, -// .arithmetic = 56000, -// .delta_range = 18000, -// .elliptic = 6000, -// .aux = 26000, -// .poseidon2_external = 17000, -// .poseidon2_internal = 92000, -// .overflow = 0 }; static constexpr TraceStructure E2E_FULL_TEST_STRUCTURE{ .ecc_op = 1 << 10, - .busread = 6100, - .lookup = 200000, - .pub_inputs = 4000, - .arithmetic = 200000, - .delta_range = 25000, - .elliptic = 80000, - .aux = 100000, - .poseidon2_external = 45192, - .poseidon2_internal = 258000, + .busread = 6000, + .lookup = 15000, + .pub_inputs = 5000, + .arithmetic = 56000, + .delta_range = 18000, + .elliptic = 6000, + .aux = 26000, + .poseidon2_external = 17000, + .poseidon2_internal = 92000, .overflow = 0 }; template