From db4b3fe3a1da5284ee1ff2718691a81fb9fa735b Mon Sep 17 00:00:00 2001 From: kevaundray Date: Sat, 2 Sep 2023 19:29:49 +0000 Subject: [PATCH 1/2] git subrepo pull (merge) circuits/cpp/barretenberg subrepo: subdir: "circuits/cpp/barretenberg" merged: "e4d04696e" upstream: origin: "https://github.com/AztecProtocol/barretenberg" branch: "master" commit: "41e028d83" 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 | 17 +++++++++++++++++ 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 | 11 +++++++++++ circuits/cpp/barretenberg/ts/package.json | 2 +- 10 files changed, 35 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 d6cf55bfe4a..9e963a099a6 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 = 5d8db8eb993334b43e24a51efba9c59e123320ab + commit = 41e028d834e4540a95ea10afba946299745eac8a parent = e72830468362f2ea26b3f830b7e056b096f56d6a 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 0adc66ce620..448138d5310 100644 --- a/circuits/cpp/barretenberg/.release-please-manifest.json +++ b/circuits/cpp/barretenberg/.release-please-manifest.json @@ -1 +1 @@ -{".":"0.4.6","ts":"0.4.6"} \ No newline at end of file +{".":"0.5.0","ts":"0.5.0"} \ No newline at end of file diff --git a/circuits/cpp/barretenberg/CHANGELOG.md b/circuits/cpp/barretenberg/CHANGELOG.md index 79339a20a83..76fe59e14cd 100644 --- a/circuits/cpp/barretenberg/CHANGELOG.md +++ b/circuits/cpp/barretenberg/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +## [0.5.0](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.4.6...barretenberg-v0.5.0) (2023-09-01) + + +### ⚠ BREAKING CHANGES + +* update to acvm 0.24.0 ([#1925](https://github.com/AztecProtocol/barretenberg/issues/1925)) + +### Bug Fixes + +* Benchmark preset uses clang16 ([#1902](https://github.com/AztecProtocol/barretenberg/issues/1902)) ([cd0ff0e](https://github.com/AztecProtocol/barretenberg/commit/cd0ff0e2c049917ec47a110b45d76bed4c00ae2a)) +* Reset keccak var inputs to 0 ([#1881](https://github.com/AztecProtocol/barretenberg/issues/1881)) ([23011ee](https://github.com/AztecProtocol/barretenberg/commit/23011ee1ea7f1b00b0f4194ebceedc75ea01c157)) + + +### Miscellaneous Chores + +* Update to acvm 0.24.0 ([#1925](https://github.com/AztecProtocol/barretenberg/issues/1925)) ([5d8db8e](https://github.com/AztecProtocol/barretenberg/commit/5d8db8eb993334b43e24a51efba9c59e123320ab)) + ## [0.4.6](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.4.5...barretenberg-v0.4.6) (2023-08-29) diff --git a/circuits/cpp/barretenberg/VERSION b/circuits/cpp/barretenberg/VERSION index 17fe4efbb73..d20dbcc1372 100644 --- a/circuits/cpp/barretenberg/VERSION +++ b/circuits/cpp/barretenberg/VERSION @@ -1 +1 @@ -v0.4.6 x-release-please-version +v0.5.0 x-release-please-version diff --git a/circuits/cpp/barretenberg/barretenberg-wasm.nix b/circuits/cpp/barretenberg/barretenberg-wasm.nix index e5efdc0568a..def57e2d87d 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.6"; # x-release-please-version + version = "0.5.0"; # x-release-please-version src = ./cpp; diff --git a/circuits/cpp/barretenberg/barretenberg.nix b/circuits/cpp/barretenberg/barretenberg.nix index 0007c5d2092..7e16af818a5 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.6"; # x-release-please-version + version = "0.5.0"; # x-release-please-version src = ./cpp; diff --git a/circuits/cpp/barretenberg/cpp/CMakeLists.txt b/circuits/cpp/barretenberg/cpp/CMakeLists.txt index 6eecea9a54c..92504526985 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.6 # x-release-please-version + VERSION 0.5.0 # x-release-please-version LANGUAGES CXX C ) diff --git a/circuits/cpp/barretenberg/ts/CHANGELOG.md b/circuits/cpp/barretenberg/ts/CHANGELOG.md index 7d7dea917a8..4fb66eb136a 100644 --- a/circuits/cpp/barretenberg/ts/CHANGELOG.md +++ b/circuits/cpp/barretenberg/ts/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## [0.5.0](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.4.6...barretenberg.js-v0.5.0) (2023-09-01) + + +### ⚠ BREAKING CHANGES + +* update to acvm 0.24.0 ([#1925](https://github.com/AztecProtocol/barretenberg/issues/1925)) + +### Miscellaneous Chores + +* Update to acvm 0.24.0 ([#1925](https://github.com/AztecProtocol/barretenberg/issues/1925)) ([5d8db8e](https://github.com/AztecProtocol/barretenberg/commit/5d8db8eb993334b43e24a51efba9c59e123320ab)) + ## [0.4.6](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.4.5...barretenberg.js-v0.4.6) (2023-08-29) diff --git a/circuits/cpp/barretenberg/ts/package.json b/circuits/cpp/barretenberg/ts/package.json index 4c365576549..310398c695b 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.6", + "version": "0.5.0", "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/circuits/cpp/barretenberg/ts", "license": "MIT", "type": "module", From b123223fd0b02d598158f0da9044b1e61139a411 Mon Sep 17 00:00:00 2001 From: kevaundray Date: Sat, 2 Sep 2023 19:30:09 +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