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.

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

feat: simplify public input copy cycles #4753

Merged
merged 2 commits into from
Feb 26, 2024
Merged

feat: simplify public input copy cycles #4753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3190482
simplify and see wwhat breaks
ledwards2225 Feb 25, 2024
148fc94
update vk hash in js test
ledwards2225 Feb 25, 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
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,7 @@ TEST_F(join_split_tests, test_0_input_notes_and_detect_circuit_change)
// The below part detects any changes in the join-split circuit
constexpr uint32_t CIRCUIT_GATE_COUNT = 49492;
constexpr uint32_t GATES_NEXT_POWER_OF_TWO = 65535;
const uint256_t VK_HASH("e253629a7f74dd33ac4288473df5fac928aae029cb8f5867bb413366b54c02ba");
const uint256_t VK_HASH("c1032f787036ac943a5f064e599772d255423a221bba2af98ebce3baf2b53f56");

auto number_of_gates_js = result.number_of_gates;
std::cout << get_verification_key()->sha256_hash() << std::endl;
Expand Down
7 changes: 1 addition & 6 deletions barretenberg/cpp/src/barretenberg/proof_system/execution_trace/execution_trace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,7 @@ typename ExecutionTrace_<Flavor>::TraceData ExecutionTrace_<Flavor>::construct_t
// Insert the real witness values from this block into the wire polys at the correct offset
trace_data.wires[wire_idx][trace_row_idx] = builder.get_variable(var_idx);
// Add the address of the witness value to its corresponding copy cycle
// NB: Not adding cycles for wires 3 and 4 here is only needed in order to maintain consistency with old
// version. We can remove this special case and the result is simply that all the zeros in wires 3 and 4
// over the PI range are copy constrained together, but this changes sigma/id which changes the vkey.
if (!(block.is_public_input && wire_idx > 1)) {
trace_data.copy_cycles[real_var_idx].emplace_back(cycle_node{ wire_idx, trace_row_idx });
}
trace_data.copy_cycles[real_var_idx].emplace_back(cycle_node{ wire_idx, trace_row_idx });
}
}

Expand Down
Loading