@aztec/ethereum 3.0.0-nightly.20251005 → 3.0.0-nightly.20251008

package/dest/l1_tx_utils/l1_tx_utils.js

@@ -19,11 +19,12 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
     client;
     address;
     signer;
-    logger;
+    store;
+    metrics;
     nonceManager;
     txs;
-    constructor(client, address, signer, logger = createLogger('L1TxUtils'), dateProvider = new DateProvider(), config, debugMaxGasLimit = false){
-        super(client, logger, dateProvider, config, debugMaxGasLimit), this.client = client, this.address = address, this.signer = signer, this.logger = logger, this.txs = [];
+    constructor(client, address, signer, logger = createLogger('ethereum:publisher'), dateProvider = new DateProvider(), config, debugMaxGasLimit = false, store, metrics){
+        super(client, logger, dateProvider, config, debugMaxGasLimit), this.client = client, this.address = address, this.signer = signer, this.store = store, this.metrics = metrics, this.txs = [];
         this.nonceManager = createNonceManager({
             source: jsonRpc()
         });
@@ -35,11 +36,19 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
         const minedBlockNumbers = this.txs.map((tx)=>tx.receipt?.blockNumber).filter((bn)=>bn !== undefined);
         return minedBlockNumbers.length === 0 ? undefined : maxBigint(...minedBlockNumbers);
     }
-    updateState(l1TxState, newState) {
+    async updateState(l1TxState, newState, l1Timestamp) {
         const oldState = l1TxState.status;
         l1TxState.status = newState;
         const sender = this.getSenderAddress().toString();
         this.logger.debug(`Tx state changed from ${TxUtilsState[oldState]} to ${TxUtilsState[newState]} for nonce ${l1TxState.nonce} account ${sender}`);
+        // Record metrics
+        if (newState === TxUtilsState.MINED && l1Timestamp !== undefined) {
+            this.metrics?.recordMinedTx(l1TxState, new Date(l1Timestamp));
+        } else if (newState === TxUtilsState.NOT_MINED) {
+            this.metrics?.recordDroppedTx(l1TxState);
+        }
+        // Update state in the store
+        await this.store?.saveState(sender, l1TxState).catch((err)=>this.logger.error('Failed to persist L1 tx state', err));
     }
     updateConfig(newConfig) {
         this.config = merge(this.config, newConfig);
@@ -53,6 +62,43 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
             address: this.getSenderAddress().toString()
         });
     }
+    /**
+   * Rehydrates transaction states from the store and resumes monitoring for pending transactions.
+   * This should be called on startup to restore state and resume monitoring of any in-flight transactions.
+   */ async loadStateAndResumeMonitoring() {
+        if (!this.store) {
+            return;
+        }
+        const account = this.getSenderAddress().toString();
+        const loadedStates = await this.store.loadStates(account);
+        if (loadedStates.length === 0) {
+            this.logger.debug(`No states to rehydrate for account ${account}`);
+            return;
+        }
+        // Convert loaded states (which have id) to the txs format
+        this.txs = loadedStates;
+        this.logger.info(`Rehydrated ${loadedStates.length} tx states for account ${account}`);
+        // Find all pending states and resume monitoring
+        const pendingStates = loadedStates.filter((state)=>!TerminalTxUtilsState.includes(state.status));
+        if (pendingStates.length === 0) {
+            return;
+        }
+        this.logger.info(`Resuming monitoring for ${pendingStates.length} pending transactions for account ${account}`, {
+            txs: pendingStates.map((s)=>({
+                    id: s.id,
+                    nonce: s.nonce,
+                    status: TxUtilsState[s.status]
+                }))
+        });
+        for (const state of pendingStates){
+            void this.monitorTransaction(state).catch((err)=>{
+                this.logger.error(`Error monitoring rehydrated tx with nonce ${state.nonce} for account ${account}`, formatViemError(err), {
+                    nonce: state.nonce,
+                    account
+                });
+            });
+        }
+    }
     async signTransaction(txRequest) {
         const signature = await this.signer(txRequest, this.getSenderAddress());
         return serializeTransaction(txRequest, signature);
@@ -86,53 +132,56 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
                 ...request
             });
             const gasPrice = await this.getGasPrice(gasConfig, !!blobInputs);
