Skip to content
This repository has been archived by the owner on Oct 31, 2023. It is now read-only.

feat!: Depend upon upstream barretenberg & switch to UltraPlonk #84

Merged
merged 84 commits into from
Apr 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
a9bb836
feat: Introduce barretenberg-sys crate to provide native bindings
phated Mar 13, 2023
8993e7c
chore: Remove committed barretenberg.wasm
phated Mar 13, 2023
bdbcbb1
fix!: Copy wasm into project during build instead of committing it
phated Mar 13, 2023
52822a9
feat: Build the project with Nix
phated Mar 13, 2023
eb57b8f
chore: Remove barretenberg_dep.sh
phated Mar 13, 2023
4912774
Comment
phated Mar 14, 2023
35bee99
Use master branch
phated Mar 14, 2023
d5bcd54
Back to static
phated Mar 14, 2023
3b00403
Better error messages when build script fails
phated Mar 14, 2023
e2e9728
Add links toml key
phated Mar 14, 2023
b41c46c
Avoid OS being pub
phated Mar 14, 2023
813735e
Move name and version into nix
phated Mar 14, 2023
728f559
Share environment with devShell
phated Mar 14, 2023
e4ed021
Add Security framework so tests run on apple
phated Mar 14, 2023
0afa73c
Comment
phated Mar 14, 2023
b7b93c7
Provide NOIR_TRANSCRIPT via nix fetch
phated Mar 15, 2023
154e84b
Document nativeBuildInputs
phated Mar 15, 2023
398c716
Rework nix to build & reuse artifact & add test check
phated Mar 15, 2023
70604b3
Rename for barretenberg-backend
phated Mar 15, 2023
98dba82
Add clippy check
phated Mar 15, 2023
2068ae4
Fix clippy warnings
phated Mar 15, 2023
cccb91d
Apply our clippy flags
phated Mar 15, 2023
da61389
Update some comments
phated Mar 15, 2023
3be775b
Simplify check naming & do various cleanup
phated Mar 15, 2023
158573d
Prefix cargo
phated Mar 15, 2023
032c99b
Try to build with nix in CI
phated Mar 15, 2023
cee6700
Switch to rust-embed to interpolate the nix env var
phated Mar 15, 2023
26fc3a2
try to override bintools for all of crane
phated Mar 16, 2023
92a675c
feat(nix): Switch to which clang (#88)
kobyhallx Mar 16, 2023
a12d7e9
gcc11 libs always?
phated Mar 16, 2023
b35456d
why does ring fail to build?
phated Mar 16, 2023
aae64b4
which fails in nix
phated Mar 16, 2023
b41c507
back to stdenv
phated Mar 16, 2023
0f0622c
try to use pkg-config to find omp
phated Mar 16, 2023
fd96ca3
pkg-config cannot load omp, move the link to the bottom again
phated Mar 16, 2023
a5c84e5
avoid cleaning the source
phated Mar 17, 2023
449859a
try adding the linker config to the workspace root
phated Mar 17, 2023
0385274
try overriding the dummy src to copy the cargo dir
phated Mar 17, 2023
a85f8ed
put rustls back
phated Mar 17, 2023
929ac47
fix dummysrc
phated Mar 17, 2023
0019192
put the cargo dir at the root of the dummy src
phated Mar 17, 2023
801ac3a
build deps without bb-sys
phated Mar 17, 2023
4b03165
Copy the linker config to root of workspace
phated Mar 17, 2023
232410a
Remove bb-sys from workspace and use as git dep
phated Mar 21, 2023
2a18f32
Update G2_START, rename transcript & fetch monomial transcript
phated Mar 22, 2023
e82dd5d
Change transcript name and download URL
phated Mar 22, 2023
038597e
trying to get it working
phated Mar 28, 2023
286caf3
changes to wasm instance load and new bb.wasm using ultra composer
vezenovm Mar 15, 2023
c806b56
fixed up bb.wasm with logic constraints for ultra
vezenovm Mar 15, 2023
d6c2926
rename wasm composer methods
vezenovm Mar 22, 2023
f95803c
testing ultra still, pushing remotely for others to access
vezenovm Mar 28, 2023
cc6b56f
working towards solidity verifier
phated Mar 27, 2023
61c75fa
Set AND and XOR to false
phated Mar 28, 2023
627a6ed
make things kind of work
phated Mar 28, 2023
29eeeef
WIP
phated Mar 30, 2023
976f645
re-enable AND and XOR - needs test
phated Mar 30, 2023
a5eedaf
remove print statments
phated Mar 30, 2023
7751c45
re-enable tests
phated Mar 30, 2023
213cdab
cleanup
phated Mar 30, 2023
ba33c62
update merkle wasm test hashes
phated Mar 30, 2023
8bd47b3
use latest bb-sys commit
phated Mar 30, 2023
3d3e981
removed check
phated Mar 30, 2023
37b8dd2
update lockfile
phated Mar 30, 2023
83a4a3c
cleanup and notes from diff review
phated Mar 30, 2023
b826ab6
Generate solidity contract natively
phated Mar 31, 2023
1df8e4c
update lockfile
phated Mar 31, 2023
c0f59eb
update lockfile
phated Apr 3, 2023
997b035
clippy
phated Apr 3, 2023
9271a1b
include solidity files in source
phated Apr 3, 2023
a244f1b
clippy
phated Apr 3, 2023
dc3ea4c
implement solidity verifier in wasm
phated Apr 3, 2023
d3d90f4
Use workarounds from bb nix and update import bindings
phated Apr 5, 2023
16810a6
update lockfile
phated Apr 5, 2023
2cb91d6
clippy
phated Apr 5, 2023
463c8e2
update lockfile
phated Apr 5, 2023
de793be
update lockfile
phated Apr 5, 2023
bfd26ce
dedupe contract and remove old contract stuff in common crate
phated Apr 5, 2023
9d07ab1
update lockfile
phated Apr 5, 2023
bbb7e9f
diff review nits
phated Apr 5, 2023
20062bc
Use published bb-sys crate
phated Apr 6, 2023
9ac585a
cleanup description
phated Apr 6, 2023
f8db8e9
Merge branch 'master' into mv/ultra-wasm
phated Apr 6, 2023
c539cc1
Update barretenberg_wasm/src/lib.rs
phated Apr 6, 2023
756fe09
update lockfile
phated Apr 6, 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
36 changes: 27 additions & 9 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,32 @@ concurrency:
cancel-in-progress: true

jobs:
check_n_test:
name: cargo check & test
uses: noir-lang/.github/.github/workflows/rust-test.yml@main
nix:
name: Nix build & test - ${{ matrix.os }}
runs-on: ${{ matrix.os }}

clippy:
name: cargo clippy
uses: noir-lang/.github/.github/workflows/rust-clippy.yml@main
strategy:
fail-fast: false
matrix:
include:
- os: ubuntu-latest
target: x86_64-linux
- os: macos-latest
target: x86_64-darwin

format:
name: cargo fmt
uses: noir-lang/.github/.github/workflows/rust-format.yml@main
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: Cargo clippy
run: |
nix build -L .#checks.${{ matrix.target }}.cargo-clippy

- name: Cargo test
run: |
nix build -L .#checks.${{ matrix.target }}.cargo-test
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/target
**/target
target
.DS_Store
node_modules
dest
noir-example-project
result
barretenberg_wasm/src/barretenberg.wasm
Loading