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

feat!: Switch to aztec_backend that uses upstream BB & UltraPlonk #1114

Merged
merged 57 commits into from
Apr 21, 2023
Merged
Show file tree
Hide file tree
Changes from 49 commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
7168aec
feat(build): Nix flake to build with
Feb 22, 2023
4d962ff
use debug ultra branch for backend, and temporary simple XOR/AND test…
vezenovm Mar 28, 2023
df4d386
ignore result
phated Apr 6, 2023
3ad9134
Update deps
phated Apr 6, 2023
22cf677
Avoid reading build data if we already have it
phated Apr 6, 2023
c2561c1
Update values for UP
phated Apr 6, 2023
ebebb2e
Align flake with aztec_backend
phated Apr 6, 2023
b6d300c
update lockfile
phated Apr 6, 2023
d650a9f
skip simple_shield until it is updated
phated Apr 6, 2023
4bfd4d1
Update nix version with our workflow
phated Apr 6, 2023
30afaf5
Build with Nix in CI
phated Apr 6, 2023
3dc730b
Update backend deps
phated Apr 6, 2023
b03c759
Simplify the nix file
phated Apr 6, 2023
02d5c07
chore(nargo)!: Update the codegen command to use vk, which requires c…
phated Apr 10, 2023
b049ab5
chore!: Update Prover.toml for merkle_insert and simple_shield with U…
vezenovm Apr 10, 2023
eb6b2ee
re-enable simple_shield
phated Apr 10, 2023
13a652a
use CARGO_MANIFEST_DIR to locate data for integration testing
phated Apr 10, 2023
a4e11d2
clippy
phated Apr 10, 2023
d3f4a54
patch for bb-sys
phated Apr 10, 2023
ff82cda
patch for bb
phated Apr 10, 2023
2505346
Add build workaround to wasm crate
phated Apr 10, 2023
0c38f6c
clippy
phated Apr 10, 2023
95808b4
Remove buggy clippy lint
phated Apr 10, 2023
6f02d92
cleanup flake
phated Apr 10, 2023
5fcdb49
Rough guidelines for working on Noir with nix
phated Apr 10, 2023
5e50dde
chore: Cleanup UltraPlonk Debugging (#1130)
vezenovm Apr 11, 2023
4b6a544
update 8_integration main func
vezenovm Apr 11, 2023
506bfb5
update to newer bb
phated Apr 12, 2023
44a0d74
update aztec_backend
phated Apr 12, 2023
818d1f9
update acvm to 0.9.0
phated Apr 12, 2023
e3745dc
Reference temp commit on aztec_backend
phated Apr 12, 2023
4c626b3
fix some issues with the acvm 0.9 upgrade
phated Apr 12, 2023
a5ad575
temp lock to cody bb branch
phated Apr 12, 2023
c11e6e0
Merge branch 'master' into phated/nix-ultra
TomAFrench Apr 13, 2023
5ce8a05
chore: fix up merge issues
TomAFrench Apr 13, 2023
50b5050
update for contract changes
phated Apr 13, 2023
bdf50a6
update to appropriate refs
phated Apr 13, 2023
6fe4ad7
working on direnv
phated Apr 14, 2023
6e018d6
Merge remote-tracking branch 'origin/master' into phated/nix-ultra
phated Apr 19, 2023
8ada5fe
Update nix and direnv stuff
phated Apr 19, 2023
c98cacc
Update building documentation
phated Apr 19, 2023
3a47d2d
Stop ignoring vscode dir and recommend extensions and settings
phated Apr 19, 2023
6d4649e
cspell
phated Apr 19, 2023
957fb85
aztec_backend refs
phated Apr 20, 2023
d662842
nix lockfile
phated Apr 20, 2023
3e3c3e7
Simplify and rename workflow
phated Apr 20, 2023
a64d04f
docs cleanup
phated Apr 20, 2023
039cd9e
Merge remote-tracking branch 'origin/master' into phated/nix-ultra
phated Apr 20, 2023
6a79a0e
code review
phated Apr 20, 2023
855cbd3
Update crates/nargo_cli/tests/prove_and_verify.rs
TomAFrench Apr 21, 2023
652b7fa
Update crates/nargo_cli/tests/prove_and_verify.rs
TomAFrench Apr 21, 2023
9d904a5
Update cspell.json
kevaundray Apr 21, 2023
ce9d46a
Update README.md
kevaundray Apr 21, 2023
ef2ca28
Update cspell.json
kevaundray Apr 21, 2023
f821ec1
update bb-sys for linux env fixes
phated Apr 21, 2023
8d1eace
add issue numbers to TODOs
phated Apr 21, 2023
ab9e8c3
Update transcript comment
phated Apr 21, 2023
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
21 changes: 20 additions & 1 deletion .envrc
Original file line number Diff line number Diff line change
@@ -1 +1,20 @@
use nix
# Based on https://github.com/direnv/direnv-vscode/blob/158e8302c2594cc0eaa5f8b4f0cafedd4e1c0315/.envrc

# You can define your system-specific logic (like Git settings or GH tokens) in .envrc.local
# If that logic is usable by other people and might improve development environment, consider
# contributing it to this file!

source_env_if_exists .envrc.local

if [[ -z "${SKIP_NIX:-}" ]] && has nix; then

if nix flake metadata &>/dev/null && has use_flake; then
# use flakes if possible
use flake

else
# Otherwise fall back to pure nix
use nix
fi

fi
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
pull-request-title-pattern: "chore(noir): Release ${version}"
extra-files: |
Cargo.toml
flake.nix

update-lockfile:
name: Update lockfile
Expand Down
21 changes: 0 additions & 21 deletions .github/workflows/rust.yml

This file was deleted.

35 changes: 35 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Test

on: [push, pull_request]

# This will cancel previous runs when a branch or PR is updated
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.ref || github.run_id }}
cancel-in-progress: true

jobs:
test:
name: Test on ${{ matrix.os }}
runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
include:
- os: ubuntu-latest
target: x86_64-linux
- os: macos-latest
target: x86_64-darwin

steps:
- name: Checkout
uses: actions/checkout@v3

- uses: cachix/install-nix-action@v20
with:
nix_path: nixpkgs=channel:nixos-22.11
github_access_token: ${{ secrets.GITHUB_TOKEN }}

- name: Run `nix flake check`
run: |
nix flake check
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,19 @@
.DS_Store
examples/**/target/
examples/9
.vscode
kevaundray marked this conversation as resolved.
Show resolved Hide resolved
node_modules
pkg/

# Nix stuff
result
.envrc.local
.direnv/

# Nargo output
*.proof
*.acir
*.acir.sha256
*.tr
*.pk
*.vk
**/Verifier.toml
**/Verifier.toml
13 changes: 13 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
// List of extensions which should be recommended for users of this workspace.
"recommendations": [
"mkhl.direnv",
"jnoortheen.nix-ide",
"rust-lang.rust-analyzer",
"redhat.vscode-yaml"
],
// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
"unwantedRecommendations": []
}
16 changes: 16 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"direnv.restart.automatic": true,
"redhat.telemetry.enabled": false,
"yaml.recommendations.show": false,
"nix.serverPath": "nil",
"nix.enableLanguageServer": true,
"nix.serverSettings": {
"nil": {
"formatting": {
"command": [
"nixpkgs-fmt"
]
}
}
},
}
Loading