+            if (this.interrupted) {
+                throw new InterruptError(`Transaction sending is interrupted`);
+            }
             const nonce = await this.nonceManager.consume({
                 client: this.client,
                 address: account,
                 chainId: this.client.chain.id
             });
-            const baseTxData = {
-                ...request,
-                gas: gasLimit,
-                maxFeePerGas: gasPrice.maxFeePerGas,
-                maxPriorityFeePerGas: gasPrice.maxPriorityFeePerGas,
+            const baseState = {
+                request,
+                gasLimit,
+                blobInputs,
+                gasPrice,
                 nonce
             };
-            const txData = blobInputs ? {
-                ...baseTxData,
-                ...blobInputs,
-                maxFeePerBlobGas: gasPrice.maxFeePerBlobGas
-            } : baseTxData;
+            const txData = this.makeTxData(baseState, {
+                isCancelTx: false
+            });
             const now = new Date(await this.getL1Timestamp());
             if (gasConfig.txTimeoutAt && now > gasConfig.txTimeoutAt) {
                 throw new TimeoutError(`Transaction timed out before sending (now ${now.toISOString()} > timeoutAt ${gasConfig.txTimeoutAt.toISOString()})`);
             }
-            if (this.interrupted) {
-                throw new InterruptError(`Transaction sending is interrupted`);
-            }
+            // Send the new tx
             const signedRequest = await this.prepareSignedTransaction(txData);
             const txHash = await this.client.sendRawTransaction({
                 serializedTransaction: signedRequest
             });
+            // Create the new state for monitoring
             const l1TxState = {
+                ...baseState,
+                id: await this.store?.consumeNextStateId(account) ?? Math.max(...this.txs.map((tx)=>tx.id), 0),
                 txHashes: [
                     txHash
                 ],
                 cancelTxHashes: [],
-                gasPrice,
-                request,
                 status: TxUtilsState.IDLE,
-                nonce,
-                gasLimit,
                 txConfigOverrides: gasConfigOverrides ?? {},
-                blobInputs,
                 sentAtL1Ts: now,
                 lastSentAtL1Ts: now
             };
-            this.updateState(l1TxState, stateChange);
+            // And persist it
+            await this.updateState(l1TxState, stateChange);
+            await this.store?.saveBlobs(account, l1TxState.id, blobInputs);
             this.txs.push(l1TxState);
+            // Clean up stale states
             if (this.txs.length > MAX_L1_TX_STATES) {
-                this.txs.shift();
+                const removed = this.txs.shift();
+                if (removed && this.store) {
+                    await this.store.deleteState(account, removed.id);
+                }
             }
             this.logger.info(`Sent L1 transaction ${txHash}`, {
                 to: request.to,
@@ -236,7 +285,7 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
     /**
    * Monitors a transaction until completion, handling speed-ups if needed
    */ async monitorTransaction(state) {
-        const { request, nonce, gasLimit, blobInputs, txConfigOverrides: gasConfigOverrides } = state;
+        const { nonce, gasLimit, blobInputs, txConfigOverrides: gasConfigOverrides } = state;
         const gasConfig = merge(this.config, gasConfigOverrides);
         const { maxSpeedUpAttempts, stallTimeMs } = gasConfig;
         const isCancelTx = state.cancelTxHashes.length > 0;
@@ -244,7 +293,7 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
         const isBlobTx = !!blobInputs;
         const account = this.getSenderAddress().toString();
         const initialTxHash = txHashes[0];
-        let currentTxHash = initialTxHash;
+        let currentTxHash = txHashes.at(-1);
         let l1Timestamp;
         while(true){
             l1Timestamp = await this.getL1Timestamp();
@@ -265,13 +314,13 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
                     // We try getting the receipt twice, since sometimes anvil fails to return it if the tx has just been mined
                     const receipt = await this.tryGetTxReceipt(state.cancelTxHashes, nonce, true) ?? await this.tryGetTxReceipt(state.txHashes, nonce, false) ?? await sleep(500) ?? await this.tryGetTxReceipt(state.cancelTxHashes, nonce, true) ?? await this.tryGetTxReceipt(state.txHashes, nonce, false);
                     if (receipt) {
-                        this.updateState(state, TxUtilsState.MINED);
                         state.receipt = receipt;
+                        await this.updateState(state, TxUtilsState.MINED, l1Timestamp);
                         return receipt;
                     }
                     // If we get here then we have checked all of our tx versions and not found anything.
                     // We should consider the nonce as MINED
-                    this.updateState(state, TxUtilsState.MINED);
+                    await this.updateState(state, TxUtilsState.MINED, l1Timestamp);
                     throw new UnknownMinedTxError(nonce, account);
                 }
                 // If this is a cancel tx and its nonce is no longer on the mempool, we consider it dropped and stop monitoring
@@ -283,7 +332,7 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
                         pendingNonce,
                         timePassed
                     });
-                    this.updateState(state, TxUtilsState.NOT_MINED);
+                    await this.updateState(state, TxUtilsState.NOT_MINED);
                     this.nonceManager.reset({
                         address: account,
                         chainId: this.client.chain.id
@@ -308,25 +357,13 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
                             maxFeePerBlobGas: formatGwei(newGasPrice.maxFeePerBlobGas)
                         }
                     });
-                    const baseTxData = {
-                        ...request,
-                        gas: gasLimit,
-                        maxFeePerGas: newGasPrice.maxFeePerGas,
-                        maxPriorityFeePerGas: newGasPrice.maxPriorityFeePerGas,
-                        nonce
-                    };
-                    const txData = blobInputs ? {
-                        ...baseTxData,
-                        ...blobInputs,
-                        maxFeePerBlobGas: newGasPrice.maxFeePerBlobGas
-                    } : baseTxData;
+                    const txData = this.makeTxData(state, {
+                        isCancelTx
+                    });
                     const signedRequest = await this.prepareSignedTransaction(txData);
                     const newHash = await this.client.sendRawTransaction({
                         serializedTransaction: signedRequest
                     });
-                    if (!isCancelTx) {
-                        this.updateState(state, TxUtilsState.SPEED_UP);
-                    }
                     this.logger.verbose(`Sent L1 speed-up tx ${newHash} replacing ${currentTxHash} for nonce ${nonce} from ${account}`, {
                         nonce,
                         account,
@@ -341,6 +378,7 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
                     currentTxHash = newHash;
                     txHashes.push(currentTxHash);
                     state.lastSentAtL1Ts = new Date(l1Timestamp);
+                    await this.updateState(state, isCancelTx ? TxUtilsState.CANCELLED : TxUtilsState.SPEED_UP);
                     await sleep(gasConfig.checkIntervalMs);
                     continue;
                 }
@@ -374,7 +412,7 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
             // and reset the nonce manager, so the next tx that comes along can reuse the nonce if/when this tx gets dropped.
             // This is the nastiest scenario for us, since the new tx could acquire the next nonce, but then this tx is dropped,
             // and the new tx would never get mined. Eventually, the new tx would also drop.
-            this.updateState(state, TxUtilsState.NOT_MINED);
+            await this.updateState(state, TxUtilsState.NOT_MINED);
             this.nonceManager.reset({
                 address: account,
                 chainId: this.client.chain.id
@@ -382,8 +420,8 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
         } else {
             // Otherwise we fire the cancellation without awaiting to avoid blocking the caller,
             // and monitor it in the background so we can speed it up as needed.
-            void this.attemptTxCancellation(state).catch((err)=>{
-                this.updateState(state, TxUtilsState.NOT_MINED);
+            void this.attemptTxCancellation(state).catch(async (err)=>{
+                await this.updateState(state, TxUtilsState.NOT_MINED);
                 this.logger.error(`Failed to send cancellation for timed out tx ${initialTxHash} with nonce ${nonce}`, err, {
                     account,
                     nonce,
@@ -407,6 +445,41 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
         });
         throw new TimeoutError(`L1 transaction ${initialTxHash} timed out`);
     }
+    /**
+   * Creates tx data to be signed by viem signTransaction method, using the state as input.
+   * If isCancelTx is true, creates a 0-value tx to self with 21k gas and no data instead,
+   * and an empty blob input if the original tx also had blobs.
+   */ makeTxData(state, opts) {
+        const { request, gasLimit, blobInputs, gasPrice, nonce } = state;
+        const isBlobTx = blobInputs !== undefined;
+        const baseTxOpts = {
+            nonce,
+            ...pick(gasPrice, 'maxFeePerGas', 'maxPriorityFeePerGas')
+        };
+        if (opts.isCancelTx) {
+            const baseTxData = {
+                to: this.getSenderAddress().toString(),
+                value: 0n,
+                data: '0x',
+                gas: 21_000n,
+                ...baseTxOpts
+            };
+            return isBlobTx ? {
+                ...baseTxData,
+                ...this.makeEmptyBlobInputs(gasPrice.maxFeePerBlobGas)
+            } : baseTxData;
+        }
+        const baseTxData = {
+            ...request,
+            ...baseTxOpts,
+            gas: gasLimit
+        };
+        return blobInputs ? {
+            ...baseTxData,
+            ...blobInputs,
+            maxFeePerBlobGas: gasPrice.maxFeePerBlobGas
+        } : baseTxData;
+    }
     /** Returns when all monitor loops have stopped. */ async waitMonitoringStopped(timeoutSeconds = 10) {
         const account = this.getSenderAddress().toString();
         await retryUntil(()=>this.txs.every((tx)=>TerminalTxUtilsState.includes(tx.status)), `monitoring stopped for ${account}`, timeoutSeconds, 0.1).catch(()=>this.logger.warn(`Timeout waiting for monitoring loops to stop for ${account}`));
@@ -458,7 +531,7 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
                 nonce,
                 account
             });
-            this.updateState(state, TxUtilsState.NOT_MINED);
+            await this.updateState(state, TxUtilsState.NOT_MINED);
             this.nonceManager.reset({
                 address: account,
                 chainId: this.client.chain.id
@@ -476,7 +549,7 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
                 account,
                 currentNonce
             });
-            this.updateState(state, TxUtilsState.NOT_MINED);
+            await this.updateState(state, TxUtilsState.NOT_MINED);
             this.nonceManager.reset({
                 address: account,
                 chainId: this.client.chain.id
@@ -497,34 +570,21 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
                 maxFeePerBlobGas: formatGwei(maxFeePerBlobGas)
             }
         });
-        const request = {
-            to: this.getSenderAddress().toString(),
-            value: 0n
-        };
         // Send 0-value tx to self with higher gas price
-        const baseTxData = {
-            ...request,
-            nonce,
-            gas: 21_000n,
-            maxFeePerGas,
-            maxPriorityFeePerGas
-        };
-        const txData = isBlobTx ? {
-            ...baseTxData,
-            ...this.makeEmptyBlobInputs(maxFeePerBlobGas)
-        } : baseTxData;
+        state.gasPrice = cancelGasPrice;
+        state.lastSentAtL1Ts = new Date(await this.getL1Timestamp());
+        const txData = this.makeTxData(state, {
+            isCancelTx: true
+        });
         const signedRequest = await this.prepareSignedTransaction(txData);
         const cancelTxHash = await this.client.sendRawTransaction({
             serializedTransaction: signedRequest
         });
-        state.gasPrice = cancelGasPrice;
-        state.gasLimit = 21_000n;
         state.cancelTxHashes.push(cancelTxHash);
-        state.lastSentAtL1Ts = new Date(await this.getL1Timestamp());
-        this.updateState(state, TxUtilsState.CANCELLED);
+        await this.updateState(state, TxUtilsState.CANCELLED);
         this.logger.warn(`Sent cancellation tx ${cancelTxHash} for timed out tx from ${account} with nonce ${nonce}`, {
             nonce,
-            txData: baseTxData,
+            cancelGasPrice,
             isBlobTx,
             txHashes: state.txHashes
         });
@@ -537,7 +597,7 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
             });
         });
     }
