@aztec/sequencer-client 0.0.1-commit.2eb6648a → 0.0.1-commit.2f68f620

package/src/publisher/config.ts

@@ -1,32 +1,47 @@
 import { type BlobClientConfig, blobClientConfigMapping } from '@aztec/blob-client/client/config';
 import { type L1ReaderConfig, l1ReaderConfigMappings } from '@aztec/ethereum/l1-reader';
 import { type L1TxUtilsConfig, l1TxUtilsConfigMappings } from '@aztec/ethereum/l1-tx-utils/config';
-import {
-  type ConfigMappingsType,
-  SecretValue,
-  booleanConfigHelper,
-  getConfigFromMappings,
-} from '@aztec/foundation/config';
+import { type ConfigMappingsType, SecretValue, booleanConfigHelper } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 
-/**
- * The configuration of the rollup transaction publisher.
- */
+import { parseEther } from 'viem';
+
+/** Configuration of the transaction publisher. */
 export type TxSenderConfig = L1ReaderConfig & {
-  /**
-   * The private key to be used by the publisher.
-   */
+  /** The private key to be used by the publisher. */
   publisherPrivateKeys?: SecretValue<`0x${string}`>[];
 
-  /**
-   * Publisher addresses to be used with a remote signer
-   */
+  /** Publisher addresses to be used with a remote signer */
   publisherAddresses?: EthAddress[];
 };
 
-/**
- * Configuration of the L1Publisher.
- */
+export type ProverTxSenderConfig = L1ReaderConfig & {
+  proverPublisherPrivateKeys?: SecretValue<`0x${string}`>[];
+  proverPublisherAddresses?: EthAddress[];
+};
+
+export type SequencerTxSenderConfig = L1ReaderConfig & {
+  sequencerPublisherPrivateKeys?: SecretValue<`0x${string}`>[];
+  sequencerPublisherAddresses?: EthAddress[];
+};
+
+export function getTxSenderConfigFromProverConfig(config: ProverTxSenderConfig): TxSenderConfig {
+  return {
+    ...config,
+    publisherPrivateKeys: config.proverPublisherPrivateKeys,
+    publisherAddresses: config.proverPublisherAddresses,
+  };
+}
+
+export function getTxSenderConfigFromSequencerConfig(config: SequencerTxSenderConfig): TxSenderConfig {
+  return {
+    ...config,
+    publisherPrivateKeys: config.sequencerPublisherPrivateKeys,
+    publisherAddresses: config.sequencerPublisherAddresses,
+  };
+}
+
+/** Configuration of the L1Publisher. */
 export type PublisherConfig = L1TxUtilsConfig &
   BlobClientConfig & {
     /** True to use publishers in invalid states (timed out, cancelled, etc) if no other is available */
@@ -35,37 +50,113 @@ export type PublisherConfig = L1TxUtilsConfig &
     fishermanMode?: boolean;
     /** Address of the forwarder contract to wrap all L1 transactions through (for testing purposes only) */
     publisherForwarderAddress?: EthAddress;
+    /** Store for failed L1 transaction inputs (test networks only). Format: gs://bucket/path */
+    l1TxFailedStore?: string;
+    /** Min ETH balance below which a publisher gets funded. Undefined = funding disabled. */
+    publisherFundingThreshold?: bigint;
+    /** Amount of ETH to send when funding a publisher. Undefined = funding disabled. */
+    publisherFundingAmount?: bigint;
+  };
+
+/** Shared config mappings for publisher funding, used by both sequencer and prover publisher configs. */
+const publisherFundingConfigMappings = {
+  publisherFundingThreshold: {
+    env: 'PUBLISHER_FUNDING_THRESHOLD' as const,
+    description:
+      'Min ETH balance below which a publisher gets funded. Specified in ether (e.g. 0.1). Unset = funding disabled.',
+    parseEnv: (val: string) => parseEther(val),
+  },
+  publisherFundingAmount: {
+    env: 'PUBLISHER_FUNDING_AMOUNT' as const,
+    description:
+      'Amount of ETH to send when funding a publisher. Specified in ether (e.g. 0.5). Unset = funding disabled.',
+    parseEnv: (val: string) => parseEther(val),
+  },
+};
+
+export type ProverPublisherConfig = L1TxUtilsConfig &
+  BlobClientConfig & {
+    fishermanMode?: boolean;
+    proverPublisherAllowInvalidStates?: boolean;
+    proverPublisherForwarderAddress?: EthAddress;
+    /** Min ETH balance below which a publisher gets funded. Undefined = funding disabled. */
+    publisherFundingThreshold?: bigint;
+    /** Amount of ETH to send when funding a publisher. Undefined = funding disabled. */
+    publisherFundingAmount?: bigint;
+  };
+
+export type SequencerPublisherConfig = L1TxUtilsConfig &
+  BlobClientConfig & {
+    fishermanMode?: boolean;
+    sequencerPublisherAllowInvalidStates?: boolean;
+    sequencerPublisherForwarderAddress?: EthAddress;
+    /** Store for failed L1 transaction inputs (test networks only). Format: gs://bucket/path */
+    l1TxFailedStore?: string;
+    /** Min ETH balance below which a publisher gets funded. Undefined = funding disabled. */
+    publisherFundingThreshold?: bigint;
+    /** Amount of ETH to send when funding a publisher. Undefined = funding disabled. */
+    publisherFundingAmount?: bigint;
+  };
+
+export function getPublisherConfigFromProverConfig(config: ProverPublisherConfig): PublisherConfig {
+  return {
+    ...config,
+    publisherAllowInvalidStates: config.proverPublisherAllowInvalidStates,
+    publisherForwarderAddress: config.proverPublisherForwarderAddress,
+  };
+}
+
+export function getPublisherConfigFromSequencerConfig(config: SequencerPublisherConfig): PublisherConfig {
+  return {
+    ...config,
+    publisherAllowInvalidStates: config.sequencerPublisherAllowInvalidStates,
+    publisherForwarderAddress: config.sequencerPublisherForwarderAddress,
+    l1TxFailedStore: config.l1TxFailedStore,
   };
+}
 
