@aztec/stdlib 6.0.0-nightly.20260604 → 6.0.0-nightly.20260721

package/src/timetable/proposer_timetable.ts

@@ -0,0 +1,190 @@
+import type { SlotNumber } from '@aztec/foundation/branded-types';
+import type { Logger } from '@aztec/foundation/log';
+
+import { type ResolvedTimingBudgets, getDefaultCheckpointProposalSyncGrace, resolveTimingBudgets } from './budgets.js';
+import { ConsensusTimetable, type SlotTimingConstants } from './consensus_timetable.js';
+
+/** Result of selecting the next block sub-slot to build. */
+export type SubslotSelection =
+  | { canStart: false; index: undefined; deadline: undefined; isLastBlock: false }
+  | { canStart: true; index: number; deadline: number; isLastBlock: boolean };
+
+/**
+ * Proposer ideal/happy-path schedule and block sub-slot timetable.
+ *
+ * Composes a {@link ConsensusTimetable} and adds the operational budgets that only the proposer needs
+ * (`min_block_duration`, `p2p_propagation_time`, `checkpoint_proposal_prepare_time`). Used by the
+ * sequencer and checkpoint-proposal job. All getters take a target slot and return an absolute
+ * wall-clock timestamp in seconds (or sub-slot deadlines in seconds for {@link selectNextSubslot}).
+ *
+ * The single hard deadline {@link getAttestationDeadline} is inherited from the composed
+ * {@link ConsensusTimetable}, so the proposer uses one object.
+ *
+ * `maxBlocksPerCheckpoint` is computed from the local operational budgets and then clamped down to the optional
+ * network-provided value when that value is lower; a network value at or above the computed count leaves the
+ * computed count in effect. When clamping down occurs and a logger is supplied, a warning is emitted.
+ */
+export class ProposerTimetable extends ConsensusTimetable {
+  /** Minimum block-building time (`min_block_duration`) in seconds. */
+  public readonly minBlockDuration: number;
+
+  /** One-way proposal/attestation propagation budget (`p2p_propagation_time`) in seconds. */
+  public readonly p2pPropagationTime: number;
+
+  /** Local checkpoint proposal preparation budget (`checkpoint_proposal_prepare_time`) in seconds. */
+  public readonly checkpointProposalPrepareTime: number;
+
+  /** Proposer initialization budget (`checkpoint_proposal_init_time`) reserved before the first sub-slot, in seconds. */
+  public readonly checkpointProposalInitTime: number;
+
+  /**
+   * Effective maximum number of block sub-slots per checkpoint: the value the local operational budgets compute,
+   * clamped down to the explicit network value when that value is lower. A network value above the computed
+   * count has no effect (the computed count is used) and is not logged.
+   */
+  public readonly maxBlocksPerCheckpoint: number;
+
+  constructor(opts: {
+    l1Constants: SlotTimingConstants;
+    blockDuration: number;
+    minBlockDuration: number;
+    p2pPropagationTime: number;
+    checkpointProposalPrepareTime: number;
+    checkpointProposalInitTime: number;
+    checkpointProposalSyncGrace?: number;
+    /** Explicit network max blocks per checkpoint; the effective value is clamped down to this when it is lower. */
+    maxBlocksPerCheckpoint?: number;
+    /** Optional logger; warns when the local budgets compute more blocks than the network value allows. */
+    logger?: Logger;
+  }) {
+    super({
+      l1Constants: opts.l1Constants,
+      blockDuration: opts.blockDuration,
+      checkpointProposalSyncGrace:
+        opts.checkpointProposalSyncGrace ?? getDefaultCheckpointProposalSyncGrace(opts.blockDuration),
+    });
+
+    // Resolve operational budgets, applying the fast local/e2e profile for low ethereum slot durations so a
+    // fast network does not inherit the conservative production budgets (which would shrink the build window).
+    const budgets: ResolvedTimingBudgets = resolveTimingBudgets(this.ethereumSlotDuration, {
+      minBlockDuration: opts.minBlockDuration,
+      p2pPropagationTime: opts.p2pPropagationTime,
+      checkpointProposalPrepareTime: opts.checkpointProposalPrepareTime,
+      checkpointProposalInitTime: opts.checkpointProposalInitTime,
+    });
+    this.p2pPropagationTime = budgets.p2pPropagationTime;
+    this.checkpointProposalPrepareTime = budgets.checkpointProposalPrepareTime;
+    this.checkpointProposalInitTime = budgets.checkpointProposalInitTime;
+
+    // Clamp min block duration to the block duration so a single sub-slot is always startable.
+    this.minBlockDuration = Math.min(budgets.minBlockDuration, this.blockDuration);
+
+    const computed = this.computeMaxBlocksPerCheckpoint();
+    this.maxBlocksPerCheckpoint =
+      opts.maxBlocksPerCheckpoint !== undefined ? Math.min(computed, opts.maxBlocksPerCheckpoint) : computed;
+    if (opts.maxBlocksPerCheckpoint !== undefined && opts.maxBlocksPerCheckpoint < computed) {
+      opts.logger?.warn(`Locally computed max blocks per checkpoint clamped down to the network-provided value`, {
+        computed,
+        maxBlocksPerCheckpoint: opts.maxBlocksPerCheckpoint,
+      });
+    }
+    if (this.maxBlocksPerCheckpoint < 1) {
+      throw new Error(
+        `Invalid timing configuration: derived ${this.maxBlocksPerCheckpoint} blocks per checkpoint for ` +
+          `slot duration ${this.aztecSlotDuration}s and block duration ${this.blockDuration}s.`,
+      );
+    }
+  }
+
+  /**
+   * Computes the maximum number of full-duration block sub-slots in a checkpoint from the already-resolved
+   * budgets. Derived from the spec's `max_blocks_per_checkpoint = floor((last_block_build_time -
+   * first_subslot_start) / D)`, where the first sub-slot starts one `checkpoint_proposal_init_time` (`init`)
+   * after `build_frame_start`, so it simplifies to `floor((S - init - D - 2P - prepCp) / D)`.
+   */
+  private computeMaxBlocksPerCheckpoint(): number {
+    // last_block_build_time - (build_frame_start + init) = S - init - D - 2P - prepCp.
+    const timeAvailableForBlocks =
+      this.aztecSlotDuration -
+      this.checkpointProposalInitTime -
+      this.blockDuration -
+      2 * this.p2pPropagationTime -
+      this.checkpointProposalPrepareTime;
+    return Math.floor(timeAvailableForBlocks / this.blockDuration);
+  }
+
+  /**
+   * Ideal time the last block must finish building by to make the ideal L1 publish path:
+   * `target_slot_start - E - D - 2P - prepCp` (= `checkpoint_proposal_send_time - prepCp`). Single value;
+   * the proposer sizes block production around the ideal L1-publish path only.
+   */
+  public getLastBlockBuildTime(slot: SlotNumber): number {
+    return (
+      this.getTargetSlotStart(slot) -
+      this.ethereumSlotDuration -
+      this.blockDuration -
+      2 * this.p2pPropagationTime -
+      this.checkpointProposalPrepareTime
+    );
+  }
+
+  /**
+   * Latest start at which the proposer can still squeeze in a minimum-duration block.
+   *
+   * Multi-block mode: `last_block_build_time - min_block_duration`, an ideal-derived cutoff
+   * intentionally earlier (by `P`) than the consensus receive gate would strictly allow, and
+   * conservatively no later than the final sub-slot's start cutoff in {@link selectNextSubslot}.
+   *
+   */
+  public getBuildStartDeadline(slot: SlotNumber): number {
+    return this.getLastBlockBuildTime(slot) - this.minBlockDuration;
+  }
+
+  /** Ideal L1 publish/send time: `target_slot_start - E`. Also the ideal attestation-receipt target. */
+  public getL1PublishIdealTime(slot: SlotNumber): number {
+    return this.getTargetSlotStart(slot) - this.ethereumSlotDuration;
+  }
+
+  /**
+   * Build deadline for sub-slot `k` (zero-based): `build_frame_start + init + (k + 1) * D`.
+   *
+   * The `init` (`checkpoint_proposal_init_time`) offset reserves the proposer's sync/proposer-check/init
+   * budget at the start of the build frame, so the first sub-slot still has its full duration once the
+   * prologue finishes rather than being eaten by it.
+   */
+  public getBlockBuildDeadline(slot: SlotNumber, blockIndex: number): number {
+    return this.getBuildFrameStart(slot) + this.checkpointProposalInitTime + (blockIndex + 1) * this.blockDuration;
+  }
+
+  /** Latest time to keep waiting for txs for sub-slot `k`: `block_build_deadline(k) - min_block_duration`. */
+  public getWaitForTxsDeadline(slot: SlotNumber, blockIndex: number): number {
+    return this.getBlockBuildDeadline(slot, blockIndex) - this.minBlockDuration;
+  }
+
+  /** Maximum number of full-duration block sub-slots for this timing config. */
+  public getMaxBlocksPerCheckpoint(): number {
+    return this.maxBlocksPerCheckpoint;
+  }
+
+  /**
+   * Selects the next block sub-slot to build for the target slot given the current wall-clock time.
+   *
+   * Scans sub-slots in order and picks the first whose build deadline is at least `min_block_duration`
+   * in the future. Sub-slots with insufficient remaining headroom are skipped.
+   *
+   * @param slot - Target slot the checkpoint commits to.
+   * @param now - Current wall-clock time in seconds.
+   */
+  public selectNextSubslot(slot: SlotNumber, now: number): SubslotSelection {
+    const maxBlocks = this.maxBlocksPerCheckpoint;
+    for (let index = 0; index < maxBlocks; index++) {
+      const deadline = this.getBlockBuildDeadline(slot, index);
+      if (deadline - now >= this.minBlockDuration) {
+        const isLastBlock = index === maxBlocks - 1;
+        return { canStart: true, index, deadline, isLastBlock };
+      }
+    }
+
+    return { canStart: false, index: undefined, deadline: undefined, isLastBlock: false };
+  }
+}

