@aztec/stdlib 3.0.0-nightly.20251007 → 3.0.0-nightly.20251008

package/src/avm/avm_circuit_public_inputs.ts

@@ -16,6 +16,7 @@ import {
 } from '../kernel/private_to_avm_accumulated_data.js';
 import { PublicCallRequest, PublicCallRequestArrayLengths } from '../kernel/public_call_request.js';
 import { GlobalVariables } from '../tx/global_variables.js';
+import { ProtocolContracts } from '../tx/protocol_contracts.js';
 import { TreeSnapshots } from '../tx/tree_snapshots.js';
 import { AvmAccumulatedData, AvmAccumulatedDataArrayLengths } from './avm_accumulated_data.js';
 import { serializeWithMessagePack } from './message_pack.js';
@@ -27,7 +28,7 @@ export class AvmCircuitPublicInputs {
     ///////////////////////////////////
     // Inputs.
     public globalVariables: GlobalVariables,
-    public protocolContractTreeRoot: Fr,
+    public protocolContracts: ProtocolContracts,
     public startTreeSnapshots: TreeSnapshots,
     public startGasUsed: Gas,
     public gasSettings: GasSettings,
@@ -56,7 +57,7 @@ export class AvmCircuitPublicInputs {
     return z
       .object({
         globalVariables: GlobalVariables.schema,
-        protocolContractTreeRoot: schemas.Fr,
+        protocolContracts: ProtocolContracts.schema,
         startTreeSnapshots: TreeSnapshots.schema,
         startGasUsed: Gas.schema,
         gasSettings: GasSettings.schema,
@@ -81,7 +82,7 @@ export class AvmCircuitPublicInputs {
       .transform(
         ({
           globalVariables,
-          protocolContractTreeRoot,
+          protocolContracts,
           startTreeSnapshots,
           startGasUsed,
           gasSettings,
@@ -105,7 +106,7 @@ export class AvmCircuitPublicInputs {
         }) =>
           new AvmCircuitPublicInputs(
             globalVariables,
-            protocolContractTreeRoot,
+            protocolContracts,
             startTreeSnapshots,
             startGasUsed,
             gasSettings,
@@ -134,7 +135,7 @@ export class AvmCircuitPublicInputs {
     const reader = BufferReader.asReader(buffer);
     return new AvmCircuitPublicInputs(
       reader.readObject(GlobalVariables),
-      reader.readObject(Fr),
+      reader.readObject(ProtocolContracts),
       reader.readObject(TreeSnapshots),
       reader.readObject(Gas),
       reader.readObject(GasSettings),
@@ -161,7 +162,7 @@ export class AvmCircuitPublicInputs {
   toBuffer() {
     return serializeToBuffer(
       this.globalVariables,
-      this.protocolContractTreeRoot,
+      this.protocolContracts,
       this.startTreeSnapshots,
       this.startGasUsed,
       this.gasSettings,
@@ -197,7 +198,7 @@ export class AvmCircuitPublicInputs {
     const reader = FieldReader.asReader(fields);
     return new AvmCircuitPublicInputs(
       GlobalVariables.fromFields(reader),
-      reader.readField(),
+      ProtocolContracts.fromFields(reader),
       TreeSnapshots.fromFields(reader),
       Gas.fromFields(reader),
       GasSettings.fromFields(reader),
@@ -224,7 +225,7 @@ export class AvmCircuitPublicInputs {
   toFields() {
     return [
       ...this.globalVariables.toFields(),
-      this.protocolContractTreeRoot,
+      ...this.protocolContracts.toFields(),
       ...this.startTreeSnapshots.toFields(),
       ...this.startGasUsed.toFields(),
       ...this.gasSettings.toFields(),
@@ -251,7 +252,7 @@ export class AvmCircuitPublicInputs {
   static empty() {
     return new AvmCircuitPublicInputs(
       GlobalVariables.empty(),
-      Fr.zero(),
+      ProtocolContracts.empty(),
       TreeSnapshots.empty(),
       Gas.empty(),
       GasSettings.empty(),
@@ -282,7 +283,7 @@ export class AvmCircuitPublicInputs {
   [inspect.custom]() {
     return `AvmCircuitPublicInputs {
       globalVariables: ${inspect(this.globalVariables)},
-      protocolContractTreeRoot: ${inspect(this.protocolContractTreeRoot)},
+      protocolContracts: ${inspect(this.protocolContracts)},
       startTreeSnapshots: ${inspect(this.startTreeSnapshots)},
       startGasUsed: ${inspect(this.startGasUsed)},
       gasSettings: ${inspect(this.gasSettings)},

package/src/interfaces/configs.ts

@@ -52,6 +52,8 @@ export interface SequencerConfig {
   skipCollectingAttestations?: boolean;
   /** Do not invalidate the previous block if invalid when we are the proposer (for testing only) */
   skipInvalidateBlockAsProposer?: boolean;
+  /** Broadcast invalid block proposals with corrupted state (for testing only) */
+  broadcastInvalidBlockProposal?: boolean;
 }
 
 export const SequencerConfigSchema = z.object({
@@ -75,4 +77,5 @@ export const SequencerConfigSchema = z.object({
   skipCollectingAttestations: z.boolean().optional(),
   secondsBeforeInvalidatingBlockAsCommitteeMember: z.number(),
   secondsBeforeInvalidatingBlockAsNonCommitteeMember: z.number(),
+  broadcastInvalidBlockProposal: z.boolean().optional(),
 }) satisfies ZodFor<SequencerConfig>;

package/src/interfaces/validator.ts

@@ -43,7 +43,7 @@ export interface ValidatorClientConfig {
 }
 
 export type ValidatorClientFullConfig = ValidatorClientConfig &
-  Pick<SequencerConfig, 'txPublicSetupAllowList'> &
+  Pick<SequencerConfig, 'txPublicSetupAllowList' | 'broadcastInvalidBlockProposal'> &
   Pick<SlasherConfig, 'slashBroadcastedInvalidBlockPenalty'>;
 
 export const ValidatorClientConfigSchema = z.object({

package/src/kernel/hints/build_nullifier_read_request_hints.ts

@@ -4,9 +4,10 @@ import {
   type NULLIFIER_TREE_HEIGHT,
 } from '@aztec/constants';
 import type { Fr } from '@aztec/foundation/fields';
-import { type IndexedTreeLeafPreimage, MembershipWitness } from '@aztec/foundation/trees';
+import { MembershipWitness } from '@aztec/foundation/trees';
 
 import { siloNullifier } from '../../hash/hash.js';
+import type { NullifierLeafPreimage } from '../../trees/nullifier_leaf.js';
 import type { ClaimedLengthArray } from '../claimed_length_array.js';
 import type { ScopedNullifier } from '../nullifier.js';
 import { NullifierReadRequestHintsBuilder } from './nullifier_read_request_hints.js';
@@ -24,7 +25,7 @@ export function isValidNullifierReadRequest(readRequest: ScopedReadRequest, null
 
 interface NullifierMembershipWitnessWithPreimage {
   membershipWitness: MembershipWitness<typeof NULLIFIER_TREE_HEIGHT>;
-  leafPreimage: IndexedTreeLeafPreimage;
+  leafPreimage: NullifierLeafPreimage;
 }
 
 export function getNullifierReadRequestResetActions(

package/src/kernel/hints/nullifier_read_request_hints.ts

@@ -1,7 +1,7 @@
 import { MAX_NULLIFIER_READ_REQUESTS_PER_TX, NULLIFIER_TREE_HEIGHT } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
 import type { BufferReader } from '@aztec/foundation/serialize';
-import type { MembershipWitness, TreeLeafPreimage } from '@aztec/foundation/trees';
+import type { MembershipWitness } from '@aztec/foundation/trees';
 
 import { NullifierLeafPreimage } from '../../trees/index.js';
 import { PendingReadHint, ReadRequestAction, ReadRequestResetHints, SettledReadHint } from './read_request_hints.js';
@@ -11,7 +11,7 @@ export type NullifierReadRequestHints<PENDING extends number, SETTLED extends nu
   PENDING,
   SETTLED,
   typeof NULLIFIER_TREE_HEIGHT,
-  TreeLeafPreimage
+  NullifierLeafPreimage
 >;
 
 export function nullifierReadRequestHintsFromBuffer<PENDING extends number, SETTLED extends number>(
@@ -64,7 +64,7 @@ export class NullifierReadRequestHintsBuilder<PENDING extends number, SETTLED ex
   addSettledReadRequest(
     readRequestIndex: number,
     membershipWitness: MembershipWitness<typeof NULLIFIER_TREE_HEIGHT>,
-    leafPreimage: TreeLeafPreimage,
+    leafPreimage: NullifierLeafPreimage,
   ) {
     if (this.numSettledReadHints === this.maxSettled) {
       throw new Error('Cannot add more settled read request.');

package/src/kernel/private_call_data.ts

@@ -1,9 +1,4 @@
-import {
-  FUNCTION_TREE_HEIGHT,
-  PROTOCOL_CONTRACT_TREE_HEIGHT,
-  PUBLIC_DATA_TREE_HEIGHT,
-  UPDATES_VALUE_SIZE,
-} from '@aztec/constants';
+import { FUNCTION_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT, UPDATES_VALUE_SIZE } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { MembershipWitness } from '@aztec/foundation/trees';
@@ -11,7 +6,7 @@ import type { FieldsOf } from '@aztec/foundation/types';
 
 import { DelayedPublicMutableValues } from '../delayed_public_mutable/delayed_public_mutable_values.js';
 import { PublicKeys } from '../keys/public_keys.js';
-import { ProtocolContractLeafPreimage, PublicDataTreeLeafPreimage } from '../trees/index.js';
+import { PublicDataTreeLeafPreimage } from '../trees/index.js';
 import { VerificationKeyAsFields } from '../vks/verification_key.js';
 import { PrivateCircuitPublicInputs } from './private_circuit_public_inputs.js';
 
@@ -94,16 +89,6 @@ export class PrivateVerificationKeyHints {
      * The membership witness for the function leaf corresponding to the function being invoked.
      */
     public functionLeafMembershipWitness: MembershipWitness<typeof FUNCTION_TREE_HEIGHT>,
-    /**
-     * The membership witness for the protocolContractLeaf.
-     */
-    public protocolContractMembershipWitness: MembershipWitness<typeof PROTOCOL_CONTRACT_TREE_HEIGHT>,
-    /**
-     * The leaf of the protocol contract tree, of either:
-     *  The protocol contract being called.
-     *  The low leaf showing that the address of the contract being called is not in the tree.
-     */
-    public protocolContractLeaf: ProtocolContractLeafPreimage,
 
     public updatedClassIdHints: UpdatedClassIdHints,
   ) {}
@@ -120,8 +105,6 @@ export class PrivateVerificationKeyHints {
       fields.publicKeys,
       fields.saltedInitializationHash,
       fields.functionLeafMembershipWitness,
-      fields.protocolContractMembershipWitness,
-      fields.protocolContractLeaf,
       fields.updatedClassIdHints,
     ] as const;
   }
@@ -151,8 +134,6 @@ export class PrivateVerificationKeyHints {
       reader.readObject(PublicKeys),
       reader.readObject(Fr),
       reader.readObject(MembershipWitness.deserializer(FUNCTION_TREE_HEIGHT)),
-      reader.readObject(MembershipWitness.deserializer(PROTOCOL_CONTRACT_TREE_HEIGHT)),
-      reader.readObject(ProtocolContractLeafPreimage),
       reader.readObject(UpdatedClassIdHints),
     );
   }

package/src/kernel/private_kernel_circuit_public_inputs.ts

@@ -3,7 +3,7 @@ import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, bigintToUInt64BE, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { AztecAddress } from '../aztec-address/index.js';
-import { TxConstantData } from '../tx/tx_constant_data.js';
+import { PrivateTxConstantData } from '../tx/private_tx_constant_data.js';
 import type { UInt64 } from '../types/shared.js';
 import { PrivateAccumulatedData } from './private_accumulated_data.js';
 import { PrivateValidationRequests } from './private_validation_requests.js';
@@ -17,7 +17,7 @@ export class PrivateKernelCircuitPublicInputs {
     /**
      * Data which is not modified by the circuits.
      */
-    public constants: TxConstantData,
+    public constants: PrivateTxConstantData,
     /**
      * The side effect counter that non-revertible side effects are all beneath.
      */
@@ -82,7 +82,7 @@ export class PrivateKernelCircuitPublicInputs {
   static fromBuffer(buffer: Buffer | BufferReader): PrivateKernelCircuitPublicInputs {
     const reader = BufferReader.asReader(buffer);
     return new PrivateKernelCircuitPublicInputs(
-      reader.readObject(TxConstantData),
+      reader.readObject(PrivateTxConstantData),
       reader.readObject(Fr),
       reader.readObject(PrivateValidationRequests),
       reader.readObject(PrivateAccumulatedData),
@@ -96,7 +96,7 @@ export class PrivateKernelCircuitPublicInputs {
 
   static empty() {
     return new PrivateKernelCircuitPublicInputs(
-      TxConstantData.empty(),
+      PrivateTxConstantData.empty(),
       Fr.zero(),
       PrivateValidationRequests.empty(),
       PrivateAccumulatedData.empty(),

package/src/kernel/private_kernel_init_circuit_private_inputs.ts

@@ -1,6 +1,7 @@
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
+import { ProtocolContracts } from '../tx/protocol_contracts.js';
 import { TxRequest } from '../tx/tx_request.js';
 import { PrivateCallData } from './private_call_data.js';
 
@@ -18,9 +19,9 @@ export class PrivateKernelInitCircuitPrivateInputs {
      */
     public vkTreeRoot: Fr,
     /**
-     * The root of the protocol contract tree.
+     * The protocol contracts.
      */
-    public protocolContractTreeRoot: Fr,
+    public protocolContracts: ProtocolContracts,
     /**
      * Private calldata corresponding to this iteration of the kernel.
      */
@@ -43,7 +44,7 @@ export class PrivateKernelInitCircuitPrivateInputs {
     return serializeToBuffer(
       this.txRequest,
       this.vkTreeRoot,
-      this.protocolContractTreeRoot,
+      this.protocolContracts,
       this.privateCall,
       this.firstNullifierHint,
     );
@@ -59,7 +60,7 @@ export class PrivateKernelInitCircuitPrivateInputs {
     return new PrivateKernelInitCircuitPrivateInputs(
       reader.readObject(TxRequest),
       Fr.fromBuffer(reader),
-      Fr.fromBuffer(reader),
+      reader.readObject(ProtocolContracts),
       reader.readObject(PrivateCallData),
       reader.readBoolean(),
       Fr.fromBuffer(reader),

package/src/kernel/private_kernel_tail_circuit_public_inputs.ts

@@ -173,7 +173,7 @@ export class PrivateKernelTailCircuitPublicInputs {
       this.constants.anchorBlockHeader,
       this.constants.txContext,
       this.constants.vkTreeRoot,
-      this.constants.protocolContractTreeRoot,
+      this.constants.protocolContractsHash,
     );
     return new PrivateToRollupKernelCircuitPublicInputs(
       constants,

package/src/p2p/block_proposal.ts

@@ -26,6 +26,8 @@ export class BlockProposalHash extends Buffer32 {
 
 export type BlockProposalOptions = {
   publishFullTxs: boolean;
+  /** Whether to generate an invalid block proposal for broadcasting. Use only for testing. */
+  broadcastInvalidBlockProposal?: boolean;
 };
 
 /**

package/src/rollup/block_constant_data.ts

@@ -21,8 +21,8 @@ export class BlockConstantData {
     public l1ToL2TreeSnapshot: AppendOnlyTreeSnapshot,
     /** Root of the verification key tree. */
     public vkTreeRoot: Fr,
-    /** Root of the protocol contract tree. */
-    public protocolContractTreeRoot: Fr,
+    /** Hash of the protocol contracts list. */
+    public protocolContractsHash: Fr,
     /** Global variables for the block. */
     public globalVariables: GlobalVariables,
     /** Identifier of the prover. */
@@ -50,7 +50,7 @@ export class BlockConstantData {
       fields.lastArchive,
       fields.l1ToL2TreeSnapshot,
       fields.vkTreeRoot,
-      fields.protocolContractTreeRoot,
+      fields.protocolContractsHash,
       fields.globalVariables,
       fields.proverId,
     ] as const;

package/src/rollup/checkpoint_constant_data.ts

@@ -17,8 +17,8 @@ export class CheckpointConstantData {
     public version: Fr,
     /** Root of the verification key tree. */
     public vkTreeRoot: Fr,
-    /** Root of the protocol contract tree. */
-    public protocolContractTreeRoot: Fr,
+    /** Hash of the protocol contracts list. */
+    public protocolContractsHash: Fr,
     /** Identifier of the prover. */
     public proverId: Fr,
     /** Slot number of the checkpoint. */
@@ -40,7 +40,7 @@ export class CheckpointConstantData {
       fields.chainId,
       fields.version,
       fields.vkTreeRoot,
-      fields.protocolContractTreeRoot,
+      fields.protocolContractsHash,
       fields.proverId,
       fields.slotNumber,
       fields.coinbase,

package/src/rollup/epoch_constant_data.ts

@@ -20,9 +20,9 @@ export class EpochConstantData {
      */
     public vkTreeRoot: Fr,
     /**
-     * Root of the protocol contract tree.
+     * Hash of the protocol contracts list.
      */
-    public protocolContractTreeRoot: Fr,
+    public protocolContractsHash: Fr,
     /**
      * Identifier of the prover of the epoch.
      */
@@ -34,13 +34,7 @@ export class EpochConstantData {
   }
 
   static getFields(fields: FieldsOf<EpochConstantData>) {
-    return [
-      fields.chainId,
-      fields.version,
-      fields.vkTreeRoot,
-      fields.protocolContractTreeRoot,
-      fields.proverId,
-    ] as const;
+    return [fields.chainId, fields.version, fields.vkTreeRoot, fields.protocolContractsHash, fields.proverId] as const;
   }
 
   toFields(): Fr[] {

package/src/tests/factories.ts

@@ -68,7 +68,6 @@ import {
   AvmGetLeafValueHint,
   AvmGetPreviousValueIndexHint,
   AvmGetSiblingPathHint,
-  AvmProtocolContractAddressHint,
   AvmRevertCheckpointHint,
   AvmSequentialInsertHintNullifierTree,
   AvmSequentialInsertHintPublicDataTree,
@@ -160,6 +159,7 @@ import { FunctionData } from '../tx/function_data.js';
 import { GlobalVariables } from '../tx/global_variables.js';
 import { PartialStateReference } from '../tx/partial_state_reference.js';
 import { makeProcessedTxFromPrivateOnlyTx, makeProcessedTxFromTxWithPublicCalls } from '../tx/processed_tx.js';
+import { ProtocolContracts } from '../tx/protocol_contracts.js';
 import { PublicCallRequestWithCalldata } from '../tx/public_call_request_with_calldata.js';
 import { StateReference } from '../tx/state_reference.js';
 import { TreeSnapshots } from '../tx/tree_snapshots.js';
@@ -420,6 +420,10 @@ export function makePublicTubePublicInputs(seed = 1) {
   return new PublicTubePublicInputs(makePrivateToPublicKernelCircuitPublicInputs(seed), fr(seed + 0x1000));
 }
 
+export function makeProtocolContracts(seed = 1) {
+  return new ProtocolContracts(makeTuple(MAX_PROTOCOL_CONTRACTS, makeAztecAddress, seed));
+}
+
 /**
  * Creates arbitrary public kernel circuit public inputs.
  * @param seed - The seed to use for generating the kernel circuit public inputs.
@@ -441,7 +445,7 @@ export function makePrivateToRollupKernelCircuitPublicInputs(
 function makeAvmCircuitPublicInputs(seed = 1) {
   return new AvmCircuitPublicInputs(
     makeGlobalVariables(seed),
-    fr(seed + 0x100),
+    makeProtocolContracts(seed + 0x100),
     makeTreeSnapshots(seed + 0x10),
     makeGas(seed + 0x20),
     makeGasSettings(),
@@ -1429,13 +1433,6 @@ export async function makeAvmTxHint(seed = 0): Promise<AvmTxHint> {
   );
 }
 
-export function makeAvmProtocolContractDerivedAddressesHint(seed = 0): AvmProtocolContractAddressHint {
-  return new AvmProtocolContractAddressHint(
-    /*canonicalAddress=*/ new AztecAddress(new Fr(seed + 1)),
-    /*derivedAddress=*/ new AztecAddress(new Fr(seed + 0x1001)),
-  );
-}
-
 /**
  * Creates arbitrary AvmExecutionHints.
  * @param seed - The seed to use for generating the hints.
@@ -1452,11 +1449,7 @@ export async function makeAvmExecutionHints(
   const fields = {
     globalVariables: makeGlobalVariables(seed + 0x4000),
     tx: await makeAvmTxHint(seed + 0x4100),
-    protocolContractDerivedAddresses: makeArray(
-      MAX_PROTOCOL_CONTRACTS,
-      makeAvmProtocolContractDerivedAddressesHint,
-      seed + 0x4600,
-    ),
+    protocolContracts: new ProtocolContracts(makeTuple(MAX_PROTOCOL_CONTRACTS, makeAztecAddress, seed + 0x4600)),
     contractInstances: makeArray(baseLength + 2, makeAvmContractInstanceHint, seed + 0x4700),
     contractClasses: makeArray(baseLength + 5, makeAvmContractClassHint, seed + 0x4900),
     bytecodeCommitments: await makeArrayAsync(baseLength + 5, makeAvmBytecodeCommitmentHint, seed + 0x4900),
@@ -1490,7 +1483,7 @@ export async function makeAvmExecutionHints(
   return new AvmExecutionHints(
     fields.globalVariables,
     fields.tx,
-    fields.protocolContractDerivedAddresses,
+    fields.protocolContracts,
     fields.contractInstances,
     fields.contractClasses,
     fields.bytecodeCommitments,
@@ -1546,7 +1539,7 @@ export async function makeBloatedProcessedTx({
   version = Fr.ZERO,
   gasSettings = GasSettings.default({ maxFeesPerGas: new GasFees(10, 10) }),
   vkTreeRoot = Fr.ZERO,
-  protocolContractTreeRoot = Fr.ZERO,
+  protocolContracts = makeProtocolContracts(seed + 0x100),
   globalVariables = GlobalVariables.empty(),
   newL1ToL2Snapshot = AppendOnlyTreeSnapshot.empty(),
   feePayer,
@@ -1562,7 +1555,7 @@ export async function makeBloatedProcessedTx({
   vkTreeRoot?: Fr;
   globalVariables?: GlobalVariables;
   newL1ToL2Snapshot?: AppendOnlyTreeSnapshot;
-  protocolContractTreeRoot?: Fr;
+  protocolContracts?: ProtocolContracts;
   feePayer?: AztecAddress;
   feePaymentPublicDataWrite?: PublicDataWrite;
   privateOnly?: boolean;
@@ -1577,7 +1570,7 @@ export async function makeBloatedProcessedTx({
   txConstantData.txContext.version = version;
   txConstantData.txContext.gasSettings = gasSettings;
   txConstantData.vkTreeRoot = vkTreeRoot;
-  txConstantData.protocolContractTreeRoot = protocolContractTreeRoot;
+  txConstantData.protocolContractsHash = await protocolContracts.hash();
 
   const tx = !privateOnly
     ? await mockTx(seed, { feePayer })
@@ -1616,7 +1609,7 @@ export async function makeBloatedProcessedTx({
     // Create avm output.
     const avmOutput = AvmCircuitPublicInputs.empty();
     // Assign data from hints.
-    avmOutput.protocolContractTreeRoot = protocolContractTreeRoot;
+    avmOutput.protocolContracts = protocolContracts;
     avmOutput.startTreeSnapshots.l1ToL2MessageTree = newL1ToL2Snapshot;
     avmOutput.endTreeSnapshots.l1ToL2MessageTree = newL1ToL2Snapshot;
     // Assign data from private.

package/src/tests/mocks.ts

@@ -87,7 +87,7 @@ export const mockTx = async (
     chainId = Fr.ZERO,
     version = Fr.ZERO,
     vkTreeRoot = Fr.ZERO,
-    protocolContractTreeRoot = Fr.ZERO,
+    protocolContractsHash = Fr.ZERO,
   }: {
     numberOfNonRevertiblePublicCallRequests?: number;
     numberOfRevertiblePublicCallRequests?: number;
@@ -100,7 +100,7 @@ export const mockTx = async (
     chainId?: Fr;
     version?: Fr;
     vkTreeRoot?: Fr;
-    protocolContractTreeRoot?: Fr;
+    protocolContractsHash?: Fr;
   } = {},
 ) => {
   const totalPublicCallRequests =
@@ -118,7 +118,7 @@ export const mockTx = async (
   data.constants.txContext.chainId = chainId;
   data.constants.txContext.version = version;
   data.constants.vkTreeRoot = vkTreeRoot;
-  data.constants.protocolContractTreeRoot = protocolContractTreeRoot;
+  data.constants.protocolContractsHash = protocolContractsHash;
 
   // Set includeByTimestamp to the maximum allowed duration from the current time.
   data.includeByTimestamp = BigInt(Math.floor(Date.now() / 1000) + MAX_INCLUDE_BY_TIMESTAMP_DURATION);

package/src/trees/index.ts

@@ -1,5 +1,4 @@
 export * from './nullifier_leaf.js';
-export * from './protocol_contract_leaf.js';
 export * from './public_data_leaf.js';
 export * from './append_only_tree_snapshot.js';
 export * from './merkle_tree_id.js';

package/src/tx/index.ts

@@ -6,6 +6,7 @@ export * from './state_reference.js';
 export * from './partial_state_reference.js';
 export * from './function_data.js';
 export * from './tree_snapshots.js';
+export * from './private_tx_constant_data.js';
 export * from './tx_constant_data.js';
 export * from './tx_context.js';
 export * from './tx_request.js';
@@ -29,3 +30,4 @@ export * from './hashed_values.js';
 export * from './indexed_tx_effect.js';
 export * from './offchain_effect.js';
 export * from './profiling.js';
+export * from './protocol_contracts.js';

package/src/tx/private_tx_constant_data.ts

@@ -0,0 +1,94 @@
+import { TX_CONSTANT_DATA_LENGTH } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
+import type { FieldsOf } from '@aztec/foundation/types';
+
+import { BlockHeader } from './block_header.js';
+import { ProtocolContracts } from './protocol_contracts.js';
+import { TxContext } from './tx_context.js';
+
+/**
+ * Data that is constant/not modified by neither of the kernels.
+ */
+export class PrivateTxConstantData {
+  constructor(
+    /** Header of a block whose state is used during execution (not the block the transaction is included in). */
+    public anchorBlockHeader: BlockHeader,
+    /**
+     * Context of the transaction.
+     *
+     * Note: `chainId` and `version` in txContext are not redundant to the values in
+     * self.anchor_block_header.global_variables because they can be different in case of a protocol upgrade. In such
+     * a situation we could be using header from a block before the upgrade took place but be using the updated
+     * protocol to execute and prove the transaction.
+     */
+    public txContext: TxContext,
+    /**
+     * Root of the vk tree for the protocol circuits.
+     */
+    public vkTreeRoot: Fr,
+    /**
+     * List of protocol contracts.
+     */
+    public protocolContracts: ProtocolContracts,
+  ) {}
+
+  static from(fields: FieldsOf<PrivateTxConstantData>) {
+    return new PrivateTxConstantData(...PrivateTxConstantData.getFields(fields));
+  }
+
+  static getFields(fields: FieldsOf<PrivateTxConstantData>) {
+    return [fields.anchorBlockHeader, fields.txContext, fields.vkTreeRoot, fields.protocolContracts] as const;
+  }
+
+  static fromFields(fields: Fr[] | FieldReader): PrivateTxConstantData {
+    const reader = FieldReader.asReader(fields);
+    return new PrivateTxConstantData(
+      reader.readObject(BlockHeader),
+      reader.readObject(TxContext),
+      reader.readField(),
+      reader.readObject(ProtocolContracts),
+    );
+  }
+
+  toFields(): Fr[] {
+    const fields = serializeToFields(...PrivateTxConstantData.getFields(this));
+    if (fields.length !== TX_CONSTANT_DATA_LENGTH) {
+      throw new Error(
+        `Invalid number of fields for PrivateTxConstantData. Expected ${TX_CONSTANT_DATA_LENGTH}, got ${fields.length}`,
+      );
+    }
+    return fields;
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader): PrivateTxConstantData {
+    const reader = BufferReader.asReader(buffer);
+    return new PrivateTxConstantData(
+      reader.readObject(BlockHeader),
+      reader.readObject(TxContext),
+      Fr.fromBuffer(reader),
+      reader.readObject(ProtocolContracts),
+    );
+  }
+
+  toBuffer() {
+    return serializeToBuffer(...PrivateTxConstantData.getFields(this));
+  }
+
+  static empty() {
+    return new PrivateTxConstantData(BlockHeader.empty(), TxContext.empty(), Fr.ZERO, ProtocolContracts.empty());
+  }
+
+  getSize() {
+    return (
+      this.anchorBlockHeader.getSize() +
+      this.txContext.getSize() +
+      this.vkTreeRoot.size +
+      this.protocolContracts.getSize()
+    );
+  }
+
+  clone(): PrivateTxConstantData {
+    return PrivateTxConstantData.fromBuffer(this.toBuffer());
+  }
+}