@aztec/ethereum 3.0.0-nightly.20251003 → 3.0.0-nightly.20251004

package/dest/l1_tx_utils/readonly_l1_tx_utils.js

@@ -1,4 +1,4 @@
-import { times } from '@aztec/foundation/collection';
+import { getKeys, merge, pick, times } from '@aztec/foundation/collection';
 import { createLogger } from '@aztec/foundation/log';
 import { makeBackoff, retry } from '@aztec/foundation/retry';
 import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
@@ -20,10 +20,7 @@ export class ReadOnlyL1TxUtils {
         this.dateProvider = dateProvider;
         this.debugMaxGasLimit = debugMaxGasLimit;
         this.interrupted = false;
-        this.config = {
-            ...defaultL1TxUtilsConfig,
-            ...config || {}
-        };
+        this.config = merge(defaultL1TxUtilsConfig, pick(config || {}, ...getKeys(l1TxUtilsConfigMappings)));
     }
     interrupt() {
         this.interrupted = true;
@@ -39,11 +36,8 @@ export class ReadOnlyL1TxUtils {
     }
     /**
    * Gets the current gas price with bounds checking
-   */ async getGasPrice(_gasConfig, isBlobTx = false, attempt = 0, previousGasPrice) {
-        const gasConfig = {
-            ...this.config,
-            ..._gasConfig
-        };
+   */ async getGasPrice(gasConfigOverrides, isBlobTx = false, attempt = 0, previousGasPrice) {
+        const gasConfig = merge(this.config, gasConfigOverrides);
         const block = await this.client.getBlock({
             blockTag: 'latest'
         });
@@ -53,9 +47,6 @@ export class ReadOnlyL1TxUtils {
         if (isBlobTx) {
             try {
                 blobBaseFee = await retry(()=>this.client.getBlobBaseFee(), 'Getting L1 blob base fee', makeBackoff(times(2, ()=>1)), this.logger, true);
-                this.logger?.debug('L1 Blob base fee:', {
-                    blobBaseFee: formatGwei(blobBaseFee)
-                });
             } catch  {
                 this.logger?.warn('Failed to get L1 blob base fee', attempt);
             }
@@ -120,14 +111,13 @@ export class ReadOnlyL1TxUtils {
             // use max between current network values and min required values
             maxFeePerBlobGas = maxFeePerBlobGas > minBlobFee ? maxFeePerBlobGas : minBlobFee;
         }
-        this.logger?.debug(`Computed L1 gas price`, {
+        this.logger?.trace(`Computed L1 gas price max fee ${formatGwei(maxFeePerGas)} and max priority fee ${formatGwei(maxPriorityFeePerGas)}`, {
             attempt,
             baseFee: formatGwei(baseFee),
             maxFeePerGas: formatGwei(maxFeePerGas),
             maxPriorityFeePerGas: formatGwei(maxPriorityFeePerGas),
-            ...maxFeePerBlobGas && {
-                maxFeePerBlobGas: formatGwei(maxFeePerBlobGas)
-            }
+            blobBaseFee: formatGwei(blobBaseFee),
+            maxFeePerBlobGas: formatGwei(maxFeePerBlobGas)
         });
         return {
             maxFeePerGas,
@@ -155,14 +145,14 @@ export class ReadOnlyL1TxUtils {
                 maxFeePerBlobGas: gasPrice.maxFeePerBlobGas,
                 gas: LARGE_GAS_LIMIT
             });
-            this.logger?.debug(`L1 gas used in estimateGas by blob tx: ${initialEstimate}`);
+            this.logger?.trace(`Estimated gas for blob tx: ${initialEstimate}`);
         } else {
             initialEstimate = await this.client.estimateGas({
                 account,
                 ...request,
                 gas: LARGE_GAS_LIMIT
             });
-            this.logger?.debug(`L1 gas used in estimateGas by non-blob tx: ${initialEstimate}`);
+            this.logger?.trace(`Estimated gas for non-blob tx: ${initialEstimate}`);
         }
         // Add buffer based on either fixed amount or percentage
         const withBuffer = this.bumpGasLimit(initialEstimate, gasConfig);
@@ -294,7 +284,7 @@ export class ReadOnlyL1TxUtils {
         };
         const bumpedGasLimit = gasLimit + gasLimit * BigInt((gasConfig?.gasLimitBufferPercentage || 0) * 1_00) / 100_00n;
         const cleanGasConfig = pickBy(gasConfig, (_, key)=>key in l1TxUtilsConfigMappings);
-        this.logger?.debug('Bumping gas limit', {
+        this.logger?.trace(`Bumping gas limit from ${gasLimit} to ${bumpedGasLimit}`, {
             gasLimit,
             gasConfig: cleanGasConfig,
             bumpedGasLimit

package/dest/l1_tx_utils/types.d.ts

@@ -9,7 +9,7 @@ export interface L1TxRequest {
     value?: bigint;
     abi?: Abi;
 }
-export type L1GasConfig = Partial<L1TxUtilsConfig> & {
+export type L1TxConfig = Partial<L1TxUtilsConfig> & {
     gasLimit?: bigint;
     txTimeoutAt?: Date;
 };
@@ -41,17 +41,26 @@ export declare enum TxUtilsState {
     NOT_MINED = 4,
     MINED = 5
 }
+export declare const TerminalTxUtilsState: TxUtilsState[];
 export type L1TxState = {
     txHashes: Hex[];
     cancelTxHashes: Hex[];
     gasLimit: bigint;
     gasPrice: GasPrice;
-    txConfig: L1GasConfig;
+    txConfigOverrides: L1TxConfig;
     request: L1TxRequest;
     status: TxUtilsState;
     nonce: number;
+    sentAtL1Ts: Date;
+    lastSentAtL1Ts: Date;
     receipt?: TransactionReceipt;
     blobInputs: L1BlobInputs | undefined;
 };
 export type SigningCallback = (transaction: TransactionSerializable, signingAddress: EthAddress) => Promise<ViemTransactionSignature>;
+export declare class UnknownMinedTxError extends Error {
+    constructor(nonce: number, account: string);
+}
+export declare class DroppedTransactionError extends Error {
+    constructor(nonce: number, account: string);
+}
 //# sourceMappingURL=types.d.ts.map

package/dest/l1_tx_utils/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/l1_tx_utils/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAEhF,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,MAAM,CAAC;AAE3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,GAAG,CAAC;CACX;AAED,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,IAAI,CAAA;CAAE,CAAC;AAE/F,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,GAAG,EAAE,eAAe,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,6BAA6B;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,+BAA+B;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,uCAAuC;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB,4FAA4F;IAC5F,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,oBAAY,YAAY;IACtB,IAAI,IAAA;IACJ,IAAI,IAAA;IACJ,QAAQ,IAAA;IACR,SAAS,IAAA;IACT,SAAS,IAAA;IACT,KAAK,IAAA;CACN;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,EAAE,GAAG,EAAE,CAAC;IAChB,cAAc,EAAE,GAAG,EAAE,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,EAAE,WAAW,CAAC;IACtB,OAAO,EAAE,WAAW,CAAC;IACrB,MAAM,EAAE,YAAY,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAC7B,UAAU,EAAE,YAAY,GAAG,SAAS,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,CAC5B,WAAW,EAAE,uBAAuB,EACpC,cAAc,EAAE,UAAU,KACvB,OAAO,CAAC,wBAAwB,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/l1_tx_utils/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAEhF,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,MAAM,CAAC;AAE3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,GAAG,CAAC;CACX;AAED,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,IAAI,CAAA;CAAE,CAAC;AAE9F,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,GAAG,EAAE,eAAe,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,6BAA6B;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,+BAA+B;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,uCAAuC;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB,4FAA4F;IAC5F,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,oBAAY,YAAY;IACtB,IAAI,IAAA;IACJ,IAAI,IAAA;IACJ,QAAQ,IAAA;IACR,SAAS,IAAA;IACT,SAAS,IAAA;IACT,KAAK,IAAA;CACN;AAED,eAAO,MAAM,oBAAoB,gBAAkE,CAAC;AAEpG,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,EAAE,GAAG,EAAE,CAAC;IAChB,cAAc,EAAE,GAAG,EAAE,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC;IACnB,iBAAiB,EAAE,UAAU,CAAC;IAC9B,OAAO,EAAE,WAAW,CAAC;IACrB,MAAM,EAAE,YAAY,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,IAAI,CAAC;IACjB,cAAc,EAAE,IAAI,CAAC;IACrB,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAC7B,UAAU,EAAE,YAAY,GAAG,SAAS,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,CAC5B,WAAW,EAAE,uBAAuB,EACpC,cAAc,EAAE,UAAU,KACvB,OAAO,CAAC,wBAAwB,CAAC,CAAC;AAEvC,qBAAa,mBAAoB,SAAQ,KAAK;gBAChC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAI3C;AAED,qBAAa,uBAAwB,SAAQ,KAAK;gBACpC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAI3C"}

package/dest/l1_tx_utils/types.js

@@ -7,3 +7,20 @@ export var TxUtilsState = /*#__PURE__*/ function(TxUtilsState) {
     TxUtilsState[TxUtilsState["MINED"] = 5] = "MINED";
     return TxUtilsState;
 }({});
+export const TerminalTxUtilsState = [
+    0,
+    5,
+    4
+];
+export class UnknownMinedTxError extends Error {
+    constructor(nonce, account){
+        super(`Nonce ${nonce} from account ${account} is MINED but not by one of our expected transactions`);
+        this.name = 'UnknownMinedTxError';
+    }
+}
+export class DroppedTransactionError extends Error {
+    constructor(nonce, account){
+        super(`Transaction with nonce ${nonce} from account ${account} was dropped from the mempool`);
+        this.name = 'DroppedTransactionError';
+    }
+}

package/dest/publisher_manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"publisher_manager.d.ts","sourceRoot":"","sources":["../src/publisher_manager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAgB,MAAM,wBAAwB,CAAC;AAKjE,MAAM,MAAM,eAAe,CAAC,SAAS,SAAS,SAAS,IAAI,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC;AAEzF,qBAAa,gBAAgB,CAAC,SAAS,SAAS,SAAS,GAAG,SAAS;IAKjE,OAAO,CAAC,UAAU;IAJpB,OAAO,CAAC,GAAG,CAAoC;IAC/C,OAAO,CAAC,MAAM,CAA4C;gBAGhD,UAAU,EAAE,SAAS,EAAE,EAC/B,MAAM,EAAE;QAAE,2BAA2B,CAAC,EAAE,OAAO,CAAA;KAAE;IAatC,qBAAqB,CAAC,MAAM,GAAE,eAAe,CAAC,SAAS,CAAc,GAAG,OAAO,CAAC,SAAS,CAAC;IAyChG,SAAS;CAGjB"}
+{"version":3,"file":"publisher_manager.d.ts","sourceRoot":"","sources":["../src/publisher_manager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAgB,MAAM,wBAAwB,CAAC;AAwBjE,MAAM,MAAM,eAAe,CAAC,SAAS,SAAS,SAAS,IAAI,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC;AAEzF,qBAAa,gBAAgB,CAAC,SAAS,SAAS,SAAS,GAAG,SAAS;IAKjE,OAAO,CAAC,UAAU;IAJpB,OAAO,CAAC,GAAG,CAAoC;IAC/C,OAAO,CAAC,MAAM,CAA4C;gBAGhD,UAAU,EAAE,SAAS,EAAE,EAC/B,MAAM,EAAE;QAAE,2BAA2B,CAAC,EAAE,OAAO,CAAA;KAAE;IAatC,qBAAqB,CAAC,MAAM,GAAE,eAAe,CAAC,SAAS,CAAc,GAAG,OAAO,CAAC,SAAS,CAAC;IAyChG,SAAS;CAGjB"}

package/dest/publisher_manager.js

@@ -1,16 +1,26 @@
 import { pick } from '@aztec/foundation/collection';
 import { createLogger } from '@aztec/foundation/log';
 import { TxUtilsState } from './l1_tx_utils/index.js';
+// Defines the order in which we prioritise publishers based on their state (first is better)
 const sortOrder = [
+    // Always prefer sending from idle publishers
     TxUtilsState.IDLE,
-    TxUtilsState.MINED
+    // Then from publishers that have sent a tx and it got mined
+    TxUtilsState.MINED,
+    // Then from publishers that have sent a tx but it's in-flight
+    TxUtilsState.SPEED_UP,
+    TxUtilsState.SENT,
+    // We leave cancelled and not-mined states for last, since these represent failures to mines and could be problematic
+    TxUtilsState.CANCELLED,
+    TxUtilsState.NOT_MINED
 ];
-const invalidStates = [
+// Which states represent a busy publisher that we should avoid if possible
+const busyStates = [
     TxUtilsState.SENT,
     TxUtilsState.SPEED_UP,
     TxUtilsState.CANCELLED,
     TxUtilsState.NOT_MINED
-]; // Cancelled and not mined are states that can be handled by a later iteration
+];
 export class PublisherManager {
     publishers;
     log;
@@ -25,13 +35,13 @@ export class PublisherManager {
     // Finds and prioritises available publishers based on
     // 1. Validity as per the provided filter function
     // 2. Validity based on the state the publisher is in
-    // 3. Priority based on state as defined bu sortOrder
+    // 3. Priority based on state as defined by sortOrder
     // 4. Then priority based on highest balance
     // 5. Then priority based on least recently used
     async getAvailablePublisher(filter = ()=>true) {
         // Extract the valid publishers
-        let validPublishers = this.publishers.filter((pub)=>!invalidStates.includes(pub.state) && filter(pub));
-        // If none found but we allow invalid states, try again including them
+        let validPublishers = this.publishers.filter((pub)=>!busyStates.includes(pub.state) && filter(pub));
+        // If none found but we allow invalid (busy) states, try again including them
         if (validPublishers.length === 0 && this.config.publisherAllowInvalidStates) {
             this.log.warn(`No valid publishers found. Trying again including invalid states.`);
             validPublishers = this.publishers.filter((pub)=>filter(pub));

package/dest/test/eth_cheat_codes.d.ts

@@ -1,6 +1,6 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { DateProvider, TestDateProvider } from '@aztec/foundation/timer';
-import { type Hex } from 'viem';
+import { type Hex, type Transaction } from 'viem';
 import type { ViemPublicClient } from '../types.js';
 /**
  * A class that provides utility functions for interacting with ethereum (L1).
@@ -33,6 +33,7 @@ export declare class EthCheatCodes {
      */
     logger?: import("@aztec/foundation/log").Logger);
     rpcCall(method: string, params: any[]): Promise<any>;
+    private doRpcCall;
     /**
      * Get the auto mine status of the underlying chain
      * @returns True if automine is on, false otherwise
@@ -199,6 +200,22 @@ export declare class EthCheatCodes {
         value?: number | bigint;
     })[][]): Promise<void>;
     traceTransaction(txHash: Hex): Promise<any>;
+    getTxPoolStatus(): Promise<{
+        pending: number;
+        queued: number;
+    }>;
+    getTxPoolContents(): Promise<TxPoolTransaction[]>;
+    /**
+     * Mines an empty block by temporarily removing all pending transactions from the mempool,
+     * mining a block, and then re-adding the transactions back to the pool.
+     */
+    mineEmptyBlock(blockCount?: number): Promise<void>;
     execWithPausedAnvil<T>(fn: () => Promise<T>): Promise<T>;
+    syncDateProvider(): Promise<void>;
 }
+type TxPoolState = 'pending' | 'queued';
+export type TxPoolTransaction = Transaction & {
+    poolState: TxPoolState;
+};
+export {};
 //# sourceMappingURL=eth_cheat_codes.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"eth_cheat_codes.d.ts","sourceRoot":"","sources":["../../src/test/eth_cheat_codes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"eth_cheat_codes.d.ts","sourceRoot":"","sources":["../../src/test/eth_cheat_codes.ts"],"names":[],"mappings":"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"}

package/dest/test/eth_cheat_codes.js

@@ -2,7 +2,8 @@ import { toBigIntBE, toHex } from '@aztec/foundation/bigint-buffer';
 import { keccak256 } from '@aztec/foundation/crypto';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import { createLogger } from '@aztec/foundation/log';
-import { createPublicClient, fallback, http } from 'viem';
+import { pluralize } from '@aztec/foundation/string';
+import { createPublicClient, fallback, hexToNumber, http } from 'viem';
 /**
  * A class that provides utility functions for interacting with ethereum (L1).
  */ export class EthCheatCodes {
@@ -24,9 +25,11 @@ import { createPublicClient, fallback, http } from 'viem';
             transport: fallback(this.rpcUrls.map((url)=>http(url)))
         });
     }
-    async rpcCall(method, params) {
-        const paramsString = jsonStringify(params);
-        this.logger.debug(`Calling ${method} with params: ${paramsString} on ${this.rpcUrls.join(', ')}`);
+    rpcCall(method, params) {
+        this.logger.debug(`Calling ${method} with params: ${jsonStringify(params)} on ${this.rpcUrls.join(', ')}`);
+        return this.doRpcCall(method, params);
+    }
+    async doRpcCall(method, params) {
         return await this.publicClient.transport.request({
             method,
             params
@@ -37,7 +40,7 @@ import { createPublicClient, fallback, http } from 'viem';
    * @returns True if automine is on, false otherwise
    */ async isAutoMining() {
         try {
-            const res = await this.rpcCall('anvil_getAutomine', []);
+            const res = await this.doRpcCall('anvil_getAutomine', []);
             return res;
         } catch (err) {
             this.logger.error(`Calling "anvil_getAutomine" failed with:`, err);
@@ -48,21 +51,21 @@ import { createPublicClient, fallback, http } from 'viem';
    * Get the current blocknumber
    * @returns The current block number
    */ async blockNumber() {
-        const res = await this.rpcCall('eth_blockNumber', []);
+        const res = await this.doRpcCall('eth_blockNumber', []);
         return parseInt(res, 16);
     }
     /**
    * Get the current chainId
    * @returns The current chainId
    */ async chainId() {
-        const res = await this.rpcCall('eth_chainId', []);
+        const res = await this.doRpcCall('eth_chainId', []);
         return parseInt(res, 16);
     }
     /**
    * Get the current timestamp
    * @returns The current timestamp
    */ async timestamp() {
-        const res = await this.rpcCall('eth_getBlockByNumber', [
+        const res = await this.doRpcCall('eth_getBlockByNumber', [
             'latest',
             true
         ]);
@@ -77,7 +80,7 @@ import { createPublicClient, fallback, http } from 'viem';
     }
     async doMine(numberOfBlocks = 1) {
         try {
-            await this.rpcCall('hardhat_mine', [
+            await this.doRpcCall('hardhat_mine', [
                 numberOfBlocks
             ]);
         } catch (err) {
@@ -88,7 +91,8 @@ import { createPublicClient, fallback, http } from 'viem';
    * Mines a single block with evm_mine
    */ async evmMine() {
         try {
-            await this.rpcCall('evm_mine', []);
+            await this.doRpcCall('evm_mine', []);
+            this.logger.warn(`Mined 1 L1 block with evm_mine`);
         } catch (err) {
             throw new Error(`Error mining: ${err}`);
         }
@@ -109,7 +113,7 @@ import { createPublicClient, fallback, http } from 'viem';
         this.logger.warn(`Set balance for ${account} to ${balance}`);
     }
     async getBalance(account) {
-        const res = await this.rpcCall('eth_getBalance', [
+        const res = await this.doRpcCall('eth_getBalance', [
             account.toString(),
             'latest'
         ]);
@@ -146,7 +150,7 @@ import { createPublicClient, fallback, http } from 'viem';
    * @param seconds - The interval to use between blocks
    */ getIntervalMining() {
         try {
-            return this.rpcCall('anvil_getIntervalMining', []);
+            return this.doRpcCall('anvil_getIntervalMining', []);
         } catch (err) {
             throw new Error(`Error getting interval mining: ${err}`);
         }
@@ -341,31 +345,28 @@ import { createPublicClient, fallback, http } from 'viem';
    * @param contract - The contract address
    * @returns The bytecode for the contract
    */ async getBytecode(contract) {
-        const res = await this.rpcCall('eth_getCode', [
+        return await this.doRpcCall('eth_getCode', [
             contract.toString(),
             'latest'
         ]);
-        return res;
     }
     /**
    * Get the raw transaction object for a given transaction hash
    * @param txHash - The transaction hash
    * @returns The raw transaction
    */ async getRawTransaction(txHash) {
-        const res = await this.rpcCall('debug_getRawTransaction', [
+        return await this.doRpcCall('debug_getRawTransaction', [
             txHash
         ]);
-        return res;
     }
     /**
    * Get the trace for a given transaction hash
    * @param txHash - The transaction hash
    * @returns The trace
    */ async debugTraceTransaction(txHash) {
-        const res = await this.rpcCall('debug_traceTransaction', [
+        return await this.doRpcCall('debug_traceTransaction', [
             txHash
         ]);
-        return res;
     }
     /**
    * Triggers a reorg of the given depth, removing those blocks from the chain.
@@ -381,9 +382,6 @@ import { createPublicClient, fallback, http } from 'viem';
    * Causes Anvil to reorg until the given block number is the new tip
    * @param blockNumber - The block number that's going to be the new tip
    */ reorgTo(blockNumber) {
-        this.logger.info('reorgTo', {
-            blockNumber
-        });
         if (blockNumber <= 0) {
             throw new Error(`Can't reorg to block before genesis: ${blockNumber}`);
         }
@@ -397,6 +395,7 @@ import { createPublicClient, fallback, http } from 'viem';
             await this.rpcCall('anvil_rollback', [
                 depth
             ]);
+            this.logger.warn(`Reorged L1 chain to block number ${blockNumber} (depth ${depth})`);
         });
     }
     /**
@@ -426,10 +425,68 @@ import { createPublicClient, fallback, http } from 'viem';
         });
     }
     traceTransaction(txHash) {
-        return this.rpcCall('trace_transaction', [
+        return this.doRpcCall('trace_transaction', [
             txHash
         ]);
     }
+    async getTxPoolStatus() {
+        const { pending, queued } = await this.doRpcCall('txpool_status', []);
+        return {
+            pending: hexToNumber(pending),
+            queued: hexToNumber(queued)
+        };
+    }
+    async getTxPoolContents() {
+        const txpoolContent = await this.doRpcCall('txpool_content', []);
+        return mapTxPoolContent(txpoolContent);
+    }
+    /**
+   * Mines an empty block by temporarily removing all pending transactions from the mempool,
+   * mining a block, and then re-adding the transactions back to the pool.
+   */ async mineEmptyBlock(blockCount = 1) {
+        await this.execWithPausedAnvil(async ()=>{
+            // Get all pending and queued transactions from the pool
+            const txs = await this.getTxPoolContents();
+            this.logger.debug(`Found ${txs.length} transactions in pool`);
+            // Get raw transactions before dropping them
+            const rawTxs = [];
+            for (const tx of txs){
+                try {
+                    const rawTx = await this.doRpcCall('debug_getRawTransaction', [
+                        tx.hash
+                    ]);
+                    if (rawTx) {
+                        rawTxs.push(rawTx);
+                        this.logger.debug(`Got raw tx for ${tx.hash}`);
+                    } else {
+                        this.logger.warn(`No raw tx found for ${tx.hash}`);
+                    }
+                } catch  {
+                    this.logger.warn(`Failed to get raw transaction for ${tx.hash}`);
+                }
+            }
+            this.logger.debug(`Retrieved ${rawTxs.length} raw transactions`);
+            // Drop all transactions from the mempool
+            await this.doRpcCall('anvil_dropAllTransactions', []);
+            // Mine an empty block
+            await this.doMine(blockCount);
+            // Re-add the transactions to the pool
+            for (const rawTx of rawTxs){
+                try {
+                    const txHash = await this.doRpcCall('eth_sendRawTransaction', [
+                        rawTx
+                    ]);
+                    this.logger.debug(`Re-added transaction ${txHash}`);
+                } catch (err) {
+                    this.logger.warn(`Failed to re-add transaction: ${err}`);
+                }
+            }
+            if (rawTxs.length !== txs.length) {
+                this.logger.warn(`Failed to add all txs back: had ${txs.length} but re-added ${rawTxs.length}`);
+            }
+        });
+        this.logger.warn(`Mined ${blockCount} empty L1 ${pluralize('block', blockCount)}`);
+    }
     async execWithPausedAnvil(fn) {
         const [blockInterval, wasAutoMining] = await Promise.all([
             this.getIntervalMining(),
@@ -470,4 +527,26 @@ import { createPublicClient, fallback, http } from 'viem';
             }
         }
     }
+    async syncDateProvider() {
+        const timestamp = await this.timestamp();
+        if ('setTime' in this.dateProvider) {
+            this.dateProvider.setTime(timestamp * 1000);
+        }
+    }
+}
+function mapTxPoolContent(content) {
+    const result = [];
+    const processPool = (pool, poolState)=>{
+        for (const txsByNonce of Object.values(pool)){
+            for (const tx of Object.values(txsByNonce)){
+                result.push({
+                    ...tx,
+                    poolState
+                });
+            }
+        }
+    };
+    processPool(content.pending, 'pending');
+    processPool(content.queued, 'queued');
+    return result;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/ethereum",
-  "version": "3.0.0-nightly.20251003",
+  "version": "3.0.0-nightly.20251004",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -31,10 +31,10 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/blob-lib": "3.0.0-nightly.20251003",
-    "@aztec/constants": "3.0.0-nightly.20251003",
-    "@aztec/foundation": "3.0.0-nightly.20251003",
-    "@aztec/l1-artifacts": "3.0.0-nightly.20251003",
+    "@aztec/blob-lib": "3.0.0-nightly.20251004",
+    "@aztec/constants": "3.0.0-nightly.20251004",
+    "@aztec/foundation": "3.0.0-nightly.20251004",
+    "@aztec/l1-artifacts": "3.0.0-nightly.20251004",
     "@viem/anvil": "^0.0.10",
     "dotenv": "^16.0.3",
     "lodash.chunk": "^4.2.0",

package/src/config.ts

@@ -212,7 +212,7 @@ const LocalEntryQueueConfig = {
   bootstrapFlushSize: 0n,
   normalFlushSizeMin: 48n,
   normalFlushSizeQuotient: 2n,
-  maxQueueFlushSize: 32n,
+  maxQueueFlushSize: 48n,
 };
 
 const StagingPublicEntryQueueConfig = {

package/src/contracts/multicall.ts

@@ -4,7 +4,7 @@ import type { Logger } from '@aztec/foundation/log';
 
 import { type EncodeFunctionDataParameters, type Hex, encodeFunctionData, multicall3Abi } from 'viem';
 
-import type { L1BlobInputs, L1GasConfig, L1TxRequest, L1TxUtils } from '../l1_tx_utils/index.js';
+import type { L1BlobInputs, L1TxConfig, L1TxRequest, L1TxUtils } from '../l1_tx_utils/index.js';
 import type { ExtendedViemWalletClient } from '../types.js';
 import { FormattedViemError, formatViemError } from '../utils.js';
 import { RollupContract } from './rollup.js';
@@ -15,7 +15,7 @@ export class Multicall3 {
   static async forward(
     requests: L1TxRequest[],
     l1TxUtils: L1TxUtils,
-    gasConfig: L1GasConfig | undefined,
+    gasConfig: L1TxConfig | undefined,
     blobConfig: L1BlobInputs | undefined,
     rollupAddress: Hex,
     logger: Logger,
@@ -37,10 +37,7 @@ export class Multicall3 {
 
     try {
       const { receipt, state } = await l1TxUtils.sendAndMonitorTransaction(
-        {
-          to: MULTI_CALL_3_ADDRESS,
-          data: encodedForwarderData,
-        },
+        { to: MULTI_CALL_3_ADDRESS, data: encodedForwarderData },
         gasConfig,
         blobConfig,
       );

package/src/contracts/rollup.ts

@@ -425,8 +425,8 @@ export class RollupContract {
     return result;
   }
 
-  getBlock(blockNumber: bigint) {
-    return this.rollup.read.getBlock([blockNumber]);
+  getBlock(blockNumber: bigint | number) {
+    return this.rollup.read.getBlock([BigInt(blockNumber)]);
   }
 
   getTips() {

package/src/deploy_l1_contracts.ts

@@ -64,7 +64,7 @@ import {
 import type { L1ContractAddresses } from './l1_contract_addresses.js';
 import {
   type GasPrice,
-  type L1GasConfig,
+  type L1TxConfig,
   type L1TxRequest,
   L1TxUtils,
   type L1TxUtilsConfig,
@@ -1556,7 +1556,7 @@ export class L1Deployer {
 
   sendTransaction(
     tx: L1TxRequest,
-    options?: L1GasConfig,
+    options?: L1TxConfig,
   ): Promise<{ txHash: Hex; gasLimit: bigint; gasPrice: GasPrice }> {
     return this.l1TxUtils.sendTransaction(tx, options).then(({ txHash, state }) => ({
       txHash,