-export const getTxSenderConfigMappings: (
-  scope: 'PROVER' | 'SEQ',
-) => ConfigMappingsType<Omit<TxSenderConfig, 'l1Contracts'>> = (scope: 'PROVER' | 'SEQ') => ({
+export const proverTxSenderConfigMappings: ConfigMappingsType<ProverTxSenderConfig> = {
   ...l1ReaderConfigMappings,
-  publisherPrivateKeys: {
-    env: scope === 'PROVER' ? `PROVER_PUBLISHER_PRIVATE_KEYS` : `SEQ_PUBLISHER_PRIVATE_KEYS`,
-    description: 'The private keys to be used by the publisher.',
-    parseEnv: (val: string) => val.split(',').map(key => new SecretValue(`0x${key.replace('0x', '')}`)),
+  proverPublisherPrivateKeys: {
+    env: `PROVER_PUBLISHER_PRIVATE_KEYS`,
+    description: 'The private keys to be used by the prover publisher.',
+    parseEnv: (val: string) =>
+      val.split(',').map(key => new SecretValue(`0x${key.replace('0x', '')}` as `0x${string}`)),
     defaultValue: [],
-    fallback: [scope === 'PROVER' ? `PROVER_PUBLISHER_PRIVATE_KEY` : `SEQ_PUBLISHER_PRIVATE_KEY`],
+    fallback: [`PROVER_PUBLISHER_PRIVATE_KEY`],
   },
-  publisherAddresses: {
-    env: scope === 'PROVER' ? `PROVER_PUBLISHER_ADDRESSES` : `SEQ_PUBLISHER_ADDRESSES`,
+  proverPublisherAddresses: {
+    env: `PROVER_PUBLISHER_ADDRESSES`,
     description: 'The addresses of the publishers to use with remote signers',
     parseEnv: (val: string) => val.split(',').map(address => EthAddress.fromString(address)),
     defaultValue: [],
   },
-});
+};
 
-export function getTxSenderConfigFromEnv(scope: 'PROVER' | 'SEQ'): Omit<TxSenderConfig, 'l1Contracts'> {
-  return getConfigFromMappings(getTxSenderConfigMappings(scope));
-}
+export const sequencerTxSenderConfigMappings: ConfigMappingsType<SequencerTxSenderConfig> = {
+  ...l1ReaderConfigMappings,
+  sequencerPublisherPrivateKeys: {
+    env: `SEQ_PUBLISHER_PRIVATE_KEYS`,
+    description: 'The private keys to be used by the sequencer publisher.',
+    parseEnv: (val: string) =>
+      val.split(',').map(key => new SecretValue(`0x${key.replace('0x', '')}` as `0x${string}`)),
+    defaultValue: [],
+    fallback: [`SEQ_PUBLISHER_PRIVATE_KEY`],
+  },
+  sequencerPublisherAddresses: {
+    env: `SEQ_PUBLISHER_ADDRESSES`,
+    description: 'The addresses of the publishers to use with remote signers',
+    parseEnv: (val: string) => val.split(',').map(address => EthAddress.fromString(address)),
+    defaultValue: [],
+  },
+};
 
-export const getPublisherConfigMappings: (
-  scope: 'PROVER' | 'SEQ',
-) => ConfigMappingsType<PublisherConfig & L1TxUtilsConfig> = scope => ({
-  publisherAllowInvalidStates: {
+export const sequencerPublisherConfigMappings: ConfigMappingsType<SequencerPublisherConfig & L1TxUtilsConfig> = {
+  ...l1TxUtilsConfigMappings,
+  ...blobClientConfigMapping,
+  sequencerPublisherAllowInvalidStates: {
+    env: `SEQ_PUBLISHER_ALLOW_INVALID_STATES`,
     description: 'True to use publishers in invalid states (timed out, cancelled, etc) if no other is available',
-    env: scope === `PROVER` ? `PROVER_PUBLISHER_ALLOW_INVALID_STATES` : `SEQ_PUBLISHER_ALLOW_INVALID_STATES`,
     ...booleanConfigHelper(true),
   },
   fishermanMode: {
@@ -74,15 +165,36 @@ export const getPublisherConfigMappings: (
       'Whether to run in fisherman mode: builds blocks on every slot for validation without publishing to L1',
     ...booleanConfigHelper(false),
   },
-  publisherForwarderAddress: {
-    env: scope === `PROVER` ? `PROVER_PUBLISHER_FORWARDER_ADDRESS` : `SEQ_PUBLISHER_FORWARDER_ADDRESS`,
+  sequencerPublisherForwarderAddress: {
+    env: `SEQ_PUBLISHER_FORWARDER_ADDRESS`,
     description: 'Address of the forwarder contract to wrap all L1 transactions through (for testing purposes only)',
-    parseEnv: (val: string) => (val ? EthAddress.fromString(val) : undefined),
+    parseEnv: (val: string) => EthAddress.fromString(val),
+  },
+  l1TxFailedStore: {
+    env: 'L1_TX_FAILED_STORE',
+    description: 'Store for failed L1 transaction inputs (test networks only). Format: gs://bucket/path',
   },
+  ...publisherFundingConfigMappings,
+};
+
+export const proverPublisherConfigMappings: ConfigMappingsType<ProverPublisherConfig & L1TxUtilsConfig> = {
   ...l1TxUtilsConfigMappings,
   ...blobClientConfigMapping,
-});
-
-export function getPublisherConfigFromEnv(scope: 'PROVER' | 'SEQ'): PublisherConfig {
-  return getConfigFromMappings(getPublisherConfigMappings(scope));
-}
+  proverPublisherAllowInvalidStates: {
+    env: `PROVER_PUBLISHER_ALLOW_INVALID_STATES`,
+    description: 'True to use publishers in invalid states (timed out, cancelled, etc) if no other is available',
+    ...booleanConfigHelper(true),
+  },
+  fishermanMode: {
+    env: 'FISHERMAN_MODE',
+    description:
+      'Whether to run in fisherman mode: builds blocks on every slot for validation without publishing to L1',
+    ...booleanConfigHelper(false),
+  },
+  proverPublisherForwarderAddress: {
+    env: `PROVER_PUBLISHER_FORWARDER_ADDRESS`,
+    description: 'Address of the forwarder contract to wrap all L1 transactions through (for testing purposes only)',
+    parseEnv: (val: string) => EthAddress.fromString(val),
+  },
+  ...publisherFundingConfigMappings,
+};

package/src/publisher/index.ts

@@ -3,3 +3,6 @@ export { SequencerPublisherFactory } from './sequencer-publisher-factory.js';
 
 // Used for tests
 export { SequencerPublisherMetrics } from './sequencer-publisher-metrics.js';
+
+// Failed L1 tx store (optional, for test networks)
+export { type FailedL1Tx, type FailedL1TxUri, type L1TxFailedStore } from './l1_tx_failed_store/index.js';

package/src/publisher/l1_tx_failed_store/factory.ts

@@ -0,0 +1,32 @@
+import { type Logger, createLogger } from '@aztec/foundation/log';
+import { createFileStore } from '@aztec/stdlib/file-store';
+
+import type { L1TxFailedStore } from './failed_tx_store.js';
+import { FileStoreL1TxFailedStore } from './file_store_failed_tx_store.js';
+
+/**
+ * Creates an L1TxFailedStore from a config string.
+ * Supports any backend that FileStore supports (GCS, S3, R2, local filesystem).
+ * @param config - Config string (e.g., 'gs://bucket/path', 's3://bucket/path', 'file:///path'). If undefined, returns undefined.
+ * @param logger - Optional logger.
+ * @returns The store instance, or undefined if config is not provided.
+ */
+export async function createL1TxFailedStore(
+  config: string | undefined,
+  logger: Logger = createLogger('sequencer:l1-tx-failed-store'),
+): Promise<L1TxFailedStore | undefined> {
+  if (!config) {
+    return undefined;
+  }
+
+  const fileStore = await createFileStore(config, logger);
+  if (!fileStore) {
+    throw new Error(
+      `Failed to create file store from config: '${config}'. ` +
+        `Supported formats: 'gs://bucket/path', 's3://bucket/path', 'file:///path'.`,
+    );
+  }
+
+  logger.info(`Created L1 tx failed store`, { config });
+  return new FileStoreL1TxFailedStore(fileStore, logger);
+}

package/src/publisher/l1_tx_failed_store/failed_tx_store.ts

@@ -0,0 +1,57 @@
+import type { Branded } from '@aztec/foundation/branded-types';
+
+import type { Hex } from 'viem';
+
+/** URI pointing to a stored failed L1 transaction. */
+export type FailedL1TxUri = Branded<string, 'FailedL1TxUri'>;
+
+/** A failed L1 transaction captured for debugging and replay. */
+export type FailedL1Tx = {
+  /** Tx hash (for reverts) or keccak256(request.data) (for simulation/send failures). */
+  id: Hex;
+  /** Unix timestamp (ms) when failure occurred. */
+  timestamp: number;
+  /** Whether the failure was during simulation or after sending. */
+  failureType: 'simulation' | 'revert' | 'send-error';
+  /** The actual L1 transaction for replay (multicall-encoded for bundled txs). */
+  request: {
+    to: Hex;
+    data: Hex;
+    value?: string; // bigint as string
+  };
+  /** Raw blob data as hex for replay. */
+  blobData?: Hex[];
+  /** L1 block number at time of failure (simulation target or receipt block). */
+  l1BlockNumber: string; // bigint as string
+  /** Receipt info (present only for on-chain reverts). */
+  receipt?: {
+    transactionHash: Hex;
+    blockNumber: string; // bigint as string
+    gasUsed: string; // bigint as string
+    status: 'reverted';
+  };
+  /** Error information. */
+  error: {
+    message: string;
+    /** Decoded error name (e.g., 'Rollup__InvalidProposer'). */
+    name?: string;
+  };
+  /** Context metadata. */
+  context: {
+    /** Actions involved (e.g., ['propose', 'governance-signal']). */
+    actions: string[];
+    /** Individual request data for each action (metadata, not used for replay). */
+    requests?: Array<{ action: string; to: Hex; data: Hex }>;
+    checkpointNumber?: number;
+    slot?: number;
+    sender: Hex;
+  };
+};
+
+/** Store for failed L1 transactions for debugging purposes. */
+export interface L1TxFailedStore {
+  /** Saves a failed transaction and returns its URI. */
+  saveFailedTx(tx: FailedL1Tx): Promise<FailedL1TxUri>;
+  /** Retrieves a failed transaction by its URI. */
+  getFailedTx(uri: FailedL1TxUri): Promise<FailedL1Tx>;
+}

package/src/publisher/l1_tx_failed_store/file_store_failed_tx_store.ts

@@ -0,0 +1,46 @@
+import { type Logger, createLogger } from '@aztec/foundation/log';
+import type { FileStore } from '@aztec/stdlib/file-store';
+
+import type { FailedL1Tx, FailedL1TxUri, L1TxFailedStore } from './failed_tx_store.js';
+
+/**
+ * L1TxFailedStore implementation using the FileStore abstraction.
+ * Supports any backend that FileStore supports (GCS, S3, R2, local filesystem).
+ */
+export class FileStoreL1TxFailedStore implements L1TxFailedStore {
+  private readonly log: Logger;
+
+  constructor(
+    private readonly fileStore: FileStore,
+    logger?: Logger,
+  ) {
+    this.log = logger ?? createLogger('sequencer:l1-tx-failed-store');
+  }
+
+  public async saveFailedTx(tx: FailedL1Tx): Promise<FailedL1TxUri> {
+    const prefix = tx.receipt ? 'tx' : 'data';
+    const path = `${tx.failureType}/${prefix}-${tx.id}.json`;
+    const json = JSON.stringify(tx, null, 2);
+
+    const uri = await this.fileStore.save(path, Buffer.from(json), {
+      metadata: {
+        'content-type': 'application/json',
+        actions: tx.context.actions.join(','),
+        'failure-type': tx.failureType,
+      },
+    });
+
+    this.log.info(`Saved failed L1 tx to ${uri}`, {
+      id: tx.id,
+      failureType: tx.failureType,
+      actions: tx.context.actions.join(','),
+    });
+
+    return uri as FailedL1TxUri;
+  }
+
+  public async getFailedTx(uri: FailedL1TxUri): Promise<FailedL1Tx> {
+    const data = await this.fileStore.read(uri);
+    return JSON.parse(data.toString()) as FailedL1Tx;
+  }
+}

package/src/publisher/l1_tx_failed_store/index.ts

@@ -0,0 +1,3 @@
+export { type FailedL1Tx, type FailedL1TxUri, type L1TxFailedStore } from './failed_tx_store.js';
+export { createL1TxFailedStore } from './factory.js';
+export { FileStoreL1TxFailedStore } from './file_store_failed_tx_store.js';

package/src/publisher/sequencer-bundle-simulator.ts

@@ -0,0 +1,254 @@
+import type { EpochCache } from '@aztec/epoch-cache';
+import { Multicall3, type RollupContract, buildSimulationOverridesStateOverride } from '@aztec/ethereum/contracts';
+import { type L1TxUtils, MAX_L1_TX_LIMIT } from '@aztec/ethereum/l1-tx-utils';
+import { formatViemError } from '@aztec/ethereum/utils';
+import type { SlotNumber } from '@aztec/foundation/branded-types';
+import { type Logger, createLogger } from '@aztec/foundation/log';
+import { getLastL1SlotTimestampForL2Slot } from '@aztec/stdlib/epoch-helpers';
+
+import type { Hex, StateOverride } from 'viem';
+
+import type { RequestWithExpiry } from './sequencer-publisher.js';
+
+/** A request that was dropped by bundle simulation, with the decoded revert reason. */
+export type DroppedRequest = {
+  request: RequestWithExpiry;
+  revertReason: string | undefined;
+  returnData: Hex | undefined;
+};
+
+/**
+ * Result of {@link SequencerBundleSimulator.simulate}.
+ *
+ * - `success`: simulation succeeded. `requests` is the filtered survivor list, `gasLimit` is
+ *   the bumped gas limit derived from `gasUsed` (plus blob evaluation gas). `droppedRequests`
+ *   lists the entries that were observed to revert in simulation.
+ * - `fallback`: the node does not support eth_simulateV1 (or the simulate call threw). The
+ *   caller should send `requests` as-is with a safe gas limit (e.g. {@link MAX_L1_TX_LIMIT}).
+ *   `droppedRequests` carries any entries that the first pass already proved reverted, so the
+ *   caller does not re-include them when the second pass falls back.
+ * - `aborted`: the bundle cannot be sent. `droppedRequests` contains only entries that were
+ *   actually observed to revert (so they can be reported as simulation failures); it is empty
+ *   when the abort was caused by an empty input bundle.
+ */
+export type BundleSimulateResult =
+  | { kind: 'success'; requests: RequestWithExpiry[]; gasLimit: bigint; droppedRequests: DroppedRequest[] }
+  | { kind: 'fallback'; requests: RequestWithExpiry[]; droppedRequests: DroppedRequest[] }
+  | { kind: 'aborted'; reason: AbortReason; droppedRequests: DroppedRequest[] };
+
+export type AbortReason = 'empty-bundle' | 'all-reverted' | 'second-pass-reverts';
+
+type SimulatePassResult =
+  | { kind: 'decoded'; survivors: RequestWithExpiry[]; droppedRequests: DroppedRequest[]; gasUsed: bigint }
+  | { kind: 'fallback' };
+
+/**
+ * Bundle-level simulator for the aggregate3 payload that `SequencerPublisher` is about to send.
+ *
+ * Runs `eth_simulateV1` against `Multicall3.aggregate3`, drops entries that revert, and returns
+ * a gasLimit for the survivors. When `eth_simulateV1` is unavailable, signals fallback to the
+ * caller so it can send the bundle as-is with a conservative gas limit.
+ */
+export class SequencerBundleSimulator {
+  private readonly log: Logger;
+
+  constructor(
+    private readonly deps: {
+      getL1TxUtils: () => L1TxUtils;
+      rollupContract: RollupContract;
+      epochCache: EpochCache;
+      log?: Logger;
+    },
+  ) {
+    this.log = deps.log ?? createLogger('sequencer:publisher:bundle-simulator');
+  }
+
+  /**
+   * Simulates the given bundle near the end of the target slot and filters out entries
+   * that revert.
+   *
+   * - If all entries pass on the first pass, returns `success` with the gasLimit.
+   * - If some entries revert, re-simulates the survivors. If the second pass is clean, returns
+   *   `success` with the survivors and dropped entries. If the second pass surfaces any revert,
+   *   returns `aborted` — we refuse to send a bundle whose composition still has internal
+   *   reverts after one round of filtering.
+   * - If eth_simulateV1 is unavailable, returns `fallback`. The caller is expected to send the
+   *   bundle as-is with a safe gas limit.
+   *
+   * The simulation `block.timestamp` is the last L1 slot timestamp inside the target L2 slot.
+   * This still maps to the target L2 slot for propose's `validateHeader` and EIP-712 signature
+   * checks, while avoiding eth_simulateV1 rejecting a child block whose timestamp is not strictly
+   * greater than the current L1 head.
+   *
+   * Known limitation: on networks where L1 is mining behind cadence (missed L1 slots, anvil with
+   * overridden timestamps), the actual `block.timestamp` at send time can land in the prior L2
+   * slot. In that case `propose` would revert silently inside the multicall. The simulator does
+   * not detect this case because it simulates inside the target slot — the prior implementation
+   * used `min(predictedNextL1Ts, targetTimestamp)` to surface this failure mode at simulate time.
+   */
+  public async simulate(validRequests: RequestWithExpiry[], targetSlot: SlotNumber): Promise<BundleSimulateResult> {
+    if (validRequests.length === 0) {
+      return { kind: 'aborted', reason: 'empty-bundle', droppedRequests: [] };
+    }
+    // Pin the publisher we'll use across the whole simulate call so that the publisher's rotation
+    // can't change l1TxUtils mid-flight.
+    const l1TxUtils = this.deps.getL1TxUtils();
+
+    const proposeRequest = validRequests.find(r => r.action === 'propose');
+    const simulateTimestamp = getLastL1SlotTimestampForL2Slot(targetSlot, this.deps.epochCache.getL1Constants());
+    const firstPassOverrides = await this.buildStateOverrides(!!proposeRequest);
+
+    const firstPass = await this.simulateAndDecode(l1TxUtils, validRequests, simulateTimestamp, firstPassOverrides);
+
+    if (firstPass.kind === 'fallback') {
+      this.log.warn('Bundle simulate fallback (eth_simulateV1 unavailable); caller will send bundle as-is', {
+        actions: validRequests.map(r => r.action),
+      });
+      return { kind: 'fallback', requests: validRequests, droppedRequests: [] };
+    }
+
+    if (firstPass.survivors.length === 0) {
+      this.log.warn('All bundle entries dropped in simulation; aborting send', {
+        actions: validRequests.map(r => r.action),
+      });
+      return { kind: 'aborted', reason: 'all-reverted', droppedRequests: firstPass.droppedRequests };
+    }
+
+    if (firstPass.droppedRequests.length === 0) {
+      return this.buildSuccessResult(l1TxUtils, firstPass.survivors, [], firstPass.gasUsed, proposeRequest);
+    }
+
+    this.log.warn('Some bundle entries reverted; re-simulating reduced bundle', {
+      droppedActions: firstPass.droppedRequests.map(d => d.request.action),
+      remainingActions: firstPass.survivors.map(r => r.action),
+    });
+
+    // Rebuild overrides for the reduced bundle: if propose was dropped, we no longer need the blob-check override
+    const proposeSurvived = proposeRequest !== undefined && firstPass.survivors.includes(proposeRequest);
+    const secondPassOverrides = proposeSurvived ? firstPassOverrides : await this.buildStateOverrides(false);
+    const secondPass = await this.simulateAndDecode(
+      l1TxUtils,
+      firstPass.survivors,
+      simulateTimestamp,
+      secondPassOverrides,
+    );
+
+    if (secondPass.kind === 'fallback') {
+      this.log.warn(
+        'Bundle simulate errored on second pass (eth_simulateV1 unavailable); sending first-pass survivors as-is',
+        {
+          actions: firstPass.survivors.map(r => r.action),
+          droppedActions: firstPass.droppedRequests.map(d => d.request.action),
+        },
+      );
+      return { kind: 'fallback', requests: firstPass.survivors, droppedRequests: firstPass.droppedRequests };
+    }
+
+    // We refuse to chase reverts through repeated trimming: anything other than a clean second pass aborts the whole send
+    if (secondPass.droppedRequests.length > 0) {
+      this.log.error('Re-simulate surfaced reverts; aborting send', {
+        secondPassDroppedActions: secondPass.droppedRequests.map(d => d.request.action),
+      });
+      return {
+        kind: 'aborted',
+        reason: 'second-pass-reverts',
+        droppedRequests: [...firstPass.droppedRequests, ...secondPass.droppedRequests],
+      };
+    }
+
+    return this.buildSuccessResult(
+      l1TxUtils,
+      secondPass.survivors,
+      firstPass.droppedRequests,
+      secondPass.gasUsed,
+      proposeRequest,
+    );
+  }
+
+  private buildSuccessResult(
+    l1TxUtils: L1TxUtils,
+    survivors: RequestWithExpiry[],
+    droppedRequests: DroppedRequest[],
+    bundleGasUsed: bigint,
+    proposeRequest: RequestWithExpiry | undefined,
+  ): BundleSimulateResult {
+    const proposeSurvived = proposeRequest !== undefined && survivors.includes(proposeRequest);
+    const blobEvaluationGas = proposeSurvived ? (proposeRequest?.blobEvaluationGas ?? 0n) : 0n;
+    const gasLimit = this.computeGasLimit(l1TxUtils, bundleGasUsed, blobEvaluationGas);
+    this.log.debug('Bundle simulate complete', {
+      survivingRequests: survivors.length,
+      bundleGasUsed,
+      gasLimit,
+      actions: survivors.map(r => r.action),
+    });
+    return { kind: 'success', requests: survivors, gasLimit, droppedRequests };
+  }
+
+  /**
+   * `gasLimit = bumpGasLimit(ceil(gasUsed * 64 / 63))`, plus blob evaluation gas if a propose
+   * survived, capped at the L1 block gas limit.
+   */
+  private computeGasLimit(l1TxUtils: L1TxUtils, bundleGasUsed: bigint, blobEvaluationGas: bigint): bigint {
+    const gasUsedWithEip150 = (bundleGasUsed * 64n + 62n) / 63n;
+    const gasLimit = l1TxUtils.bumpGasLimit(gasUsedWithEip150) + blobEvaluationGas;
+    return gasLimit > MAX_L1_TX_LIMIT ? MAX_L1_TX_LIMIT : gasLimit;
+  }
+
+  /**
+   * eth_simulateV1 cannot carry blob sidecar data, so disable the rollup's on-chain blob check
+   * when a propose is in the bundle.
+   */
+  private buildStateOverrides(hasProposeAction: boolean): Promise<StateOverride> {
+    return buildSimulationOverridesStateOverride(
+      this.deps.rollupContract,
+      hasProposeAction ? { disableBlobCheck: true } : undefined,
+    );
+  }
+
+  private async simulateAndDecode(
+    l1TxUtils: L1TxUtils,
+    requests: RequestWithExpiry[],
+    simulateTimestamp: bigint,
+    stateOverrides: StateOverride,
+  ): Promise<SimulatePassResult> {
+    let simResult: Awaited<ReturnType<typeof Multicall3.simulateAggregate3>>;
+    try {
+      simResult = await Multicall3.simulateAggregate3(
+        requests.map(r => ({ to: r.request.to! as Hex, data: r.request.data! as Hex, abi: r.request.abi })),
+        l1TxUtils,
+        {
+          blockOverrides: { time: simulateTimestamp, gasLimit: MAX_L1_TX_LIMIT * 2n },
+          stateOverrides,
+          gas: MAX_L1_TX_LIMIT,
+          fallbackGasEstimate: MAX_L1_TX_LIMIT,
+        },
+      );
+    } catch (err) {
+      this.log.warn('Bundle simulate threw; treating as fallback', {
+        err: formatViemError(err),
+        actions: requests.map(r => r.action),
+      });
+      return { kind: 'fallback' };
+    }
+
+    if (simResult.kind === 'fallback') {
+      return { kind: 'fallback' };
+    }
+
+    const survivors: RequestWithExpiry[] = [];
+    const droppedRequests: DroppedRequest[] = [];
+    for (let i = 0; i < requests.length; i++) {
+      const entry = simResult.entries[i];
+      if (entry.success) {
+        survivors.push(requests[i]);
+        continue;
+      }
+      droppedRequests.push({
+        request: requests[i],
+        revertReason: entry.revertReason,
+        returnData: entry.returnData,
+      });
+    }
+    return { kind: 'decoded', survivors, droppedRequests, gasUsed: simResult.gasUsed };
+  }
+}