From 970783c67fc68df96464540f7361842b50fc7628 Mon Sep 17 00:00:00 2001 From: ludamad Date: Sun, 3 Sep 2023 18:03:57 -0400 Subject: [PATCH 1/7] scripts/git_subrepo.sh not -eu --- scripts/git_subrepo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/git_subrepo.sh b/scripts/git_subrepo.sh index dd87b304408d..df9743a2bd5f 100755 --- a/scripts/git_subrepo.sh +++ b/scripts/git_subrepo.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -eu SCRIPT_DIR=$(dirname "$(realpath "$0")") From e7d0cf45e2e632ffa0a9dfa30c3c2903b61cf5eb Mon Sep 17 00:00:00 2001 From: ludamad Date: Sun, 3 Sep 2023 18:05:27 -0400 Subject: [PATCH 2/7] git subrepo pull --force circuits/cpp/barretenberg subrepo: subdir: "circuits/cpp/barretenberg" merged: "297a20d787" upstream: origin: "https://github.com/AztecProtocol/barretenberg" branch: "master" commit: "297a20d787" 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 4c6c45e4210b..4911961da529 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 = 0e17d978a0cc6805b72646a8e36fd5267cbd6bcd - parent = 3aaf91e03fc01f0cb12249f22dbcb007023f69d4 + commit = 297a20d7878a4aabab1cabf2cc5d2d67f9e969c5 + parent = 970783c67fc68df96464540f7361842b50fc7628 method = merge cmdver = 0.4.6 From 1b3bd2c20a2ec1c4c4f86efe7b9b611c7254969b Mon Sep 17 00:00:00 2001 From: ludamad Date: Sun, 3 Sep 2023 18:06:12 -0400 Subject: [PATCH 3/7] Revert git data --- .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 49ffc4d7023363afbe5141655b62da81efc1e5f6 Mon Sep 17 00:00:00 2001 From: ludamad Date: Sun, 3 Sep 2023 18:07:12 -0400 Subject: [PATCH 4/7] Revert git data --- circuits/cpp/barretenberg/.gitrepo | 12 ++++++------ scripts/git-subrepo/lib/git-subrepo | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/circuits/cpp/barretenberg/.gitrepo b/circuits/cpp/barretenberg/.gitrepo index 4911961da529..a367b5661c09 100644 --- a/circuits/cpp/barretenberg/.gitrepo +++ b/circuits/cpp/barretenberg/.gitrepo @@ -4,9 +4,9 @@ ; git-subrepo command. See https://github.com/ingydotnet/git-subrepo#readme ; [subrepo] - remote = https://github.com/AztecProtocol/barretenberg - branch = master - commit = 297a20d7878a4aabab1cabf2cc5d2d67f9e969c5 - parent = 970783c67fc68df96464540f7361842b50fc7628 - method = merge - cmdver = 0.4.6 +remote = https://github.com/AztecProtocol/barretenberg +branch = master +commit = 297a20d7878a4aabab1cabf2cc5d2d67f9e969c5 +parent = 3aaf91e03fc01f0cb12249f22dbcb007023f69d4 +method = merge +cmdver = 0.4.6 diff --git a/scripts/git-subrepo/lib/git-subrepo b/scripts/git-subrepo/lib/git-subrepo index a6d5d96a1f6a..142786b97aa5 100755 --- a/scripts/git-subrepo/lib/git-subrepo +++ b/scripts/git-subrepo/lib/git-subrepo @@ -492,7 +492,8 @@ subrepo:clone() { assert-subdir-empty if [[ -z $subrepo_branch ]]; then o "Determine the upstream head branch." - get-upstream-head-branch + get + pstream-head-branch subrepo_branch=$output fi From c3f229840e5f9da539ecf6b274816df7936a049b Mon Sep 17 00:00:00 2001 From: ludamad Date: Sun, 3 Sep 2023 18:07:28 -0400 Subject: [PATCH 5/7] Revert git data --- scripts/git-subrepo/lib/git-subrepo | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/git-subrepo/lib/git-subrepo b/scripts/git-subrepo/lib/git-subrepo index 142786b97aa5..a6d5d96a1f6a 100755 --- a/scripts/git-subrepo/lib/git-subrepo +++ b/scripts/git-subrepo/lib/git-subrepo @@ -492,8 +492,7 @@ subrepo:clone() { assert-subdir-empty if [[ -z $subrepo_branch ]]; then o "Determine the upstream head branch." - get - pstream-head-branch + get-upstream-head-branch subrepo_branch=$output fi From 1990f0dd00c82d7a95cb6e7d4b831014296fd2ea Mon Sep 17 00:00:00 2001 From: ludamad Date: Sun, 3 Sep 2023 18:08:28 -0400 Subject: [PATCH 6/7] Revert git data --- circuits/cpp/barretenberg/.gitrepo | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/circuits/cpp/barretenberg/.gitrepo b/circuits/cpp/barretenberg/.gitrepo index a367b5661c09..1113b7795499 100644 --- a/circuits/cpp/barretenberg/.gitrepo +++ b/circuits/cpp/barretenberg/.gitrepo @@ -4,9 +4,9 @@ ; git-subrepo command. See https://github.com/ingydotnet/git-subrepo#readme ; [subrepo] -remote = https://github.com/AztecProtocol/barretenberg -branch = master -commit = 297a20d7878a4aabab1cabf2cc5d2d67f9e969c5 -parent = 3aaf91e03fc01f0cb12249f22dbcb007023f69d4 -method = merge -cmdver = 0.4.6 + remote = https://github.com/AztecProtocol/barretenberg + branch = master + commit = 297a20d7878a4aabab1cabf2cc5d2d67f9e969c5 + parent = 3aaf91e03fc01f0cb12249f22dbcb007023f69d4 + method = merge + cmdver = 0.4.6 From 4e934ba0ef24016b1ba86e080fe3b8a863c782b0 Mon Sep 17 00:00:00 2001 From: ludamad Date: Sun, 3 Sep 2023 18:09:19 -0400 Subject: [PATCH 7/7] Revert git data --- circuits/cpp/barretenberg/.gitrepo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circuits/cpp/barretenberg/.gitrepo b/circuits/cpp/barretenberg/.gitrepo index 1113b7795499..3173257aff9e 100644 --- a/circuits/cpp/barretenberg/.gitrepo +++ b/circuits/cpp/barretenberg/.gitrepo @@ -7,6 +7,6 @@ remote = https://github.com/AztecProtocol/barretenberg branch = master commit = 297a20d7878a4aabab1cabf2cc5d2d67f9e969c5 - parent = 3aaf91e03fc01f0cb12249f22dbcb007023f69d4 + parent = 1990f0dd00c82d7a95cb6e7d4b831014296fd2ea method = merge cmdver = 0.4.6