From 8a414396663f3f7683e9a36278faf09a709cb5ca Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 6 Sep 2023 20:37:59 +0000 Subject: [PATCH 1/3] fix: remaining refs to clang15 --- .gitmodules | 12 ----------- .../barretenberg/barretenberg.code-workspace | 2 +- circuits/cpp/barretenberg/cpp/bootstrap.sh | 2 +- ...circuits-x86_64-linux-clang-builder-runner | 20 +++++++++---------- circuits/cpp/barretenberg/sol/Dockerfile | 20 +++++++++---------- circuits/cpp/barretenberg/sol/bootstrap.sh | 4 ++-- 6 files changed, 24 insertions(+), 36 deletions(-) diff --git a/.gitmodules b/.gitmodules index 64ffb023e53..62c1fb92b7c 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/barretenberg.code-workspace b/circuits/cpp/barretenberg/barretenberg.code-workspace index d3709dc0976..0995a1c0c9f 100644 --- a/circuits/cpp/barretenberg/barretenberg.code-workspace +++ b/circuits/cpp/barretenberg/barretenberg.code-workspace @@ -151,7 +151,7 @@ "editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd" }, "cmake.configureArgs": [ - "--preset clang15", + "--preset clang16", "-G Ninja", "-g" ], diff --git a/circuits/cpp/barretenberg/cpp/bootstrap.sh b/circuits/cpp/barretenberg/cpp/bootstrap.sh index 869bbc9c885..4cc41dfb740 100755 --- a/circuits/cpp/barretenberg/cpp/bootstrap.sh +++ b/circuits/cpp/barretenberg/cpp/bootstrap.sh @@ -35,7 +35,7 @@ if [ "$OS" == "macos" ]; then PRESET=default else if [ "$(which clang++-15)" != "" ]; then - PRESET=clang15 + PRESET=clang16 else PRESET=default fi diff --git a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.circuits-x86_64-linux-clang-builder-runner b/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.circuits-x86_64-linux-clang-builder-runner index 7ac0ea01a07..87a7f3c0781 100644 --- a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.circuits-x86_64-linux-clang-builder-runner +++ b/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.circuits-x86_64-linux-clang-builder-runner @@ -2,16 +2,16 @@ FROM alpine:3.17 RUN apk update \ && apk upgrade \ && apk add --no-cache \ - bash \ - build-base \ - clang15 \ - openmp \ - openmp-dev \ - cmake \ - ninja \ - git \ - curl \ - perl + bash \ + build-base \ + clang16 \ + openmp \ + openmp-dev \ + cmake \ + ninja \ + git \ + curl \ + perl WORKDIR /usr/src/barretenberg/cpp diff --git a/circuits/cpp/barretenberg/sol/Dockerfile b/circuits/cpp/barretenberg/sol/Dockerfile index 0b6d172926b..b4b1468ba44 100644 --- a/circuits/cpp/barretenberg/sol/Dockerfile +++ b/circuits/cpp/barretenberg/sol/Dockerfile @@ -1,15 +1,15 @@ FROM alpine:3.17 RUN apk update \ - && apk upgrade \ - && apk add --no-cache \ - build-base \ - clang15 \ - openmp-dev \ - cmake \ - ninja \ - git \ - curl \ - perl + && apk upgrade \ + && apk add --no-cache \ + build-base \ + clang16 \ + openmp-dev \ + cmake \ + ninja \ + git \ + curl \ + perl WORKDIR /usr/src/barretenberg/cpp diff --git a/circuits/cpp/barretenberg/sol/bootstrap.sh b/circuits/cpp/barretenberg/sol/bootstrap.sh index fa9a85bbf06..03f5d31909c 100755 --- a/circuits/cpp/barretenberg/sol/bootstrap.sh +++ b/circuits/cpp/barretenberg/sol/bootstrap.sh @@ -18,8 +18,8 @@ cd ../../sol echo "Building c++ binaries..." cd ../cpp -cmake --preset clang15 -cmake --build --preset clang15 --target solidity_key_gen solidity_proof_gen +cmake --preset clang16 +cmake --build --preset clang16 --target solidity_key_gen solidity_proof_gen cd ../sol echo "Generating keys..." From 3d8ced55551ffadddeabd02f8b09862ad3f907fd Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 6 Sep 2023 20:38:36 +0000 Subject: [PATCH 2/3] fix: remaining refs to clang15 --- .gitmodules | 12 +++++++++++ ...circuits-x86_64-linux-clang-builder-runner | 20 +++++++++---------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index 62c1fb92b7c..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 diff --git a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.circuits-x86_64-linux-clang-builder-runner b/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.circuits-x86_64-linux-clang-builder-runner index 87a7f3c0781..7ac0ea01a07 100644 --- a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.circuits-x86_64-linux-clang-builder-runner +++ b/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.circuits-x86_64-linux-clang-builder-runner @@ -2,16 +2,16 @@ FROM alpine:3.17 RUN apk update \ && apk upgrade \ && apk add --no-cache \ - bash \ - build-base \ - clang16 \ - openmp \ - openmp-dev \ - cmake \ - ninja \ - git \ - curl \ - perl + bash \ + build-base \ + clang15 \ + openmp \ + openmp-dev \ + cmake \ + ninja \ + git \ + curl \ + perl WORKDIR /usr/src/barretenberg/cpp From 4c77c02f48bc26c0ac1a41c8fbc8473809899ab3 Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 6 Sep 2023 20:39:15 +0000 Subject: [PATCH 3/3] fix: remaining refs to clang15 --- circuits/cpp/barretenberg/sol/Dockerfile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/circuits/cpp/barretenberg/sol/Dockerfile b/circuits/cpp/barretenberg/sol/Dockerfile index b4b1468ba44..0b6d172926b 100644 --- a/circuits/cpp/barretenberg/sol/Dockerfile +++ b/circuits/cpp/barretenberg/sol/Dockerfile @@ -1,15 +1,15 @@ FROM alpine:3.17 RUN apk update \ - && apk upgrade \ - && apk add --no-cache \ - build-base \ - clang16 \ - openmp-dev \ - cmake \ - ninja \ - git \ - curl \ - perl + && apk upgrade \ + && apk add --no-cache \ + build-base \ + clang15 \ + openmp-dev \ + cmake \ + ninja \ + git \ + curl \ + perl WORKDIR /usr/src/barretenberg/cpp