package/src/timetable/timetable-example.svg

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 1080 460" width="1080" height="460" xmlns="http://www.w3.org/2000/svg" font-family="-apple-system, Segoe UI, Helvetica, Arial, sans-serif" role="img" aria-label="Proportional example timetable">
+  <rect x="0" y="0" width="1080" height="460" fill="#ffffff"/>
+  <text x="540" y="28" text-anchor="middle" font-size="16" font-weight="700" fill="#1e293b">Example timetable — offsets from build_frame_start (S=72,E=12,D=6,P=2,prepCp=1)</text>
+
+  <!-- phase bands -->
+  <rect x="70" y="244" width="427" height="32" rx="4" fill="#dbeafe"/>
+  <rect x="497" y="244" width="77" height="32" fill="#fde68a"/>
+  <rect x="574" y="244" width="84" height="32" fill="#e9d5ff"/>
+  <rect x="658" y="244" width="352" height="32" rx="4" fill="#dcfce7"/>
+
+  <text x="283" y="236" text-anchor="middle" font-size="12" fill="#1e40af">block building</text>
+  <text x="535" y="236" text-anchor="middle" font-size="10.5" fill="#92400e">dead zone</text>
+  <text x="616" y="236" text-anchor="middle" font-size="10.5" fill="#6b21a8">send lead</text>
+  <text x="834" y="236" text-anchor="middle" font-size="12" fill="#166534">target L2 slot →</text>
+
+  <!-- ethereum-slot ticks (12s) -->
+  <g stroke="#94a3b8" stroke-width="1" opacity="0.45">
+    <line x1="154" y1="246" x2="154" y2="274"/>
+    <line x1="238" y1="246" x2="238" y2="274"/>
+    <line x1="322" y1="246" x2="322" y2="274"/>
+    <line x1="406" y1="246" x2="406" y2="274"/>
+    <line x1="490" y1="246" x2="490" y2="274"/>
+    <line x1="574" y1="246" x2="574" y2="274"/>
+    <line x1="658" y1="246" x2="658" y2="274"/>
+    <line x1="742" y1="246" x2="742" y2="274"/>
+    <line x1="826" y1="246" x2="826" y2="274"/>
+    <line x1="910" y1="246" x2="910" y2="274"/>
+    <line x1="994" y1="246" x2="994" y2="274"/>
+  </g>
+
+  <line x1="70" y1="260" x2="1010" y2="260" stroke="#475569" stroke-width="1.5"/>
+
+  <!-- slot boundaries (dashed) -->
+  <line x1="154" y1="242" x2="154" y2="296" stroke="#94a3b8" stroke-width="1.2" stroke-dasharray="4 3"/>
+  <text x="154" y="310" text-anchor="middle" font-size="10" fill="#64748b">build slot start (+12)</text>
+  <line x1="658" y1="218" x2="658" y2="302" stroke="#64748b" stroke-width="1.4" stroke-dasharray="5 3"/>
+  <text x="658" y="212" text-anchor="middle" font-size="10.5" fill="#334155">target slot start (+84)</text>
+
+  <!-- build frame opens (+0) -->
+  <line x1="70" y1="255" x2="70" y2="222" stroke="#94a3b8" stroke-width="1"/>
+  <circle cx="70" cy="260" r="5" fill="#2563eb" stroke="#fff" stroke-width="1.5"/>
+  <text x="64" y="216" text-anchor="start" font-size="11" fill="#1e3a5f">Build frame opens (+0)</text>
+
+  <!-- block 1 build deadline (+6) -->
+  <line x1="112" y1="265" x2="112" y2="300" stroke="#94a3b8" stroke-width="1"/>
+  <circle cx="112" cy="260" r="4" fill="#2563eb" stroke="#fff" stroke-width="1.5"/>
+  <text x="112" y="314" text-anchor="middle" font-size="10" fill="#64748b">block 1 build deadline (+6)</text>
+
+  <!-- start_deadline (+59) -->
+  <line x1="483" y1="265" x2="483" y2="332" stroke="#94a3b8" stroke-width="1"/>
+  <circle cx="483" cy="260" r="5" fill="#2563eb" stroke="#fff" stroke-width="1.5"/>
+  <text x="483" y="346" text-anchor="middle" font-size="11" fill="#1e3a5f">start_deadline (+59)</text>
+
+  <!-- last_block_build_time (+61, single value) -->
+  <line x1="497" y1="265" x2="497" y2="362" stroke="#94a3b8" stroke-width="1"/>
+  <circle cx="497" cy="260" r="5" fill="#2563eb" stroke="#fff" stroke-width="1.5"/>
+  <text x="497" y="376" text-anchor="middle" font-size="11" fill="#1e3a5f">last_block_build_time (+61)</text>
+
+  <!-- checkpoint_proposal_send_time (+62) -->
+  <line x1="504" y1="255" x2="504" y2="190" stroke="#94a3b8" stroke-width="1"/>
+  <circle cx="504" cy="260" r="5" fill="#2563eb" stroke="#fff" stroke-width="1.5"/>
+  <text x="504" y="184" text-anchor="middle" font-size="11" fill="#1e3a5f">checkpoint_proposal_send_time (+62)</text>
+
+  <!-- checkpoint_proposal_receive_ideal (+64) -->
+  <line x1="518" y1="255" x2="518" y2="146" stroke="#16a34a" stroke-width="1"/>
+  <circle cx="518" cy="260" r="5" fill="#16a34a" stroke="#fff" stroke-width="1.5"/>
+  <text x="518" y="140" text-anchor="middle" font-size="11" fill="#14532d">checkpoint_proposal_receive_ideal (+64)</text>
+
+  <!-- checkpoint_proposal_receive_deadline (+66) -->
+  <line x1="532" y1="255" x2="532" y2="92" stroke="#dc2626" stroke-width="1"/>
+  <circle cx="532" cy="260" r="5" fill="#dc2626" stroke="#fff" stroke-width="1.5"/>
+  <text x="532" y="72" text-anchor="middle" font-size="11" fill="#7f1d1d">checkpoint_proposal</text>
+  <text x="532" y="86" text-anchor="middle" font-size="11" fill="#7f1d1d">receive_deadline (+66)</text>
+
+  <!-- next proposer frame opens / l1_publish_ideal / attestation_receive_ideal (+72) -->
+  <line x1="574" y1="255" x2="574" y2="116" stroke="#16a34a" stroke-width="1"/>
+  <circle cx="574" cy="260" r="5" fill="#16a34a" stroke="#fff" stroke-width="1.5"/>
+  <text x="574" y="96" text-anchor="middle" font-size="11" fill="#6b21a8">Next proposer frame opens (+72)</text>
+  <text x="574" y="110" text-anchor="middle" font-size="11" fill="#14532d">l1_publish_ideal = attestation_receive_ideal</text>
+
+  <!-- single attestation_deadline (+132) -->
+  <line x1="994" y1="255" x2="994" y2="176" stroke="#dc2626" stroke-width="1.4"/>
+  <circle cx="994" cy="260" r="5.5" fill="#dc2626" stroke="#fff" stroke-width="1.5"/>
+  <text x="994" y="148" text-anchor="middle" font-size="11" font-weight="700" fill="#7f1d1d">attestation_deadline (+132)</text>
+  <text x="994" y="162" text-anchor="middle" font-size="10.5" fill="#7f1d1d">single deadline: validation / re-exec / signing</text>
+  <text x="994" y="176" text-anchor="middle" font-size="10" fill="#991b1b">+ collection cutoff · latest useful L1 send · tx timeout</text>
+
+  <!-- acceptance windows — both open at build_frame_start (+0, x=70) -->
+  <text x="70" y="397" text-anchor="start" font-size="10" fill="#7f1d1d">acceptance windows open at build_frame_start (+0):</text>
+  <!-- proposal acceptance: +0 .. +66 (checkpoint_proposal_receive_deadline) -->
+  <rect x="70" y="402" width="462" height="9" rx="3" fill="#fee2e2" stroke="#dc2626" stroke-width="0.8"/>
+  <text x="538" y="410" text-anchor="start" font-size="9.5" fill="#991b1b">proposal accept [+0 .. +66] (narrow, non-overlapping)</text>
+  <!-- attestation acceptance: +0 .. +132 (attestation_deadline) -->
+  <rect x="70" y="414" width="924" height="9" rx="3" fill="#dcfce7" stroke="#16a34a" stroke-width="0.8"/>
+  <text x="70" y="436" text-anchor="start" font-size="9.5" fill="#166534">attestation accept [+0 .. +132] (wide, liberal)</text>
+
+  <!-- legend -->
+  <g font-size="11">
+    <circle cx="540" cy="432" r="5" fill="#2563eb"/>
+    <text x="552" y="436" fill="#334155">build / structural</text>
+    <circle cx="682" cy="432" r="5" fill="#16a34a"/>
+    <text x="694" y="436" fill="#334155">ideal path</text>
+    <circle cx="782" cy="432" r="5" fill="#dc2626"/>
+    <text x="794" y="436" fill="#334155">late-acceptance deadline</text>
+    <text x="540" y="453" text-anchor="middle" fill="#64748b">dashed = slot boundary · ticks = 12s Ethereum slots · time → seconds from build_frame_start</text>
+  </g>
+</svg>

