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/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/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{

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

@@ -62,7 +62,7 @@ KernelCircuitPublicInputs<NT> native_public_kernel_circuit_private_previous_kern
     // validate the kernel execution common to all invocation circumstances
     common_validate_kernel_execution(builder, public_kernel_inputs);
 
-    // vallidate our public call hash
+    // validate our public call hash
     validate_this_public_call_hash(builder, public_kernel_inputs, public_inputs);
 
     // update the public end state of the circuit

circuits/cpp/src/aztec3/constants.hpp

@@ -221,7 +221,7 @@ constexpr size_t VIEW_NOTE_ORACLE_RETURN_LENGTH = MAX_NOTES_PER_PAGE * (MAX_NOTE
 
 constexpr size_t CALL_CONTEXT_LENGTH = 6;
 // Must be updated if any data is added into the block hash calculation.
-constexpr size_t CONSTANT_HISTORIC_BLOCK_DATA_LENGTH = 7;
+constexpr size_t HISTORIC_BLOCK_DATA_LENGTH = 7;
 constexpr size_t FUNCTION_DATA_LENGTH = 4;
 constexpr size_t CONTRACT_DEPLOYMENT_DATA_LENGTH = 6;
 
@@ -233,14 +233,14 @@ constexpr size_t PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH =
     + RETURN_VALUES_LENGTH + MAX_READ_REQUESTS_PER_CALL + MAX_NEW_COMMITMENTS_PER_CALL +
     2 * MAX_NEW_NULLIFIERS_PER_CALL + MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL + MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL +
     MAX_NEW_L2_TO_L1_MSGS_PER_CALL + NUM_FIELDS_PER_SHA256 + NUM_FIELDS_PER_SHA256 + 2  // + 2 for logs preimage lengths
-    + CONSTANT_HISTORIC_BLOCK_DATA_LENGTH + CONTRACT_DEPLOYMENT_DATA_LENGTH + 2;        // + 2 for chain_id and version
+    + HISTORIC_BLOCK_DATA_LENGTH + CONTRACT_DEPLOYMENT_DATA_LENGTH + 2;                 // + 2 for chain_id and version
 
 constexpr size_t PRIVATE_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH =
     1 + 1  // call_context_hash + args_hash
     + RETURN_VALUES_LENGTH + MAX_READ_REQUESTS_PER_CALL + MAX_NEW_COMMITMENTS_PER_CALL +
     2 * MAX_NEW_NULLIFIERS_PER_CALL + MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL + MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL +
     MAX_NEW_L2_TO_L1_MSGS_PER_CALL + NUM_FIELDS_PER_SHA256 + NUM_FIELDS_PER_SHA256 + 2  // + 2 for logs preimage lengths
-    + CONSTANT_HISTORIC_BLOCK_DATA_LENGTH + 3;  // + 3 for contract_deployment_data.hash(), chain_id, version
+    + HISTORIC_BLOCK_DATA_LENGTH + 3;  // + 3 for contract_deployment_data.hash(), chain_id, version
 
 constexpr size_t CONTRACT_STORAGE_UPDATE_REQUEST_LENGTH = 3;
 constexpr size_t CONTRACT_STORAGE_READ_LENGTH = 2;
@@ -251,15 +251,15 @@ constexpr size_t PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH =
     MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL * CONTRACT_STORAGE_UPDATE_REQUEST_LENGTH +
     MAX_PUBLIC_DATA_READS_PER_CALL * CONTRACT_STORAGE_READ_LENGTH + MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL +
     MAX_NEW_COMMITMENTS_PER_CALL + MAX_NEW_NULLIFIERS_PER_CALL + MAX_NEW_L2_TO_L1_MSGS_PER_CALL +
-    NUM_FIELDS_PER_SHA256 + 1 +               // + 1 for unencrypted logs preimage length
-    CONSTANT_HISTORIC_BLOCK_DATA_LENGTH + 2;  // + 2 for chain_id and version
+    NUM_FIELDS_PER_SHA256 + 1 +      // + 1 for unencrypted logs preimage length
+    HISTORIC_BLOCK_DATA_LENGTH + 2;  // + 2 for chain_id and version
 
 constexpr size_t PUBLIC_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH =
     2 + RETURN_VALUES_LENGTH +  // + 1 for args_hash + 1 call_context.hash
     MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL + MAX_PUBLIC_DATA_READS_PER_CALL + MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL +
     MAX_NEW_COMMITMENTS_PER_CALL + MAX_NEW_NULLIFIERS_PER_CALL + MAX_NEW_L2_TO_L1_MSGS_PER_CALL +
-    NUM_FIELDS_PER_SHA256 +  // unencrypted_logs_hash (being represented by NUM_FIELDS_PER_SHA256)
-    3;                       // unencrypted_log_preimages_length + historic_public_data_tree_root + prover_address
+    NUM_FIELDS_PER_SHA256 +          // unencrypted_logs_hash (being represented by NUM_FIELDS_PER_SHA256)
+    HISTORIC_BLOCK_DATA_LENGTH + 2;  // unencrypted_log_preimages_length + prover_address
 
 
 // Size of the return value of a private function call,

l1-contracts/src/core/libraries/ConstantsGen.sol

@@ -65,7 +65,7 @@ library Constants {
   uint256 internal constant MAX_NOTES_PER_PAGE = 10;
   uint256 internal constant VIEW_NOTE_ORACLE_RETURN_LENGTH = 212;
   uint256 internal constant CALL_CONTEXT_LENGTH = 6;
-  uint256 internal constant CONSTANT_HISTORIC_BLOCK_DATA_LENGTH = 7;
+  uint256 internal constant HISTORIC_BLOCK_DATA_LENGTH = 7;
   uint256 internal constant FUNCTION_DATA_LENGTH = 4;
   uint256 internal constant CONTRACT_DEPLOYMENT_DATA_LENGTH = 6;
   uint256 internal constant PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH = 58;
@@ -75,7 +75,7 @@ library Constants {
   uint256 internal constant GET_NOTES_ORACLE_RETURN_LENGTH = 86;
   uint256 internal constant EMPTY_NULLIFIED_COMMITMENT = 1000000;
   uint256 internal constant CALL_PRIVATE_FUNCTION_RETURN_SIZE = 64;
-  uint256 internal constant PUBLIC_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH = 41;
+  uint256 internal constant PUBLIC_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH = 47;
   uint256 internal constant PRIVATE_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH = 48;
   uint256 internal constant COMMITMENTS_NUM_BYTES_PER_BASE_ROLLUP = 1024;
   uint256 internal constant NULLIFIERS_NUM_BYTES_PER_BASE_ROLLUP = 1024;