-    async getL1Timestamp() {
+    /** Returns L1 timestamps in milliseconds */ async getL1Timestamp() {
         const { timestamp } = await this.client.getBlock({
             blockTag: 'latest',
             includeTransactions: false

package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts

@@ -1,8 +1,9 @@
-import { type Logger } from '@aztec/foundation/log';
+import type { Logger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
 import type { EthSigner } from '../eth-signer/eth-signer.js';
 import type { ExtendedViemWalletClient, ViemClient } from '../types.js';
 import type { L1TxUtilsConfig } from './config.js';
+import type { IL1TxMetrics, IL1TxStore } from './interfaces.js';
 import { L1TxUtils } from './l1_tx_utils.js';
 import type { L1BlobInputs } from './types.js';
 /** Extends L1TxUtils with the capability to cancel blobs. This needs to be a separate class so we don't require a dependency on blob-lib unnecessarily. */
@@ -10,6 +11,16 @@ export declare class L1TxUtilsWithBlobs extends L1TxUtils {
     /** Makes empty blob inputs for the cancellation tx. */
     protected makeEmptyBlobInputs(maxFeePerBlobGas: bigint): Required<L1BlobInputs>;
 }
-export declare function createL1TxUtilsWithBlobsFromViemWallet(client: ExtendedViemWalletClient, logger?: Logger, dateProvider?: DateProvider, config?: Partial<L1TxUtilsConfig>, debugMaxGasLimit?: boolean): L1TxUtilsWithBlobs;
-export declare function createL1TxUtilsWithBlobsFromEthSigner(client: ViemClient, signer: EthSigner, logger?: Logger, dateProvider?: DateProvider, config?: Partial<L1TxUtilsConfig>, debugMaxGasLimit?: boolean): L1TxUtilsWithBlobs;
+export declare function createL1TxUtilsWithBlobsFromViemWallet(client: ExtendedViemWalletClient, deps?: {
+    logger?: Logger;
+    dateProvider?: DateProvider;
+    store?: IL1TxStore;
+    metrics?: IL1TxMetrics;
+}, config?: Partial<L1TxUtilsConfig>, debugMaxGasLimit?: boolean): L1TxUtilsWithBlobs;
+export declare function createL1TxUtilsWithBlobsFromEthSigner(client: ViemClient, signer: EthSigner, deps?: {
+    logger?: Logger;
+    dateProvider?: DateProvider;
+    store?: IL1TxStore;
+    metrics?: IL1TxMetrics;
+}, config?: Partial<L1TxUtilsConfig>, debugMaxGasLimit?: boolean): L1TxUtilsWithBlobs;
 //# sourceMappingURL=l1_tx_utils_with_blobs.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"l1_tx_utils_with_blobs.d.ts","sourceRoot":"","sources":["../../src/l1_tx_utils/l1_tx_utils_with_blobs.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAIvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,KAAK,EAAE,wBAAwB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,KAAK,EAAE,YAAY,EAAmB,MAAM,YAAY,CAAC;AAEhE,2JAA2J;AAC3J,qBAAa,kBAAmB,SAAQ,SAAS;IAC/C,uDAAuD;cACpC,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,GAAG,QAAQ,CAAC,YAAY,CAAC;CAKzF;AAED,wBAAgB,sCAAsC,CACpD,MAAM,EAAE,wBAAwB,EAChC,MAAM,GAAE,MAAkC,EAC1C,YAAY,GAAE,YAAiC,EAC/C,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,EACjC,gBAAgB,GAAE,OAAe,sBAWlC;AAED,wBAAgB,qCAAqC,CACnD,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,SAAS,EACjB,MAAM,GAAE,MAAkC,EAC1C,YAAY,GAAE,YAAiC,EAC/C,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,EACjC,gBAAgB,GAAE,OAAe,sBAOlC"}
+{"version":3,"file":"l1_tx_utils_with_blobs.d.ts","sourceRoot":"","sources":["../../src/l1_tx_utils/l1_tx_utils_with_blobs.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAIvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,KAAK,EAAE,wBAAwB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,KAAK,EAAE,YAAY,EAAmB,MAAM,YAAY,CAAC;AAEhE,2JAA2J;AAC3J,qBAAa,kBAAmB,SAAQ,SAAS;IAC/C,uDAAuD;cACpC,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,GAAG,QAAQ,CAAC,YAAY,CAAC;CAKzF;AAED,wBAAgB,sCAAsC,CACpD,MAAM,EAAE,wBAAwB,EAChC,IAAI,GAAE;IACJ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,OAAO,CAAC,EAAE,YAAY,CAAC;CACnB,EACN,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,gBAAgB,GAAE,OAAe,sBAalC;AAED,wBAAgB,qCAAqC,CACnD,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,SAAS,EACjB,IAAI,GAAE;IACJ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,OAAO,CAAC,EAAE,YAAY,CAAC;CACnB,EACN,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,gBAAgB,GAAE,OAAe,sBAiBlC"}

package/dest/l1_tx_utils/l1_tx_utils_with_blobs.js

@@ -1,7 +1,5 @@
 import { Blob } from '@aztec/blob-lib';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { createLogger } from '@aztec/foundation/log';
-import { DateProvider } from '@aztec/foundation/timer';
 import { L1TxUtils } from './l1_tx_utils.js';
 import { createViemSigner } from './signer.js';
 /** Extends L1TxUtils with the capability to cancel blobs. This needs to be a separate class so we don't require a dependency on blob-lib unnecessarily. */ export class L1TxUtilsWithBlobs extends L1TxUtils {
@@ -17,12 +15,12 @@ import { createViemSigner } from './signer.js';
         };
     }
 }
-export function createL1TxUtilsWithBlobsFromViemWallet(client, logger = createLogger('L1TxUtils'), dateProvider = new DateProvider(), config, debugMaxGasLimit = false) {
-    return new L1TxUtilsWithBlobs(client, EthAddress.fromString(client.account.address), createViemSigner(client), logger, dateProvider, config, debugMaxGasLimit);
+export function createL1TxUtilsWithBlobsFromViemWallet(client, deps = {}, config = {}, debugMaxGasLimit = false) {
+    return new L1TxUtilsWithBlobs(client, EthAddress.fromString(client.account.address), createViemSigner(client), deps.logger, deps.dateProvider, config, debugMaxGasLimit, deps.store, deps.metrics);
 }
-export function createL1TxUtilsWithBlobsFromEthSigner(client, signer, logger = createLogger('L1TxUtils'), dateProvider = new DateProvider(), config, debugMaxGasLimit = false) {
+export function createL1TxUtilsWithBlobsFromEthSigner(client, signer, deps = {}, config = {}, debugMaxGasLimit = false) {
     const callback = async (transaction, _signingAddress)=>{
         return (await signer.signTransaction(transaction)).toViemTransactionSignature();
     };
-    return new L1TxUtilsWithBlobs(client, signer.address, callback, logger, dateProvider, config, debugMaxGasLimit);
+    return new L1TxUtilsWithBlobs(client, signer.address, callback, deps.logger, deps.dateProvider, config, debugMaxGasLimit, deps.store, deps.metrics);
 }

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

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

package/dest/l1_tx_utils/readonly_l1_tx_utils.js

@@ -14,7 +14,7 @@ export class ReadOnlyL1TxUtils {
     debugMaxGasLimit;
     config;
     interrupted;
-    constructor(client, logger = createLogger('ReadOnlyL1TxUtils'), dateProvider, config, debugMaxGasLimit = false){
+    constructor(client, logger = createLogger('ethereum:readonly-l1-utils'), dateProvider, config, debugMaxGasLimit = false){
         this.client = client;
         this.logger = logger;
         this.dateProvider = dateProvider;

package/dest/l1_tx_utils/types.d.ts

@@ -43,6 +43,7 @@ export declare enum TxUtilsState {
 }
 export declare const TerminalTxUtilsState: TxUtilsState[];
 export type L1TxState = {
+    id: number;
     txHashes: Hex[];
     cancelTxHashes: Hex[];
     gasLimit: bigint;

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,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"}
+{"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,EAAE,EAAE,MAAM,CAAC;IACX,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/publisher_manager.d.ts

@@ -7,6 +7,8 @@ export declare class PublisherManager<UtilsType extends L1TxUtils = L1TxUtils> {
     constructor(publishers: UtilsType[], config: {
         publisherAllowInvalidStates?: boolean;
     });
+    /** Loads the state of all publishers and resumes monitoring any pending txs */
+    loadState(): Promise<void>;
     getAvailablePublisher(filter?: PublisherFilter<UtilsType>): Promise<UtilsType>;
     interrupt(): void;
 }

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;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"}
+{"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,CAAqC;IAChD,OAAO,CAAC,MAAM,CAA4C;gBAGhD,UAAU,EAAE,SAAS,EAAE,EAC/B,MAAM,EAAE;QAAE,2BAA2B,CAAC,EAAE,OAAO,CAAA;KAAE;IAOnD,+EAA+E;IAClE,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAU1B,qBAAqB,CAAC,MAAM,GAAE,eAAe,CAAC,SAAS,CAAc,GAAG,OAAO,CAAC,SAAS,CAAC;IAiDhG,SAAS;CAGjB"}

package/dest/publisher_manager.js

@@ -27,11 +27,14 @@ export class PublisherManager {
     config;
     constructor(publishers, config){
         this.publishers = publishers;
-        this.log = createLogger('PublisherManager');
+        this.log = createLogger('publisher:manager');
         this.log.info(`PublisherManager initialized with ${publishers.length} publishers.`);
         this.publishers = publishers;
         this.config = pick(config, 'publisherAllowInvalidStates');
     }
+    /** Loads the state of all publishers and resumes monitoring any pending txs */ async loadState() {
+        await Promise.all(this.publishers.map((pub)=>pub.loadStateAndResumeMonitoring()));
+    }
     // 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
@@ -39,6 +42,13 @@ export class PublisherManager {
     // 4. Then priority based on highest balance
     // 5. Then priority based on least recently used
     async getAvailablePublisher(filter = ()=>true) {
+        this.log.debug(`Getting available publisher`, {
+            publishers: this.publishers.map((p)=>({
+                    address: p.getSenderAddress(),
+                    state: p.state,
+                    lastMined: p.lastMinedAtBlockNumber
+                }))
+        });
         // Extract the valid publishers
         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

package/package.json

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

package/src/config.ts

@@ -160,6 +160,8 @@ export const getGovernanceConfiguration = (networkName: NetworkNames) => {
   switch (networkName) {
     case 'local':
       return LocalGovernanceConfiguration;
+    case 'next-net':
+      return LocalGovernanceConfiguration;
     case 'staging-public':
       return StagingPublicGovernanceConfiguration;
     case 'testnet':
@@ -185,6 +187,7 @@ const DefaultRewardConfig = {
 export const getRewardConfig = (networkName: NetworkNames) => {
   switch (networkName) {
     case 'local':
+    case 'next-net':
     case 'staging-public':
     case 'testnet':
     case 'staging-ignition':
@@ -243,6 +246,8 @@ export const getEntryQueueConfig = (networkName: NetworkNames) => {
   switch (networkName) {
     case 'local':
       return LocalEntryQueueConfig;
+    case 'next-net':
+      return LocalEntryQueueConfig;
     case 'staging-public':
       return StagingPublicEntryQueueConfig;
     case 'testnet':

package/src/contracts/governance.ts

@@ -187,7 +187,7 @@ export class GovernanceContract extends ReadOnlyGovernanceContract {
     retries: number;
     logger: Logger;
   }) {
-    const l1TxUtils = createL1TxUtilsFromViemWallet(this.client, logger);
+    const l1TxUtils = createL1TxUtilsFromViemWallet(this.client, { logger });
     const retryDelaySeconds = 12;
 
     voteAmount = voteAmount ?? (await this.getPower());
@@ -244,7 +244,7 @@ export class GovernanceContract extends ReadOnlyGovernanceContract {
     retries: number;
     logger: Logger;
   }) {
-    const l1TxUtils = createL1TxUtilsFromViemWallet(this.client, logger);
+    const l1TxUtils = createL1TxUtilsFromViemWallet(this.client, { logger });
     const retryDelaySeconds = 12;
     let success = false;
     for (let i = 0; i < retries; i++) {

package/src/deploy_l1_contracts.ts

@@ -147,8 +147,8 @@ export type VerificationRecord = {
 export interface DeployL1ContractsArgs extends Omit<L1ContractsConfig, keyof L1TxUtilsConfig> {
   /** The vk tree root. */
   vkTreeRoot: Fr;
-  /** The protocol contract tree root. */
-  protocolContractTreeRoot: Fr;
+  /** The hash of the protocol contracts. */
+  protocolContractsHash: Fr;
   /** The genesis root of the archive tree. */
   genesisArchiveRoot: Fr;
   /** The salt for CREATE2 deployment. */
@@ -657,7 +657,7 @@ export const deployRollup = async (
 
   const genesisStateArgs = {
     vkTreeRoot: args.vkTreeRoot.toString(),
-    protocolContractTreeRoot: args.protocolContractTreeRoot.toString(),
+    protocolContractsHash: args.protocolContractsHash.toString(),
     genesisArchiveRoot: args.genesisArchiveRoot.toString(),
   };
 
@@ -1473,10 +1473,8 @@ export class L1Deployer {
     this.salt = maybeSalt ? padHex(numberToHex(maybeSalt), { size: 32 }) : undefined;
     this.l1TxUtils = createL1TxUtilsFromViemWallet(
       this.client,
-      this.logger,
-      dateProvider,
-      this.txUtilsConfig,
-      this.acceleratedTestDeployments,
+      { logger: this.logger, dateProvider },
+      { ...this.txUtilsConfig, debugMaxGasLimit: acceleratedTestDeployments },
     );
   }
 
@@ -1604,7 +1602,11 @@ export async function deployL1Contract(
 
   if (!l1TxUtils) {
     const config = getL1TxUtilsConfigEnvVars();
-    l1TxUtils = createL1TxUtilsFromViemWallet(extendedClient, logger, undefined, config, acceleratedTestDeployments);
+    l1TxUtils = createL1TxUtilsFromViemWallet(
+      extendedClient,
+      { logger },
+      { ...config, debugMaxGasLimit: acceleratedTestDeployments },
+    );
   }
 
   if (libraries) {