From 31904824b6e576a2bbae2ca51b3149cec13b5c0c Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Sun, 25 Feb 2024 20:48:34 +0000 Subject: [PATCH 1/2] simplify and see wwhat breaks --- .../proof_system/execution_trace/execution_trace.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/barretenberg/cpp/src/barretenberg/proof_system/execution_trace/execution_trace.cpp b/barretenberg/cpp/src/barretenberg/proof_system/execution_trace/execution_trace.cpp index 4cab2c63518..2235bf8f2c6 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/execution_trace/execution_trace.cpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/execution_trace/execution_trace.cpp @@ -67,12 +67,7 @@ typename ExecutionTrace_::TraceData ExecutionTrace_::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 }); } } From 148fc94a9292fdc6c683e22c9b2fed1fa22eca3e Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Sun, 25 Feb 2024 23:57:49 +0000 Subject: [PATCH 2/2] update vk hash in js test --- .../join_split_example/proofs/join_split/join_split.test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp index 40007097d63..783947e93ee 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp +++ b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp @@ -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;