From d5c721bc247d49b9844dff58c59e2df005b1746b Mon Sep 17 00:00:00 2001 From: spalladino Date: Thu, 30 Mar 2023 09:54:23 +0000 Subject: [PATCH 1/2] Print vk objects instead of pointers --- .../circuits/abis/private_kernel/previous_kernel_data.hpp | 3 ++- .../aztec3/circuits/abis/private_kernel/private_call_data.hpp | 2 +- .../aztec3/circuits/abis/rollup/base/previous_rollup_data.hpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cpp/src/aztec3/circuits/abis/private_kernel/previous_kernel_data.hpp b/cpp/src/aztec3/circuits/abis/private_kernel/previous_kernel_data.hpp index a9762913..41b30315 100644 --- a/cpp/src/aztec3/circuits/abis/private_kernel/previous_kernel_data.hpp +++ b/cpp/src/aztec3/circuits/abis/private_kernel/previous_kernel_data.hpp @@ -88,7 +88,8 @@ template std::ostream& operator<<(std::ostream& os, PreviousKerne { return os << "public_inputs: " << kernel_data.public_inputs << "\n" << "proof: " << kernel_data.proof << "\n" - << "vk: " << kernel_data.vk << "\n" + << "vk:\n" + << *(kernel_data.vk) << "\n" << "vk_index: " << kernel_data.vk_index << "\n" << "vk_path: " << kernel_data.vk_path << "\n"; } diff --git a/cpp/src/aztec3/circuits/abis/private_kernel/private_call_data.hpp b/cpp/src/aztec3/circuits/abis/private_kernel/private_call_data.hpp index 3edf39cf..8f37f4c4 100644 --- a/cpp/src/aztec3/circuits/abis/private_kernel/private_call_data.hpp +++ b/cpp/src/aztec3/circuits/abis/private_kernel/private_call_data.hpp @@ -102,7 +102,7 @@ template std::ostream& operator<<(std::ostream& os, PrivateCallDa << "proof:\n" << obj.proof << "\n" << "vk:\n" - << obj.vk << "\n" + << *(obj.vk) << "\n" << "function_leaf_membership_witness:\n" << obj.function_leaf_membership_witness << "\n" << "contract_leaf_membership_witness:\n" diff --git a/cpp/src/aztec3/circuits/abis/rollup/base/previous_rollup_data.hpp b/cpp/src/aztec3/circuits/abis/rollup/base/previous_rollup_data.hpp index b9824dff..31d73d4a 100644 --- a/cpp/src/aztec3/circuits/abis/rollup/base/previous_rollup_data.hpp +++ b/cpp/src/aztec3/circuits/abis/rollup/base/previous_rollup_data.hpp @@ -51,7 +51,7 @@ template std::ostream& operator<<(std::ostream& os, PreviousRollu { return os << "merge_rollup_public_inputs: " << obj.base_rollup_public_inputs << "\n" << "proof: " << obj.proof << "\n" - << "vk: " << obj.vk << "\n" + << "vk: " << *(obj.vk) << "\n" << "vk_index: " << obj.vk_index << "\n" << "vk_sibling_path: " << obj.vk_sibling_path << "\n"; }; From 715a9e6a808e1e8b20bbd13a6d29a29524fd0432 Mon Sep 17 00:00:00 2001 From: spalladino Date: Thu, 30 Mar 2023 10:02:35 +0000 Subject: [PATCH 2/2] Update barretenberg submodule --- cpp/barretenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/barretenberg b/cpp/barretenberg index 303eaf6e..458d7db8 160000 --- a/cpp/barretenberg +++ b/cpp/barretenberg @@ -1 +1 @@ -Subproject commit 303eaf6e169acede64046a465146aab67036ab43 +Subproject commit 458d7db8beaa9ca87e53571f7819c09f7c43568e