package/src/trees/nullifier_membership_witness.ts

@@ -1,5 +1,4 @@
 import { NULLIFIER_TREE_HEIGHT } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/curves/bn254';
 import { MembershipWitness, SiblingPath } from '@aztec/foundation/trees';
 
 import { z } from 'zod';
@@ -52,14 +51,4 @@ export class NullifierMembershipWitness {
   public withoutPreimage(): MembershipWitness<typeof NULLIFIER_TREE_HEIGHT> {
     return new MembershipWitness(NULLIFIER_TREE_HEIGHT, this.index, this.siblingPath.toTuple());
   }
-
-  /** Serializes as `(NullifierLeafPreimage, MembershipWitness)` to match the Noir oracle return type. */
-  public toNoirRepresentation(): (string | string[])[] {
-    // TODO(#12874): remove the stupid as string conversion by modifying ForeignCallOutput type in acvm.js
-    return [
-      ...(this.leafPreimage.toFields().map(fr => fr.toString()) as string[]),
-      new Fr(this.index).toString() as string,
-      this.siblingPath.toFields().map(fr => fr.toString()) as string[],
-    ];
-  }
 }

package/src/trees/public_data_witness.ts

@@ -1,6 +1,5 @@
 import { PUBLIC_DATA_TREE_HEIGHT } from '@aztec/constants';
 import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
