feat: AVM inserts fee write on txs with public calls

barretenberg/cpp/src/barretenberg/vm/aztec_constants.hpp

@@ -40,8 +40,8 @@
 #define TOTAL_FEES_LENGTH 1
 #define HEADER_LENGTH 25
 #define PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH 867
-#define AVM_ACCUMULATED_DATA_LENGTH 318
-#define AVM_CIRCUIT_PUBLIC_INPUTS_LENGTH 1006
+#define AVM_ACCUMULATED_DATA_LENGTH 320
+#define AVM_CIRCUIT_PUBLIC_INPUTS_LENGTH 1008
 #define AVM_VERIFICATION_KEY_LENGTH_IN_FIELDS 86
 #define AVM_PROOF_LENGTH_IN_FIELDS 4166
 #define AVM_PUBLIC_COLUMN_MAX_SIZE 1024

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

@@ -208,7 +208,7 @@ library Constants {
   uint256 internal constant SCOPED_READ_REQUEST_LEN = 3;
   uint256 internal constant PUBLIC_DATA_READ_LENGTH = 3;
   uint256 internal constant PRIVATE_VALIDATION_REQUESTS_LENGTH = 772;
-  uint256 internal constant COMBINED_ACCUMULATED_DATA_LENGTH = 900;
+  uint256 internal constant COMBINED_ACCUMULATED_DATA_LENGTH = 902;
   uint256 internal constant TX_CONSTANT_DATA_LENGTH = 35;
   uint256 internal constant COMBINED_CONSTANT_DATA_LENGTH = 44;
   uint256 internal constant PRIVATE_ACCUMULATED_DATA_LENGTH = 1412;
@@ -217,7 +217,7 @@ library Constants {
   uint256 internal constant PRIVATE_TO_AVM_ACCUMULATED_DATA_LENGTH = 160;
   uint256 internal constant NUM_PRIVATE_TO_AVM_ACCUMULATED_DATA_ARRAYS = 3;
   uint256 internal constant PRIVATE_TO_PUBLIC_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 1845;
-  uint256 internal constant KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 956;
+  uint256 internal constant KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 958;
   uint256 internal constant CONSTANT_ROLLUP_DATA_LENGTH = 13;
   uint256 internal constant BASE_OR_MERGE_PUBLIC_INPUTS_LENGTH = 31;
   uint256 internal constant BLOCK_ROOT_OR_BLOCK_MERGE_PUBLIC_INPUTS_LENGTH = 90;

noir-projects/noir-protocol-circuits/crates/rollup-lib/src/abis/base_or_merge_rollup_public_inputs.nr

@@ -12,23 +12,23 @@ pub(crate) global MERGE_ROLLUP_TYPE: u32 = 1;
 pub struct BaseOrMergeRollupPublicInputs {
     // rollup_type is either 0 (base) or 1 (merge)
     // TODO(Kev): Why is this a u32 instead of a u8/u16?
-    rollup_type: u32,
-    num_txs: u32,
-    constants: ConstantRollupData,
+    pub(crate) rollup_type: u32,
+    pub(crate) num_txs: u32,
+    pub(crate) constants: ConstantRollupData,
 
-    start: PartialStateReference,
-    end: PartialStateReference,
+    pub(crate) start: PartialStateReference,
+    pub(crate) end: PartialStateReference,
 
     // We hash public inputs to make them constant-sized (to then be unpacked on-chain)
     // U128 isn't safe if it's an input to the circuit (it won't automatically constrain the witness)
     // So we want to constrain it when casting these fields to U128
 
     // We hash public inputs to make them constant-sized (to then be unpacked on-chain)
-    txs_effects_hash: Field,
-    out_hash: Field,
+    pub(crate) txs_effects_hash: Field,
+    pub(crate) out_hash: Field,
 
-    accumulated_fees: Field,
-    accumulated_mana_used: Field,
+    pub(crate) accumulated_fees: Field,
+    pub(crate) accumulated_mana_used: Field,
 }
 
 impl Empty for BaseOrMergeRollupPublicInputs {

noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/private_base_rollup.nr

@@ -400,7 +400,7 @@ mod tests {
 
             let sorted_new_nullifier_tuples = unsafe {
                 get_sorted_tuple(
-                    self.nullifiers.storage.map(|insertion: NullifierInsertion| insertion.value),
+                    self.nullifiers.storage().map(|insertion: NullifierInsertion| insertion.value),
                     |a, b| full_field_less_than(b, a),
                 )
             };

noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/state_diff_hints.nr

@@ -5,7 +5,7 @@ use dep::types::{
         NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH,
         NULLIFIER_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT,
     },
-    data::{PublicDataTreeLeaf, PublicDataTreeLeafPreimage},
+    data::PublicDataTreeLeafPreimage,
     merkle_tree::MembershipWitness,
 };
 

noir-projects/noir-protocol-circuits/crates/rollup-lib/src/components.nr

@@ -231,7 +231,7 @@ fn silo_and_hash_unencrypted_logs<let N: u32>(
 //                                                                                                                                    __
 // 1 unencrypted logs hash --> 1 sha256 hash -> 31 bytes  -> 1 fields | Beware when populating bytes that we fill (prepend) to 32!      |-> 2 types of flexible-length logs - 2 fields for their hashes
 // 1 contract class logs hash --> 1 sha256 hash -> 31 bytes  -> 1 fields | Beware when populating bytes that we fill (prepend) to 32! __|
-global TX_EFFECTS_HASH_INPUT_FIELDS: u32 = 1
+pub(crate) global TX_EFFECTS_HASH_INPUT_FIELDS: u32 = 1
     + 1
     + MAX_NOTE_HASHES_PER_TX
     + MAX_NULLIFIERS_PER_TX

noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/avm_accumulated_data.nr

@@ -1,8 +1,9 @@
 use crate::{
-    abis::{gas::Gas, log_hash::ScopedLogHash, public_data_write::PublicDataWrite},
+    abis::{log_hash::ScopedLogHash, public_data_write::PublicDataWrite},
     constants::{
         AVM_ACCUMULATED_DATA_LENGTH, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX,
-        MAX_NULLIFIERS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_UNENCRYPTED_LOGS_PER_TX,
+        MAX_NULLIFIERS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+        MAX_UNENCRYPTED_LOGS_PER_TX,
     },
     messaging::l2_to_l1_message::ScopedL2ToL1Message,
     traits::{Deserialize, Empty, Serialize},
@@ -11,16 +12,16 @@ use crate::{
 
 pub struct AvmAccumulatedData {
     // The note hashes from private combining with those made in the AVM execution.
-    note_hashes: [Field; MAX_NOTE_HASHES_PER_TX],
+    pub note_hashes: [Field; MAX_NOTE_HASHES_PER_TX],
     // The nullifiers from private combining with those made in the AVM execution.
-    nullifiers: [Field; MAX_NULLIFIERS_PER_TX],
+    pub nullifiers: [Field; MAX_NULLIFIERS_PER_TX],
     // The L2 to L1 messages from private combining with those made in the AVM execution.
-    l2_to_l1_msgs: [ScopedL2ToL1Message; MAX_L2_TO_L1_MSGS_PER_TX],
+    pub l2_to_l1_msgs: [ScopedL2ToL1Message; MAX_L2_TO_L1_MSGS_PER_TX],
     // TODO(#9589): This should only contain logs emitted from public.
     // The unencrypted logs emitted from private combining with those made in the AVM execution.
-    unencrypted_logs_hashes: [ScopedLogHash; MAX_UNENCRYPTED_LOGS_PER_TX],
+    pub unencrypted_logs_hashes: [ScopedLogHash; MAX_UNENCRYPTED_LOGS_PER_TX],
     // The public data writes made in the AVM execution.
-    public_data_writes: [PublicDataWrite; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
+    pub public_data_writes: [PublicDataWrite; MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
 }
 
 impl Empty for AvmAccumulatedData {
@@ -30,7 +31,9 @@ impl Empty for AvmAccumulatedData {
             nullifiers: [0; MAX_NULLIFIERS_PER_TX],
             l2_to_l1_msgs: [ScopedL2ToL1Message::empty(); MAX_L2_TO_L1_MSGS_PER_TX],
             unencrypted_logs_hashes: [ScopedLogHash::empty(); MAX_UNENCRYPTED_LOGS_PER_TX],
-            public_data_writes: [PublicDataWrite::empty(); MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
+            public_data_writes: [
+                PublicDataWrite::empty(); MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
+            ],
         }
     }
 }
@@ -82,7 +85,7 @@ impl Deserialize<AVM_ACCUMULATED_DATA_LENGTH> for AvmAccumulatedData {
             ),
             public_data_writes: reader.read_struct_array(
                 PublicDataWrite::deserialize,
-                [PublicDataWrite::empty(); MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
+                [PublicDataWrite::empty(); MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
             ),
         };
         reader.finish();

noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/combined_accumulated_data.nr

@@ -3,7 +3,7 @@ use crate::{
     constants::{
         COMBINED_ACCUMULATED_DATA_LENGTH, MAX_CONTRACT_CLASS_LOGS_PER_TX, MAX_L2_TO_L1_MSGS_PER_TX,
         MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PRIVATE_LOGS_PER_TX,
-        MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_UNENCRYPTED_LOGS_PER_TX,
+        MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_UNENCRYPTED_LOGS_PER_TX,
     },
     messaging::l2_to_l1_message::ScopedL2ToL1Message,
     traits::{Deserialize, Empty, Serialize},
@@ -24,7 +24,7 @@ pub struct CombinedAccumulatedData {
     pub unencrypted_log_preimages_length: Field,
     pub contract_class_log_preimages_length: Field,
 
-    pub public_data_writes: [PublicDataWrite; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
+    pub public_data_writes: [PublicDataWrite; MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
 }
 
 impl Empty for CombinedAccumulatedData {
@@ -38,7 +38,9 @@ impl Empty for CombinedAccumulatedData {
             contract_class_logs_hashes: [ScopedLogHash::empty(); MAX_CONTRACT_CLASS_LOGS_PER_TX],
             unencrypted_log_preimages_length: 0,
             contract_class_log_preimages_length: 0,
-            public_data_writes: [PublicDataWrite::empty(); MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
+            public_data_writes: [
+                PublicDataWrite::empty(); MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
+            ],
         }
     }
 }
@@ -64,7 +66,7 @@ impl Serialize<COMBINED_ACCUMULATED_DATA_LENGTH> for CombinedAccumulatedData {
         fields.push(self.unencrypted_log_preimages_length);
         fields.push(self.contract_class_log_preimages_length);
 
-        for i in 0..MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX {
+        for i in 0..MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX {
             fields.extend_from_array(self.public_data_writes[i].serialize());
         }
 
@@ -101,7 +103,7 @@ impl Deserialize<COMBINED_ACCUMULATED_DATA_LENGTH> for CombinedAccumulatedData {
             contract_class_log_preimages_length: reader.read(),
             public_data_writes: reader.read_struct_array(
                 PublicDataWrite::deserialize,
-                [PublicDataWrite::empty(); MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
+                [PublicDataWrite::empty(); MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
             ),
         };
         reader.finish();

noir-projects/noir-protocol-circuits/crates/types/src/abis/avm_circuit_public_inputs.nr

@@ -26,25 +26,25 @@ use std::hash::{poseidon2, poseidon2_permutation};
 pub struct AvmCircuitPublicInputs {
     ///////////////////////////////////
     // Inputs.
-    global_variables: GlobalVariables,
-    start_tree_snapshots: TreeSnapshots,
-    start_gas_used: Gas,
-    gas_settings: GasSettings,
-    public_setup_call_requests: [PublicCallRequest; MAX_ENQUEUED_CALLS_PER_TX],
-    public_app_logic_call_requests: [PublicCallRequest; MAX_ENQUEUED_CALLS_PER_TX],
-    public_teardown_call_request: PublicCallRequest,
-    previous_non_revertible_accumulated_data_array_lengths: PrivateToAvmAccumulatedDataArrayLengths,
-    previous_revertible_accumulated_data_array_lengths: PrivateToAvmAccumulatedDataArrayLengths,
-    previous_non_revertible_accumulated_data: PrivateToAvmAccumulatedData,
-    previous_revertible_accumulated_data: PrivateToAvmAccumulatedData,
+    pub global_variables: GlobalVariables,
+    pub start_tree_snapshots: TreeSnapshots,
+    pub start_gas_used: Gas,
+    pub gas_settings: GasSettings,
+    pub public_setup_call_requests: [PublicCallRequest; MAX_ENQUEUED_CALLS_PER_TX],
+    pub public_app_logic_call_requests: [PublicCallRequest; MAX_ENQUEUED_CALLS_PER_TX],
+    pub public_teardown_call_request: PublicCallRequest,
+    pub previous_non_revertible_accumulated_data_array_lengths: PrivateToAvmAccumulatedDataArrayLengths,
+    pub previous_revertible_accumulated_data_array_lengths: PrivateToAvmAccumulatedDataArrayLengths,
+    pub previous_non_revertible_accumulated_data: PrivateToAvmAccumulatedData,
+    pub previous_revertible_accumulated_data: PrivateToAvmAccumulatedData,
 
     ///////////////////////////////////
     // Outputs.
-    end_tree_snapshots: TreeSnapshots,
-    end_gas_used: Gas,
-    accumulated_data: AvmAccumulatedData,
-    transaction_fee: Field,
-    reverted: bool,
+    pub end_tree_snapshots: TreeSnapshots,
+    pub end_gas_used: Gas,
+    pub accumulated_data: AvmAccumulatedData,
+    pub transaction_fee: Field,
+    pub reverted: bool,
 }
 
 impl Empty for AvmCircuitPublicInputs {

noir-projects/noir-protocol-circuits/crates/types/src/abis/gas.nr

@@ -6,8 +6,8 @@ use crate::{
 use std::ops::{Add, Sub};
 
 pub struct Gas {
-    da_gas: u32,
-    l2_gas: u32,
+    pub da_gas: u32,
+    pub l2_gas: u32,
 }
 
 impl Gas {

noir-projects/noir-protocol-circuits/crates/types/src/abis/tree_snapshots.nr

@@ -5,10 +5,10 @@ use crate::{
 };
 
 pub struct TreeSnapshots {
-    l1_to_l2_message_tree: AppendOnlyTreeSnapshot,
-    note_hash_tree: AppendOnlyTreeSnapshot,
-    nullifier_tree: AppendOnlyTreeSnapshot,
-    public_data_tree: AppendOnlyTreeSnapshot,
+    pub l1_to_l2_message_tree: AppendOnlyTreeSnapshot,
+    pub note_hash_tree: AppendOnlyTreeSnapshot,
+    pub nullifier_tree: AppendOnlyTreeSnapshot,
+    pub public_data_tree: AppendOnlyTreeSnapshot,
 }
 
 impl Eq for TreeSnapshots {

noir-projects/noir-protocol-circuits/crates/types/src/abis/tube.nr

@@ -25,9 +25,9 @@ impl Verifiable for PublicTubeData {
 }
 
 pub struct PrivateTubeData {
-    public_inputs: KernelCircuitPublicInputs,
-    proof: TubeProof,
-    vk_data: VkData<HONK_VERIFICATION_KEY_LENGTH_IN_FIELDS>,
+    pub public_inputs: KernelCircuitPublicInputs,
+    pub proof: TubeProof,
+    pub vk_data: VkData<HONK_VERIFICATION_KEY_LENGTH_IN_FIELDS>,
 }
 
 impl Verifiable for PrivateTubeData {

noir-projects/noir-protocol-circuits/crates/types/src/constants.nr

@@ -372,7 +372,7 @@ pub global COMBINED_ACCUMULATED_DATA_LENGTH: u32 = MAX_NOTE_HASHES_PER_TX
     + 1 /* unencrypted_log_preimages_length */
     + (SCOPED_LOG_HASH_LENGTH * MAX_CONTRACT_CLASS_LOGS_PER_TX)
     + 1 /* contract_class_log_preimages_length */
-    + (MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX * PUBLIC_DATA_WRITE_LENGTH);
+    + (MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX * PUBLIC_DATA_WRITE_LENGTH);
 pub global TX_CONSTANT_DATA_LENGTH: u32 = HEADER_LENGTH
     + TX_CONTEXT_LENGTH
     + 1 /* vk_tree_root */
@@ -409,7 +409,7 @@ pub global AVM_ACCUMULATED_DATA_LENGTH: u32 = MAX_NOTE_HASHES_PER_TX
     + MAX_NULLIFIERS_PER_TX
     + (MAX_L2_TO_L1_MSGS_PER_TX * SCOPED_L2_TO_L1_MESSAGE_LENGTH)
     + (MAX_UNENCRYPTED_LOGS_PER_TX * SCOPED_LOG_HASH_LENGTH)
-    + (MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX * PUBLIC_DATA_WRITE_LENGTH);
+    + (MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX * PUBLIC_DATA_WRITE_LENGTH);
 
 pub global PRIVATE_TO_PUBLIC_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH: u32 = TX_CONSTANT_DATA_LENGTH
     + ROLLUP_VALIDATION_REQUESTS_LENGTH

noir-projects/noir-protocol-circuits/crates/types/src/data/public_data_hint.nr

@@ -6,10 +6,10 @@ use crate::{
 };
 
 pub struct PublicDataHint {
-    leaf_slot: Field,
-    value: Field,
-    membership_witness: MembershipWitness<PUBLIC_DATA_TREE_HEIGHT>,
-    leaf_preimage: PublicDataTreeLeafPreimage,
+    pub leaf_slot: Field,
+    pub value: Field,
+    pub membership_witness: MembershipWitness<PUBLIC_DATA_TREE_HEIGHT>,
+    pub leaf_preimage: PublicDataTreeLeafPreimage,
 }
 
 impl PublicDataHint {

noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree/variable_merkle_tree.nr

@@ -89,7 +89,7 @@ impl VariableMerkleTree {
     }
 }
 
-mod tests {
+pub mod tests {
     use crate::{
         hash::accumulate_sha256,
         merkle_tree::{merkle_tree::MerkleTree, variable_merkle_tree::VariableMerkleTree},

noir-projects/noir-protocol-circuits/crates/types/src/proof/tube_proof.nr

@@ -1,7 +1,7 @@
 use crate::{constants::TUBE_PROOF_LENGTH, traits::{Deserialize, Empty, Serialize}};
 
 pub struct TubeProof {
-    fields: [Field; TUBE_PROOF_LENGTH],
+    pub fields: [Field; TUBE_PROOF_LENGTH],
 }
 
 impl Serialize<TUBE_PROOF_LENGTH> for TubeProof {

noir-projects/noir-protocol-circuits/crates/types/src/proof/vk_data.nr

@@ -5,9 +5,9 @@ use crate::{
 use super::verification_key::VerificationKey;
 
 pub struct VkData<let VK_LENGTH: u32> {
-    vk: VerificationKey<VK_LENGTH>,
-    vk_index: u32,
-    vk_path: [Field; VK_TREE_HEIGHT],
+    pub vk: VerificationKey<VK_LENGTH>,
+    pub vk_index: u32,
+    pub vk_path: [Field; VK_TREE_HEIGHT],
 }
 
 impl<let VK_LENGTH: u32> VkData<VK_LENGTH> {

noir-projects/noir-protocol-circuits/crates/types/src/tests/fixture_builder.nr

@@ -44,7 +44,7 @@ use crate::{
         MAX_NOTE_HASH_READ_REQUESTS_PER_TX, MAX_NOTE_HASHES_PER_TX,
         MAX_NULLIFIER_READ_REQUESTS_PER_TX, MAX_NULLIFIERS_PER_TX,
         MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, MAX_PRIVATE_LOGS_PER_TX,
-        MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_UNENCRYPTED_LOGS_PER_TX,
+        MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_UNENCRYPTED_LOGS_PER_TX,
         PRIVATE_CALL_REQUEST_LENGTH, PRIVATE_LOG_SIZE_IN_FIELDS, PROTOCOL_CONTRACT_TREE_HEIGHT,
         PUBLIC_CALL_REQUEST_LENGTH, VK_TREE_HEIGHT,
     },
@@ -114,7 +114,7 @@ pub struct FixtureBuilder {
     pub contract_class_logs_hashes: BoundedVec<ScopedLogHash, MAX_CONTRACT_CLASS_LOGS_PER_TX>,
     pub unencrypted_log_preimages_length: Field,
     pub contract_class_log_preimages_length: Field,
-    pub public_data_writes: BoundedVec<PublicDataWrite, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX>,
+    pub public_data_writes: BoundedVec<PublicDataWrite, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX>,
     pub private_call_requests: BoundedVec<PrivateCallRequest, MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX>,
     pub public_call_requests: BoundedVec<Counted<PublicCallRequest>, MAX_ENQUEUED_CALLS_PER_TX>,
     pub gas_used: Gas,
@@ -1017,19 +1017,19 @@ impl FixtureBuilder {
         fixtures::vk_tree::get_vk_merkle_tree().get_root()
     }
 
-    fn to_private_tube_data(self) -> PrivateTubeData {
+    pub fn to_private_tube_data(self) -> PrivateTubeData {
         let mut result: PrivateTubeData = std::mem::zeroed();
         result.public_inputs = self.to_kernel_circuit_public_inputs();
         result
     }
 
-    fn to_public_tube_data(self) -> PublicTubeData {
+    pub fn to_public_tube_data(self) -> PublicTubeData {
         let mut result: PublicTubeData = std::mem::zeroed();
         result.public_inputs = self.to_private_to_public_kernel_circuit_public_inputs(true);
         result
     }
 
-    fn to_avm_accumulated_data(self) -> AvmAccumulatedData {
+    pub fn to_avm_accumulated_data(self) -> AvmAccumulatedData {
         AvmAccumulatedData {
             note_hashes: self.note_hashes.storage().map(|n: ScopedNoteHash| n.note_hash.value),
             nullifiers: self.nullifiers.storage().map(|n: ScopedNullifier| n.nullifier.value),
@@ -1039,7 +1039,7 @@ impl FixtureBuilder {
         }
     }
 
-    fn to_avm_proof_data(self, reverted: bool) -> AvmProofData {
+    pub fn to_avm_proof_data(self, reverted: bool) -> AvmProofData {
         let mut result: AvmProofData = std::mem::zeroed();
 
         result.public_inputs.reverted = reverted;

noir-projects/noir-protocol-circuits/crates/types/src/tests/fixtures.nr

@@ -5,9 +5,9 @@ pub(crate) mod vk_tree;
 
 use crate::address::AztecAddress;
 
-pub(crate) global MSG_SENDER: AztecAddress = AztecAddress { inner: 27 };
+pub global MSG_SENDER: AztecAddress = AztecAddress { inner: 27 };
 
-pub(crate) global CHAIN_ID: Field = 1;
+pub global CHAIN_ID: Field = 1;
 
-pub(crate) global VERSION: Field = 3;
+pub global VERSION: Field = 3;