Skip to content

fix: Revert ClientIVC mock sizes #6693

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.

Sign up for GitHub

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

Closed
codygunton wants to merge 5 commits into from
Closed

fix: Revert ClientIVC mock sizes #6693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
63e6542
Function circuits
codygunton May 26, 2024
1af79f4
Revert mock kernel size
codygunton May 26, 2024
ba1c2ef
Log structures
codygunton May 27, 2024
d829e99
Merge branch 'master' into cg/revert-mock-sizes
codygunton May 29, 2024
fb09b48
Merge branch 'master' into cg/revert-mock-sizes
codygunton Jul 12, 2024
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
3 changes: 3 additions & 0 deletions barretenberg/cpp/src/barretenberg/client_ivc/mock_kernel_pinning.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ TEST_F(MockKernelTest, PinFoldingKernelSizes)
GoblinMockCircuits::construct_mock_function_circuit(circuit_2);
GoblinMockCircuits::construct_mock_folding_kernel(kernel_circuit);

info("num gates: ", kernel_circuit.get_num_gates());
kernel_circuit.blocks.summarize();

// Accumulate all three; The kernel will contain a single recursive folding verifier
ivc.accumulate(circuit_1);
ivc.accumulate(circuit_2);
Expand Down
8 changes: 4 additions & 4 deletions barretenberg/cpp/src/barretenberg/goblin/mock_circuits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ class GoblinMockCircuits {

if (large) {
stdlib::generate_sha256_test_circuit(builder, NUM_ITERATIONS_LARGE);
stdlib::generate_ecdsa_verification_test_circuit(builder, NUM_ITERATIONS_LARGE / 2);
stdlib::generate_ecdsa_verification_test_circuit(builder, NUM_ITERATIONS_LARGE - 1);
stdlib::generate_merkle_membership_test_circuit(builder, NUM_ITERATIONS_LARGE);
} else { // Results in circuit size 2^17 when accumulated via ClientIvc
stdlib::generate_sha256_test_circuit(builder, 5);
stdlib::generate_ecdsa_verification_test_circuit(builder, 1);
stdlib::generate_ecdsa_verification_test_circuit(builder, 2);
stdlib::generate_merkle_membership_test_circuit(builder, 10);
}

Expand Down Expand Up @@ -149,8 +149,8 @@ class GoblinMockCircuits {
{
// Add operations representing general kernel logic e.g. state updates. Note: these are structured to make
// the kernel "full" within the dyadic size 2^17
const size_t NUM_MERKLE_CHECKS = 20;
const size_t NUM_ECDSA_VERIFICATIONS = 1;
const size_t NUM_MERKLE_CHECKS = 15;
const size_t NUM_ECDSA_VERIFICATIONS = 2;
const size_t NUM_SHA_HASHES = 1;
stdlib::generate_merkle_membership_test_circuit(builder, NUM_MERKLE_CHECKS);
stdlib::generate_ecdsa_verification_test_circuit(builder, NUM_ECDSA_VERIFICATIONS);
Expand Down
2 changes: 2 additions & 0 deletions barretenberg/cpp/src/barretenberg/goblin/mock_circuits_pinning.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ TEST_F(MegaMockCircuitsPinning, FunctionSizes)
GoblinProver goblin;
MegaCircuitBuilder app_circuit{ goblin.op_queue };
GoblinMockCircuits::construct_mock_function_circuit(app_circuit, large);
info("num gates: ", app_circuit.get_num_gates());
app_circuit.blocks.summarize();
auto instance = std::make_shared<ProverInstance>(app_circuit);
if (large) {
EXPECT_EQ(instance->proving_key.log_circuit_size, 19);
Expand Down