-import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { MembershipWitness, SiblingPath } from '@aztec/foundation/trees';
@@ -43,36 +42,6 @@ export class PublicDataWitness {
       .transform(({ index, leafPreimage, siblingPath }) => new PublicDataWitness(index, leafPreimage, siblingPath));
   }
 
-  /**
-   * Returns a field array representation of a public data witness.
-   * @returns A field array representation of a public data witness.
-   */
-  public toFields(): Fr[] {
-    return [
-      new Fr(this.index),
-      new Fr(this.leafPreimage.leaf.slot),
-      new Fr(this.leafPreimage.leaf.value),
-      new Fr(this.leafPreimage.nextIndex),
-      new Fr(this.leafPreimage.nextKey),
-      ...this.siblingPath.toFields(),
-    ];
-  }
-
-  /**
-   * Returns a representation of the public data witness as expected by intrinsic Noir deserialization.
-   */
-  public toNoirRepresentation(): (string | string[])[] {
-    // TODO(#12874): remove the stupid as string conversion by modifying ForeignCallOutput type in acvm.js
-    return [
-      new Fr(this.index).toString() as string,
-      new Fr(this.leafPreimage.leaf.slot).toString() as string,
-      new Fr(this.leafPreimage.leaf.value).toString() as string,
-      new Fr(this.leafPreimage.nextKey).toString() as string,
-      new Fr(this.leafPreimage.nextIndex).toString() as string,
-      this.siblingPath.toFields().map(fr => fr.toString()) as string[],
-    ];
-  }
-
   toBuffer(): Buffer {
     return serializeToBuffer([this.index, this.leafPreimage, this.siblingPath]);
   }

