Skip to content

fix: verify_honk_proof inputs generation in bootstrap #12457

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

Merged
ludamad merged 6 commits into from
Mar 14, 2025
Merged

fix: verify_honk_proof inputs generation in bootstrap #12457

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aa3d06f
fix?
lucasxia01 Mar 4, 2025
621d751
add TODO
lucasxia01 Mar 5, 2025
1ca573f
add new functionality for regenerating inputs
lucasxia01 Mar 5, 2025
59b42a3
Merge remote-tracking branch 'origin/master' into lx/fix-acir-tests-i…
lucasxia01 Mar 10, 2025
7846a54
add new functions to make bootstrap more readable and to deduplicate
lucasxia01 Mar 11, 2025
5a4b560
Merge remote-tracking branch 'origin/master' into lx/fix-acir-tests-i…
lucasxia01 Mar 12, 2025
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
99 changes: 82 additions & 17 deletions barretenberg/acir_tests/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,89 @@ function build {
echo_header "acir_tests build"

if ! cache_download $tests_tar; then
rm -rf acir_tests
denoise "cd ../../noir/noir-repo/test_programs/execution_success && git clean -fdx"
cp -R ../../noir/noir-repo/test_programs/execution_success acir_tests
# Running these requires extra gluecode so they're skipped.
rm -rf acir_tests/{diamond_deps_0,workspace,workspace_default_member}
# TODO(https://github.com/AztecProtocol/barretenberg/issues/1108): problem regardless the proof system used
# TODO: Check if resolved. Move to .test_skip_patterns if not.
rm -rf acir_tests/regression_5045

# COMPILE=2 only compiles the test.
denoise "parallel --joblog joblog.txt --line-buffered 'COMPILE=2 ./run_test.sh \$(basename {})' ::: ./acir_tests/*"

echo "Regenerating verify_honk_proof and verify_rollup_honk_proof recursive inputs."
# rm -rf acir_tests
# denoise "cd ../../noir/noir-repo/test_programs/execution_success && git clean -fdx"
# cp -R ../../noir/noir-repo/test_programs/execution_success acir_tests
# # Running these requires extra gluecode so they're skipped.
# rm -rf acir_tests/{diamond_deps_0,workspace,workspace_default_member}
# # TODO(https://github.com/AztecProtocol/barretenberg/issues/1108): problem regardless the proof system used
# # TODO: Check if resolved. Move to .test_skip_patterns if not.
# rm -rf acir_tests/regression_5045
# # Don't compile these until we generate their inputs
# rm -rf acir_tests/{verify_honk_proof,double_verify_honk_proof,verify_rollup_honk_proof}

# # COMPILE=2 only compiles the test.
# denoise "parallel --joblog joblog.txt --line-buffered 'COMPILE=2 ./run_test.sh \$(basename {})' ::: ./acir_tests/*"

cp -R ../../noir/noir-repo/test_programs/execution_success/{verify_honk_proof,double_verify_honk_proof,verify_rollup_honk_proof} acir_tests
echo "Regenerating verify_honk_proof, double_verify_honk_proof, verify_rollup_honk_proof recursive inputs."
local bb=$(realpath ../cpp/build/bin/bb)
(cd ./acir_tests/assert_statement && \
# TODO(https://github.com/AztecProtocol/barretenberg/issues/1253) Deprecate command and construct TOML (e.g., via yq or via conversion from a JSON)
$bb OLD_API write_recursion_inputs_ultra_honk -b ./target/program.json -o ../verify_honk_proof --recursive && \
$bb OLD_API write_recursion_inputs_ultra_honk --ipa_accumulation -b ./target/program.json -o ../verify_rollup_honk_proof --recursive)
cd ./acir_tests/assert_statement

outdir=$(mktemp -d)
trap "rm -rf $outdir" EXIT
local key_hash="0x0000000000000000000000000000000000000000000000000000000000000000"

local prove_uh_cmd="$bb prove --scheme ultra_honk --init_kzg_accumulator --output_format fields --write_vk -o $outdir -b ./target/program.json -w ./target/witness.gz"

@lucasxia01 lucasxia01 Mar 6, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this as a whole is honestly a little more complicated than I would've liked... unclear if this that much better than the write_recursion_inputs_ultra_honk flows

@lucasxia01 lucasxia01 Mar 6, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its probably easier to have all the logic here though instead of having to modify both bootstrap and cpp files, even if this is quite annoying logic to handle in bash/jq

echo_stderr $prove_uh_cmd
dump_fail "$prove_uh_cmd"
vk_fields=$(cat $outdir/vk_fields.json)
proof_fields=$(cat $outdir/proof_fields.json)
num_inner_public_inputs=$(( 16#$(echo $vk_fields | jq -r '.[1] | ltrimstr("0x")') - 16 ))
echo "num_inner_public_inputs = $num_inner_public_inputs"

jq -nr \
--arg key_hash "$key_hash" \
--argjson vkf "$vk_fields" \
--argjson prooff "$proof_fields" \
--argjson num_inner_public_inputs "$num_inner_public_inputs" \
'[
"key_hash = \($key_hash)",
"proof = [\($prooff | .[$num_inner_public_inputs:] | map("\"" + . + "\"") | join(", "))]",
"public_inputs = [\($prooff | .[:$num_inner_public_inputs] | map("\"" + . + "\"") | join(", "))]",
"verification_key = [\($vkf | map("\"" + . + "\"") | join(", "))]"
] | join("\n")' > ../verify_honk_proof/Prover.toml

