From ac11fb62dcec08a988aae6b7cc85c0f1767935e8 Mon Sep 17 00:00:00 2001 From: ludamad Date: Tue, 8 Aug 2023 13:26:22 -0400 Subject: [PATCH 1/2] git subrepo pull (merge) --force circuits/cpp/barretenberg subrepo: subdir: "circuits/cpp/barretenberg" merged: "d026d0103" upstream: origin: "https://github.com/AztecProtocol/barretenberg" branch: "master" commit: "d026d0103" git-subrepo: version: "0.4.6" origin: "???" commit: "???" --- .gitmodules | 12 -------- .../.github/workflows/release-please.yml | 25 ++++++++++------- circuits/cpp/barretenberg/.gitrepo | 4 +-- .../.release-please-manifest.json | 2 +- circuits/cpp/barretenberg/CHANGELOG.md | 28 +++++++++++++++++++ circuits/cpp/barretenberg/VERSION | 2 +- .../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 | 14 ++++++++++ circuits/cpp/barretenberg/ts/package.json | 2 +- 11 files changed, 65 insertions(+), 30 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/.github/workflows/release-please.yml b/circuits/cpp/barretenberg/.github/workflows/release-please.yml index 79741dff70e..1a5d8b75e4b 100644 --- a/circuits/cpp/barretenberg/.github/workflows/release-please.yml +++ b/circuits/cpp/barretenberg/.github/workflows/release-please.yml @@ -128,19 +128,24 @@ jobs: brew install cmake ninja - name: Compile Barretenberg + working-directory: cpp run: | - cd cpp cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert cmake --build --preset default --target bb + + - name: Package barretenberg artifact + working-directory: cpp/build/bin + run: | + mkdir dist + cp ./bb ./dist/bb + 7z a -ttar -so -an ./dist/* | 7z a -si ./barretenberg-x86_64-apple-darwin.tar.gz - - name: Tar bb binary (Mac) - run: tar -cvzf bb-mac.tar.gz cpp/build/bin/bb - - - name: Upload artifacts - uses: actions/upload-artifact@v2 + - name: Upload artifact + uses: actions/upload-artifact@v3 with: - name: release-mac - path: bb-mac.tar.gz + name: barretenberg-x86_64-apple-darwin + path: ./cpp/build/bin/barretenberg-x86_64-apple-darwin.tar.gz + retention-days: 3 release: name: Publish @@ -155,7 +160,7 @@ jobs: - name: Download files from Mac Runner uses: actions/download-artifact@v2 with: - name: release-mac + name: barretenberg-x86_64-apple-darwin - name: Publish to GitHub uses: softprops/action-gh-release@v1 @@ -165,4 +170,4 @@ jobs: files: | barretenberg.wasm.tar.gz bb-ubuntu.tar.gz - bb-mac.tar.gz + barretenberg-x86_64-apple-darwin.tar.gz diff --git a/circuits/cpp/barretenberg/.gitrepo b/circuits/cpp/barretenberg/.gitrepo index 6740555cbc6..dab7d1454d9 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 = d4ade2a5f06a3abf3c9c2635946d7121cc2f64b4 - parent = 5cf9c203e126b7613bf80960063d86cb9ee97954 + commit = d026d01038512b6da92b6cf33fb29059e4379a68 + parent = 3afd853074be02ebf0a8d1f6187e49505513017e 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 9464665e4ce..2d487c35030 100644 --- a/circuits/cpp/barretenberg/.release-please-manifest.json +++ b/circuits/cpp/barretenberg/.release-please-manifest.json @@ -1 +1 @@ -{".":"0.3.4","ts":"0.3.4"} \ No newline at end of file +{".":"0.3.6","ts":"0.3.6"} \ No newline at end of file diff --git a/circuits/cpp/barretenberg/CHANGELOG.md b/circuits/cpp/barretenberg/CHANGELOG.md index f6549df82d0..5d79640e585 100644 --- a/circuits/cpp/barretenberg/CHANGELOG.md +++ b/circuits/cpp/barretenberg/CHANGELOG.md @@ -1,5 +1,33 @@ # Changelog +## [0.3.6](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.3.5...barretenberg-v0.3.6) (2023-08-08) + + +### Features + +* Update release-please.yml ([#651](https://github.com/AztecProtocol/barretenberg/issues/651)) ([2795df6](https://github.com/AztecProtocol/barretenberg/commit/2795df6b705175a32fe2a6f18b3c572e297e277e)) + +## [0.3.5](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.3.4...barretenberg-v0.3.5) (2023-08-07) + + +### Features + +* Celer benchmark ([#1369](https://github.com/AztecProtocol/barretenberg/issues/1369)) ([d4ade2a](https://github.com/AztecProtocol/barretenberg/commit/d4ade2a5f06a3abf3c9c2635946d7121cc2f64b4)) +* Goblin Honk Composer/Prover/Verifier ([#1220](https://github.com/AztecProtocol/barretenberg/issues/1220)) ([970bb07](https://github.com/AztecProtocol/barretenberg/commit/970bb073763cc59552cd05dccf7f8fc63f58cef9)) +* Goblin translator prototype ([#1249](https://github.com/AztecProtocol/barretenberg/issues/1249)) ([7738d74](https://github.com/AztecProtocol/barretenberg/commit/7738d74791acc0fa8b1b1d8bb2a77783ca900123)) +* Internal keyword + lending contract and tests ([#978](https://github.com/AztecProtocol/barretenberg/issues/978)) ([e58ca4b](https://github.com/AztecProtocol/barretenberg/commit/e58ca4b332272fc57b2a5358bb5003bac79a8f5a)) +* Minimal barretenberg .circleci ([#1352](https://github.com/AztecProtocol/barretenberg/issues/1352)) ([708e2e2](https://github.com/AztecProtocol/barretenberg/commit/708e2e2786de5dce5bfc770c54734e5862a436e5)) + + +### Bug Fixes + +* Bootstrap.sh git hook for monorepo ([#1256](https://github.com/AztecProtocol/barretenberg/issues/1256)) ([b22b8d5](https://github.com/AztecProtocol/barretenberg/commit/b22b8d5f42ddfae140068c3ce8b3053d4c8d1874)) +* Build-system spot request cancellation ([#1339](https://github.com/AztecProtocol/barretenberg/issues/1339)) ([fc1d96a](https://github.com/AztecProtocol/barretenberg/commit/fc1d96a744a8d5a6cae06c408546c3638408551d)) +* Fixing external benchmarks ([#1250](https://github.com/AztecProtocol/barretenberg/issues/1250)) ([0ea6a39](https://github.com/AztecProtocol/barretenberg/commit/0ea6a39950e8cd5ff7765031457c162d03ebae06)) +* Fixing fuzzing build after composer splitting ([#1317](https://github.com/AztecProtocol/barretenberg/issues/1317)) ([946c23c](https://github.com/AztecProtocol/barretenberg/commit/946c23c52d45ddce973e453c40c048734e7f6937)) +* Reinstate barretenberg-benchmark-aggregator ([#1330](https://github.com/AztecProtocol/barretenberg/issues/1330)) ([407a915](https://github.com/AztecProtocol/barretenberg/commit/407a915a94c7d83dec9e14a11ad0e3461fd2906d)) +* Retry git submodule fetch ([#1371](https://github.com/AztecProtocol/barretenberg/issues/1371)) ([037dda3](https://github.com/AztecProtocol/barretenberg/commit/037dda3d254d56a20292d2bed5a9582d36c08427)) + ## [0.3.4](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.3.3...barretenberg-v0.3.4) (2023-07-25) diff --git a/circuits/cpp/barretenberg/VERSION b/circuits/cpp/barretenberg/VERSION index 8d7d53e0fe7..7ea12e0d690 100644 --- a/circuits/cpp/barretenberg/VERSION +++ b/circuits/cpp/barretenberg/VERSION @@ -1 +1 @@ -v0.3.4 x-release-please-version +v0.3.6 x-release-please-version diff --git a/circuits/cpp/barretenberg/barretenberg-wasm.nix b/circuits/cpp/barretenberg/barretenberg-wasm.nix index bdcb4b84be3..25b504dcbeb 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.3.4"; # x-release-please-version + version = "0.3.6"; # x-release-please-version src = ./cpp; diff --git a/circuits/cpp/barretenberg/barretenberg.nix b/circuits/cpp/barretenberg/barretenberg.nix index dd744c37c74..3ccaee5ddb7 100644 --- a/circuits/cpp/barretenberg/barretenberg.nix +++ b/circuits/cpp/barretenberg/barretenberg.nix @@ -14,7 +14,7 @@ in buildEnv.mkDerivation { pname = "libbarretenberg"; - version = "0.3.4"; # x-release-please-version + version = "0.3.6"; # x-release-please-version src = ./cpp; diff --git a/circuits/cpp/barretenberg/cpp/CMakeLists.txt b/circuits/cpp/barretenberg/cpp/CMakeLists.txt index 9877fc65cac..81f0e9e8788 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.3.4 # x-release-please-version + VERSION 0.3.6 # x-release-please-version LANGUAGES CXX C ) diff --git a/circuits/cpp/barretenberg/ts/CHANGELOG.md b/circuits/cpp/barretenberg/ts/CHANGELOG.md index 05b4a8aa7b0..7e0295a46c6 100644 --- a/circuits/cpp/barretenberg/ts/CHANGELOG.md +++ b/circuits/cpp/barretenberg/ts/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [0.3.6](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.3.5...barretenberg.js-v0.3.6) (2023-08-08) + + +### Miscellaneous Chores + +* **barretenberg.js:** Synchronize barretenberg versions + +## [0.3.5](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.3.4...barretenberg.js-v0.3.5) (2023-08-07) + + +### Miscellaneous Chores + +* **barretenberg.js:** Synchronize barretenberg versions + ## [0.3.4](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.3.3...barretenberg.js-v0.3.4) (2023-07-25) diff --git a/circuits/cpp/barretenberg/ts/package.json b/circuits/cpp/barretenberg/ts/package.json index 4444070e8c1..b5a7f3cfe11 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.3.4", + "version": "0.3.6", "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/circuits/cpp/barretenberg/ts", "license": "MIT", "type": "module", From baedf564450d2c91dbc40a2fa1b6775d42fcd3f0 Mon Sep 17 00:00:00 2001 From: ludamad Date: Tue, 8 Aug 2023 13:26:31 -0400 Subject: [PATCH 2/2] Revert .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