From 945b64e3645976accda407888acd49008f6fc477 Mon Sep 17 00:00:00 2001
From: dbanks12 <david@aztecprotocol.com>
Date: Tue, 16 May 2023 15:41:24 +0000
Subject: [PATCH 1/3] bump to bberg master

---
 circuits/cpp/barretenberg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circuits/cpp/barretenberg b/circuits/cpp/barretenberg
index af243b20ebf3..97c9bc72aeba 160000
--- a/circuits/cpp/barretenberg
+++ b/circuits/cpp/barretenberg
@@ -1 +1 @@
-Subproject commit af243b20ebf38b27e79a1631cc056eab66573fd3
+Subproject commit 97c9bc72aebab850b4a647d6e6cc50085226eafb

From f68dc3be206021be089b0cc1f4594c6208290979 Mon Sep 17 00:00:00 2001
From: dbanks12 <david@aztecprotocol.com>
Date: Tue, 16 May 2023 15:51:05 +0000
Subject: [PATCH 2/3] missing blake includes in NT/CT

---
 circuits/cpp/src/aztec3/utils/types/circuit_types.hpp | 1 +
 circuits/cpp/src/aztec3/utils/types/native_types.hpp  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/circuits/cpp/src/aztec3/utils/types/circuit_types.hpp b/circuits/cpp/src/aztec3/utils/types/circuit_types.hpp
index f487b74a0dc5..7bf6e8c8042c 100644
--- a/circuits/cpp/src/aztec3/utils/types/circuit_types.hpp
+++ b/circuits/cpp/src/aztec3/utils/types/circuit_types.hpp
@@ -5,6 +5,7 @@
 #include <barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp>
 #include <barretenberg/stdlib/encryption/schnorr/schnorr.hpp>
 #include <barretenberg/stdlib/hash/blake2s/blake2s.hpp>
+#include <barretenberg/stdlib/hash/blake3s/blake3s.hpp>
 #include <barretenberg/stdlib/hash/pedersen/pedersen.hpp>
 #include <barretenberg/stdlib/primitives/address/address.hpp>
 #include <barretenberg/stdlib/primitives/bigfield/bigfield.hpp>
diff --git a/circuits/cpp/src/aztec3/utils/types/native_types.hpp b/circuits/cpp/src/aztec3/utils/types/native_types.hpp
index 50443d88d198..320e9b1b9567 100644
--- a/circuits/cpp/src/aztec3/utils/types/native_types.hpp
+++ b/circuits/cpp/src/aztec3/utils/types/native_types.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <barretenberg/crypto/blake2s/blake2s.hpp>
 #include <barretenberg/crypto/blake3s/blake3s.hpp>
 #include <barretenberg/crypto/ecdsa/ecdsa.hpp>
 #include <barretenberg/crypto/generators/generator_data.hpp>

From 895660dcc5ef4714c9d01e4a5364988d42a45c33 Mon Sep 17 00:00:00 2001
From: dbanks12 <david@aztecprotocol.com>
Date: Tue, 16 May 2023 17:56:36 +0000
Subject: [PATCH 3/3] fix includes

---
 .../cpp/src/aztec3/circuits/abis/combined_accumulated_data.hpp  | 1 -
 .../abis/rollup/base/base_or_merge_rollup_public_inputs.hpp     | 2 --
 circuits/cpp/src/aztec3/utils/types/circuit_types.hpp           | 1 +
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/circuits/cpp/src/aztec3/circuits/abis/combined_accumulated_data.hpp b/circuits/cpp/src/aztec3/circuits/abis/combined_accumulated_data.hpp
index 382b68087277..e670c16d9656 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/combined_accumulated_data.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/combined_accumulated_data.hpp
@@ -12,7 +12,6 @@
 
 #include <barretenberg/common/map.hpp>
 #include <barretenberg/stdlib/primitives/witness/witness.hpp>
-#include <barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp>
 
 namespace aztec3::circuits::abis {
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/rollup/base/base_or_merge_rollup_public_inputs.hpp b/circuits/cpp/src/aztec3/circuits/abis/rollup/base/base_or_merge_rollup_public_inputs.hpp
index 962c10df2ea1..7305890f4551 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/rollup/base/base_or_merge_rollup_public_inputs.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/rollup/base/base_or_merge_rollup_public_inputs.hpp
@@ -6,8 +6,6 @@
 #include <aztec3/utils/types/convert.hpp>
 #include <aztec3/utils/types/native_types.hpp>
 
-#include <barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp>
-
 namespace aztec3::circuits::abis {
 
 using aztec3::utils::types::CircuitTypes;
diff --git a/circuits/cpp/src/aztec3/utils/types/circuit_types.hpp b/circuits/cpp/src/aztec3/utils/types/circuit_types.hpp
index 7bf6e8c8042c..00c1a8207dac 100644
--- a/circuits/cpp/src/aztec3/utils/types/circuit_types.hpp
+++ b/circuits/cpp/src/aztec3/utils/types/circuit_types.hpp
@@ -18,6 +18,7 @@
 #include <barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp>
 #include <barretenberg/stdlib/primitives/point/point.hpp>
 #include <barretenberg/stdlib/primitives/uint/uint.hpp>
+#include <barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp>
 #include <barretenberg/stdlib/recursion/verification_key/verification_key.hpp>
 #include <barretenberg/stdlib/recursion/verifier/program_settings.hpp>
 #include <barretenberg/stdlib/recursion/verifier/verifier.hpp>