From 21cb22bbb2a0b894a8609f835a8ad28da44a52bd Mon Sep 17 00:00:00 2001 From: ludamad Date: Mon, 4 Sep 2023 11:34:21 -0400 Subject: [PATCH 1/4] git subrepo pull --force circuits/cpp/barretenberg subrepo: subdir: "circuits/cpp/barretenberg" merged: "c6c469aa5d" upstream: origin: "https://github.com/AztecProtocol/barretenberg" branch: "master" commit: "c6c469aa5d" git-subrepo: version: "0.4.6" origin: "???" commit: "???" --- .gitmodules | 12 ------------ circuits/cpp/barretenberg/.gitrepo | 4 ++-- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.gitmodules b/.gitmodules index 64ffb023e533..24ef9571bd48 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 aa21fe09a253..114164437d37 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 = 155e32ba1498bb18ebbd86d784aea8b56f910f8f - parent = 74c83c5e1436f391eef435926c2da1d508d67713 + commit = c6c469aa5da7c6973f656ddf8af4fb20c3e8e4f6 + parent = 0a2a515ecf52849cce1e45a7b39f44d420b43f34 method = merge cmdver = 0.4.6 From 10772d3ace43d01e4a45495baccd40d0ade20ee6 Mon Sep 17 00:00:00 2001 From: ludamad Date: Mon, 4 Sep 2023 11:36:04 -0400 Subject: [PATCH 2/4] Fix bb --- .gitmodules | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitmodules b/.gitmodules index 24ef9571bd48..64ffb023e533 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 From b00790b3f3260b789ab1b0929cee138ea15d781e Mon Sep 17 00:00:00 2001 From: ludamad Date: Mon, 4 Sep 2023 11:44:51 -0400 Subject: [PATCH 3/4] fix master --- yarn-project/end-to-end/scripts/run_tests_local | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/yarn-project/end-to-end/scripts/run_tests_local b/yarn-project/end-to-end/scripts/run_tests_local index e77366224170..1ea02e7bd9b1 100755 --- a/yarn-project/end-to-end/scripts/run_tests_local +++ b/yarn-project/end-to-end/scripts/run_tests_local @@ -8,9 +8,11 @@ export COMPOSE_FILE=${2:-./scripts/docker-compose.yml} aws ecr get-login-password --region us-east-2 | docker login --username AWS --password-stdin 278380418400.dkr.ecr.us-east-2.amazonaws.com +BS=$(git rev-parse --show-toplevel)/build-system/scripts + for REPO in end-to-end; do - docker pull 278380418400.dkr.ecr.us-east-2.amazonaws.com/$REPO:cache-$CONTENT_HASH - docker tag 278380418400.dkr.ecr.us-east-2.amazonaws.com/$REPO:cache-$CONTENT_HASH aztecprotocol/$REPO:latest + docker pull $($BS/calculate_image_uri $REPO) + docker tag $($BS/calculate_image_uri $REPO) aztecprotocol/$REPO:latest done docker-compose -f $COMPOSE_FILE rm -f From cbe0b56c175e510b32bb6c3e8012cddb39b7e96b Mon Sep 17 00:00:00 2001 From: ludamad Date: Mon, 4 Sep 2023 11:58:07 -0400 Subject: [PATCH 4/4] fix e2e sandbox test --- yarn-project/canary/scripts/docker-compose-e2e-sandbox.yml | 2 +- yarn-project/canary/scripts/run_tests | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/yarn-project/canary/scripts/docker-compose-e2e-sandbox.yml b/yarn-project/canary/scripts/docker-compose-e2e-sandbox.yml index a37fd7880fcd..bd97f00d8233 100644 --- a/yarn-project/canary/scripts/docker-compose-e2e-sandbox.yml +++ b/yarn-project/canary/scripts/docker-compose-e2e-sandbox.yml @@ -13,7 +13,7 @@ services: - '8545:8545' sandbox: - image: $ECR_URL/aztec-sandbox:cache-$CONTENT_HASH + image: aztecprotocol/sandbox:latest environment: DEBUG: 'aztec:*' ETHEREUM_HOST: http://fork:8545 diff --git a/yarn-project/canary/scripts/run_tests b/yarn-project/canary/scripts/run_tests index 44c0b2e9dcac..e2fd492f2872 100755 --- a/yarn-project/canary/scripts/run_tests +++ b/yarn-project/canary/scripts/run_tests @@ -18,5 +18,9 @@ IMAGE_URI=$($(git rev-parse --show-toplevel)/build-system/scripts/calculate_imag docker pull $IMAGE_URI docker tag $IMAGE_URI aztecprotocol/canary:latest +SANDBOX_IMAGE_URI=$($(git rev-parse --show-toplevel)/build-system/scripts/calculate_image_uri aztec-sandbox) +docker pull $SANDBOX_IMAGE_URI +docker tag $SANDBOX_IMAGE_URI aztecprotocol/sandbox:latest + docker-compose rm -f docker-compose -f $COMPOSE_FILE up --exit-code-from canary