From f9b06de3a42ae478cdb32312b0fc6d642e1fb1f5 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Mon, 10 Apr 2023 13:13:24 -0700 Subject: [PATCH 1/4] fix: Barretenberg renamed pedersen to pedersen_commitment --- build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.rs b/build.rs index 65c5588..157b8aa 100644 --- a/build.rs +++ b/build.rs @@ -81,7 +81,7 @@ fn main() -> Result<()> { r#" #include #include - #include + #include #include #include "#, From ef4fa42463867e32bb313652cf7a941a966b5735 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Mon, 10 Apr 2023 13:13:35 -0700 Subject: [PATCH 2/4] temp pin my branch --- flake.lock | 43 +++++++++++++++++++++++++++++++------------ flake.nix | 2 +- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index c340a5e..116f461 100644 --- a/flake.lock +++ b/flake.lock @@ -10,15 +10,16 @@ ] }, "locked": { - "lastModified": 1680810781, - "narHash": "sha256-2ctkV3EyHtog3caxbckTDUtJbMk/USdmF179Jvr0w40=", + "lastModified": 1681153256, + "narHash": "sha256-0rHyY0vDbCfziBwFcrVZS9GDjLbjSQyCvTZhdmVhzk0=", "owner": "AztecProtocol", "repo": "barretenberg", - "rev": "3bc724d2163d29041bfa29a1e49625bab77289a2", + "rev": "ac2db15e26e4403df4154d6f3d4765060f456bf2", "type": "github" }, "original": { "owner": "AztecProtocol", + "ref": "phated/generator-memory-oob", "repo": "barretenberg", "type": "github" } @@ -78,12 +79,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1680776469, - "narHash": "sha256-3CXUDK/3q/kieWtdsYpDOBJw3Gw4Af6x+2EiSnIkNQw=", + "lastModified": 1681037374, + "narHash": "sha256-XL6X3VGbEFJZDUouv2xpKg2Aljzu/etPLv5e1FPt1q0=", "owner": "numtide", "repo": "flake-utils", - "rev": "411e8764155aa9354dbcd6d5faaeb97e9e3dce24", + "rev": "033b9f258ca96a10e543d4442071f614dc3f8412", "type": "github" }, "original": { @@ -94,11 +98,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1680665430, - "narHash": "sha256-MTVhTukwza1Jlq2gECITZPFnhROmylP2uv3O3cSqQCE=", + "lastModified": 1681091990, + "narHash": "sha256-ifIzhksUBZKp5WgCuoVhDY32qaEplXp7khzrB6zkaFc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5233fd2ba76a3accb5aaa999c00509a11fd0793c", + "rev": "ea96b4af6148114421fda90df33cf236ff5ecf1d", "type": "github" }, "original": { @@ -152,11 +156,11 @@ ] }, "locked": { - "lastModified": 1680747499, - "narHash": "sha256-E9rcxSTsqRqNd4SD+D/4aqm3qfFyVw0S9YseCks7h+c=", + "lastModified": 1681093076, + "narHash": "sha256-6uLZNeuP5jDDGlFkXgcoAxsJhTKy8yUTw25zdLHzdxE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8ad3b5ee01a2074b54274216ff2cf0ab844a7426", + "rev": "45c2ed9dd1397526dad35fc867c43955d87f9f3f", "type": "github" }, "original": { @@ -164,6 +168,21 @@ "repo": "rust-overlay", "type": "github" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 55a9294..943c78c 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,7 @@ }; barretenberg = { - url = "github:AztecProtocol/barretenberg"; + url = "github:AztecProtocol/barretenberg/phated/generator-memory-oob"; inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.follows = "flake-utils"; From 7aa8cfd47f581f26236dca2de6e19a9df859711b Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Mon, 10 Apr 2023 13:15:27 -0700 Subject: [PATCH 3/4] cspell --- cspell.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cspell.json b/cspell.json index 1be7563..b3d993f 100644 --- a/cspell.json +++ b/cspell.json @@ -9,6 +9,10 @@ "bindgen", "Bindgen", "thiserror", - "Barretenberg" + "Barretenberg", + "consts", + "acir", + "schnorr", + "plookup" ] } From 1cb976b75b1c8188bcbc0e5b1f97df3f4b090a70 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Wed, 12 Apr 2023 08:18:51 -0700 Subject: [PATCH 4/4] update commit ref --- .github/workflows/test.yml | 2 +- README.md | 2 +- flake.lock | 31 +++++++++++++++---------------- flake.nix | 2 +- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 16752a8..b2720ab 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -54,7 +54,7 @@ jobs: with: repository: AztecProtocol/barretenberg path: barretenberg - ref: 3bc724d2163d29041bfa29a1e49625bab77289a2 + ref: 500daf1ceb03771d2c01eaf1a86139a7ac1d814f - name: Setup Linux environment if: matrix.os == 'ubuntu-latest' diff --git a/README.md b/README.md index 9687312..91b3b0e 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ To leverage the `barretenberg-sys` crate, you'll need to install some global pac Linker provided by Clang, but might need to be installed via `apt install lld`. -4. `barretenberg` (preferably at commit `3bc724d2163d29041bfa29a1e49625bab77289a2`) +4. `barretenberg` (preferably at commit `500daf1ceb03771d2c01eaf1a86139a7ac1d814f`) Needs to be built and installed following the instructions [in the README](https://github.com/AztecProtocol/barretenberg#getting-started). Note that barretenberg has its own [dependencies](https://github.com/AztecProtocol/barretenberg#dependencies) that will need to be installed, such as `cmake` and `ninja`. diff --git a/flake.lock b/flake.lock index 116f461..a3aca5d 100644 --- a/flake.lock +++ b/flake.lock @@ -10,16 +10,15 @@ ] }, "locked": { - "lastModified": 1681153256, - "narHash": "sha256-0rHyY0vDbCfziBwFcrVZS9GDjLbjSQyCvTZhdmVhzk0=", + "lastModified": 1681312149, + "narHash": "sha256-+W+atUPf5OXPt/HX12+JL5N9AiutjL3HeWVVNxWHpQg=", "owner": "AztecProtocol", "repo": "barretenberg", - "rev": "ac2db15e26e4403df4154d6f3d4765060f456bf2", + "rev": "500daf1ceb03771d2c01eaf1a86139a7ac1d814f", "type": "github" }, "original": { "owner": "AztecProtocol", - "ref": "phated/generator-memory-oob", "repo": "barretenberg", "type": "github" } @@ -34,11 +33,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1680584903, - "narHash": "sha256-uraq+D3jcLzw/UVk0xMHcnfILfIMa0DLrtAEq2nNlxU=", + "lastModified": 1681177078, + "narHash": "sha256-ZNIjBDou2GOabcpctiQykEQVkI8BDwk7TyvlWlI4myE=", "owner": "ipetkov", "repo": "crane", - "rev": "65d3f6a3970cd46bef5eedfd458300f72c56b3c5", + "rev": "0c9f468ff00576577d83f5019a66c557ede5acf6", "type": "github" }, "original": { @@ -83,11 +82,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1681037374, - "narHash": "sha256-XL6X3VGbEFJZDUouv2xpKg2Aljzu/etPLv5e1FPt1q0=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "033b9f258ca96a10e543d4442071f614dc3f8412", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -98,11 +97,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1681091990, - "narHash": "sha256-ifIzhksUBZKp5WgCuoVhDY32qaEplXp7khzrB6zkaFc=", + "lastModified": 1681154110, + "narHash": "sha256-OQwWzlzAY1dCqgSsgZzsPIOGmX4pBGaoXOy0rSl4b5Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ea96b4af6148114421fda90df33cf236ff5ecf1d", + "rev": "115a96e2ac1e92937cd47c30e073e16dcaaf6247", "type": "github" }, "original": { @@ -156,11 +155,11 @@ ] }, "locked": { - "lastModified": 1681093076, - "narHash": "sha256-6uLZNeuP5jDDGlFkXgcoAxsJhTKy8yUTw25zdLHzdxE=", + "lastModified": 1681265948, + "narHash": "sha256-wYS5dR1fRoU6VtoKScz1OUS/dmart7hfI0G71qkJcwc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "45c2ed9dd1397526dad35fc867c43955d87f9f3f", + "rev": "b10a42fe6bb0b6d1b335c1f137419ebf754b2b59", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 943c78c..55a9294 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,7 @@ }; barretenberg = { - url = "github:AztecProtocol/barretenberg/phated/generator-memory-oob"; + url = "github:AztecProtocol/barretenberg"; inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.follows = "flake-utils";