@aztec/stdlib 1.0.0-nightly.20250607 → 1.0.0-nightly.20250610

package/src/tests/factories.ts

@@ -1,4 +1,4 @@
-import { makeBlockBlobPublicInputs, makeSpongeBlob } from '@aztec/blob-lib/testing';
+import { makeBatchedBlobAccumulator, makeBlockBlobPublicInputs, makeSpongeBlob } from '@aztec/blob-lib/testing';
 import {
   ARCHIVE_HEIGHT,
   AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED,
@@ -46,7 +46,7 @@ import { toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { compact } from '@aztec/foundation/collection';
 import { SchnorrSignature, poseidon2HashWithSeparator, sha256 } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr, GrumpkinScalar, Point } from '@aztec/foundation/fields';
+import { BLS12Point, Fr, GrumpkinScalar, Point } from '@aztec/foundation/fields';
 import type { Bufferable } from '@aztec/foundation/serialize';
 import { MembershipWitness } from '@aztec/foundation/trees';
 
@@ -99,7 +99,6 @@ import { KeyValidationRequestAndGenerator } from '../kernel/hints/key_validation
 import { ReadRequest } from '../kernel/hints/read_request.js';
 import { RollupValidationRequests } from '../kernel/hints/rollup_validation_requests.js';
 import {
-  CombinedConstantData,
   PartialPrivateTailPublicInputsForPublic,
   PartialPrivateTailPublicInputsForRollup,
   PrivateKernelTailCircuitPublicInputs,
@@ -145,8 +144,9 @@ import {
   BlockRootRollupInputs,
   SingleTxBlockRootRollupInputs,
 } from '../rollup/block_root_rollup.js';
-import { ConstantRollupData } from '../rollup/constant_rollup_data.js';
 import { EmptyBlockRootRollupInputs } from '../rollup/empty_block_root_rollup_inputs.js';
+import { EpochConstantData } from '../rollup/epoch_constant_data.js';
+import { BlockConstantData } from '../rollup/index.js';
 import { MergeRollupInputs } from '../rollup/merge_rollup.js';
 import { PreviousRollupBlockData } from '../rollup/previous_rollup_block_data.js';
 import { PreviousRollupData } from '../rollup/previous_rollup_data.js';
@@ -314,16 +314,6 @@ function makeTxConstantData(seed = 1) {
   return new TxConstantData(makeHeader(seed), makeTxContext(seed + 0x100), new Fr(seed + 0x200), new Fr(seed + 0x201));
 }
 
-export function makeCombinedConstantData(seed = 1): CombinedConstantData {
-  return new CombinedConstantData(
-    makeHeader(seed),
-    makeTxContext(seed + 0x100),
-    new Fr(seed + 0x200),
-    new Fr(seed + 0x201),
-    makeGlobalVariables(seed + 0x300),
-  );
-}
-
 /**
  * Creates arbitrary accumulated data.
  * @param seed - The seed to use for generating the accumulated data.
@@ -626,24 +616,6 @@ export function makeFeeRecipient(seed = 1) {
   return new FeeRecipient(EthAddress.fromField(fr(seed)), fr(seed + 1));
 }
 
-/**
- * Makes constant base rollup data.
- * @param seed - The seed to use for generating the constant base rollup data.
- * @param blockNumber - The block number to use for generating the global variables.
- * @returns A constant base rollup data.
- */
-export function makeConstantRollupData(
-  seed = 1,
-  globalVariables: GlobalVariables | undefined = undefined,
-): ConstantRollupData {
-  return ConstantRollupData.from({
-    lastArchive: makeAppendOnlyTreeSnapshot(seed + 0x300),
-    vkTreeRoot: fr(seed + 0x401),
-    protocolContractTreeRoot: fr(seed + 0x402),
-    globalVariables: globalVariables ?? makeGlobalVariables(seed + 0x500),
-  });
-}
-
 /**
  * Makes arbitrary append only tree snapshot.
  * @param seed - The seed to use for generating the append only tree snapshot.
@@ -690,6 +662,16 @@ export function makeSchnorrSignature(seed = 1): SchnorrSignature {
   return new SchnorrSignature(Buffer.alloc(SchnorrSignature.SIZE, seed));
 }
 
+function makeBlockConstantData(seed = 1, globalVariables?: GlobalVariables) {
+  return new BlockConstantData(
+    makeAppendOnlyTreeSnapshot(seed + 0x100),
+    makeAppendOnlyTreeSnapshot(seed + 0x200),
+    fr(seed + 0x300),
+    fr(seed + 0x400),
+    globalVariables ?? makeGlobalVariables(seed + 0x500),
+  );
+}
+
 /**
  * Makes arbitrary base or merge rollup circuit public inputs.
  * @param seed - The seed to use for generating the base rollup circuit public inputs.
@@ -703,7 +685,7 @@ export function makeBaseOrMergeRollupPublicInputs(
   return new BaseOrMergeRollupPublicInputs(
     RollupTypes.Base,
     1,
-    makeConstantRollupData(seed + 0x200, globalVariables),
+    makeBlockConstantData(seed + 0x200, globalVariables),
     makePartialStateReference(seed + 0x300),
     makePartialStateReference(seed + 0x400),
     makeSpongeBlob(seed + 0x500),
@@ -714,6 +696,10 @@ export function makeBaseOrMergeRollupPublicInputs(
   );
 }
 
+function makeEpochConstantData(seed = 1) {
+  return new EpochConstantData(fr(seed), fr(seed + 1), fr(seed + 2));
+}
+
 /**
  * Makes arbitrary block merge or block root rollup circuit public inputs.
  * @param seed - The seed to use for generating the block merge or block root rollup circuit public inputs.
@@ -725,6 +711,7 @@ export function makeBlockRootOrBlockMergeRollupPublicInputs(
   globalVariables: GlobalVariables | undefined = undefined,
 ): BlockRootOrBlockMergePublicInputs {
   return new BlockRootOrBlockMergePublicInputs(
+    makeEpochConstantData(seed + 0x100),
     makeAppendOnlyTreeSnapshot(seed + 0x200),
     makeAppendOnlyTreeSnapshot(seed + 0x300),
     globalVariables ?? makeGlobalVariables(seed + 0x400),
@@ -732,10 +719,7 @@ export function makeBlockRootOrBlockMergeRollupPublicInputs(
     fr(seed + 0x600),
     makeTuple(AZTEC_MAX_EPOCH_DURATION, () => fr(seed), 0x650),
     makeTuple(AZTEC_MAX_EPOCH_DURATION, () => makeFeeRecipient(seed), 0x700),
-    fr(seed + 0x800),
-    fr(seed + 0x801),
-    fr(seed + 0x900),
-    makeTuple(AZTEC_MAX_EPOCH_DURATION, () => makeBlockBlobPublicInputs(seed), 0x100),
+    makeBlockBlobPublicInputs(seed),
   );
 }
 
@@ -786,10 +770,10 @@ export function makePreviousRollupBlockData(
  * @returns A root rollup inputs.
  */
 export function makeRootRollupInputs(seed = 0, globalVariables?: GlobalVariables): RootRollupInputs {
-  return new RootRollupInputs(
-    [makePreviousRollupBlockData(seed, globalVariables), makePreviousRollupBlockData(seed + 0x1000, globalVariables)],
-    fr(seed + 0x2000),
-  );
+  return new RootRollupInputs([
+    makePreviousRollupBlockData(seed, globalVariables),
+    makePreviousRollupBlockData(seed + 0x1000, globalVariables),
+  ]);
 }
 
 function makeBlockRootRollupData(seed = 0) {
@@ -799,14 +783,16 @@ function makeBlockRootRollupData(seed = 0) {
     makeTuple(ARCHIVE_HEIGHT, fr, 0x2200),
     makeTuple(ARCHIVE_HEIGHT, fr, 0x2300),
     makeHeader(seed + 0x2400),
-    fr(seed + 0x2500),
+    makeBatchedBlobAccumulator(seed + 0x2500).toBlobAccumulatorPublicInputs(),
+    makeBatchedBlobAccumulator(seed + 0x2600).finalBlobChallenges,
+    fr(seed + 0x2700),
   );
 }
 
 function makeBlockRootRollupBlobData(seed = 0) {
   return new BlockRootRollupBlobData(
     makeTuple(FIELDS_PER_BLOB * BLOBS_PER_BLOCK, fr, 0x2500),
-    makeTuple(BLOBS_PER_BLOCK, () => makeTuple(2, fr, 0x2600)),
+    makeTuple(BLOBS_PER_BLOCK, () => BLS12Point.random()),
     fr(seed + 0x2700),
   );
 }
@@ -845,7 +831,7 @@ export function makeEmptyBlockRootRollupInputs(
 ): EmptyBlockRootRollupInputs {
   return new EmptyBlockRootRollupInputs(
     makeBlockRootRollupData(seed + 0x1000),
-    makeConstantRollupData(0x2500, globalVariables),
+    makeBlockConstantData(0x2500, globalVariables),
     true,
   );
 }
@@ -901,7 +887,7 @@ export function makeRootRollupPublicInputs(seed = 0): RootRollupPublicInputs {
     fr(seed + 0x702),
     fr(seed + 0x703),
     fr(seed + 0x704),
-    makeTuple(AZTEC_MAX_EPOCH_DURATION, () => makeBlockBlobPublicInputs(seed), 0x800),
+    makeBatchedBlobAccumulator(seed).toFinalBlobAccumulatorPublicInputs(),
   );
 }
 
@@ -1113,7 +1099,7 @@ function makePrivateBaseRollupHints(seed = 1) {
 
   const contractClassLogsFields = makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, makeContractClassLogFields, seed + 0x800);
 
-  const constants = makeConstantRollupData(0x100);
+  const constants = makeBlockConstantData(0x100);
 
   const feePayerFeeJuiceBalanceReadHint = PublicDataHint.empty();
 
@@ -1129,19 +1115,11 @@ function makePrivateBaseRollupHints(seed = 1) {
 }
 
 function makePublicBaseRollupHints(seed = 1) {
-  const startSpongeBlob = makeSpongeBlob(seed + 0x200);
-
-  const archiveRootMembershipWitness = makeMembershipWitness(ARCHIVE_HEIGHT, seed + 0x9000);
-
-  const contractClassLogsFields = makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, makeContractClassLogFields, seed + 0x800);
-
-  const constants = makeConstantRollupData(0x100);
-
   return PublicBaseRollupHints.from({
-    startSpongeBlob,
-    archiveRootMembershipWitness,
-    contractClassLogsFields,
-    constants,
+    startSpongeBlob: makeSpongeBlob(seed),
+    lastArchive: makeAppendOnlyTreeSnapshot(seed + 0x1000),
+    archiveRootMembershipWitness: makeMembershipWitness(ARCHIVE_HEIGHT, seed + 0x2000),
+    contractClassLogsFields: makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, makeContractClassLogFields, seed + 0x3000),
   });
 }
 

