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 backend interactions from nargo #6320

Merged
merged 30 commits into from
May 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
a22d895
chore: add example script to generate a verifier contract
TomAFrench May 9, 2024
96b58f7
chore!: remove `codegen-verifier` command
TomAFrench May 9, 2024
8e6c37a
chore: update docs
TomAFrench May 13, 2024
37b68b1
Update noir/noir-repo/examples/codegen-verifier/codegen_verifier.sh
TomAFrench May 13, 2024
836b861
chore: update integration tests to call `bb` directly
TomAFrench May 13, 2024
75e4dd4
chore: update usage to handle bb.js
TomAFrench May 13, 2024
9ccef03
Merge branch 'master' into tf/remove-codegen-verifier
TomAFrench May 13, 2024
b08729d
chore: add simple docs for installing `bb`
TomAFrench May 13, 2024
adc693c
chore: fix codegen-verifiers.sh
TomAFrench May 13, 2024
1a0c641
chore: installs `bb` for noir CI
TomAFrench May 13, 2024
4cf2403
Update noir/noir-repo/examples/codegen-verifier/codegen_verifier.sh
TomAFrench May 16, 2024
b44d4b4
Merge branch 'master' into tf/remove-codegen-verifier
TomAFrench May 16, 2024
45783d7
feat: extend example to show how
TomAFrench May 16, 2024
1270e1b
pull over some more files
TomAFrench May 16, 2024
25dbbeb
Merge branch 'master' into tf/remove-codegen-verifier
TomAFrench May 16, 2024
0016c8d
chore: add `examples` target to CI
TomAFrench May 16, 2024
898cf57
chore: update test
TomAFrench May 16, 2024
fe3cfc7
chore: remove contract.sol
TomAFrench May 16, 2024
1d8acfe
chore(ci): dont look for tags if pure spot (#6446)
ludamad May 16, 2024
1962ead
Merge branch 'master' into tf/remove-codegen-verifier
TomAFrench May 16, 2024
76b7b59
Update noir/noir-repo/examples/codegen-verifier/codegen_verifier.sh
TomAFrench May 16, 2024
eadaa0d
chore!: remove `nargo prove` and `nargo verify` (#6321)
TomAFrench May 16, 2024
7dcc7da
feat!: remove backend interactions from `nargo` (#6369)
TomAFrench May 16, 2024
4a99019
Merge branch 'master' into tf/remove-codegen-verifier
TomAFrench May 16, 2024
fdcb0d8
Update noir/noir-repo/docs/docs/how_to/how-to-solidity-verifier.md
TomAFrench May 16, 2024
999e333
chore: remove dead code
TomAFrench May 16, 2024
9ac2ed1
Merge branch 'master' into tf/remove-codegen-verifier
TomAFrench May 17, 2024
12691b4
Merge branch 'master' into tf/remove-codegen-verifier
TomAFrench May 17, 2024
7fab767
fmt
TomAFrench May 17, 2024
435ab31
chore: update docs to reflect lack of `Verifier.toml` file
TomAFrench May 17, 2024
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
14 changes: 13 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,21 @@ jobs:
- uses: ./.github/ci-setup-action
with:
concurrency_key: noir-x86
- name: "Test Noir JS packages"
- name: "Test Nargo"
run: earthly-ci --no-output ./noir+test

noir-examples:
needs: setup
runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
steps:
- uses: actions/checkout@v4
with: { ref: "${{ env.GIT_COMMIT }}" }
- uses: ./.github/ci-setup-action
with:
concurrency_key: noir-examples-x86
- name: "Test Noir examples"
run: earthly-ci --no-output ./noir+examples

noir-packages-test:
needs: setup
runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
url = https://github.com/Arachnid/solidity-stringutils
[submodule "barretenberg/sol/lib/openzeppelin-contracts"]
path = barretenberg/sol/lib/openzeppelin-contracts
url = https://github.com/OpenZeppelin/openzeppelin-contracts
url = https://github.com/OpenZeppelin/openzeppelin-contracts
15 changes: 15 additions & 0 deletions noir/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,21 @@ test:
COPY noir-repo/.rustfmt.toml noir-repo/.rustfmt.toml
RUN ./scripts/test_native.sh

examples:
FROM +nargo
ENV PATH="/usr/src/noir-repo/target/release:${PATH}"

COPY --dir noir-repo/examples noir-repo
COPY ../barretenberg/cpp/+preset-clang-assert/bin/bb /usr/src/barretenberg/cpp/build/bin/bb

ENV BACKEND=/usr/src/barretenberg/cpp/build/bin/bb

WORKDIR noir-repo/examples/codegen-verifier
RUN ./test.sh

WORKDIR ../prove_and_verify
RUN ./test.sh

format:
FROM +nargo
ENV PATH=$PATH:/usr/src/noir-repo/target/release
Expand Down
5 changes: 5 additions & 0 deletions noir/noir-repo/.github/workflows/test-js-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Download bb binary
run: |
# Adds `bb` to PATH
./scripts/install_bb.sh

- name: Download nargo binary
uses: actions/download-artifact@v4
with:
Expand Down
Loading
Loading