From cbd84a30e24a14e79cb73eac3975d0e2624c0af4 Mon Sep 17 00:00:00 2001 From: AztecBot Date: Sat, 1 Feb 2025 02:24:26 +0000 Subject: [PATCH 1/4] git subrepo push --branch=master barretenberg subrepo: subdir: "barretenberg" merged: "5fab2c043c" upstream: origin: "https://github.com/AztecProtocol/barretenberg" branch: "master" commit: "5fab2c043c" git-subrepo: version: "0.4.6" origin: "???" commit: "???" [skip ci] --- barretenberg/.gitrepo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/barretenberg/.gitrepo b/barretenberg/.gitrepo index dade6609f6e..d63aeb036cd 100644 --- a/barretenberg/.gitrepo +++ b/barretenberg/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/AztecProtocol/barretenberg branch = master - commit = 37c100901c570b61ca79b46f0fdb0bbc5ce22708 - parent = 756b94101345d231b86233921398555512855273 + commit = 5fab2c043c9e6212817b8880e415df1fc1418bfb + parent = ac6b6e810588f6e2c7194417527652bd6a4f4442 method = merge cmdver = 0.4.6 From 5486cbb09611eda565ad11822ea86889e90d5e25 Mon Sep 17 00:00:00 2001 From: AztecBot Date: Sat, 1 Feb 2025 02:25:02 +0000 Subject: [PATCH 2/4] chore: replace relative paths to noir-protocol-circuits --- noir-projects/aztec-nr/aztec/Nargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noir-projects/aztec-nr/aztec/Nargo.toml b/noir-projects/aztec-nr/aztec/Nargo.toml index 7a1f1af5863..c85663b2725 100644 --- a/noir-projects/aztec-nr/aztec/Nargo.toml +++ b/noir-projects/aztec-nr/aztec/Nargo.toml @@ -5,4 +5,4 @@ compiler_version = ">=0.18.0" type = "lib" [dependencies] -protocol_types = { path = "../../noir-protocol-circuits/crates/types" } +protocol_types = { git="https://github.com/AztecProtocol/aztec-packages", tag="aztec-packages-v0.72.1", directory="noir-projects/noir-protocol-circuits/crates/types" } From 8f7f006d7b4f1394235b66656600ba0de82dd465 Mon Sep 17 00:00:00 2001 From: AztecBot Date: Sat, 1 Feb 2025 02:25:03 +0000 Subject: [PATCH 3/4] git_subrepo.sh: Fix parent in .gitrepo file. [skip ci] --- noir-projects/aztec-nr/.gitrepo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noir-projects/aztec-nr/.gitrepo b/noir-projects/aztec-nr/.gitrepo index 10490a14e16..129fa3d93f4 100644 --- a/noir-projects/aztec-nr/.gitrepo +++ b/noir-projects/aztec-nr/.gitrepo @@ -9,4 +9,4 @@ remote = https://github.com/AztecProtocol/aztec-nr commit = ee047c9b696b4a7de528e262377c23e102caf79d method = merge cmdver = 0.4.6 - parent = 55c6e900161a9f7921f42096885784647025905e + parent = 03544d2884c4eb5cf25a7ee718242c33cd9e9e63 From 875ac9c399e47af0bdbe1d8939cc1c7ce30fa5e2 Mon Sep 17 00:00:00 2001 From: AztecBot Date: Sat, 1 Feb 2025 02:25:06 +0000 Subject: [PATCH 4/4] git subrepo push --branch=master noir-projects/aztec-nr subrepo: subdir: "noir-projects/aztec-nr" merged: "8d116d0a34" upstream: origin: "https://github.com/AztecProtocol/aztec-nr" branch: "master" commit: "8d116d0a34" git-subrepo: version: "0.4.6" origin: "???" commit: "???" [skip ci] --- noir-projects/aztec-nr/.gitrepo | 4 ++-- noir-projects/aztec-nr/aztec/Nargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/noir-projects/aztec-nr/.gitrepo b/noir-projects/aztec-nr/.gitrepo index 129fa3d93f4..7a2cc767a05 100644 --- a/noir-projects/aztec-nr/.gitrepo +++ b/noir-projects/aztec-nr/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/AztecProtocol/aztec-nr branch = master - commit = ee047c9b696b4a7de528e262377c23e102caf79d + commit = 8d116d0a34b72d8a06531842afc049e02128d454 method = merge cmdver = 0.4.6 - parent = 03544d2884c4eb5cf25a7ee718242c33cd9e9e63 + parent = 22c9e9c15c2749a756352dba0681d4e67f01fdf7 diff --git a/noir-projects/aztec-nr/aztec/Nargo.toml b/noir-projects/aztec-nr/aztec/Nargo.toml index c85663b2725..7a1f1af5863 100644 --- a/noir-projects/aztec-nr/aztec/Nargo.toml +++ b/noir-projects/aztec-nr/aztec/Nargo.toml @@ -5,4 +5,4 @@ compiler_version = ">=0.18.0" type = "lib" [dependencies] -protocol_types = { git="https://github.com/AztecProtocol/aztec-packages", tag="aztec-packages-v0.72.1", directory="noir-projects/noir-protocol-circuits/crates/types" } +protocol_types = { path = "../../noir-protocol-circuits/crates/types" }