@aztec/ethereum 0.0.0-test.0 → 0.0.1-commit.03f7ef2

package/src/test/rollup_cheat_codes.ts

@@ -0,0 +1,312 @@
+import { RollupContract } from '@aztec/ethereum/contracts';
+import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
+import type { ViemPublicClient } from '@aztec/ethereum/types';
+import { CheckpointNumber, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { createLogger } from '@aztec/foundation/log';
+import type { DateProvider } from '@aztec/foundation/timer';
+import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
+
+import {
+  type GetContractReturnType,
+  type Hex,
+  createPublicClient,
+  fallback,
+  getContract,
+  hexToBigInt,
+  http,
+} from 'viem';
+
+import { EthCheatCodes } from './eth_cheat_codes.js';
+
+/** Cheat codes for the L1 rollup contract. */
+export class RollupCheatCodes {
+  private client: ViemPublicClient;
+  private rollup: GetContractReturnType<typeof RollupAbi, ViemPublicClient>;
+
+  private logger = createLogger('aztecjs:cheat_codes');
+
+  constructor(
+    private ethCheatCodes: EthCheatCodes,
+    addresses: Pick<L1ContractAddresses, 'rollupAddress'>,
+  ) {
+    this.client = createPublicClient({
+      chain: ethCheatCodes.chain,
+      transport: fallback(ethCheatCodes.rpcUrls.map(url => http(url, { batch: false }))),
+    });
+    this.rollup = getContract({
+      abi: RollupAbi,
+      address: addresses.rollupAddress.toString(),
+      client: this.client,
+    });
+  }
+
+  static create(
+    rpcUrls: string[],
+    addresses: Pick<L1ContractAddresses, 'rollupAddress'>,
+    dateProvider: DateProvider,
+  ): RollupCheatCodes {
+    const ethCheatCodes = new EthCheatCodes(rpcUrls, dateProvider);
+    return new RollupCheatCodes(ethCheatCodes, addresses);
+  }
+
+  /** Returns the current slot */
+  public async getSlot(): Promise<SlotNumber> {
+    const ts = BigInt((await this.client.getBlock()).timestamp);
+    return SlotNumber.fromBigInt(await this.rollup.read.getSlotAt([ts]));
+  }
+
+  /** Returns the current epoch */
+  public async getEpoch(): Promise<EpochNumber> {
+    const slotNumber = await this.getSlot();
+    return EpochNumber.fromBigInt(await this.rollup.read.getEpochAtSlot([BigInt(slotNumber)]));
+  }
+
+  /**
+   * Returns the pending and proven chain tips
+   * @returns The pending and proven chain tips
+   */
+  public async getTips(): Promise<{
+    /** The pending chain tip */ pending: CheckpointNumber;
+    /** The proven chain tip */ proven: CheckpointNumber;
+  }> {
+    const { pending, proven } = await this.rollup.read.getTips();
+    return {
+      pending: CheckpointNumber.fromBigInt(pending),
+      proven: CheckpointNumber.fromBigInt(proven),
+    };
+  }
+
+  /**
+   * Logs the current state of the rollup contract.
+   */
+  public async debugRollup() {
+    const rollup = new RollupContract(this.client, this.rollup.address);
+    const pendingNum = await rollup.getCheckpointNumber();
+    const provenNum = await rollup.getProvenCheckpointNumber();
+    const validators = await rollup.getAttesters();
+    const committee = await rollup.getCurrentEpochCommittee();
+    const archive = await rollup.archive();
+    const slot = await this.getSlot();
+    const epochNum = await rollup.getEpochNumberForSlotNumber(slot);
+
+    this.logger.info(`Pending checkpoint num: ${pendingNum}`);
+    this.logger.info(`Proven checkpoint num: ${provenNum}`);
+    this.logger.info(`Validators: ${validators.map(v => v.toString()).join(', ')}`);
+    this.logger.info(`Committee: ${committee?.map(v => v.toString()).join(', ')}`);
+    this.logger.info(`Archive: ${archive}`);
+    this.logger.info(`Epoch num: ${epochNum}`);
+    this.logger.info(`Slot: ${slot}`);
+  }
+
+  /** Fetches the epoch and slot duration config from the rollup contract */
+  public async getConfig(): Promise<{
+    /** Epoch duration */ epochDuration: bigint;
+    /** Slot duration */ slotDuration: number;
+  }> {
+    const [epochDuration, slotDuration] = await Promise.all([
+      this.rollup.read.getEpochDuration(),
+      this.rollup.read.getSlotDuration(),
+    ]);
+    return { epochDuration, slotDuration: Number(slotDuration) };
+  }
+
+  /**
+   * Advances time to the beginning of the given epoch
+   * @param epoch - The epoch to advance to
+   * @param opts - Options
+   */
+  public async advanceToEpoch(
+    epoch: EpochNumber,
+    opts: {
+      /** Offset in seconds */
+      offset?: number;
+    } = {},
+  ) {
+    const { epochDuration: slotsInEpoch } = await this.getConfig();
+    const slotNumber = SlotNumber(epoch * Number(slotsInEpoch));
+    const timestamp = (await this.rollup.read.getTimestampForSlot([BigInt(slotNumber)])) + BigInt(opts.offset ?? 0);
+    try {
+      await this.ethCheatCodes.warp(Number(timestamp), { ...opts, silent: true, resetBlockInterval: true });
+      this.logger.warn(`Warped to epoch ${epoch}`, { offset: opts.offset, timestamp });
+    } catch (err) {
+      this.logger.warn(`Warp to epoch ${epoch} failed: ${err}`);
+    }
+    return timestamp;
+  }
+
+  /** Warps time in L1 until the next epoch */
+  public async advanceToNextEpoch() {
+    const slot = await this.getSlot();
+    const { epochDuration, slotDuration } = await this.getConfig();
+    const slotsUntilNextEpoch = epochDuration - (BigInt(slot) % epochDuration) + 1n;
+    const timeToNextEpoch = slotsUntilNextEpoch * BigInt(slotDuration);
+    const l1Timestamp = BigInt((await this.client.getBlock()).timestamp);
+    await this.ethCheatCodes.warp(Number(l1Timestamp + timeToNextEpoch), {
+      silent: true,
+      resetBlockInterval: true,
+    });
+    this.logger.warn(`Advanced to next epoch`);
+  }
+
+  /** Warps time in L1 until the beginning of the next slot. */
+  public async advanceToNextSlot() {
+    const currentSlot = await this.getSlot();
+    const nextSlot = SlotNumber(currentSlot + 1);
+    const timestamp = await this.rollup.read.getTimestampForSlot([BigInt(nextSlot)]);
+    await this.ethCheatCodes.warp(Number(timestamp), { silent: true, resetBlockInterval: true });
+    this.logger.warn(`Advanced to slot ${nextSlot}`);
+    return [timestamp, nextSlot];
+  }
+
+  /**
+   * Warps time in L1 equivalent to however many slots.
+   * @param howMany - The number of slots to advance.
+   */
+  public async advanceSlots(howMany: number) {
+    const l1Timestamp = (await this.client.getBlock()).timestamp;
+    const slotDuration = Number(await this.rollup.read.getSlotDuration());
+    const timeToWarp = BigInt(howMany) * BigInt(slotDuration);
+    await this.ethCheatCodes.warp(l1Timestamp + timeToWarp, { silent: true, resetBlockInterval: true });
+    const [slot, epoch] = await Promise.all([this.getSlot(), this.getEpoch()]);
+    this.logger.warn(`Advanced ${howMany} slots up to slot ${slot} in epoch ${epoch}`);
+  }
+
+  /**
+   * Marks the specified checkpoint (or latest if none) as proven
+   * @param maybeCheckpointNumber - The checkpoint number to mark as proven (defaults to latest pending)
+   */
+  public markAsProven(maybeCheckpointNumber?: number | bigint) {
+    return this.ethCheatCodes.execWithPausedAnvil(async () => {
+      const tipsBefore = await this.getTips();
+      const { pending, proven } = tipsBefore;
+
+      let checkpointNumber = maybeCheckpointNumber;
+      if (checkpointNumber === undefined || checkpointNumber > pending) {
+        checkpointNumber = pending;
+      }
+      if (checkpointNumber <= proven) {
+        this.logger.debug(`Checkpoint ${checkpointNumber} is already proven`);
+        return;
+      }
+
+      // @note @LHerskind this is heavily dependent on the storage layout and size of values
+      // The rollupStore is a struct and if the size of elements or the struct changes, this can break
+      const provenCheckpointNumberSlot = hexToBigInt(RollupContract.stfStorageSlot);
+
+      // Need to pack it as a single 32 byte word
+      const newValue = (BigInt(tipsBefore.pending) << 128n) | BigInt(checkpointNumber);
+      await this.ethCheatCodes.store(EthAddress.fromString(this.rollup.address), provenCheckpointNumberSlot, newValue);
+
+      const tipsAfter = await this.getTips();
+      if (tipsAfter.pending < tipsAfter.proven) {
+        throw new Error('Overwrote pending tip to a checkpoint in the past');
+      }
+
+      this.logger.info(
+        `Proven tip moved: ${tipsBefore.proven} -> ${tipsAfter.proven}. Pending tip: ${tipsAfter.pending}.`,
+      );
+    });
+  }
+
+  /**
+   * Overrides the inProgress field of the Inbox contract state
+   * @param howMuch - How many checkpoints to move it forward
+   */
+  public advanceInboxInProgress(howMuch: number | bigint): Promise<bigint> {
+    return this.ethCheatCodes.execWithPausedAnvil(async () => {
+      // Storage slot 2 contains the InboxState struct
+      const inboxStateSlot = 2n;
+
+      // Get inbox and its current state values
+      const inboxAddress = await this.rollup.read.getInbox();
+      const currentStateValue = await this.ethCheatCodes.load(EthAddress.fromString(inboxAddress), inboxStateSlot);
+
+      // Extract current values from the packed storage slot
+      // Storage layout: rollingHash (128 bits) | totalMessagesInserted (64 bits) | inProgress (64 bits)
+      const currentRollingHash = currentStateValue & ((1n << 128n) - 1n);
+      const currentTotalMessages = (currentStateValue >> 128n) & ((1n << 64n) - 1n);
+      const currentInProgress = currentStateValue >> 192n;
+      const newInProgress = currentInProgress + BigInt(howMuch);
+
+      // Pack new values: rollingHash (low 128 bits) | totalMessages (middle 64 bits) | inProgress (high 64 bits)
+      const newValue = (BigInt(newInProgress) << 192n) | (currentTotalMessages << 128n) | currentRollingHash;
+
+      await this.ethCheatCodes.store(EthAddress.fromString(inboxAddress), inboxStateSlot, newValue, {
+        silent: true,
+      });
+
+      this.logger.warn(`Inbox inProgress advanced from ${currentInProgress} to ${newInProgress}`, {
+        inbox: inboxAddress,
+        oldValue: '0x' + currentStateValue.toString(16),
+        newValue: '0x' + newValue.toString(16),
+        rollingHash: currentRollingHash,
+        totalMessages: currentTotalMessages,
+        oldInProgress: currentInProgress,
+        newInProgress,
+      });
+
+      return newInProgress;
+    });
+  }
+
+  /**
+   * Executes an action impersonated as the owner of the Rollup contract.
+   * @param action - The action to execute
+   */
+  public async asOwner(
+    action: (owner: Hex, rollup: GetContractReturnType<typeof RollupAbi, ViemPublicClient>) => Promise<void>,
+  ) {
+    const owner = await this.rollup.read.owner();
+    await this.ethCheatCodes.startImpersonating(owner);
+    await action(owner, this.rollup);
+    await this.ethCheatCodes.stopImpersonating(owner);
+  }
+
+  /**
+   * Sets up the epoch.
+   */
+  public async setupEpoch() {
+    // Doesn't need to be done as owner, but the functionality is here...
+    await this.asOwner(async (account, rollup) => {
+      const hash = await rollup.write.setupEpoch({ account });
+      await this.client.waitForTransactionReceipt({ hash });
+      this.logger.warn(`Setup epoch`);
+    });
+  }
+
+  /** Directly calls the L1 gas fee oracle. */
+  public async updateL1GasFeeOracle() {
+    await this.asOwner(async (account, rollup) => {
+      const hash = await rollup.write.updateL1GasFeeOracle({ account, chain: this.client.chain });
+      await this.client.waitForTransactionReceipt({ hash });
+      this.logger.warn(`Updated L1 gas fee oracle`);
+    });
+  }
+
+  /**
+   * Bumps proving cost per mana.
+   * @param bumper - Callback to calculate the new proving cost per mana based on current value.
+   */
+  public async bumpProvingCostPerMana(bumper: (before: bigint) => bigint) {
+    const currentCost = await this.rollup.read.getProvingCostPerManaInEth();
+    const newCost = bumper(currentCost);
+    await this.setProvingCostPerMana(newCost);
+  }
+
+  /**
+   * Directly updates proving cost per mana.
+   * @param ethValue - The new proving cost per mana in ETH
+   */
+  public async setProvingCostPerMana(ethValue: bigint) {
+    await this.asOwner(async (account, rollup) => {
+      const hash = await rollup.write.setProvingCostPerMana([ethValue], {
+        account,
+        chain: this.client.chain,
+        gasLimit: 1000000n,
+      });
+      await this.client.waitForTransactionReceipt({ hash });
+      this.logger.warn(`Updated proving cost per mana to ${ethValue}`);
+    });
+  }
+}

package/src/test/start_anvil.ts

@@ -1,3 +1,4 @@
+import { createLogger } from '@aztec/foundation/log';
 import { makeBackoff, retry } from '@aztec/foundation/retry';
 import { fileURLToPath } from '@aztec/foundation/url';
 
@@ -9,10 +10,19 @@ import { dirname, resolve } from 'path';
  */
 export async function startAnvil(
   opts: {
+    port?: number;
     l1BlockTime?: number;
+    log?: boolean;
+    captureMethodCalls?: boolean;
+    accounts?: number;
+    chainId?: number;
+    /** The hardfork to use - note: @viem/anvil types are out of date but 'cancun' and 'latest' work */
+    hardfork?: string;
   } = {},
-): Promise<{ anvil: Anvil; rpcUrl: string; stop: () => Promise<void> }> {
+): Promise<{ anvil: Anvil; methodCalls?: string[]; rpcUrl: string; stop: () => Promise<void> }> {
   const anvilBinary = resolve(dirname(fileURLToPath(import.meta.url)), '../../', 'scripts/anvil_kill_wrapper.sh');
+  const logger = opts.log ? createLogger('ethereum:anvil') : undefined;
+  const methodCalls = opts.captureMethodCalls ? ([] as string[]) : undefined;
 
   let port: number | undefined;
 
@@ -22,19 +32,28 @@ export async function startAnvil(
     async () => {
       const anvil = createAnvil({
         anvilBinary,
-        port: 0,
+        host: '127.0.0.1',
+        port: opts.port ?? 8545,
         blockTime: opts.l1BlockTime,
         stopTimeout: 1000,
+        accounts: opts.accounts ?? 20,
+        gasLimit: 45_000_000n,
+        chainId: opts.chainId ?? 31337,
       });
 
       // Listen to the anvil output to get the port.
       const removeHandler = anvil.on('message', (message: string) => {
+        logger?.debug(message.trim());
+
+        methodCalls?.push(...(message.match(/eth_[^\s]+/g) || []));
         if (port === undefined && message.includes('Listening on')) {
           port = parseInt(message.match(/Listening on ([^:]+):(\d+)/)![2]);
         }
       });
       await anvil.start();
-      removeHandler();
+      if (!logger && !opts.captureMethodCalls) {
+        removeHandler();
+      }
 
       return anvil;
     },
@@ -47,6 +66,6 @@ export async function startAnvil(
   }
 
   // Monkeypatch the anvil instance to include the actually assigned port
-  Object.defineProperty(anvil, 'port', { value: port, writable: false });
-  return { anvil, stop: () => anvil.stop(), rpcUrl: `http://127.0.0.1:${port}` };
+  // Object.defineProperty(anvil, 'port', { value: port, writable: false });
+  return { anvil, methodCalls, stop: () => anvil.stop(), rpcUrl: `http://127.0.0.1:${port}` };
 }

package/src/test/tx_delayer.ts

@@ -1,21 +1,31 @@
 import { omit } from '@aztec/foundation/collection';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { retryUntil } from '@aztec/foundation/retry';
+import type { DateProvider } from '@aztec/foundation/timer';
 
 import { inspect } from 'util';
 import {
   type Client,
   type Hex,
   type PublicClient,
+  type TransactionSerializableEIP4844,
   keccak256,
   parseTransaction,
   publicActions,
+  serializeTransaction,
   walletActions,
 } from 'viem';
 
-import type { ViemWalletClient } from '../types.js';
+import { type ViemClient, isExtendedClient } from '../types.js';
 
-export function waitUntilBlock<T extends Client>(client: T, blockNumber: number | bigint, logger?: Logger) {
+const MAX_WAIT_TIME_SECONDS = 180;
+
+export function waitUntilBlock<T extends Client>(
+  client: T,
+  blockNumber: number | bigint,
+  logger?: Logger,
+  timeout?: number,
+) {
   const publicClient =
     'getBlockNumber' in client && typeof client.getBlockNumber === 'function'
       ? (client as unknown as PublicClient)
@@ -28,12 +38,17 @@ export function waitUntilBlock<T extends Client>(client: T, blockNumber: number
       return currentBlockNumber >= BigInt(blockNumber);
     },
     `Wait until L1 block ${blockNumber}`,
-    120,
+    timeout ?? MAX_WAIT_TIME_SECONDS,
     0.1,
   );
 }
 
-export function waitUntilL1Timestamp<T extends Client>(client: T, timestamp: number | bigint, logger?: Logger) {
+export function waitUntilL1Timestamp<T extends Client>(
+  client: T,
+  timestamp: number | bigint,
+  logger?: Logger,
+  timeout?: number,
+) {
   const publicClient =
     'getBlockNumber' in client && typeof client.getBlockNumber === 'function'
       ? (client as unknown as PublicClient)
@@ -53,31 +68,51 @@ export function waitUntilL1Timestamp<T extends Client>(client: T, timestamp: num
       return currentTs >= BigInt(timestamp);
     },
     `Wait until L1 timestamp ${timestamp}`,
-    120,
+    timeout ?? MAX_WAIT_TIME_SECONDS,
     0.1,
   );
 }
 
 export interface Delayer {
-  /** Returns the list of all txs (not just the delayed ones) sent through the attached client. */
-  getTxs(): Hex[];
+  /** Returns the hashes of all effectively sent txs. */
+  getSentTxHashes(): Hex[];
+  /** Returns the raw hex for all cancelled txs. */
+  getCancelledTxs(): Hex[];
   /** Delays the next tx to be sent so it lands on the given L1 block number. */
   pauseNextTxUntilBlock(l1BlockNumber: number | bigint | undefined): void;
   /** Delays the next tx to be sent so it lands on the given timestamp. */
   pauseNextTxUntilTimestamp(l1Timestamp: number | bigint | undefined): void;
+  /** Delays the next tx to be sent indefinitely. */
+  cancelNextTx(): void;
+  /**
+   * Sets max inclusion time into slot. If more than this many seconds have passed
+   * since the last L1 block was mined, then any tx will not be mined in the current
+   * L1 slot but will be deferred for the next one.
+   */
+  setMaxInclusionTimeIntoSlot(seconds: number | bigint | undefined): void;
 }
 
 class DelayerImpl implements Delayer {
-  constructor(opts: { ethereumSlotDuration: bigint | number }) {
+  private logger = createLogger('ethereum:tx_delayer');
+  constructor(
+    public dateProvider: DateProvider,
+    opts: { ethereumSlotDuration: bigint | number },
+  ) {
     this.ethereumSlotDuration = BigInt(opts.ethereumSlotDuration);
   }
 
+  public maxInclusionTimeIntoSlot: number | undefined = undefined;
   public ethereumSlotDuration: bigint;
-  public nextWait: { l1Timestamp: bigint } | { l1BlockNumber: bigint } | undefined = undefined;
-  public txs: Hex[] = [];
+  public nextWait: { l1Timestamp: bigint } | { l1BlockNumber: bigint } | { indefinitely: true } | undefined = undefined;
+  public sentTxHashes: Hex[] = [];
+  public cancelledTxs: Hex[] = [];
 
-  getTxs() {
-    return this.txs;
+  getSentTxHashes() {
+    return this.sentTxHashes;
+  }
+
+  getCancelledTxs(): Hex[] {
+    return this.cancelledTxs;
   }
 
   pauseNextTxUntilBlock(l1BlockNumber: number | bigint) {
@@ -87,6 +122,14 @@ class DelayerImpl implements Delayer {
   pauseNextTxUntilTimestamp(l1Timestamp: number | bigint) {
     this.nextWait = { l1Timestamp: BigInt(l1Timestamp) };
   }
+
+  cancelNextTx() {
+    this.nextWait = { indefinitely: true };
+  }
+
+  setMaxInclusionTimeIntoSlot(seconds: number | undefined) {
+    this.maxInclusionTimeIntoSlot = seconds;
+  }
 }
 
 /**
@@ -94,12 +137,17 @@ class DelayerImpl implements Delayer {
  * The delayer can be used to hold off the next tx to be sent until a given block number.
  * TODO(#10824): This doesn't play along well with blob txs for some reason.
  */
-export function withDelayer<T extends ViemWalletClient>(
+export function withDelayer<T extends ViemClient>(
   client: T,
+  dateProvider: DateProvider,
   opts: { ethereumSlotDuration: bigint | number },
 ): { client: T; delayer: Delayer } {
+  if (!isExtendedClient(client)) {
+    throw new Error('withDelayer has to be instantiated with a wallet viem client.');
+  }
   const logger = createLogger('ethereum:tx_delayer');
-  const delayer = new DelayerImpl(opts);
+  const delayer = new DelayerImpl(dateProvider, opts);
+
   const extended = client
     // Tweak sendRawTransaction so it uses the delay defined in the delayer.
     // Note that this will only work with local accounts (ie accounts for which we have the private key).
@@ -107,28 +155,68 @@ export function withDelayer<T extends ViemWalletClient>(
     // but we do not use them in our codebase at all.
     .extend(client => ({
       async sendRawTransaction(...args) {
+        let wait: Promise<unknown> | undefined;
+        let txHash: Hex | undefined;
+
+        const { serializedTransaction } = args[0];
+        const publicClient = client as unknown as PublicClient;
+
         if (delayer.nextWait !== undefined) {
+          // Check if we have been instructed to delay the next tx.
           const waitUntil = delayer.nextWait;
           delayer.nextWait = undefined;
 
-          const publicClient = client as unknown as PublicClient;
-          const wait =
+          // Compute the tx hash manually so we emulate sendRawTransaction response
+          txHash = computeTxHash(serializedTransaction);
+
+          // Cancel tx outright if instructed
+          if ('indefinitely' in waitUntil && waitUntil.indefinitely) {
+            logger.info(`Cancelling tx ${txHash}`);
+            delayer.cancelledTxs.push(serializedTransaction);
+            return Promise.resolve(txHash);
+          }
+
+          // Or wait until the desired block number or timestamp
+          wait =
             'l1BlockNumber' in waitUntil
               ? waitUntilBlock(publicClient, waitUntil.l1BlockNumber - 1n, logger)
-              : waitUntilL1Timestamp(publicClient, waitUntil.l1Timestamp - delayer.ethereumSlotDuration, logger);
+              : 'l1Timestamp' in waitUntil
+                ? waitUntilL1Timestamp(publicClient, waitUntil.l1Timestamp - delayer.ethereumSlotDuration, logger)
+                : undefined;
 
-          // Compute the tx hash manually so we emulate sendRawTransaction response
-          const { serializedTransaction } = args[0];
-          const txHash = keccak256(serializedTransaction);
           logger.info(`Delaying tx ${txHash} until ${inspect(waitUntil)}`, {
             argsLen: args.length,
             ...omit(parseTransaction(serializedTransaction), 'data', 'sidecars'),
           });
+        } else if (delayer.maxInclusionTimeIntoSlot !== undefined) {
+          // Check if we need to delay txs sent too close to the end of the slot.
+          const currentBlock = await publicClient.getBlock({ includeTransactions: false });
+          const { timestamp: lastBlockTimestamp, number } = currentBlock;
+          const now = delayer.dateProvider.now();
+
+          txHash = computeTxHash(serializedTransaction);
+          const logData = {
+            ...omit(parseTransaction(serializedTransaction), 'data', 'sidecars'),
+            lastBlockTimestamp,
+            now,
+            maxInclusionTimeIntoSlot: delayer.maxInclusionTimeIntoSlot,
+          };
+
+          if (now / 1000 - Number(lastBlockTimestamp) > delayer.maxInclusionTimeIntoSlot) {
+            // If the last block was mined more than `maxInclusionTimeIntoSlot` seconds ago, then we cannot include
+            // any txs in the current slot, so we delay the tx until the next slot.
+            logger.info(`Delaying inclusion of tx ${txHash} until the next slot since it was sent too late`, logData);
+            wait = waitUntilBlock(publicClient, number + 1n, logger);
+          } else {
+            logger.debug(`Immediately sending tx ${txHash} as it was received early enough in the slot`, logData);
+          }
+        }
 
+        if (wait !== undefined) {
           // Do not await here so we can return the tx hash immediately as if it had been sent on the spot.
           // Instead, delay it so it lands on the desired block number or timestamp, assuming anvil will
           // mine it immediately.
-          void wait
+          void wait!
             .then(async () => {
               const clientTxHash = await client.sendRawTransaction(...args);
               if (clientTxHash !== txHash) {
@@ -137,16 +225,15 @@ export function withDelayer<T extends ViemWalletClient>(
                   computedTxHash: txHash,
                 });
               }
-              logger.info(`Sent previously delayed tx ${clientTxHash} to land on ${inspect(waitUntil)}`);
-              delayer.txs.push(clientTxHash);
+              logger.info(`Sent previously delayed tx ${clientTxHash}`);
+              delayer.sentTxHashes.push(clientTxHash);
             })
             .catch(err => logger.error(`Error sending tx after delay`, err));
-
-          return Promise.resolve(txHash);
+          return Promise.resolve(txHash!);
         } else {
           const txHash = await client.sendRawTransaction(...args);
-          logger.verbose(`Sent tx immediately ${txHash}`);
-          delayer.txs.push(txHash);
+          logger.debug(`Sent tx immediately ${txHash}`);
+          delayer.sentTxHashes.push(txHash);
           return txHash;
         }
       },
@@ -161,3 +248,19 @@ export function withDelayer<T extends ViemWalletClient>(
 
   return { client: extended, delayer };
 }
+
+/**
+ * Compute the tx hash given the serialized tx. Note that if this is a blob tx, we need to
+ * exclude the blobs, commitments, and proofs from the hash.
+ */
+function computeTxHash(serializedTransaction: Hex) {
+  if (serializedTransaction.startsWith('0x03')) {
+    const parsed = parseTransaction(serializedTransaction);
+    if (parsed.blobs || parsed.sidecars) {
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      const { blobs, sidecars, ...rest } = parsed;
+      return keccak256(serializeTransaction({ type: 'eip4844', ...rest } as TransactionSerializableEIP4844));
+    }
+  }
+  return keccak256(serializedTransaction);
+}