jq -nr \
--arg key_hash "$key_hash" \
--argjson vkf "$vk_fields" \
--argjson prooff "$proof_fields" \
--argjson num_inner_public_inputs "$num_inner_public_inputs" \
'[
"key_hash = \($key_hash)",
"proof = [\($prooff | .[$num_inner_public_inputs:] | map("\"" + . + "\"") | join(", "))]",
"public_inputs = [\($prooff | .[:$num_inner_public_inputs] | map("\"" + . + "\"") | join(", "))]",
"verification_key = [\($vkf | map("\"" + . + "\"") | join(", "))]",
"proof_b = [\($prooff | .[$num_inner_public_inputs:] | map("\"" + . + "\"") | join(", "))]"
] | join("\n")' > ../double_verify_honk_proof/Prover.toml


local prove_rollup_honk_cmd="$bb prove --scheme ultra_honk --init_kzg_accumulator --ipa_accumulation --output_format fields --write_vk -o $outdir -b ./target/program.json -w ./target/witness.gz"
echo_stderr $prove_rollup_honk_cmd
dump_fail "$prove_rollup_honk_cmd"
vk_fields=$(cat $outdir/vk_fields.json)
proof_fields=$(cat $outdir/proof_fields.json)
num_inner_public_inputs=$(( 16#$(echo $vk_fields | jq -r '.[1] | ltrimstr("0x")') - 26 ))
echo "num_inner_public_inputs = $num_inner_public_inputs"

jq -nr \
--arg key_hash "$key_hash" \
--argjson vkf "$vk_fields" \
--argjson prooff "$proof_fields" \
--argjson num_inner_public_inputs "$num_inner_public_inputs" \
'[
"key_hash = \($key_hash)",
"proof = [\($prooff | .[$num_inner_public_inputs:] | map("\"" + . + "\"") | join(", "))]",
"public_inputs = [\($prooff | .[:$num_inner_public_inputs] | map("\"" + . + "\"") | join(", "))]",
"verification_key = [\($vkf | map("\"" + . + "\"") | join(", "))]"
] | join("\n")' > ../verify_rollup_honk_proof/Prover.toml
cd ../..


# $bb OLD_API write_recursion_inputs_ultra_honk -b ./target/program.json -o ../verify_honk_proof --recursive

@lucasxia01 lucasxia01 Mar 6, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can delete these flows

# $bb OLD_API write_recursion_inputs_ultra_honk --ipa_accumulation -b ./target/program.json -o ../verify_rollup_honk_proof --recursive

denoise "parallel --joblog joblog.txt --line-buffered 'COMPILE=2 ./run_test.sh \$(basename {})' ::: ./acir_tests/{verify_honk_proof,double_verify_honk_proof,verify_rollup_honk_proof}"

cache_upload $tests_tar acir_tests
fi
Expand Down
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/api/api_ultra_honk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Circuit _compute_circuit(const std::string& bytecode_path,
honk_recursion = 2;
}

// TODO: Don't init grumpkin crs when unnecessary.
// TODO(https://github.com/AztecProtocol/barretenberg/issues/1180): Don't init grumpkin crs when unnecessary.
init_grumpkin_crs(1 << CONST_ECCVM_LOG_N);

const acir_format::ProgramMetadata metadata{ .recursive = init_kzg_accumulator, .honk_recursion = honk_recursion };
Expand Down