From eba926d48f812915302a1533fc27b5896ab3536c Mon Sep 17 00:00:00 2001 From: kevaundray Date: Wed, 23 Aug 2023 16:42:39 +0000 Subject: [PATCH 1/2] git subrepo pull (merge) circuits/cpp/barretenberg subrepo: subdir: "circuits/cpp/barretenberg" merged: "87d00c655" upstream: origin: "https://github.com/AztecProtocol/barretenberg" branch: "master" commit: "b42bb32db" git-subrepo: version: "0.4.6" origin: "???" commit: "???" --- .gitmodules | 12 ------------ circuits/cpp/barretenberg/.gitrepo | 2 +- .../barretenberg/.release-please-manifest.json | 2 +- circuits/cpp/barretenberg/CHANGELOG.md | 16 ++++++++++++++++ circuits/cpp/barretenberg/VERSION | 2 +- circuits/cpp/barretenberg/barretenberg-wasm.nix | 2 +- circuits/cpp/barretenberg/barretenberg.nix | 2 +- circuits/cpp/barretenberg/cpp/CMakeLists.txt | 2 +- circuits/cpp/barretenberg/ts/CHANGELOG.md | 8 ++++++++ circuits/cpp/barretenberg/ts/package.json | 2 +- 10 files changed, 31 insertions(+), 19 deletions(-) diff --git a/.gitmodules b/.gitmodules index 64ffb023e53..24ef9571bd4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,18 +1,6 @@ -[submodule "legacy-barretenberg-build-system"] - path = circuits/cpp/barretenberg/build-system - url = https://github.com/AztecProtocol/build-system [submodule "l1-contracts/lib/openzeppelin-contracts"] path = l1-contracts/lib/openzeppelin-contracts url = https://github.com/openzeppelin/openzeppelin-contracts [submodule "l1-contracts/lib/forge-std"] path = l1-contracts/lib/forge-std url = https://github.com/foundry-rs/forge-std -[submodule "circuits/cpp/barretenberg/sol/lib/forge-std"] - path = circuits/cpp/barretenberg/sol/lib/forge-std - url = https://github.com/foundry-rs/forge-std -[submodule "circuits/cpp/barretenberg/sol/lib/solidity-stringutils"] - path = circuits/cpp/barretenberg/sol/lib/solidity-stringutils - url = https://github.com/Arachnid/solidity-stringutils -[submodule "circuits/cpp/barretenberg/sol/lib/openzeppelin-contracts"] - path = circuits/cpp/barretenberg/sol/lib/openzeppelin-contracts - url = https://github.com/OpenZeppelin/openzeppelin-contracts diff --git a/circuits/cpp/barretenberg/.gitrepo b/circuits/cpp/barretenberg/.gitrepo index 8f8a793b066..1f5f1cd869d 100644 --- a/circuits/cpp/barretenberg/.gitrepo +++ b/circuits/cpp/barretenberg/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/AztecProtocol/barretenberg branch = master - commit = 41d362e9c9ffeb763cd56ca8a9f8c4512b86c80c + commit = b42bb32db019717aa37bb2f1404d081cc9969202 parent = 31488c19acfdfd5ff0c3e7f242f94dc0aa049158 method = merge cmdver = 0.4.6 diff --git a/circuits/cpp/barretenberg/.release-please-manifest.json b/circuits/cpp/barretenberg/.release-please-manifest.json index b1b85db09cd..3e57f385f5d 100644 --- a/circuits/cpp/barretenberg/.release-please-manifest.json +++ b/circuits/cpp/barretenberg/.release-please-manifest.json @@ -1 +1 @@ -{".":"0.4.2","ts":"0.4.2"} \ No newline at end of file +{".":"0.4.3","ts":"0.4.3"} \ No newline at end of file diff --git a/circuits/cpp/barretenberg/CHANGELOG.md b/circuits/cpp/barretenberg/CHANGELOG.md index 16aef118aac..793bec2af43 100644 --- a/circuits/cpp/barretenberg/CHANGELOG.md +++ b/circuits/cpp/barretenberg/CHANGELOG.md @@ -1,5 +1,21 @@ # Changelog +## [0.4.3](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.4.2...barretenberg-v0.4.3) (2023-08-23) + + +### Features + +* **bb:** Use an environment variable to set the transcript URL ([#1750](https://github.com/AztecProtocol/barretenberg/issues/1750)) ([41d362e](https://github.com/AztecProtocol/barretenberg/commit/41d362e9c9ffeb763cd56ca8a9f8c4512b86c80c)) + + +### Bug Fixes + +* Clang version in README and subrepo edge case ([#1730](https://github.com/AztecProtocol/barretenberg/issues/1730)) ([74158c4](https://github.com/AztecProtocol/barretenberg/commit/74158c4e467d4b6ab90e7d5aeb9a28f04adc1d66)) +* Download SRS using one canonical URL across the codebase ([#1748](https://github.com/AztecProtocol/barretenberg/issues/1748)) ([5c91de7](https://github.com/AztecProtocol/barretenberg/commit/5c91de7296e054f6d5ac3dca94ca85e06d496048)) +* Proving fails when circuit has size > ~500K ([#1739](https://github.com/AztecProtocol/barretenberg/issues/1739)) ([6d32383](https://github.com/AztecProtocol/barretenberg/commit/6d323838a525190618d608598357ee4608c46699)) +* Revert clang check bootstrap.sh ([#1734](https://github.com/AztecProtocol/barretenberg/issues/1734)) ([65a38bc](https://github.com/AztecProtocol/barretenberg/commit/65a38bc045c66c5f64e87ba8c6e446945f2f0a24)) +* Update barretenberg bootstrap.sh for mac ([#1732](https://github.com/AztecProtocol/barretenberg/issues/1732)) ([f21ac3e](https://github.com/AztecProtocol/barretenberg/commit/f21ac3e893b5d30f7a4ba8ca10e6fd70f5c617b4)) + ## [0.4.2](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.4.1...barretenberg-v0.4.2) (2023-08-21) diff --git a/circuits/cpp/barretenberg/VERSION b/circuits/cpp/barretenberg/VERSION index 04449497853..57bf754bf3f 100644 --- a/circuits/cpp/barretenberg/VERSION +++ b/circuits/cpp/barretenberg/VERSION @@ -1 +1 @@ -v0.4.2 x-release-please-version +v0.4.3 x-release-please-version diff --git a/circuits/cpp/barretenberg/barretenberg-wasm.nix b/circuits/cpp/barretenberg/barretenberg-wasm.nix index 933569143b1..1c2e2b77d51 100644 --- a/circuits/cpp/barretenberg/barretenberg-wasm.nix +++ b/circuits/cpp/barretenberg/barretenberg-wasm.nix @@ -6,7 +6,7 @@ in stdenv.mkDerivation { pname = "barretenberg.wasm"; - version = "0.4.2"; # x-release-please-version + version = "0.4.3"; # x-release-please-version src = ./cpp; diff --git a/circuits/cpp/barretenberg/barretenberg.nix b/circuits/cpp/barretenberg/barretenberg.nix index be832ca6116..a53bb79aa4d 100644 --- a/circuits/cpp/barretenberg/barretenberg.nix +++ b/circuits/cpp/barretenberg/barretenberg.nix @@ -14,7 +14,7 @@ in buildEnv.mkDerivation { pname = "libbarretenberg"; - version = "0.4.2"; # x-release-please-version + version = "0.4.3"; # x-release-please-version src = ./cpp; diff --git a/circuits/cpp/barretenberg/cpp/CMakeLists.txt b/circuits/cpp/barretenberg/cpp/CMakeLists.txt index 9106212f0dd..f9c53c8cc9c 100644 --- a/circuits/cpp/barretenberg/cpp/CMakeLists.txt +++ b/circuits/cpp/barretenberg/cpp/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.24) project( Barretenberg DESCRIPTION "BN254 elliptic curve library, and PLONK SNARK prover" - VERSION 0.4.2 # x-release-please-version + VERSION 0.4.3 # x-release-please-version LANGUAGES CXX C ) diff --git a/circuits/cpp/barretenberg/ts/CHANGELOG.md b/circuits/cpp/barretenberg/ts/CHANGELOG.md index 58967dd0cb8..4eaebde9300 100644 --- a/circuits/cpp/barretenberg/ts/CHANGELOG.md +++ b/circuits/cpp/barretenberg/ts/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [0.4.3](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.4.2...barretenberg.js-v0.4.3) (2023-08-23) + + +### Bug Fixes + +* Download SRS using one canonical URL across the codebase ([#1748](https://github.com/AztecProtocol/barretenberg/issues/1748)) ([5c91de7](https://github.com/AztecProtocol/barretenberg/commit/5c91de7296e054f6d5ac3dca94ca85e06d496048)) +* Proving fails when circuit has size > ~500K ([#1739](https://github.com/AztecProtocol/barretenberg/issues/1739)) ([6d32383](https://github.com/AztecProtocol/barretenberg/commit/6d323838a525190618d608598357ee4608c46699)) + ## [0.4.2](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.4.1...barretenberg.js-v0.4.2) (2023-08-21) diff --git a/circuits/cpp/barretenberg/ts/package.json b/circuits/cpp/barretenberg/ts/package.json index 8518682c056..29b087f7aa2 100644 --- a/circuits/cpp/barretenberg/ts/package.json +++ b/circuits/cpp/barretenberg/ts/package.json @@ -1,6 +1,6 @@ { "name": "@aztec/bb.js", - "version": "0.4.2", + "version": "0.4.3", "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/circuits/cpp/barretenberg/ts", "license": "MIT", "type": "module", From 36ef15a8a3efb1a4ab97e108128453697cea5c82 Mon Sep 17 00:00:00 2001 From: kevaundray Date: Wed, 23 Aug 2023 16:43:01 +0000 Subject: [PATCH 2/2] .gitmodules --- .gitmodules | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitmodules b/.gitmodules index 24ef9571bd4..64ffb023e53 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,18 @@ +[submodule "legacy-barretenberg-build-system"] + path = circuits/cpp/barretenberg/build-system + url = https://github.com/AztecProtocol/build-system [submodule "l1-contracts/lib/openzeppelin-contracts"] path = l1-contracts/lib/openzeppelin-contracts url = https://github.com/openzeppelin/openzeppelin-contracts [submodule "l1-contracts/lib/forge-std"] path = l1-contracts/lib/forge-std url = https://github.com/foundry-rs/forge-std +[submodule "circuits/cpp/barretenberg/sol/lib/forge-std"] + path = circuits/cpp/barretenberg/sol/lib/forge-std + url = https://github.com/foundry-rs/forge-std +[submodule "circuits/cpp/barretenberg/sol/lib/solidity-stringutils"] + path = circuits/cpp/barretenberg/sol/lib/solidity-stringutils + url = https://github.com/Arachnid/solidity-stringutils +[submodule "circuits/cpp/barretenberg/sol/lib/openzeppelin-contracts"] + path = circuits/cpp/barretenberg/sol/lib/openzeppelin-contracts + url = https://github.com/OpenZeppelin/openzeppelin-contracts