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.

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

chore: remove abi refs from publisher #10766

Merged
merged 7 commits into from
Jan 8, 2025
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/master' into mw/blob-abi-errs
MirandaWood committed Jan 2, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 8cfa09ba1cb48255064457cc283d34ef483db105
7 changes: 2 additions & 5 deletions noir-projects/Earthfile
Original file line number Diff line number Diff line change
@@ -5,11 +5,8 @@ test:
BUILD +test-contracts

test-protocol-circuits:
FROM +build

# Install nargo
COPY ../noir/+nargo/nargo /usr/bin/nargo

FROM ../+bootstrap
ENV PATH="/usr/src/noir/noir-repo/target/release:${PATH}"
# TODO(#10754): Remove --skip-brillig-constraints-check
RUN cd /usr/src/noir-projects/noir-protocol-circuits && nargo test --silence-warnings --skip-brillig-constraints-check

8 changes: 3 additions & 5 deletions noir-projects/noir-protocol-circuits/bootstrap.sh
Original file line number Diff line number Diff line change
@@ -68,7 +68,7 @@ function compile {
if ! cache_download circuit-$hash.tar.gz 1>&2; then
SECONDS=0
rm -f $json_path
# TODO: --skip-brillig-constraints-check added temporarily for blobs build time.
# TODO(#10754): Remove --skip-brillig-constraints-check
local compile_cmd="$NARGO compile --package $name --silence-warnings --skip-brillig-constraints-check"
echo_stderr "$compile_cmd"
dump_fail "$compile_cmd"
@@ -92,10 +92,8 @@ function compile {
fi
echo "$proto$"

NARGO=${NARGO:-../../noir/noir-repo/target/release/nargo}
echo "Compiling protocol circuits with ${RAYON_NUM_THREADS:-1} threads"
# TODO(#10754): Remove --skip-brillig-constraints-check
RAYON_NUM_THREADS=${RAYON_NUM_THREADS:-1} $NARGO compile --silence-warnings --skip-brillig-constraints-check
# No vks needed for simulated circuits.
[[ "$name" == *"simulated"* ]] && return

# Change this to add verification_key to original json, like contracts does.
# Will require changing TS code downstream.
You are viewing a condensed version of this merge commit. You can view the full changes here.