Skip to content

Commit

Permalink
fix(bootstrap): include crates in noir projects hashes (#11344)
Browse files Browse the repository at this point in the history
  • Loading branch information
ludamad authored Jan 20, 2025
1 parent 37d4fa8 commit 1075113
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions noir-projects/noir-protocol-circuits/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export BB=${BB:-../../barretenberg/cpp/build/bin/bb}
export NARGO=${NARGO:-../../noir/noir-repo/target/release/nargo}
export BB_HASH=$(cache_content_hash ../../barretenberg/cpp/.rebuild_patterns)
export NARGO_HASH=$(cache_content_hash ../../noir/.rebuild_patterns)
export CRATES_HASH=$(cache_content_hash crates)

# Set flags for parallel
export PARALLELISM=${PARALLELISM:-16}
Expand Down Expand Up @@ -41,7 +42,6 @@ rollup_honk_patterns=(
"rollup_merge"
)


ivc_regex=$(IFS="|"; echo "${ivc_patterns[*]}")
rollup_honk_regex=$(IFS="|"; echo "${rollup_honk_patterns[*]}")

Expand All @@ -65,10 +65,12 @@ function compile {
local json_path="./target/$filename"
local program_hash hash bytecode_hash vk vk_fields
local program_hash_cmd="$NARGO check --package $name --silence-warnings --show-program-hash | cut -d' ' -f2"
# echo_stderr $program_hash_cmd
program_hash=$(dump_fail "$program_hash_cmd")
echo_stderr "Hash preimage: $NARGO_HASH-$program_hash"
hash=$(hash_str "$NARGO_HASH-$program_hash")
echo_stderr "Hash preimage: $NARGO_HASH-$CRATES_HASH-$program_hash"
# We include CRATES_HASH as --show-program-hash does not do a good job at hashing dependencies.
# TODO(ci3) we may need to do a less granular hash if this doesn't work out.
hash=$(hash_str "$NARGO_HASH-$CRATES_HASH-$program_hash")

if ! cache_download circuit-$hash.tar.gz 1>&2; then
SECONDS=0
rm -f $json_path
Expand Down

0 comments on commit 1075113

Please sign in to comment.