package/src/tests/mocks.ts

@@ -41,7 +41,7 @@ import { PublicSimulationOutput } from '../tx/public_simulation_output.js';
 import { TxSimulationResult, accumulatePrivateReturnValues } from '../tx/simulated_tx.js';
 import { TxEffect } from '../tx/tx_effect.js';
 import { TxHash } from '../tx/tx_hash.js';
-import { makeCombinedConstantData, makeGas, makeHeader, makePublicCallRequest } from './factories.js';
+import { makeGas, makeGlobalVariables, makeHeader, makePublicCallRequest } from './factories.js';
 
 export const randomTxHash = (): TxHash => TxHash.random();
 
@@ -181,6 +181,7 @@ const emptyPrivateCallExecutionResult = () =>
     [],
     [],
     [],
+    [],
   );
 
 const emptyPrivateExecutionResult = () => new PrivateExecutionResult(emptyPrivateCallExecutionResult(), Fr.zero(), []);
@@ -190,7 +191,7 @@ export const mockSimulatedTx = async (seed = 1) => {
   const tx = await mockTx(seed);
   const output = new PublicSimulationOutput(
     undefined,
-    makeCombinedConstantData(),
+    makeGlobalVariables(),
     await TxEffect.random(),
     [accumulatePrivateReturnValues(privateExecutionResult)],
     {

package/src/trees/append_only_tree_snapshot.ts

@@ -1,3 +1,4 @@
+import type { ViemAppendOnlyTreeSnapshot } from '@aztec/ethereum';
 import { Fr } from '@aztec/foundation/fields';
 import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
@@ -71,11 +72,26 @@ export class AppendOnlyTreeSnapshot {
     return new AppendOnlyTreeSnapshot(reader.readField(), Number(reader.readField().toBigInt()));
   }
 
-  static zero() {
+  static fromViem(snapshot: ViemAppendOnlyTreeSnapshot) {
+    return new AppendOnlyTreeSnapshot(Fr.fromString(snapshot.root), snapshot.nextAvailableLeafIndex);
+  }
+
+  toViem(): ViemAppendOnlyTreeSnapshot {
+    return {
+      root: this.root.toString(),
+      nextAvailableLeafIndex: this.nextAvailableLeafIndex,
+    };
+  }
+
+  toAbi(): [`0x${string}`, number] {
+    return [this.root.toString(), this.nextAvailableLeafIndex];
+  }
+
+  static empty() {
     return new AppendOnlyTreeSnapshot(Fr.ZERO, 0);
   }
 
-  isZero(): boolean {
+  isEmpty(): boolean {
     return this.root.isZero() && this.nextAvailableLeafIndex === 0;
   }
 

package/src/tx/block_header.ts

@@ -46,7 +46,7 @@ export class BlockHeader {
   }
 
   static getFields(fields: FieldsOf<BlockHeader>) {
-    // Note: The order here must match the order in the HeaderLib solidity library.
+    // Note: The order here must match the order in the ProposedHeaderLib solidity library.
     return [
       fields.lastArchive,
       fields.contentCommitment,
@@ -124,7 +124,7 @@ export class BlockHeader {
 
   static empty(fields: Partial<FieldsOf<BlockHeader>> = {}): BlockHeader {
     return BlockHeader.from({
-      lastArchive: AppendOnlyTreeSnapshot.zero(),
+      lastArchive: AppendOnlyTreeSnapshot.empty(),
       contentCommitment: ContentCommitment.empty(),
       state: StateReference.empty(),
       globalVariables: GlobalVariables.empty(),
@@ -136,7 +136,7 @@ export class BlockHeader {
 
   isEmpty(): boolean {
     return (
-      this.lastArchive.isZero() &&
+      this.lastArchive.isEmpty() &&
       this.contentCommitment.isEmpty() &&
       this.state.isEmpty() &&
       this.globalVariables.isEmpty() &&

package/src/tx/content_commitment.ts

@@ -1,8 +1,9 @@
 import { CONTENT_COMMITMENT_LENGTH } from '@aztec/constants';
+import type { ViemContentCommitment } from '@aztec/ethereum';
 import { Fr } from '@aztec/foundation/fields';
 import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { bufferToHex } from '@aztec/foundation/string';
+import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 
 import { z } from 'zod';
 
@@ -79,6 +80,14 @@ export class ContentCommitment {
     return serialized;
   }
 
+  toViem(): ViemContentCommitment {
+    return {
+      numTxs: this.numTxs.toBigInt(),
+      blobsHash: `0x${this.blobsHash.toString('hex').padStart(64, '0')}`,
+      inHash: `0x${this.inHash.toString('hex').padStart(64, '0')}`,
+      outHash: `0x${this.outHash.toString('hex').padStart(64, '0')}`,
+    };
+  }
   static fromBuffer(buffer: Buffer | BufferReader): ContentCommitment {
     const reader = BufferReader.asReader(buffer);
 
@@ -90,6 +99,15 @@ export class ContentCommitment {
     );
   }
 
+  static fromViem(contentCommitment: ViemContentCommitment) {
+    return new ContentCommitment(
+      new Fr(contentCommitment.numTxs),
+      hexToBuffer(contentCommitment.blobsHash),
+      hexToBuffer(contentCommitment.inHash),
+      hexToBuffer(contentCommitment.outHash),
+    );
+  }
+
   static fromFields(fields: Fr[] | FieldReader): ContentCommitment {
     const reader = FieldReader.asReader(fields);
     return new ContentCommitment(

package/src/tx/global_variables.ts

@@ -102,7 +102,7 @@ export class GlobalVariables {
   }
 
   static getFields(fields: FieldsOf<GlobalVariables>) {
-    // Note: The order here must match the order in the HeaderLib solidity library.
+    // Note: The order here must match the order in the ProposedHeaderLib solidity library.
     return [
       fields.chainId,
       fields.version,

package/src/tx/index.ts

@@ -29,4 +29,5 @@ export * from './capsule.js';
 export * from './global_variable_builder.js';
 export * from './hashed_values.js';
 export * from './indexed_tx_effect.js';
+export * from './offchain_message.js';
 export * from './profiling.js';

package/src/tx/offchain_message.ts

@@ -0,0 +1,16 @@
+import { Fr } from '@aztec/foundation/fields';
+
+import type { AztecAddress } from '../aztec-address/index.js';
+
+/**
+ * Represents an offchain message emitted via the `emit_offchain_message` oracle (see the oracle documentation for
+ * more details).
+ */
+export type OffchainMessage = {
+  /** The message content */
+  message: Fr[];
+  /** The message recipient */
+  recipient: AztecAddress;
+  /** The contract that emitted the message */
+  contractAddress: AztecAddress;
+};

package/src/tx/partial_state_reference.ts

@@ -1,4 +1,5 @@
 import { PARTIAL_STATE_REFERENCE_LENGTH } from '@aztec/constants';
+import type { ViemPartialStateReference } from '@aztec/ethereum';
 import type { Fr } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
@@ -55,11 +56,35 @@ export class PartialStateReference {
     return new PartialStateReference(noteHashTree, nullifierTree, publicDataTree);
   }
 
+  static fromViem(stateReference: ViemPartialStateReference) {
+    return new PartialStateReference(
+      AppendOnlyTreeSnapshot.fromViem(stateReference.noteHashTree),
+      AppendOnlyTreeSnapshot.fromViem(stateReference.nullifierTree),
+      AppendOnlyTreeSnapshot.fromViem(stateReference.publicDataTree),
+    );
+  }
+
+  toViem(): ViemPartialStateReference {
+    return {
+      noteHashTree: this.noteHashTree.toViem(),
+      nullifierTree: this.nullifierTree.toViem(),
+      publicDataTree: this.publicDataTree.toViem(),
+    };
+  }
+
+  toAbi(): [
+    ReturnType<AppendOnlyTreeSnapshot['toAbi']>,
+    ReturnType<AppendOnlyTreeSnapshot['toAbi']>,
+    ReturnType<AppendOnlyTreeSnapshot['toAbi']>,
+  ] {
+    return [this.noteHashTree.toAbi(), this.nullifierTree.toAbi(), this.publicDataTree.toAbi()];
+  }
+
   static empty(): PartialStateReference {
     return new PartialStateReference(
-      AppendOnlyTreeSnapshot.zero(),
-      AppendOnlyTreeSnapshot.zero(),
-      AppendOnlyTreeSnapshot.zero(),
+      AppendOnlyTreeSnapshot.empty(),
+      AppendOnlyTreeSnapshot.empty(),
+      AppendOnlyTreeSnapshot.empty(),
     );
   }
 
@@ -82,7 +107,7 @@ export class PartialStateReference {
   }
 
   isEmpty(): boolean {
-    return this.noteHashTree.isZero() && this.nullifierTree.isZero() && this.publicDataTree.isZero();
+    return this.noteHashTree.isEmpty() && this.nullifierTree.isEmpty() && this.publicDataTree.isEmpty();
   }
 
   public equals(other: this): boolean {

package/src/tx/private_execution_result.ts

@@ -6,6 +6,7 @@ import type { FieldsOf } from '@aztec/foundation/types';
 import { z } from 'zod';
 
 import { NoteSelector } from '../abi/note_selector.js';
+import { AztecAddress } from '../aztec-address/index.js';
 import { PrivateCircuitPublicInputs } from '../kernel/private_circuit_public_inputs.js';
 import type { IsEmpty } from '../kernel/utils/interfaces.js';
 import { sortByCounter } from '../kernel/utils/order_and_comparison.js';
@@ -13,6 +14,7 @@ import { ContractClassLog, ContractClassLogFields } from '../logs/contract_class
 import { Note } from '../note/note.js';
 import { type ZodFor, mapSchema, schemas } from '../schemas/index.js';
 import { HashedValues } from './hashed_values.js';
+import type { OffchainMessage } from './offchain_message.js';
 
 /**
  * The contents of a new note.
@@ -131,6 +133,8 @@ export class PrivateCallExecutionResult {
     public noteHashNullifierCounterMap: Map<number, number>,
     /** The raw return values of the executed function. */
     public returnValues: Fr[],
+    /** The offchain messages emitted during execution of this function call via the `emit_offchain_message` oracle. */
+    public offchainMessages: { message: Fr[]; recipient: AztecAddress }[],
     /** The nested executions. */
     public nestedExecutions: PrivateCallExecutionResult[],
     /**
@@ -153,6 +157,7 @@ export class PrivateCallExecutionResult {
         newNotes: z.array(NoteAndSlot.schema),
         noteHashNullifierCounterMap: mapSchema(z.coerce.number(), z.number()),
         returnValues: z.array(schemas.Fr),
+        offchainMessages: z.array(z.object({ message: z.array(schemas.Fr), recipient: AztecAddress.schema })),
         nestedExecutions: z.array(z.lazy(() => PrivateCallExecutionResult.schema)),
         contractClassLogs: z.array(CountedContractClassLog.schema),
       })
@@ -169,6 +174,7 @@ export class PrivateCallExecutionResult {
       fields.newNotes,
       fields.noteHashNullifierCounterMap,
       fields.returnValues,
+      fields.offchainMessages,
       fields.nestedExecutions,
       fields.contractClassLogs,
     );
@@ -184,6 +190,12 @@ export class PrivateCallExecutionResult {
       [NoteAndSlot.random()],
       new Map([[0, 0]]),
       [Fr.random()],
+      [
+        {
+          message: [Fr.random()],
+          recipient: await AztecAddress.random(),
+        },
+      ],
       await timesParallel(nested, () => PrivateCallExecutionResult.random(0)),
       [new CountedContractClassLog(await ContractClassLog.random(), randomInt(10))],
     );
@@ -233,6 +245,24 @@ export function collectSortedContractClassLogs(execResult: PrivateExecutionResul
   return sortedLogs.map(l => l.log.fields);
 }
 
+/**
+ * Collect all offchain messages emitted across all nested executions.
+ * @param execResult - The execution result to collect messages from.
+ * @returns Array of offchain messages.
+ */
+export function collectOffchainMessages(execResult: PrivateExecutionResult): OffchainMessage[] {
+  const collectMessagesRecursive = (callResult: PrivateCallExecutionResult): OffchainMessage[] => {
+    return [
+      ...callResult.offchainMessages.map(msg => ({
+        ...msg,
+        contractAddress: callResult.publicInputs.callContext.contractAddress, // contract that emitted the message
+      })),
+      ...callResult.nestedExecutions.flatMap(nested => collectMessagesRecursive(nested)),
+    ];
+  };
+  return collectMessagesRecursive(execResult.entrypoint);
+}
+
 export function getFinalMinRevertibleSideEffectCounter(execResult: PrivateExecutionResult): number {
   const collectFinalMinRevertibleSideEffectCounterRecursive = (callResult: PrivateCallExecutionResult): number => {
     return callResult.nestedExecutions.reduce((counter, exec) => {

package/src/tx/processed_tx.ts

@@ -6,8 +6,7 @@ import { RevertCode } from '../avm/revert_code.js';
 import type { SimulationError } from '../errors/simulation_error.js';
 import { Gas } from '../gas/gas.js';
 import type { GasUsed } from '../gas/gas_used.js';
-import { siloL2ToL1Message } from '../hash/hash.js';
-import { CombinedConstantData } from '../kernel/combined_constant_data.js';
+import { computeL2ToL1MessageHash } from '../hash/hash.js';
 import type { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
 import type { ClientIvcProof } from '../proofs/client_ivc_proof.js';
 import type { GlobalVariables } from './global_variables.js';
@@ -43,9 +42,9 @@ export type ProcessedTx = {
    */
   avmProvingRequest: AvmProvingRequest | undefined;
   /**
-   * Combining `TxConstantData` specified by the user, and `GlobalVariables` injected by the sequencer.
+   * `GlobalVariables` injected by the sequencer. It's the same for all the txs in a block.
    */
-  constants: CombinedConstantData;
+  globalVariables: GlobalVariables;
   /**
    * Output data of the tx.
    */
@@ -84,8 +83,6 @@ export async function makeProcessedTxFromPrivateOnlyTx(
   feePaymentPublicDataWrite: PublicDataWrite,
   globalVariables: GlobalVariables,
 ): Promise<ProcessedTx> {
-  const constants = CombinedConstantData.combine(tx.data.constants, globalVariables);
-
   const data = tx.data.forRollup!;
   const txEffect = new TxEffect(
     RevertCode.OK,
@@ -94,8 +91,16 @@ export async function makeProcessedTxFromPrivateOnlyTx(
     data.end.noteHashes.filter(h => !h.isZero()),
     data.end.nullifiers.filter(h => !h.isZero()),
     data.end.l2ToL1Msgs
-      .map(message => siloL2ToL1Message(message, constants.txContext.version, constants.txContext.chainId))
-      .filter(h => !h.isZero()),
+      .filter(msg => !msg.contractAddress.isZero())
+      .map(msg =>
+        computeL2ToL1MessageHash({
+          l2Sender: msg.contractAddress,
+          l1Recipient: msg.message.recipient,
+          content: msg.message.content,
+          rollupVersion: globalVariables.version,
+          chainId: globalVariables.chainId,
+        }),
+      ),
     [feePaymentPublicDataWrite],
     data.end.privateLogs.filter(l => !l.isEmpty()),
     [],
@@ -115,7 +120,7 @@ export async function makeProcessedTxFromPrivateOnlyTx(
     data: tx.data,
     clientIvcProof: tx.clientIvcProof,
     avmProvingRequest: undefined,
-    constants,
+    globalVariables,
     txEffect,
     gasUsed,
     revertCode: RevertCode.OK,
@@ -138,7 +143,7 @@ export async function makeProcessedTxFromTxWithPublicCalls(
 ): Promise<ProcessedTx> {
   const avmPublicInputs = avmProvingRequest.inputs.publicInputs;
 
-  const constants = CombinedConstantData.combine(tx.data.constants, avmPublicInputs.globalVariables);
+  const globalVariables = avmPublicInputs.globalVariables;
 
   const publicDataWrites = avmPublicInputs.accumulatedData.publicDataWrites.filter(w => !w.isEmpty());
 
@@ -158,8 +163,16 @@ export async function makeProcessedTxFromTxWithPublicCalls(
     avmPublicInputs.accumulatedData.noteHashes.filter(h => !h.isZero()),
     avmPublicInputs.accumulatedData.nullifiers.filter(h => !h.isZero()),
     avmPublicInputs.accumulatedData.l2ToL1Msgs
-      .map(message => siloL2ToL1Message(message, constants.txContext.version, constants.txContext.chainId))
-      .filter(h => !h.isZero()),
+      .filter(msg => !msg.contractAddress.isZero())
+      .map(msg =>
+        computeL2ToL1MessageHash({
+          l2Sender: msg.contractAddress,
+          l1Recipient: msg.message.recipient,
+          content: msg.message.content,
+          rollupVersion: globalVariables.version,
+          chainId: globalVariables.chainId,
+        }),
+      ),
     publicDataWrites,
     privateLogs,
     avmPublicInputs.accumulatedData.publicLogs.filter(l => !l.isEmpty()),
@@ -171,7 +184,7 @@ export async function makeProcessedTxFromTxWithPublicCalls(
     data: tx.data,
     clientIvcProof: tx.clientIvcProof,
     avmProvingRequest,
-    constants,
+    globalVariables,
     txEffect,
     gasUsed,
     revertCode,

package/src/tx/proposed_block_header.ts

@@ -1,3 +1,4 @@
+import type { ViemHeader } from '@aztec/ethereum';
 import { sha256ToField } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
@@ -84,7 +85,7 @@ export class ProposedBlockHeader {
   }
 
   toBuffer() {
-    // Note: The order here must match the order in the HeaderLib solidity library.
+    // Note: The order here must match the order in the ProposedHeaderLib solidity library.
     return serializeToBuffer([
       this.lastArchiveRoot,
       this.contentCommitment,
@@ -140,6 +141,35 @@ export class ProposedBlockHeader {
     return ProposedBlockHeader.fromBuffer(hexToBuffer(str));
   }
 
+  static fromViem(header: ViemHeader) {
+    return new ProposedBlockHeader(
+      Fr.fromString(header.lastArchiveRoot),
+      ContentCommitment.fromViem(header.contentCommitment),
+      new Fr(header.slotNumber),
+      header.timestamp,
+      new EthAddress(hexToBuffer(header.coinbase)),
+      new AztecAddress(hexToBuffer(header.feeRecipient)),
+      new GasFees(header.gasFees.feePerDaGas, header.gasFees.feePerL2Gas),
+      new Fr(header.totalManaUsed),
+    );
+  }
+
+  toViem(): ViemHeader {
+    return {
+      lastArchiveRoot: this.lastArchiveRoot.toString(),
+      contentCommitment: this.contentCommitment.toViem(),
+      slotNumber: this.slotNumber.toBigInt(),
+      timestamp: this.timestamp,
+      coinbase: this.coinbase.toString(),
+      feeRecipient: `0x${this.feeRecipient.toBuffer().toString('hex').padStart(64, '0')}`,
+      gasFees: {
+        feePerDaGas: this.gasFees.feePerDaGas,
+        feePerL2Gas: this.gasFees.feePerL2Gas,
+      },
+      totalManaUsed: this.totalManaUsed.toBigInt(),
+    };
+  }
+
   toInspect() {
     return {
       lastArchive: this.lastArchiveRoot.toString(),

package/src/tx/proven_tx.ts

@@ -5,7 +5,12 @@ import { z } from 'zod';
 
 import { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
 import { ClientIvcProof } from '../proofs/client_ivc_proof.js';
-import { PrivateExecutionResult, collectSortedContractClassLogs } from './private_execution_result.js';
+import type { OffchainMessage } from './offchain_message.js';
+import {
+  PrivateExecutionResult,
+  collectOffchainMessages,
+  collectSortedContractClassLogs,
+} from './private_execution_result.js';
 import { type ProvingStats, ProvingTimingsSchema } from './profiling.js';
 import { Tx } from './tx.js';
 
@@ -29,6 +34,10 @@ export class TxProvingResult {
     return tx;
   }
 
+  getOffchainMessages(): OffchainMessage[] {
+    return collectOffchainMessages(this.privateExecutionResult);
+  }
+
   static get schema() {
     return z
       .object({