Skip to content

Commit

Permalink
fix(ci): add install backend step in noir rebuild (#2182)
Browse files Browse the repository at this point in the history
Please provide a paragraph or two giving a summary of the change,
including relevant motivation and context.

# Checklist:
Remove the checklist to signal you've completed it. Enable auto-merge if
the PR is ready to merge.
- [ ] If the pull request requires a cryptography review (e.g.
cryptographic algorithm implementations) I have added the 'crypto' tag.
- [ ] I have reviewed my diff in github, line by line and removed
unexpected formatting changes, testing logs, or commented-out code.
- [ ] Every change is related to the PR description.
- [ ] I have
[linked](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)
this pull request to relevant issues (if any exist).
  • Loading branch information
Maddiaa0 authored Sep 11, 2023
1 parent 0b5258c commit 27b8bed
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 12 deletions.
6 changes: 3 additions & 3 deletions yarn-project/aztec.js/src/abis/ecdsa_account_contract.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions yarn-project/aztec.js/src/abis/schnorr_account_contract.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions yarn-project/end-to-end/src/e2e_nested_contract.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ describe('e2e_nested_contract', () => {
parentContract.methods
.entryPoint(childContract.address, childContract.methods.valueInternal.selector.toField())
.simulate(),
).rejects.toThrowError(/Assertion failed: Sender must be this contract '.*'/);
).rejects.toThrowError('Assertion failed: Sender must be this contract');
}, 100_000);

it('performs public nested calls', async () => {
Expand All @@ -75,7 +75,7 @@ describe('e2e_nested_contract', () => {
parentContract.methods
.enqueueCallToChild(childContract.address, childContract.methods.pubIncValueInternal.selector.toField(), 42n)
.simulate(),
).rejects.toThrowError(/Assertion failed: Sender must be this contract '.*'/);
).rejects.toThrowError('Assertion failed: Sender must be this contract');
}, 100_000);

it('enqueues multiple public calls', async () => {
Expand Down
1 change: 1 addition & 0 deletions yarn-project/noir-contracts/Dockerfile.build
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ RUN ./scripts/install_noirup.sh $(pwd)
ENV PATH="/usr/src/yarn-project/noir-contracts/.nargo/bin:${PATH}"

RUN ./scripts/install_noir.sh
RUN ./scripts/install_noir_backend.sh
RUN ./scripts/compile_ci.sh
1 change: 1 addition & 0 deletions yarn-project/noir-contracts/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ fi

# Update noir
./scripts/install_noir.sh
./scripts/install_noir_backend.sh

# Use yarn script to compile and create types
yarn
Expand Down
13 changes: 13 additions & 0 deletions yarn-project/noir-contracts/scripts/install_noir_backend.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash

# Script to install the current barretenberg backend

set -eu

BACKEND_NAME="acvm-backend-barretenberg"

# If the backend is not installed, then install it
if [ -z $(nargo backend ls | grep $BACKEND_NAME) ]; then
echo "Installing $BACKEND_NAME"
nargo backend install $BACKEND_NAME https://github.com/AztecProtocol/barretenberg/releases/download/barretenberg-v0.5.1/barretenberg-x86_64-linux-gnu.tar.gz
fi

0 comments on commit 27b8bed

Please sign in to comment.