@aztec/ethereum 0.0.0-test.1 → 0.0.1-commit.b655e406

package/dest/test/rollup_cheat_codes.js

@@ -0,0 +1,268 @@
+import { RollupContract } from '@aztec/ethereum';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { createLogger } from '@aztec/foundation/log';
+import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
+import { createPublicClient, fallback, getContract, hexToBigInt, http } from 'viem';
+import { foundry } from 'viem/chains';
+import { EthCheatCodes } from './eth_cheat_codes.js';
+/** Cheat codes for the L1 rollup contract. */ export class RollupCheatCodes {
+    ethCheatCodes;
+    client;
+    rollup;
+    logger;
+    constructor(ethCheatCodes, addresses){
+        this.ethCheatCodes = ethCheatCodes;
+        this.logger = createLogger('aztecjs:cheat_codes');
+        this.client = createPublicClient({
+            chain: foundry,
+            transport: fallback(ethCheatCodes.rpcUrls.map((url)=>http(url)))
+        });
+        this.rollup = getContract({
+            abi: RollupAbi,
+            address: addresses.rollupAddress.toString(),
+            client: this.client
+        });
+    }
+    static create(rpcUrls, addresses, dateProvider) {
+        const ethCheatCodes = new EthCheatCodes(rpcUrls, dateProvider);
+        return new RollupCheatCodes(ethCheatCodes, addresses);
+    }
+    /** Returns the current slot */ async getSlot() {
+        const ts = BigInt((await this.client.getBlock()).timestamp);
+        return await this.rollup.read.getSlotAt([
+            ts
+        ]);
+    }
+    /** Returns the current epoch */ async getEpoch() {
+        const slotNumber = await this.getSlot();
+        return await this.rollup.read.getEpochAtSlot([
+            slotNumber
+        ]);
+    }
+    /**
+   * Returns the pending and proven chain tips
+   * @returns The pending and proven chain tips
+   */ async getTips() {
+        const res = await this.rollup.read.getTips();
+        return {
+            pending: res.pendingBlockNumber,
+            proven: res.provenBlockNumber
+        };
+    }
+    /**
+   * Logs the current state of the rollup contract.
+   */ async debugRollup() {
+        const rollup = new RollupContract(this.client, this.rollup.address);
+        const pendingNum = await rollup.getBlockNumber();
+        const provenNum = await rollup.getProvenBlockNumber();
+        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 block num: ${pendingNum}`);
+        this.logger.info(`Proven block 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 */ async getConfig() {
+        const [epochDuration, slotDuration] = await Promise.all([
+            this.rollup.read.getEpochDuration(),
+            this.rollup.read.getSlotDuration()
+        ]);
+        return {
+            epochDuration,
+            slotDuration
+        };
+    }
+    /**
+   * Advances time to the beginning of the given epoch
+   * @param epoch - The epoch to advance to
+   * @param opts - Options
+   */ async advanceToEpoch(epoch, opts = {}) {
+        const { epochDuration: slotsInEpoch } = await this.getConfig();
+        const timestamp = await this.rollup.read.getTimestampForSlot([
+            BigInt(epoch) * slotsInEpoch
+        ]) + BigInt(opts.offset ?? 0);
+        try {
+            await this.ethCheatCodes.warp(Number(timestamp), {
+                ...opts,
+                silent: true,
+                resetBlockInterval: true
+            });
+            this.logger.warn(`Warped to epoch ${epoch}`);
+        } catch (err) {
+            this.logger.warn(`Warp to epoch ${epoch} failed: ${err}`);
+        }
+        return timestamp;
+    }
+    /** Warps time in L1 until the next epoch */ async advanceToNextEpoch() {
+        const slot = await this.getSlot();
+        const { epochDuration, slotDuration } = await this.getConfig();
+        const slotsUntilNextEpoch = epochDuration - slot % epochDuration + 1n;
+        const timeToNextEpoch = slotsUntilNextEpoch * 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. */ async advanceToNextSlot() {
+        const currentSlot = await this.getSlot();
+        const timestamp = await this.rollup.read.getTimestampForSlot([
+            currentSlot + 1n
+        ]);
+        await this.ethCheatCodes.warp(Number(timestamp), {
+            silent: true,
+            resetBlockInterval: true
+        });
+        this.logger.warn(`Advanced to slot ${currentSlot + 1n}`);
+        return [
+            timestamp,
+            currentSlot + 1n
+        ];
+    }
+    /**
+   * Warps time in L1 equivalent to however many slots.
+   * @param howMany - The number of slots to advance.
+   */ async advanceSlots(howMany) {
+        const l1Timestamp = (await this.client.getBlock()).timestamp;
+        const slotDuration = await this.rollup.read.getSlotDuration();
+        const timeToWarp = BigInt(howMany) * 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 block (or latest if none) as proven
+   * @param maybeBlockNumber - The block number to mark as proven (defaults to latest pending)
+   */ markAsProven(maybeBlockNumber) {
+        return this.ethCheatCodes.execWithPausedAnvil(async ()=>{
+            const tipsBefore = await this.getTips();
+            const { pending, proven } = tipsBefore;
+            let blockNumber = maybeBlockNumber;
+            if (blockNumber === undefined || blockNumber > pending) {
+                blockNumber = pending;
+            }
+            if (blockNumber <= proven) {
+                this.logger.debug(`Block ${blockNumber} 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 provenBlockNumberSlot = hexToBigInt(RollupContract.stfStorageSlot);
+            // Need to pack it as a single 32 byte word
+            const newValue = BigInt(tipsBefore.pending) << 128n | BigInt(blockNumber);
+            await this.ethCheatCodes.store(EthAddress.fromString(this.rollup.address), provenBlockNumberSlot, newValue);
+            const tipsAfter = await this.getTips();
+            if (tipsAfter.pending < tipsAfter.proven) {
+                throw new Error('Overwrote pending tip to a block 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 blocks to move it forward
+   */ advanceInboxInProgress(howMuch) {
+        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
+   */ async asOwner(action) {
+        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.
+   */ 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. */ 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.
+   */ async bumpProvingCostPerMana(bumper) {
+        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
+   */ async setProvingCostPerMana(ethValue) {
+        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/dest/test/start_anvil.d.ts

@@ -3,9 +3,14 @@ import { type Anvil } from '@viem/anvil';
  * Ensures there's a running Anvil instance and returns the RPC URL.
  */
 export declare function startAnvil(opts?: {
+    port?: number;
     l1BlockTime?: number;
+    log?: boolean;
+    captureMethodCalls?: boolean;
+    accounts?: number;
 }): Promise<{
     anvil: Anvil;
+    methodCalls?: string[];
     rpcUrl: string;
     stop: () => Promise<void>;
 }>;

package/dest/test/start_anvil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start_anvil.d.ts","sourceRoot":"","sources":["../../src/test/start_anvil.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,KAAK,EAAe,MAAM,aAAa,CAAC;AAGtD;;GAEG;AACH,wBAAsB,UAAU,CAC9B,IAAI,GAAE;IACJ,WAAW,CAAC,EAAE,MAAM,CAAC;CACjB,GACL,OAAO,CAAC;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CAsCtE"}
+{"version":3,"file":"start_anvil.d.ts","sourceRoot":"","sources":["../../src/test/start_anvil.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,KAAK,EAAe,MAAM,aAAa,CAAC;AAGtD;;GAEG;AACH,wBAAsB,UAAU,CAC9B,IAAI,GAAE;IACJ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACd,GACL,OAAO,CAAC;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CAgD9F"}

package/dest/test/start_anvil.js

@@ -1,3 +1,4 @@
+import { createLogger } from '@aztec/foundation/log';
 import { makeBackoff, retry } from '@aztec/foundation/retry';
 import { fileURLToPath } from '@aztec/foundation/url';
 import { createAnvil } from '@viem/anvil';
@@ -6,24 +7,33 @@ import { dirname, resolve } from 'path';
  * Ensures there's a running Anvil instance and returns the RPC URL.
  */ export async function startAnvil(opts = {}) {
     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 ? [] : undefined;
     let port;
     // Start anvil.
     // We go via a wrapper script to ensure if the parent dies, anvil dies.
     const anvil = await retry(async ()=>{
         const anvil = createAnvil({
             anvilBinary,
-            port: 0,
+            host: '127.0.0.1',
+            port: opts.port ?? 8545,
             blockTime: opts.l1BlockTime,
-            stopTimeout: 1000
+            stopTimeout: 1000,
+            accounts: opts.accounts ?? 20,
+            gasLimit: 45_000_000n
         });
         // Listen to the anvil output to get the port.
         const removeHandler = anvil.on('message', (message)=>{
+            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;
     }, 'Start anvil', makeBackoff([
         5,
@@ -34,12 +44,10 @@ import { dirname, resolve } from 'path';
         throw new Error('Failed to start anvil');
     }
     // Monkeypatch the anvil instance to include the actually assigned port
-    Object.defineProperty(anvil, 'port', {
-        value: port,
-        writable: false
-    });
+    // Object.defineProperty(anvil, 'port', { value: port, writable: false });
     return {
         anvil,
+        methodCalls,
         stop: ()=>anvil.stop(),
         rpcUrl: `http://127.0.0.1:${port}`
     };

package/dest/test/tx_delayer.d.ts

@@ -1,22 +1,33 @@
 import { type Logger } from '@aztec/foundation/log';
+import type { DateProvider } from '@aztec/foundation/timer';
 import { type Client, type Hex } from 'viem';
-import type { ViemWalletClient } from '../types.js';
-export declare function waitUntilBlock<T extends Client>(client: T, blockNumber: number | bigint, logger?: Logger): Promise<boolean>;
-export declare function waitUntilL1Timestamp<T extends Client>(client: T, timestamp: number | bigint, logger?: Logger): Promise<boolean>;
+import { type ViemClient } from '../types.js';
+export declare function waitUntilBlock<T extends Client>(client: T, blockNumber: number | bigint, logger?: Logger, timeout?: number): Promise<boolean>;
+export declare function waitUntilL1Timestamp<T extends Client>(client: T, timestamp: number | bigint, logger?: Logger, timeout?: number): Promise<boolean>;
 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;
 }
 /**
  * Returns a new client (without modifying the one passed in) with an injected tx 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 declare function withDelayer<T extends ViemWalletClient>(client: T, opts: {
+export declare function withDelayer<T extends ViemClient>(client: T, dateProvider: DateProvider, opts: {
     ethereumSlotDuration: bigint | number;
 }): {
     client: T;

package/dest/test/tx_delayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tx_delayer.d.ts","sourceRoot":"","sources":["../../src/test/tx_delayer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAIlE,OAAO,EACL,KAAK,MAAM,EACX,KAAK,GAAG,EAMT,MAAM,MAAM,CAAC;AAEd,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,oBAgBxG;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,oBAuB5G;AAED,MAAM,WAAW,OAAO;IACtB,gGAAgG;IAChG,MAAM,IAAI,GAAG,EAAE,CAAC;IAChB,8EAA8E;IAC9E,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACxE,wEAAwE;IACxE,yBAAyB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;CAC3E;AAwBD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,gBAAgB,EACpD,MAAM,EAAE,CAAC,EACT,IAAI,EAAE;IAAE,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAC9C;IAAE,MAAM,EAAE,CAAC,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CA+DjC"}
+{"version":3,"file":"tx_delayer.d.ts","sourceRoot":"","sources":["../../src/test/tx_delayer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAG5D,OAAO,EACL,KAAK,MAAM,EACX,KAAK,GAAG,EAQT,MAAM,MAAM,CAAC;AAEd,OAAO,EAAE,KAAK,UAAU,EAAoB,MAAM,aAAa,CAAC;AAEhE,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,EAC7C,MAAM,EAAE,CAAC,EACT,WAAW,EAAE,MAAM,GAAG,MAAM,EAC5B,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,oBAiBjB;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,MAAM,EACnD,MAAM,EAAE,CAAC,EACT,SAAS,EAAE,MAAM,GAAG,MAAM,EAC1B,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,oBAwBjB;AAED,MAAM,WAAW,OAAO;IACtB,sDAAsD;IACtD,eAAe,IAAI,GAAG,EAAE,CAAC;IACzB,iDAAiD;IACjD,eAAe,IAAI,GAAG,EAAE,CAAC;IACzB,8EAA8E;IAC9E,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACxE,wEAAwE;IACxE,yBAAyB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IAC1E,kDAAkD;IAClD,YAAY,IAAI,IAAI,CAAC;IACrB;;;;OAIG;IACH,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;CACzE;AA0CD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,UAAU,EAC9C,MAAM,EAAE,CAAC,EACT,YAAY,EAAE,YAAY,EAC1B,IAAI,EAAE;IAAE,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAC9C;IAAE,MAAM,EAAE,CAAC,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CA0GjC"}

package/dest/test/tx_delayer.js

@@ -2,8 +2,9 @@ import { omit } from '@aztec/foundation/collection';
 import { createLogger } from '@aztec/foundation/log';
 import { retryUntil } from '@aztec/foundation/retry';
 import { inspect } from 'util';
-import { keccak256, parseTransaction, publicActions, walletActions } from 'viem';
-export function waitUntilBlock(client, blockNumber, logger) {
+import { keccak256, parseTransaction, publicActions, serializeTransaction, walletActions } from 'viem';
+import { isExtendedClient } from '../types.js';
+export function waitUntilBlock(client, blockNumber, logger, timeout) {
     const publicClient = 'getBlockNumber' in client && typeof client.getBlockNumber === 'function' ? client : client.extend(publicActions);
     return retryUntil(async ()=>{
         const currentBlockNumber = await publicClient.getBlockNumber({
@@ -11,9 +12,9 @@ export function waitUntilBlock(client, blockNumber, logger) {
         });
         logger?.debug(`Block number is ${currentBlockNumber} (waiting until ${blockNumber})`);
         return currentBlockNumber >= BigInt(blockNumber);
-    }, `Wait until L1 block ${blockNumber}`, 120, 0.1);
+    }, `Wait until L1 block ${blockNumber}`, timeout ?? 120, 0.1);
 }
-export function waitUntilL1Timestamp(client, timestamp, logger) {
+export function waitUntilL1Timestamp(client, timestamp, logger, timeout) {
     const publicClient = 'getBlockNumber' in client && typeof client.getBlockNumber === 'function' ? client : client.extend(publicActions);
     let lastBlock = undefined;
     return retryUntil(async ()=>{
@@ -31,17 +32,30 @@ export function waitUntilL1Timestamp(client, timestamp, logger) {
         const currentTs = currentBlock.timestamp;
         logger?.debug(`Block timstamp is ${currentTs} (waiting until ${timestamp})`);
         return currentTs >= BigInt(timestamp);
-    }, `Wait until L1 timestamp ${timestamp}`, 120, 0.1);
+    }, `Wait until L1 timestamp ${timestamp}`, timeout ?? 120, 0.1);
 }
 class DelayerImpl {
-    constructor(opts){
+    dateProvider;
+    logger;
+    constructor(dateProvider, opts){
+        this.dateProvider = dateProvider;
+        this.logger = createLogger('ethereum:tx_delayer');
+        this.maxInclusionTimeIntoSlot = undefined;
+        this.nextWait = undefined;
+        this.sentTxHashes = [];
+        this.cancelledTxs = [];
         this.ethereumSlotDuration = BigInt(opts.ethereumSlotDuration);
     }
+    maxInclusionTimeIntoSlot;
     ethereumSlotDuration;
-    nextWait = undefined;
-    txs = [];
-    getTxs() {
-        return this.txs;
+    nextWait;
+    sentTxHashes;
+    cancelledTxs;
+    getSentTxHashes() {
+        return this.sentTxHashes;
+    }
+    getCancelledTxs() {
+        return this.cancelledTxs;
     }
     pauseNextTxUntilBlock(l1BlockNumber) {
         this.nextWait = {
@@ -53,32 +67,77 @@ class DelayerImpl {
             l1Timestamp: BigInt(l1Timestamp)
         };
     }
+    cancelNextTx() {
+        this.nextWait = {
+            indefinitely: true
+        };
+    }
+    setMaxInclusionTimeIntoSlot(seconds) {
+        this.maxInclusionTimeIntoSlot = seconds;
+    }
 }
 /**
  * Returns a new client (without modifying the one passed in) with an injected tx 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(client, opts) {
+ */ export function withDelayer(client, dateProvider, opts) {
+    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).
     // Transactions signed by the node will not be delayed since they use sendTransaction directly,
     // but we do not use them in our codebase at all.
     .extend((client)=>({
             async sendRawTransaction (...args) {
+                let wait;
+                let txHash;
+                const { serializedTransaction } = args[0];
+                const publicClient = client;
                 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;
-                    const wait = 'l1BlockNumber' in waitUntil ? waitUntilBlock(publicClient, waitUntil.l1BlockNumber - 1n, logger) : waitUntilL1Timestamp(publicClient, waitUntil.l1Timestamp - delayer.ethereumSlotDuration, logger);
                     // Compute the tx hash manually so we emulate sendRawTransaction response
-                    const { serializedTransaction } = args[0];
-                    const txHash = keccak256(serializedTransaction);
+                    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) : 'l1Timestamp' in waitUntil ? waitUntilL1Timestamp(publicClient, waitUntil.l1Timestamp - delayer.ethereumSlotDuration, logger) : undefined;
                     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.
@@ -90,14 +149,14 @@ class DelayerImpl {
                                 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);
                 } else {
                     const txHash = await client.sendRawTransaction(...args);
                     logger.verbose(`Sent tx immediately ${txHash}`);
-                    delayer.txs.push(txHash);
+                    delayer.sentTxHashes.push(txHash);
                     return txHash;
                 }
             }
@@ -114,3 +173,20 @@ class DelayerImpl {
         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) {
+    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
+            }));
+        }
+    }
+    return keccak256(serializedTransaction);
+}

package/dest/test/upgrade_utils.d.ts

@@ -2,10 +2,11 @@ import type { Logger } from '@aztec/foundation/log';
 import { GovernanceAbi } from '@aztec/l1-artifacts/GovernanceAbi';
 import { type GetContractReturnType, type PrivateKeyAccount } from 'viem';
 import type { L1ContractAddresses } from '../l1_contract_addresses.js';
-import type { L1Clients } from '../types.js';
-export declare function executeGovernanceProposal(proposalId: bigint, governance: GetContractReturnType<typeof GovernanceAbi, L1Clients['publicClient']>, voteAmount: bigint, privateKey: PrivateKeyAccount, publicClient: L1Clients['publicClient'], walletClient: L1Clients['walletClient'], rpcUrls: string[], logger: Logger): Promise<void>;
-export declare function createGovernanceProposal(payloadAddress: `0x${string}`, addresses: L1ContractAddresses, privateKey: PrivateKeyAccount, publicClient: L1Clients['publicClient'], logger: Logger): Promise<{
-    governance: GetContractReturnType<typeof GovernanceAbi, L1Clients['publicClient']>;
+import type { ExtendedViemWalletClient, ViemPublicClient } from '../types.js';
+export declare function executeGovernanceProposal(proposalId: bigint, governance: GetContractReturnType<typeof GovernanceAbi, ViemPublicClient>, voteAmount: bigint, privateKey: PrivateKeyAccount, l1Client: ExtendedViemWalletClient, rpcUrls: string[], logger: Logger): Promise<void>;
+export declare function createGovernanceProposal(payloadAddress: `0x${string}`, addresses: L1ContractAddresses, privateKey: PrivateKeyAccount, publicClient: ViemPublicClient, logger: Logger): Promise<{
+    governance: GetContractReturnType<typeof GovernanceAbi, ViemPublicClient>;
     voteAmount: bigint;
+    proposalId: bigint;
 }>;
 //# sourceMappingURL=upgrade_utils.d.ts.map

package/dest/test/upgrade_utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upgrade_utils.d.ts","sourceRoot":"","sources":["../../src/test/upgrade_utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,OAAO,EAAE,KAAK,qBAAqB,EAAE,KAAK,iBAAiB,EAAe,MAAM,MAAM,CAAC;AAGvF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,qBAAqB,CAAC,OAAO,aAAa,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC,EAClF,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,iBAAiB,EAC7B,YAAY,EAAE,SAAS,CAAC,cAAc,CAAC,EACvC,YAAY,EAAE,SAAS,CAAC,cAAc,CAAC,EACvC,OAAO,EAAE,MAAM,EAAE,EACjB,MAAM,EAAE,MAAM,iBAoCf;AAED,wBAAsB,wBAAwB,CAC5C,cAAc,EAAE,KAAK,MAAM,EAAE,EAC7B,SAAS,EAAE,mBAAmB,EAC9B,UAAU,EAAE,iBAAiB,EAC7B,YAAY,EAAE,SAAS,CAAC,cAAc,CAAC,EACvC,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,UAAU,EAAE,qBAAqB,CAAC,OAAO,aAAa,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC,CAqCrH"}
+{"version":3,"file":"upgrade_utils.d.ts","sourceRoot":"","sources":["../../src/test/upgrade_utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAGlE,OAAO,EAAE,KAAK,qBAAqB,EAAE,KAAK,iBAAiB,EAAe,MAAM,MAAM,CAAC;AAGvF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAEvE,OAAO,KAAK,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAG9E,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,qBAAqB,CAAC,OAAO,aAAa,EAAE,gBAAgB,CAAC,EACzE,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,iBAAiB,EAC7B,QAAQ,EAAE,wBAAwB,EAClC,OAAO,EAAE,MAAM,EAAE,EACjB,MAAM,EAAE,MAAM,iBAmCf;AAED,wBAAsB,wBAAwB,CAC5C,cAAc,EAAE,KAAK,MAAM,EAAE,EAC7B,SAAS,EAAE,mBAAmB,EAC9B,UAAU,EAAE,iBAAiB,EAC7B,YAAY,EAAE,gBAAgB,EAC9B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IACT,UAAU,EAAE,qBAAqB,CAAC,OAAO,aAAa,EAAE,gBAAgB,CAAC,CAAC;IAC1E,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC,CAyCD"}