feat(aztec-noir): align public and private execution patterns

circuits/cpp/src/aztec3/circuits/abis/c_bind.cpp

@@ -524,6 +524,13 @@ WASM_EXPORT const char* abis__test_roundtrip_serialize_private_circuit_public_in
                                                                                     size);
 }
 
+WASM_EXPORT const char* abis__test_roundtrip_serialize_public_circuit_public_inputs(
+    uint8_t const* public_circuits_public_inputs_buf, uint32_t* size)
+{
+    return as_string_output<aztec3::circuits::abis::PublicCircuitPublicInputs<NT>>(public_circuits_public_inputs_buf,
+                                                                                   size);
+}
+
 WASM_EXPORT const char* abis__test_roundtrip_serialize_function_data(uint8_t const* function_data_buf, uint32_t* size)
 {
     return as_string_output<aztec3::circuits::abis::FunctionData<NT>>(function_data_buf, size);

circuits/cpp/src/aztec3/circuits/abis/c_bind.test.cpp

@@ -1,5 +1,4 @@
 #include "c_bind.h"
-
 #include "function_leaf_preimage.hpp"
 #include "tx_request.hpp"
 

circuits/cpp/src/aztec3/circuits/abis/historic_block_data.hpp

@@ -9,6 +9,8 @@
 
 #include <barretenberg/barretenberg.hpp>
 
+#include <array>
+
 namespace aztec3::circuits::abis {
 
 using aztec3::utils::types::CircuitTypes;
@@ -96,6 +98,18 @@ template <typename NCT> struct HistoricBlockData {
         global_variables_hash.set_public();
     }
 
+    std::array<fr, 7> to_array() const
+    {
+        return { private_data_tree_root,
+                 nullifier_tree_root,
+                 contract_tree_root,
+                 l1_to_l2_messages_tree_root,
+                 blocks_tree_root,  // Note private_kernel_vk_tree_root, is not included yet as
+                                    // it is not present in noir,
+                 public_data_tree_root,
+                 global_variables_hash };
+    }
+
 
     fr hash()
     {

circuits/cpp/src/aztec3/circuits/abis/packers.hpp

@@ -68,7 +68,7 @@ struct ConstantsPacker {
                  MAX_NOTES_PER_PAGE,
                  VIEW_NOTE_ORACLE_RETURN_LENGTH,
                  CALL_CONTEXT_LENGTH,
-                 CONSTANT_HISTORIC_BLOCK_DATA_LENGTH,
+                 HISTORIC_BLOCK_DATA_LENGTH,
                  FUNCTION_DATA_LENGTH,
                  CONTRACT_DEPLOYMENT_DATA_LENGTH,
                  PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH,

circuits/cpp/src/aztec3/circuits/abis/private_circuit_public_inputs.hpp

@@ -50,8 +50,8 @@ template <typename NCT> class PrivateCircuitPublicInputs {
     fr historic_contract_tree_root = 0;
     fr historic_l1_to_l2_messages_tree_root = 0;
     fr historic_blocks_tree_root = 0;
-    fr historic_global_variables_hash = 0;
     fr historic_public_data_tree_root = 0;
+    fr historic_global_variables_hash = 0;
 
     ContractDeploymentData<NCT> contract_deployment_data{};
 
@@ -78,8 +78,8 @@ template <typename NCT> class PrivateCircuitPublicInputs {
                    historic_contract_tree_root,
                    historic_l1_to_l2_messages_tree_root,
                    historic_blocks_tree_root,
-                   historic_global_variables_hash,
                    historic_public_data_tree_root,
+                   historic_global_variables_hash,
                    contract_deployment_data,
                    chain_id,
                    version);
@@ -100,8 +100,8 @@ template <typename NCT> class PrivateCircuitPublicInputs {
                historic_contract_tree_root == other.historic_contract_tree_root &&
                historic_l1_to_l2_messages_tree_root == other.historic_l1_to_l2_messages_tree_root &&
                historic_blocks_tree_root == other.historic_blocks_tree_root &&
-               historic_global_variables_hash == other.historic_global_variables_hash &&
                historic_public_data_tree_root == other.historic_public_data_tree_root &&
+               historic_global_variables_hash == other.historic_global_variables_hash &&
                contract_deployment_data == other.contract_deployment_data && chain_id == other.chain_id &&
                version == other.version;
     };
@@ -142,8 +142,8 @@ template <typename NCT> class PrivateCircuitPublicInputs {
             to_ct(historic_contract_tree_root),
             to_ct(historic_l1_to_l2_messages_tree_root),
             to_ct(historic_blocks_tree_root),
-            to_ct(historic_global_variables_hash),
             to_ct(historic_public_data_tree_root),
+            to_ct(historic_global_variables_hash),
 
             to_circuit_type(contract_deployment_data),
 
@@ -187,8 +187,8 @@ template <typename NCT> class PrivateCircuitPublicInputs {
             to_nt(historic_contract_tree_root),
             to_nt(historic_l1_to_l2_messages_tree_root),
             to_nt(historic_blocks_tree_root),
-            to_nt(historic_global_variables_hash),
             to_nt(historic_public_data_tree_root),
+            to_nt(historic_global_variables_hash),
 
             to_native_type(contract_deployment_data),
 
@@ -231,8 +231,8 @@ template <typename NCT> class PrivateCircuitPublicInputs {
         inputs.push_back(historic_contract_tree_root);
         inputs.push_back(historic_l1_to_l2_messages_tree_root);
         inputs.push_back(historic_blocks_tree_root);
-        inputs.push_back(historic_global_variables_hash);
         inputs.push_back(historic_public_data_tree_root);
+        inputs.push_back(historic_global_variables_hash);
 
         inputs.push_back(contract_deployment_data.hash());
 
@@ -287,8 +287,8 @@ template <typename NCT> class OptionalPrivateCircuitPublicInputs {
     opt_fr historic_contract_tree_root;
     opt_fr historic_l1_to_l2_messages_tree_root;
     opt_fr historic_blocks_tree_root;
-    opt_fr historic_global_variables_hash;
     opt_fr historic_public_data_tree_root;
+    opt_fr historic_global_variables_hash;
 
     std::optional<ContractDeploymentData<NCT>> contract_deployment_data;
 
@@ -315,8 +315,8 @@ template <typename NCT> class OptionalPrivateCircuitPublicInputs {
                    historic_contract_tree_root,
                    historic_l1_to_l2_messages_tree_root,
                    historic_blocks_tree_root,
-                   historic_global_variables_hash,
                    historic_public_data_tree_root,
+                   historic_global_variables_hash,
                    contract_deployment_data,
                    chain_id,
                    version);
@@ -350,8 +350,8 @@ template <typename NCT> class OptionalPrivateCircuitPublicInputs {
         opt_fr const& historic_contract_tree_root,
         opt_fr const& historic_l1_to_l2_messages_tree_root,
         opt_fr const& historic_blocks_tree_root,
-        opt_fr const& historic_global_variables_hash,
         opt_fr const& historic_public_data_tree_root,
+        opt_fr const& historic_global_variables_hash,
 
         std::optional<ContractDeploymentData<NCT>> const& contract_deployment_data,
 
@@ -376,8 +376,8 @@ template <typename NCT> class OptionalPrivateCircuitPublicInputs {
         , historic_contract_tree_root(historic_contract_tree_root)
         , historic_l1_to_l2_messages_tree_root(historic_l1_to_l2_messages_tree_root)
         , historic_blocks_tree_root(historic_blocks_tree_root)
-        , historic_global_variables_hash(historic_global_variables_hash)
         , historic_public_data_tree_root(historic_public_data_tree_root)
+        , historic_global_variables_hash(historic_global_variables_hash)
         , contract_deployment_data(contract_deployment_data)
         , chain_id(chain_id)
         , version(version){};
@@ -414,8 +414,8 @@ template <typename NCT> class OptionalPrivateCircuitPublicInputs {
         new_inputs.historic_contract_tree_root = std::nullopt;
         new_inputs.historic_l1_to_l2_messages_tree_root = std::nullopt;
         new_inputs.historic_blocks_tree_root = std::nullopt;
-        new_inputs.historic_global_variables_hash = std::nullopt;
         new_inputs.historic_public_data_tree_root = std::nullopt;
+        new_inputs.historic_global_variables_hash = std::nullopt;
 
         new_inputs.contract_deployment_data = std::nullopt;
 
@@ -485,8 +485,8 @@ template <typename NCT> class OptionalPrivateCircuitPublicInputs {
         make_unused_element_zero(builder, historic_contract_tree_root);
         make_unused_element_zero(builder, historic_l1_to_l2_messages_tree_root);
         make_unused_element_zero(builder, historic_blocks_tree_root);
-        make_unused_element_zero(builder, historic_global_variables_hash);
         make_unused_element_zero(builder, historic_public_data_tree_root);
+        make_unused_element_zero(builder, historic_global_variables_hash);
 
         make_unused_element_zero(builder, contract_deployment_data);
 
@@ -530,8 +530,8 @@ template <typename NCT> class OptionalPrivateCircuitPublicInputs {
         (*historic_contract_tree_root).set_public();
         (*historic_l1_to_l2_messages_tree_root).set_public();
         (*historic_blocks_tree_root).set_public();
-        (*historic_global_variables_hash).set_public();
         (*historic_public_data_tree_root).set_public();
+        (*historic_global_variables_hash).set_public();
 
         (*contract_deployment_data).set_public();
 
@@ -577,8 +577,8 @@ template <typename NCT> class OptionalPrivateCircuitPublicInputs {
             to_ct(historic_contract_tree_root),
             to_ct(historic_l1_to_l2_messages_tree_root),
             to_ct(historic_blocks_tree_root),
-            to_ct(historic_global_variables_hash),
             to_ct(historic_public_data_tree_root),
+            to_ct(historic_global_variables_hash),
 
             to_circuit_type(contract_deployment_data),
 
@@ -624,8 +624,8 @@ template <typename NCT> class OptionalPrivateCircuitPublicInputs {
                                                                 to_nt(historic_contract_tree_root),
                                                                 to_nt(historic_l1_to_l2_messages_tree_root),
                                                                 to_nt(historic_blocks_tree_root),
-                                                                to_nt(historic_global_variables_hash),
                                                                 to_nt(historic_public_data_tree_root),
+                                                                to_nt(historic_global_variables_hash),
 
                                                                 to_native_type(contract_deployment_data),
 
@@ -672,8 +672,8 @@ template <typename NCT> class OptionalPrivateCircuitPublicInputs {
         inputs.push_back(*historic_contract_tree_root);
         inputs.push_back(*historic_l1_to_l2_messages_tree_root);
         inputs.push_back(*historic_blocks_tree_root);
-        inputs.push_back(*historic_global_variables_hash);
         inputs.push_back(*historic_public_data_tree_root);
+        inputs.push_back(*historic_global_variables_hash);
 
         inputs.push_back((*contract_deployment_data).hash());
 
@@ -715,8 +715,8 @@ template <typename NCT> class OptionalPrivateCircuitPublicInputs {
             .historic_contract_tree_root = historic_contract_tree_root.value(),
             .historic_l1_to_l2_messages_tree_root = historic_l1_to_l2_messages_tree_root.value(),
             .historic_blocks_tree_root = historic_blocks_tree_root.value(),
-            .historic_global_variables_hash = historic_global_variables_hash.value(),
             .historic_public_data_tree_root = historic_public_data_tree_root.value(),
+            .historic_global_variables_hash = historic_global_variables_hash.value(),
 
             .contract_deployment_data = contract_deployment_data.value(),
 

circuits/cpp/src/aztec3/circuits/abis/public_circuit_public_inputs.hpp

@@ -5,6 +5,7 @@
 #include "contract_storage_update_request.hpp"
 #include "../../constants.hpp"
 
+#include "aztec3/circuits/abis/historic_block_data.hpp"
 #include "aztec3/utils/msgpack_derived_output.hpp"
 #include "aztec3/utils/types/circuit_types.hpp"
 #include "aztec3/utils/types/native_types.hpp"
@@ -42,7 +43,7 @@ template <typename NCT> struct PublicCircuitPublicInputs {
     // variable-length data.
     fr unencrypted_log_preimages_length = 0;
 
-    fr historic_public_data_tree_root = 0;
+    HistoricBlockData<NCT> historic_block_data{};
 
     address prover_address;
 
@@ -58,7 +59,7 @@ template <typename NCT> struct PublicCircuitPublicInputs {
                    new_l2_to_l1_msgs,
                    unencrypted_logs_hash,
                    unencrypted_log_preimages_length,
-                   historic_public_data_tree_root,
+                   historic_block_data,
                    prover_address);
 
     boolean operator==(PublicCircuitPublicInputs<NCT> const& other) const
@@ -91,7 +92,7 @@ template <typename NCT> struct PublicCircuitPublicInputs {
             .unencrypted_logs_hash = to_ct(unencrypted_logs_hash),
             .unencrypted_log_preimages_length = to_ct(unencrypted_log_preimages_length),
 
-            .historic_public_data_tree_root = to_ct(historic_public_data_tree_root),
+            .historic_block_data = to_ct(historic_block_data),
 
             .prover_address = to_ct(prover_address),
         };
@@ -121,7 +122,7 @@ template <typename NCT> struct PublicCircuitPublicInputs {
         spread_arr_into_vec(unencrypted_logs_hash, inputs);
         inputs.push_back(unencrypted_log_preimages_length);
 
-        inputs.push_back(historic_public_data_tree_root);
+        spread_arr_into_vec(historic_block_data.to_array(), inputs);
         inputs.push_back(prover_address);
 
         if (inputs.size() != PUBLIC_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH) {

circuits/cpp/src/aztec3/circuits/apps/notes/default_private_note/note_preimage.hpp

@@ -47,15 +47,17 @@ template <typename NCT, typename V> struct DefaultPrivateNotePreimage {
 
         // To avoid messy template arguments in the calling code, we use a lambda function with `auto` return type to
         // avoid explicitly having to state the circuit type for `V`.
-        auto circuit_value = [&]() -> auto {
+        auto circuit_value = [&]() -> auto
+        {
             if constexpr (has_to_circuit_type) {
                 return value.to_circuit_type();
             } else if (has_to_ct) {
                 return to_ct(value);
             } else {
                 throw_or_abort("Can't convert Value to circuit type");
             }
-        }();
+        }
+        ();
 
         // When this method is called, this class must be templated over native types. We can avoid templating over the
         // circuit types (for the return values) (in order to make the calling syntax cleaner) with the below `decltype`
@@ -78,15 +80,17 @@ template <typename NCT, typename V> struct DefaultPrivateNotePreimage {
         const bool has_to_native_type = requires(V v) { v.to_native_type(); };
         const bool has_to_nt = requires(V v) { to_nt(v); };
 
-        auto native_value = [&]() -> auto {
+        auto native_value = [&]() -> auto
+        {
             if constexpr (has_to_native_type) {
                 return value.to_native_type();
             } else if (has_to_nt) {
                 return to_nt(value);
             } else {
                 throw_or_abort("Can't convert Value to native type");
             }
-        }();
+        }
+        ();
 
         DefaultPrivateNotePreimage<NativeTypes, typename decltype(native_value)::value_type> preimage = {
             native_value, to_nt(owner), to_nt(creator_address), to_nt(memo), to_nt(salt), to_nt(nonce), to_nt(is_dummy),

circuits/cpp/src/aztec3/circuits/apps/notes/default_singleton_private_note/note_preimage.hpp

@@ -44,15 +44,17 @@ template <typename NCT, typename V> struct DefaultSingletonPrivateNotePreimage {
 
         // To avoid messy template arguments in the calling code, we use a lambda function with `auto` return type to
         // avoid explicitly having to state the circuit type for `V`.
-        auto circuit_value = [&]() -> auto {
+        auto circuit_value = [&]() -> auto
+        {
             if constexpr (has_to_circuit_type) {
                 return value.to_circuit_type();
             } else if (has_to_ct) {
                 return to_ct(value);
             } else {
                 throw_or_abort("Can't convert Value to circuit type");
             }
-        }();
+        }
+        ();
 
         // When this method is called, this class must be templated over native types. We can avoid templating over the
         // circuit types (for the return values) (in order to make the calling syntax cleaner) with the below `decltype`
@@ -78,15 +80,17 @@ template <typename NCT, typename V> struct DefaultSingletonPrivateNotePreimage {
         const bool has_to_native_type = requires(V v) { v.to_native_type(); };
         const bool has_to_nt = requires(V v) { to_nt(v); };
 
-        auto native_value = [&]() -> auto {
+        auto native_value = [&]() -> auto
+        {
             if constexpr (has_to_native_type) {
                 return value.to_native_type();
             } else if (has_to_nt) {
                 return to_nt(value);
             } else {
                 throw_or_abort("Can't convert Value to native type");
             }
-        }();
+        }
+        ();
 
         DefaultSingletonPrivateNotePreimage<NativeTypes, typename decltype(native_value)::value_type> preimage = {
             native_value,

circuits/cpp/src/aztec3/circuits/kernel/private/common.cpp

@@ -244,10 +244,11 @@ void common_update_end_values(DummyBuilder& builder,
         std::array<NT::fr, MAX_NEW_NULLIFIERS_PER_CALL> siloed_nullified_commitments{};
         for (size_t i = 0; i < MAX_NEW_NULLIFIERS_PER_CALL; ++i) {
             siloed_nullified_commitments[i] =
-                nullified_commitments[i] == fr(0) ? fr(0)  // don't silo when empty
-                : nullified_commitments[i] == fr(EMPTY_NULLIFIED_COMMITMENT)
-                    ? fr(EMPTY_NULLIFIED_COMMITMENT)  // don't silo when empty
-                    : silo_commitment<NT>(storage_contract_address, nullified_commitments[i]);
+                nullified_commitments[i] == fr(0)
+                    ? fr(0)  // don't silo when empty
+                    : nullified_commitments[i] == fr(EMPTY_NULLIFIED_COMMITMENT)
+                          ? fr(EMPTY_NULLIFIED_COMMITMENT)  // don't silo when empty
+                          : silo_commitment<NT>(storage_contract_address, nullified_commitments[i]);
         }
 
         push_array_to_array(

circuits/cpp/src/aztec3/circuits/kernel/public/.test.cpp

@@ -326,7 +326,16 @@ PublicKernelInputs<NT> get_kernel_inputs_with_previous_kernel(NT::boolean privat
     std::array<fr, NUM_FIELDS_PER_SHA256> const unencrypted_logs_hash =
         array_of_values<NUM_FIELDS_PER_SHA256>(seed, NUM_FIELDS_PER_SHA256);
     fr const unencrypted_log_preimages_length = ++seed;
-    fr const historic_public_data_tree_root = ++seed;
+    HistoricBlockData<NT> block_data = {
+        .private_data_tree_root = ++seed,
+        .nullifier_tree_root = ++seed,
+        .contract_tree_root = ++seed,
+        .l1_to_l2_messages_tree_root = ++seed,
+        .blocks_tree_root = ++seed,
+        .private_kernel_vk_tree_root = ++seed,
+        .public_data_tree_root = ++seed,
+        .global_variables_hash = ++seed,
+    };
 
     // create the public circuit public inputs
     auto const public_circuit_public_inputs = PublicCircuitPublicInputs<NT>{
@@ -341,7 +350,7 @@ PublicKernelInputs<NT> get_kernel_inputs_with_previous_kernel(NT::boolean privat
         .new_l2_to_l1_msgs = new_l2_to_l1_msgs,
         .unencrypted_logs_hash = unencrypted_logs_hash,
         .unencrypted_log_preimages_length = unencrypted_log_preimages_length,
-        .historic_public_data_tree_root = historic_public_data_tree_root,
+        .historic_block_data = block_data,
     };
 
     const PublicCallStackItem call_stack_item{