package/src/tx/execution_payload.ts

@@ -54,7 +54,8 @@ export function mergeExecutionPayloads(requests: ExecutionPayload[]): ExecutionP
     );
   }
 
-  const feePayer = uniqueFeePayers.size === 1 ? AztecAddress.fromString(Array.from(uniqueFeePayers)[0]) : undefined;
+  const feePayer =
+    uniqueFeePayers.size === 1 ? AztecAddress.fromStringUnsafe(Array.from(uniqueFeePayers)[0]) : undefined;
 
   return new ExecutionPayload(calls, combinedAuthWitnesses, combinedCapsules, combinedExtraHashedArgs, feePayer);
 }

package/src/tx/fee_provider.ts

@@ -5,6 +5,6 @@ import type { GasFees } from '../gas/gas_fees.js';
 export interface FeeProvider {
   /** Returns the current minimum fees for inclusion in the next block. */
   getCurrentMinFees(): Promise<GasFees>;
-  /** Returns predicted min fees for each slot in the prediction window. */
+  /** Returns current min fees first, followed by predicted min fees for each slot in the prediction window. */
   getPredictedMinFees(manaUsage?: ManaUsageEstimate): Promise<GasFees[]>;
 }

package/src/tx/global_variable_builder.ts

@@ -3,28 +3,12 @@ import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { SlotNumber } from '@aztec/foundation/schemas';
 
 import type { AztecAddress } from '../aztec-address/index.js';
