Skip to content

Commit

Permalink
chore: remove special sync behaviour of verify_honk_proof (#8676)
Browse files Browse the repository at this point in the history
This is no longer necessary now as `bb gates` handles this program
properly.
  • Loading branch information
TomAFrench authored Sep 21, 2024
1 parent 11c0710 commit a9e412b
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 39 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,11 @@ fn main(
// I believe we want to eventually make it public too though.
key_hash: Field
) {
std::verify_proof(verification_key, proof, public_inputs, key_hash);
std::verify_proof_with_type(
verification_key,
proof,
public_inputs,
key_hash,
HONK_IDENTIFIER
);
}
8 changes: 2 additions & 6 deletions noir/scripts/sync-in-fixup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,9 @@ jq -r '.dependencies."@aztec/bb.js"' $BACKEND_BARRETENBERG_PACKAGE_JSON > ../bb-
jq '.dependencies."@aztec/bb.js" = "portal:../../../../barretenberg/ts"' $BACKEND_BARRETENBERG_PACKAGE_JSON > $tmp && mv $tmp $BACKEND_BARRETENBERG_PACKAGE_JSON

# This script runs in CI which enforces immutable installs by default,
# we then must turn this off in order to update yarn.lock.
# we then must turn this off in order to update yarn.lock.
YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install

# Remove requirement for `wasm-opt` to be installed
sed -i "s/^require_command wasm-opt/#require_command wasm-opt/" ./tooling/noirc_abi_wasm/build.sh
sed -i "s/^require_command wasm-opt/#require_command wasm-opt/" ./acvm-repo/acvm_js/build.sh

# Replace `verify_honk_proof` test
cp -r ../verify_honk_proof ./test_programs/execution_success/
git add ./test_programs/execution_success/verify_honk_proof
sed -i "s/^require_command wasm-opt/#require_command wasm-opt/" ./acvm-repo/acvm_js/build.sh
7 changes: 2 additions & 5 deletions noir/scripts/sync-out-fixup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,9 @@ BACKEND_BARRETENBERG_PACKAGE_JSON=./tooling/noir_js_backend_barretenberg/package
jq --arg v $BB_VERSION '.dependencies."@aztec/bb.js" = $v' $BACKEND_BARRETENBERG_PACKAGE_JSON > $tmp && mv $tmp $BACKEND_BARRETENBERG_PACKAGE_JSON

# This script runs in CI which enforces immutable installs by default,
# we then must turn this off in order to update yarn.lock.
# we then must turn this off in order to update yarn.lock.
YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install

# Add requirement for `wasm-opt` to be installed
sed -i "s/^#require_command wasm-opt/require_command wasm-opt/" ./tooling/noirc_abi_wasm/build.sh
sed -i "s/^#require_command wasm-opt/require_command wasm-opt/" ./acvm-repo/acvm_js/build.sh

# Remove `verify_honk_proof` test
rm -rf ./test_programs/execution_success/verify_honk_proof
sed -i "s/^#require_command wasm-opt/require_command wasm-opt/" ./acvm-repo/acvm_js/build.sh
6 changes: 0 additions & 6 deletions noir/verify_honk_proof/Nargo.toml

This file was deleted.

4 changes: 0 additions & 4 deletions noir/verify_honk_proof/Prover.toml

This file was deleted.

17 changes: 0 additions & 17 deletions noir/verify_honk_proof/src/main.nr

This file was deleted.

0 comments on commit a9e412b

Please sign in to comment.