-import type { UInt32 } from '../types/index.js';
-import type { CheckpointGlobalVariables, GlobalVariables } from './global_variables.js';
+import type { CheckpointGlobalVariables } from './global_variables.js';
 
 /**
  * Interface for building global variables for Aztec blocks.
  */
 export interface GlobalVariableBuilder {
-  /**
-   * Builds global variables for a given block.
-   * @param blockNumber - The block number to build global variables for.
-   * @param coinbase - The address to receive block reward.
-   * @param feeRecipient - The address to receive fees.
-   * @param slotNumber - Optional. The slot number to use for the global variables. If undefined, it will be calculated.
-   * @returns A promise that resolves to the GlobalVariables for the given block number.
-   */
-  buildGlobalVariables(
-    blockNumber: UInt32,
-    coinbase: EthAddress,
-    feeRecipient: AztecAddress,
-    slotNumber?: SlotNumber,
-  ): Promise<GlobalVariables>;
-
   /** Builds global variables that are constant throughout a checkpoint. */
   buildCheckpointGlobalVariables(
     coinbase: EthAddress,

package/src/tx/global_variables.ts

@@ -125,7 +125,7 @@ export class GlobalVariables {
       SlotNumber(reader.readU32()),
       reader.readField().toBigInt(),
       EthAddress.fromField(reader.readField()),
-      AztecAddress.fromField(reader.readField()),
+      AztecAddress.fromFieldUnsafe(reader.readField()),
       GasFees.fromFields(reader),
     );
   }
@@ -220,7 +220,7 @@ export class GlobalVariables {
       blockNumber: BlockNumber(randomInt(100_000)),
       slotNumber: SlotNumber(randomInt(100_000)),
       coinbase: EthAddress.random(),
-      feeRecipient: AztecAddress.fromField(Fr.random()),
+      feeRecipient: AztecAddress.fromFieldUnsafe(Fr.random()),
       gasFees: GasFees.random(),
       timestamp: BigInt(randomInt(100_000_000)),
       ...overrides,

package/src/tx/index.ts

@@ -21,7 +21,6 @@ export * from './tx_effect.js';
 export * from './public_simulation_output.js';
 export * from './tx_execution_request.js';
 export * from './validator/tx_validator.js';
-export * from './validator/empty_validator.js';
 export * from './validator/error_texts.js';
 export * from './capsule.js';
 export * from './fee_provider.js';

package/src/tx/private_tx_constant_data.ts

@@ -23,6 +23,14 @@ export class PrivateTxConstantData {
      * protocol to execute and prove the transaction.
      */
     public txContext: TxContext,
+    /**
+     * Salt of the transaction request (`TxRequest.salt`).
+     *
+     * Bound to the user's `tx_request` by the Init circuit and kept constant by every subsequent kernel so that each
+     * app circuit's `txRequestSalt` public input can be checked against it. It is intentionally not carried into
+     * `TxConstantData`: it is dropped by the Tail circuits rather than being exposed by the final (hiding) kernel.
+     */
+    public txRequestSalt: Fr,
     /**
      * Root of the vk tree for the protocol circuits.
      */
@@ -38,7 +46,13 @@ export class PrivateTxConstantData {
   }
 
   static getFields(fields: FieldsOf<PrivateTxConstantData>) {
-    return [fields.anchorBlockHeader, fields.txContext, fields.vkTreeRoot, fields.protocolContracts] as const;
+    return [
+      fields.anchorBlockHeader,
+      fields.txContext,
+      fields.txRequestSalt,
+      fields.vkTreeRoot,
+      fields.protocolContracts,
+    ] as const;
   }
 
   static fromFields(fields: Fr[] | FieldReader): PrivateTxConstantData {
@@ -47,6 +61,7 @@ export class PrivateTxConstantData {
       reader.readObject(BlockHeader),
       reader.readObject(TxContext),
       reader.readField(),
+      reader.readField(),
       reader.readObject(ProtocolContracts),
     );
   }
@@ -67,6 +82,7 @@ export class PrivateTxConstantData {
       reader.readObject(BlockHeader),
       reader.readObject(TxContext),
       Fr.fromBuffer(reader),
+      Fr.fromBuffer(reader),
       reader.readObject(ProtocolContracts),
     );
   }
@@ -76,13 +92,20 @@ export class PrivateTxConstantData {
   }
 
   static empty() {
-    return new PrivateTxConstantData(BlockHeader.empty(), TxContext.empty(), Fr.ZERO, ProtocolContracts.empty());
+    return new PrivateTxConstantData(
+      BlockHeader.empty(),
+      TxContext.empty(),
+      Fr.ZERO,
+      Fr.ZERO,
+      ProtocolContracts.empty(),
+    );
   }
 
   getSize() {
     return (
       this.anchorBlockHeader.getSize() +
       this.txContext.getSize() +
+      this.txRequestSalt.size +
       this.vkTreeRoot.size +
       this.protocolContracts.getSize()
     );

package/src/tx/profiling.ts

@@ -1,3 +1,4 @@
+import { CircuitKind } from '@aztec/bb.js';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { type ZodFor, optional, schemas } from '@aztec/foundation/schemas';
 
@@ -125,6 +126,7 @@ export class TxProfileResult {
           bytecode: Buffer.from('random'),
           witness: new Map([[1, 'random']]),
           vk: Buffer.from('random'),
+          kind: CircuitKind.App,
           timings: {
             witgen: 1,
             gateCount: 1,

package/src/tx/tx.ts

@@ -135,6 +135,23 @@ export class Tx extends Gossipable {
     );
   }
 
+  /**
+   * Deserializes a Tx from separately-stored tx and proof buffers. The tx buffer is expected to carry an empty
+   * proof placeholder (as produced by `withoutProof().toBuffer()`), which is skipped in favor of the given proof.
+   * @param txBuffer - Serialized tx with an empty proof placeholder.
+   * @param proofBuffer - Serialized proof to attach.
+   * @returns An instance of Tx carrying the given proof.
+   */
+  static fromBuffers(txBuffer: Buffer | BufferReader, proofBuffer: Buffer | BufferReader): Tx {
+    const reader = BufferReader.asReader(txBuffer);
+    const txHash = reader.readObject(TxHash);
+    const data = reader.readObject(PrivateKernelTailCircuitPublicInputs);
+    reader.readObject(ChonkProof);
+    const contractClassLogFields = reader.readVectorUint8Prefix(ContractClassLogFields);
+    const publicFunctionCalldata = reader.readVectorUint8Prefix(HashedValues);
+    return new Tx(txHash, data, ChonkProof.fromBuffer(proofBuffer), contractClassLogFields, publicFunctionCalldata);
+  }
+
   /**
    * Serializes the Tx object into a Buffer.
    * @returns Buffer representation of the Tx object.

package/src/tx/validator/error_texts.ts

@@ -2,7 +2,8 @@
 export const TX_ERROR_INSUFFICIENT_FEE_PER_GAS = 'Insufficient fee per gas';
 export const TX_ERROR_INSUFFICIENT_FEE_PAYER_BALANCE = 'Insufficient fee payer balance';
 export const TX_ERROR_INSUFFICIENT_GAS_LIMIT = 'Gas limit is below the minimum fixed cost';
-export const TX_ERROR_GAS_LIMIT_TOO_HIGH = 'Gas limit is higher than the amount of gas that the AVM can process';
+export const TX_ERROR_GAS_LIMIT_TOO_HIGH =
+  'Gas limit is higher than the maximum amount of gas this network allows per tx';
 
 // Phases
 export const TX_ERROR_SETUP_FUNCTION_NOT_ALLOWED = 'Setup function not on allow list';

package/src/world-state/world_state_revision.ts

@@ -36,36 +36,3 @@ export class WorldStateRevision {
       );
   }
 }
-
-export class WorldStateRevisionWithHandle extends WorldStateRevision {
-  constructor(
-    forkId: number,
-    blockNumber: number,
-    includeUncommitted: boolean,
-    public readonly handle: any,
-  ) {
-    super(forkId, blockNumber, includeUncommitted);
-  }
-
-  public toWorldStateRevision() {
-    return new WorldStateRevision(this.forkId, this.blockNumber, this.includeUncommitted);
-  }
-
-  static fromWorldStateRevision(revision: WorldStateRevision, handle: any) {
-    return new WorldStateRevisionWithHandle(revision.forkId, revision.blockNumber, revision.includeUncommitted, handle);
-  }
-
-  static override get schema() {
-    return z
-      .object({
-        forkId: z.number(),
-        blockNumber: z.number(),
-        includeUncommitted: z.boolean(),
-        handle: z.any(),
-      })
-      .transform(
-        ({ forkId, blockNumber, includeUncommitted, handle }) =>
-          new WorldStateRevisionWithHandle(forkId, blockNumber, includeUncommitted, handle),
-      );
-  }
-}

package/dest/avm/contract_storage_read.d.ts

@@ -1,58 +0,0 @@
-import { Fr } from '@aztec/foundation/curves/bn254';
-import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
-import type { AztecAddress } from '../aztec-address/index.js';
-/**
- * Contract storage read operation on a specific contract.
- *
- * Note: Similar to `PublicDataRead` but it's from the POV of contract storage so we are not working with public data
- * tree leaf index but storage slot index.
- */
-export declare class ContractStorageRead {
-    /**
-     * Storage slot we are reading from.
-     */
-    readonly storageSlot: Fr;
-    /**
-     * Value read from the storage slot.
-     */
-    readonly currentValue: Fr;
-    /**
-     * Side effect counter tracking position of this event in tx execution.
-     */
-    readonly counter: number;
-    /**
-     * Contract address whose storage is being read.
-     */
-    contractAddress?: AztecAddress | undefined;
-    constructor(
-    /**
-     * Storage slot we are reading from.
-     */
-    storageSlot: Fr, 
-    /**
-     * Value read from the storage slot.
-     */
-    currentValue: Fr, 
-    /**
-     * Side effect counter tracking position of this event in tx execution.
-     */
-    counter: number, 
-    /**
-     * Contract address whose storage is being read.
-     */
-    contractAddress?: AztecAddress | undefined);
-    static from(args: {
-        storageSlot: Fr;
-        currentValue: Fr;
-        counter: number;
-        contractAddress?: AztecAddress;
-    }): ContractStorageRead;
-    toBuffer(): Buffer<ArrayBufferLike>;
-    static fromBuffer(buffer: Buffer | BufferReader): ContractStorageRead;
-    static empty(): ContractStorageRead;
-    isEmpty(): boolean;
-    toFriendlyJSON(): string;
-    toFields(): Fr[];
-    static fromFields(fields: Fr[] | FieldReader): ContractStorageRead;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3Rfc3RvcmFnZV9yZWFkLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXZtL2NvbnRyYWN0X3N0b3JhZ2VfcmVhZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFFM0YsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFOUQ7Ozs7O0dBS0c7QUFDSCxxQkFBYSxtQkFBbUI7SUFFNUI7O09BRUc7YUFDYSxXQUFXLEVBQUUsRUFBRTtJQUMvQjs7T0FFRzthQUNhLFlBQVksRUFBRSxFQUFFO0lBQ2hDOztPQUVHO2FBQ2EsT0FBTyxFQUFFLE1BQU07SUFDL0I7O09BRUc7SUFDSSxlQUFlLENBQUM7SUFoQnpCO0lBQ0U7O09BRUc7SUFDYSxXQUFXLEVBQUUsRUFBRTtJQUMvQjs7T0FFRztJQUNhLFlBQVksRUFBRSxFQUFFO0lBQ2hDOztPQUVHO0lBQ2EsT0FBTyxFQUFFLE1BQU07SUFDL0I7O09BRUc7SUFDSSxlQUFlLENBQUMsMEJBQWMsRUFDbkM7SUFFSixNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRTtRQUFFLFdBQVcsRUFBRSxFQUFFLENBQUM7UUFBQyxZQUFZLEVBQUUsRUFBRSxDQUFDO1FBQUMsT0FBTyxFQUFFLE1BQU0sQ0FBQztRQUFDLGVBQWUsQ0FBQyxFQUFFLFlBQVksQ0FBQTtLQUFFLHVCQUV2RztJQUVELFFBQVEsNEJBRVA7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSx1QkFHOUM7SUFFRCxNQUFNLENBQUMsS0FBSyx3QkFFWDtJQUVELE9BQU8sWUFFTjtJQUVELGNBQWMsV0FFYjtJQUVELFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FRZjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsR0FBRyxtQkFBbUIsQ0FRakU7Q0FDRiJ9