@aztec/ethereum 3.0.0-nightly.20251214 → 3.0.0-nightly.20251217

package/dest/l1_tx_utils/readonly_l1_tx_utils.js

@@ -1,4 +1,4 @@
-import { getKeys, median, merge, pick, 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';
@@ -6,8 +6,10 @@ import pickBy from 'lodash.pickby';
 import { MethodNotFoundRpcError, MethodNotSupportedRpcError, decodeErrorResult, formatGwei, getContractError, hexToBytes } from 'viem';
 import { defaultL1TxUtilsConfig, l1TxUtilsConfigMappings } from './config.js';
 import { BLOCK_TIME_MS, LARGE_GAS_LIMIT, MIN_BLOB_REPLACEMENT_BUMP_PERCENTAGE, MIN_REPLACEMENT_BUMP_PERCENTAGE, WEI_CONST } from './constants.js';
+import { P75AllTxsPriorityFeeStrategy } from './fee-strategies/index.js';
 import { getCalldataGasUsage, tryGetCustomErrorNameContractFunction } from './utils.js';
-const HISTORICAL_BLOCK_COUNT = 5;
+// Change this to the current strategy we want to use
+const CurrentStrategy = P75AllTxsPriorityFeeStrategy;
 export class ReadOnlyL1TxUtils {
     client;
     logger;
@@ -36,119 +38,32 @@ export class ReadOnlyL1TxUtils {
         return this.client.getBlockNumber();
     }
     /**
-   * Analyzes pending transactions and recent fee history to determine a competitive priority fee.
-   * Falls back to network estimate if data is unavailable or fails.
-   * @param networkEstimateResult - Result from estimateMaxPriorityFeePerGas RPC call
-   * @param pendingBlockResult - Result from getBlock with pending tag RPC call
-   * @param feeHistoryResult - Result from getFeeHistory RPC call
-   * @returns A competitive priority fee based on pending txs and recent block history
-   */ getCompetitivePriorityFee(networkEstimateResult, pendingBlockResult, feeHistoryResult) {
-        const networkEstimate = networkEstimateResult.status === 'fulfilled' && typeof networkEstimateResult.value === 'bigint' ? networkEstimateResult.value : 0n;
-        let competitiveFee = networkEstimate;
-        if (pendingBlockResult.status === 'fulfilled' && pendingBlockResult.value !== null && pendingBlockResult.value.transactions && pendingBlockResult.value.transactions.length > 0) {
-            const pendingBlock = pendingBlockResult.value;
-            // Extract priority fees from pending transactions
-            const pendingFees = pendingBlock.transactions.map((tx)=>{
-                // Transaction can be just a hash string, so we need to check if it's an object
-                if (typeof tx === 'string') {
-                    return 0n;
-                }
-                const fee = tx.maxPriorityFeePerGas || 0n;
-                // Debug: Log suspicious fees
-                if (fee > 100n * WEI_CONST) {
-                    this.logger?.warn('Suspicious high priority fee in pending tx', {
-                        txHash: tx.hash,
-                        maxPriorityFeePerGas: formatGwei(fee),
-                        maxFeePerGas: formatGwei(tx.maxFeePerGas || 0n),
-                        maxFeePerBlobGas: tx.maxFeePerBlobGas ? formatGwei(tx.maxFeePerBlobGas) : 'N/A'
-                    });
-                }
-                return fee;
-            }).filter((fee)=>fee > 0n);
-            if (pendingFees.length > 0) {
-                // Use 75th percentile of pending fees to be competitive
-                const sortedPendingFees = [
-                    ...pendingFees
-                ].sort((a, b)=>a < b ? -1 : a > b ? 1 : 0);
-                const percentile75Index = Math.floor((sortedPendingFees.length - 1) * 0.75);
-                const pendingCompetitiveFee = sortedPendingFees[percentile75Index];
-                if (pendingCompetitiveFee > competitiveFee) {
-                    competitiveFee = pendingCompetitiveFee;
-                }
-                this.logger?.debug('Analyzed pending transactions for competitive pricing', {
-                    pendingTxCount: pendingFees.length,
-                    pendingP75: formatGwei(pendingCompetitiveFee)
-                });
-            }
-        }
-        if (feeHistoryResult.status === 'fulfilled' && feeHistoryResult.value !== null && feeHistoryResult.value.reward && feeHistoryResult.value.reward.length > 0) {
-            const feeHistory = feeHistoryResult.value;
-            // Extract 75th percentile fees from each block
-            const percentile75Fees = feeHistory.reward.map((rewards)=>rewards[0] || 0n).filter((fee)=>fee > 0n);
-            if (percentile75Fees.length > 0) {
-                // Calculate median of the 75th percentile fees across blocks
-                const medianHistoricalFee = median(percentile75Fees) ?? 0n;
-                // Debug: Log suspicious fees from history
-                if (medianHistoricalFee > 100n * WEI_CONST) {
-                    this.logger?.warn('Suspicious high fee in history', {
-                        historicalMedian: formatGwei(medianHistoricalFee),
-                        allP75Fees: percentile75Fees.map((f)=>formatGwei(f))
-                    });
-                }
-                if (medianHistoricalFee > competitiveFee) {
-                    competitiveFee = medianHistoricalFee;
-                }
-                this.logger?.debug('Analyzed fee history for competitive pricing', {
-                    historicalMedian: formatGwei(medianHistoricalFee)
-                });
-            }
-        }
-        // Sanity check: cap competitive fee at 100x network estimate to avoid using unrealistic fees
-        // (e.g., Anvil returns inflated historical fees that don't reflect actual network conditions)
-        const maxReasonableFee = networkEstimate * 100n;
-        if (competitiveFee > maxReasonableFee) {
-            this.logger?.warn('Competitive fee exceeds sanity cap, using capped value', {
-                competitiveFee: formatGwei(competitiveFee),
-                networkEstimate: formatGwei(networkEstimate),
-                cappedTo: formatGwei(maxReasonableFee)
-            });
-            competitiveFee = maxReasonableFee;
-        }
-        // Log final decision
-        if (competitiveFee > networkEstimate) {
-            this.logger?.debug('Using competitive fee from market analysis', {
-                networkEstimate: formatGwei(networkEstimate),
-                competitive: formatGwei(competitiveFee)
-            });
-        }
-        return competitiveFee;
-    }
-    /**
    * Gets the current gas price with bounds checking
    */ async getGasPrice(gasConfigOverrides, isBlobTx = false, attempt = 0, previousGasPrice) {
         const gasConfig = merge(this.config, gasConfigOverrides);
         // Make all RPC calls in parallel upfront with retry logic
+        // First 2 calls are necessary to complete
         const latestBlockPromise = this.tryTwice(()=>this.client.getBlock({
                 blockTag: 'latest'
             }), 'Getting latest block');
-        const networkEstimatePromise = this.tryTwice(()=>this.client.estimateMaxPriorityFeePerGas(), 'Estimating max priority fee per gas');
-        const pendingBlockPromise = this.tryTwice(()=>this.client.getBlock({
-                blockTag: 'pending',
-                includeTransactions: true
-            }), 'Getting pending block');
-        const feeHistoryPromise = this.tryTwice(()=>this.client.getFeeHistory({
-                blockCount: HISTORICAL_BLOCK_COUNT,
-                rewardPercentiles: [
-                    75
-                ]
-            }), 'Getting fee history');
-        const blobBaseFeePromise = isBlobTx ? this.tryTwice(()=>this.client.getBlobBaseFee(), 'Getting blob base fee') : null;
-        const [latestBlockResult, networkEstimateResult, pendingBlockResult, feeHistoryResult, blobBaseFeeResult] = await Promise.allSettled([
+        let blobBaseFeePromise = null;
+        if (isBlobTx) {
+            blobBaseFeePromise = this.tryTwice(()=>this.client.getBlobBaseFee(), 'Getting blob base fee');
+        }
+        // Get strategy promises for priority fee calculation
+        const strategyPromises = CurrentStrategy.getRequiredPromises(this.client, {
+            isBlobTx
+        });
+        const strategyPromiseKeys = [];
+        const strategyPromisesArr = [];
+        for (const [key, promise] of Object.entries(strategyPromises)){
+            strategyPromiseKeys.push(key);
+            strategyPromisesArr.push(this.tryTwice(()=>promise, `Getting strategy data for ${key}`));
+        }
+        const [latestBlockResult, blobBaseFeeResult, ...strategyResults] = await Promise.allSettled([
             latestBlockPromise,
-            networkEstimatePromise,
-            pendingBlockPromise,
-            feeHistoryPromise,
-            blobBaseFeePromise ?? Promise.resolve(0n)
+            blobBaseFeePromise ?? Promise.resolve(0n),
+            ...strategyPromisesArr
         ]);
         // Extract results
         const baseFee = latestBlockResult.status === 'fulfilled' && typeof latestBlockResult.value === 'object' && latestBlockResult.value.baseFeePerGas ? latestBlockResult.value.baseFeePerGas : 0n;
@@ -159,22 +74,29 @@ export class ReadOnlyL1TxUtils {
         } else if (isBlobTx) {
             this.logger?.warn('Failed to get L1 blob base fee', attempt);
         }
-        // Get competitive priority fee
-        let priorityFee = this.getCompetitivePriorityFee(networkEstimateResult, pendingBlockResult, feeHistoryResult);
-        // Apply minimum priority fee as a floor if configured
+        let priorityFee;
+        // Get competitive priority fee using strategy
+        // Reconstruct the results object with the same keys as the promises
+        const resultsObject = {};
+        strategyPromiseKeys.forEach((key, index)=>{
+            resultsObject[key] = strategyResults[index];
+        });
+        const result = CurrentStrategy.calculate(resultsObject, {
+            gasConfig,
+            isBlobTx,
+            logger: this.logger
+        });
+        priorityFee = result.priorityFee;
+        // Apply minimum priority fee floor if configured
         if (gasConfig.minimumPriorityFeePerGas) {
-            const minimumFee = BigInt(Math.trunc(gasConfig.minimumPriorityFeePerGas * Number(WEI_CONST)));
-            if (minimumFee > priorityFee) {
-                this.logger?.debug('Using minimum priority fee as floor', {
-                    minimumPriorityFeePerGas: formatGwei(minimumFee),
-                    competitiveFee: formatGwei(priorityFee)
-                });
-                priorityFee = minimumFee;
-            } else {
-                this.logger?.debug('Competitive fee exceeds minimum, using competitive fee', {
-                    minimumPriorityFeePerGas: formatGwei(minimumFee),
-                    competitiveFee: formatGwei(priorityFee)
+            const minimumPriorityFee = BigInt(Math.trunc(gasConfig.minimumPriorityFeePerGas * Number(WEI_CONST)));
+            if (priorityFee < minimumPriorityFee) {
+                this.logger?.debug('Applying minimum priority fee floor', {
+                    calculatedPriorityFee: formatGwei(priorityFee),
+                    minimumPriorityFeePerGas: gasConfig.minimumPriorityFeePerGas,
+                    appliedFee: formatGwei(minimumPriorityFee)
                 });
+                priorityFee = minimumPriorityFee;
             }
         }
         let maxFeePerGas = baseFee;

package/dest/utils.d.ts

@@ -1,6 +1,6 @@
 import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { Logger } from '@aztec/foundation/log';
-import { type Abi, type ContractEventName, type DecodeEventLogReturnType, type Hex, type Log } from 'viem';
+import { type Abi, type ContractEventName, type DecodeEventLogReturnType, type FormattedTransaction, type Hex, type Log } from 'viem';
 export interface L2Claim {
     claimSecret: Fr;
     claimAmount: Fr;
@@ -22,4 +22,16 @@ export declare function prettyLogViemErrorMsg(err: any): any;
  */
 export declare function formatViemError(error: any, abi?: Abi): FormattedViemError;
 export declare function tryGetCustomErrorName(err: any): string | undefined;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUdwRCxPQUFPLEVBQ0wsS0FBSyxHQUFHLEVBRVIsS0FBSyxpQkFBaUIsRUFFdEIsS0FBSyx3QkFBd0IsRUFDN0IsS0FBSyxHQUFHLEVBQ1IsS0FBSyxHQUFHLEVBR1QsTUFBTSxNQUFNLENBQUM7QUFFZCxNQUFNLFdBQVcsT0FBTztJQUN0QixXQUFXLEVBQUUsRUFBRSxDQUFDO0lBQ2hCLFdBQVcsRUFBRSxFQUFFLENBQUM7SUFDaEIsV0FBVyxFQUFFLEdBQUcsQ0FBQztJQUNqQixnQkFBZ0IsRUFBRSxNQUFNLENBQUM7Q0FDMUI7QUFFRCxxQkFBYSxrQkFBbUIsU0FBUSxLQUFLO0lBQzNDLFlBQVksQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDO0lBRXJCLFlBQVksT0FBTyxFQUFFLE1BQU0sRUFBRSxZQUFZLENBQUMsRUFBRSxHQUFHLEVBQUUsRUFJaEQ7Q0FDRjtBQUVELHdCQUFnQixZQUFZLENBQzFCLEtBQUssQ0FBQyxJQUFJLFNBQVMsR0FBRyxHQUFHLFNBQVMsT0FBTyxFQUFFLEVBQzNDLFVBQVUsU0FBUyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsRUFDMUMsVUFBVSxHQUFHLHdCQUF3QixDQUFDLElBQUksRUFBRSxVQUFVLEVBQUUsR0FBRyxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksQ0FBQyxFQUUvRSxJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQ1gsT0FBTyxFQUFFLEdBQUcsRUFDWixHQUFHLEVBQUUsSUFBSSxFQUNULFNBQVMsRUFBRSxVQUFVLEVBQ3JCLE1BQU0sQ0FBQyxFQUFFLENBQUMsR0FBRyxFQUFFLFVBQVUsS0FBSyxPQUFPLEVBQ3JDLE1BQU0sQ0FBQyxFQUFFLE1BQU0sR0FDZCxVQUFVLENBTVo7QUFFRCx3QkFBZ0IsZUFBZSxDQUM3QixLQUFLLENBQUMsSUFBSSxTQUFTLEdBQUcsR0FBRyxTQUFTLE9BQU8sRUFBRSxFQUMzQyxVQUFVLFNBQVMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLEVBQzFDLFVBQVUsR0FBRyx3QkFBd0IsQ0FBQyxJQUFJLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxFQUFFLFNBQVMsRUFBRSxJQUFJLENBQUMsRUFFL0UsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUNYLE9BQU8sRUFBRSxHQUFHLEVBQ1osR0FBRyxFQUFFLElBQUksRUFDVCxTQUFTLEVBQUUsVUFBVSxFQUNyQixNQUFNLENBQUMsRUFBRSxDQUFDLEdBQUcsRUFBRSxVQUFVLEtBQUssT0FBTyxFQUNyQyxNQUFNLENBQUMsRUFBRSxNQUFNLEdBQ2QsVUFBVSxHQUFHLFNBQVMsQ0FnQnhCO0FBRUQsd0JBQWdCLHFCQUFxQixDQUFDLEdBQUcsRUFBRSxHQUFHLE9BVzdDO0FBMEJEOzs7OztHQUtHO0FBQ0gsd0JBQWdCLGVBQWUsQ0FBQyxLQUFLLEVBQUUsR0FBRyxFQUFFLEdBQUcsR0FBRSxHQUFlLEdBQUcsa0JBQWtCLENBd0VwRjtBQXlCRCx3QkFBZ0IscUJBQXFCLENBQUMsR0FBRyxFQUFFLEdBQUcsc0JBYTdDIn0=
+/**
+ * Type guard to check if a transaction is a blob transaction (EIP-4844).
+ * Blob transactions have maxFeePerBlobGas and blobVersionedHashes fields.
+ */
+export declare function isBlobTransaction(tx: FormattedTransaction): tx is FormattedTransaction & {
+    maxFeePerBlobGas: bigint;
+    blobVersionedHashes: readonly Hex[];
+};
+/**
+ * Calculates a percentile from an array of bigints
+ */
+export declare function calculatePercentile(values: bigint[], percentile: number): bigint;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUdwRCxPQUFPLEVBQ0wsS0FBSyxHQUFHLEVBRVIsS0FBSyxpQkFBaUIsRUFFdEIsS0FBSyx3QkFBd0IsRUFDN0IsS0FBSyxvQkFBb0IsRUFDekIsS0FBSyxHQUFHLEVBQ1IsS0FBSyxHQUFHLEVBR1QsTUFBTSxNQUFNLENBQUM7QUFFZCxNQUFNLFdBQVcsT0FBTztJQUN0QixXQUFXLEVBQUUsRUFBRSxDQUFDO0lBQ2hCLFdBQVcsRUFBRSxFQUFFLENBQUM7SUFDaEIsV0FBVyxFQUFFLEdBQUcsQ0FBQztJQUNqQixnQkFBZ0IsRUFBRSxNQUFNLENBQUM7Q0FDMUI7QUFFRCxxQkFBYSxrQkFBbUIsU0FBUSxLQUFLO0lBQzNDLFlBQVksQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDO0lBRXJCLFlBQVksT0FBTyxFQUFFLE1BQU0sRUFBRSxZQUFZLENBQUMsRUFBRSxHQUFHLEVBQUUsRUFJaEQ7Q0FDRjtBQUVELHdCQUFnQixZQUFZLENBQzFCLEtBQUssQ0FBQyxJQUFJLFNBQVMsR0FBRyxHQUFHLFNBQVMsT0FBTyxFQUFFLEVBQzNDLFVBQVUsU0FBUyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsRUFDMUMsVUFBVSxHQUFHLHdCQUF3QixDQUFDLElBQUksRUFBRSxVQUFVLEVBQUUsR0FBRyxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksQ0FBQyxFQUUvRSxJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQ1gsT0FBTyxFQUFFLEdBQUcsRUFDWixHQUFHLEVBQUUsSUFBSSxFQUNULFNBQVMsRUFBRSxVQUFVLEVBQ3JCLE1BQU0sQ0FBQyxFQUFFLENBQUMsR0FBRyxFQUFFLFVBQVUsS0FBSyxPQUFPLEVBQ3JDLE1BQU0sQ0FBQyxFQUFFLE1BQU0sR0FDZCxVQUFVLENBTVo7QUFFRCx3QkFBZ0IsZUFBZSxDQUM3QixLQUFLLENBQUMsSUFBSSxTQUFTLEdBQUcsR0FBRyxTQUFTLE9BQU8sRUFBRSxFQUMzQyxVQUFVLFNBQVMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLEVBQzFDLFVBQVUsR0FBRyx3QkFBd0IsQ0FBQyxJQUFJLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxFQUFFLFNBQVMsRUFBRSxJQUFJLENBQUMsRUFFL0UsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUNYLE9BQU8sRUFBRSxHQUFHLEVBQ1osR0FBRyxFQUFFLElBQUksRUFDVCxTQUFTLEVBQUUsVUFBVSxFQUNyQixNQUFNLENBQUMsRUFBRSxDQUFDLEdBQUcsRUFBRSxVQUFVLEtBQUssT0FBTyxFQUNyQyxNQUFNLENBQUMsRUFBRSxNQUFNLEdBQ2QsVUFBVSxHQUFHLFNBQVMsQ0FnQnhCO0FBRUQsd0JBQWdCLHFCQUFxQixDQUFDLEdBQUcsRUFBRSxHQUFHLE9BVzdDO0FBMEJEOzs7OztHQUtHO0FBQ0gsd0JBQWdCLGVBQWUsQ0FBQyxLQUFLLEVBQUUsR0FBRyxFQUFFLEdBQUcsR0FBRSxHQUFlLEdBQUcsa0JBQWtCLENBd0VwRjtBQXlCRCx3QkFBZ0IscUJBQXFCLENBQUMsR0FBRyxFQUFFLEdBQUcsc0JBYTdDO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQWdCLGlCQUFpQixDQUFDLEVBQUUsRUFBRSxvQkFBb0IsR0FBRyxFQUFFLElBQUksb0JBQW9CLEdBQUc7SUFDeEYsZ0JBQWdCLEVBQUUsTUFBTSxDQUFDO0lBQ3pCLG1CQUFtQixFQUFFLFNBQVMsR0FBRyxFQUFFLENBQUM7Q0FDckMsQ0FPQTtBQUVEOztHQUVHO0FBQ0gsd0JBQWdCLG1CQUFtQixDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsRUFBRSxVQUFVLEVBQUUsTUFBTSxHQUFHLE1BQU0sQ0FPaEYifQ==

package/dest/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EACL,KAAK,GAAG,EAER,KAAK,iBAAiB,EAEtB,KAAK,wBAAwB,EAC7B,KAAK,GAAG,EACR,KAAK,GAAG,EAGT,MAAM,MAAM,CAAC;AAEd,MAAM,WAAW,OAAO;IACtB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,GAAG,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC;IAErB,YAAY,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,GAAG,EAAE,EAIhD;CACF;AAED,wBAAgB,YAAY,CAC1B,KAAK,CAAC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EAC3C,UAAU,SAAS,iBAAiB,CAAC,IAAI,CAAC,EAC1C,UAAU,GAAG,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAE/E,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,UAAU,EACrB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,EACrC,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,CAMZ;AAED,wBAAgB,eAAe,CAC7B,KAAK,CAAC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EAC3C,UAAU,SAAS,iBAAiB,CAAC,IAAI,CAAC,EAC1C,UAAU,GAAG,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAE/E,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,UAAU,EACrB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,EACrC,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,GAAG,SAAS,CAgBxB;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,OAW7C;AA0BD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,GAAE,GAAe,GAAG,kBAAkB,CAwEpF;AAyBD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,sBAa7C"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EACL,KAAK,GAAG,EAER,KAAK,iBAAiB,EAEtB,KAAK,wBAAwB,EAC7B,KAAK,oBAAoB,EACzB,KAAK,GAAG,EACR,KAAK,GAAG,EAGT,MAAM,MAAM,CAAC;AAEd,MAAM,WAAW,OAAO;IACtB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,GAAG,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC;IAErB,YAAY,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,GAAG,EAAE,EAIhD;CACF;AAED,wBAAgB,YAAY,CAC1B,KAAK,CAAC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EAC3C,UAAU,SAAS,iBAAiB,CAAC,IAAI,CAAC,EAC1C,UAAU,GAAG,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAE/E,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,UAAU,EACrB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,EACrC,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,CAMZ;AAED,wBAAgB,eAAe,CAC7B,KAAK,CAAC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EAC3C,UAAU,SAAS,iBAAiB,CAAC,IAAI,CAAC,EAC1C,UAAU,GAAG,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAE/E,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,UAAU,EACrB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,EACrC,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,GAAG,SAAS,CAgBxB;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,OAW7C;AA0BD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,GAAE,GAAe,GAAG,kBAAkB,CAwEpF;AAyBD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,sBAa7C;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,oBAAoB,GAAG,EAAE,IAAI,oBAAoB,GAAG;IACxF,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,SAAS,GAAG,EAAE,CAAC;CACrC,CAOA;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAOhF"}

package/dest/utils.js

@@ -162,3 +162,21 @@ export function tryGetCustomErrorName(err) {
         return undefined;
     }
 }
+/**
+ * Type guard to check if a transaction is a blob transaction (EIP-4844).
+ * Blob transactions have maxFeePerBlobGas and blobVersionedHashes fields.
+ */ export function isBlobTransaction(tx) {
+    return 'maxFeePerBlobGas' in tx && tx.maxFeePerBlobGas !== undefined && 'blobVersionedHashes' in tx && tx.blobVersionedHashes !== undefined;
+}
+/**
+ * Calculates a percentile from an array of bigints
+ */ export function calculatePercentile(values, percentile) {
+    if (values.length === 0) {
+        return 0n;
+    }
+    const sorted = [
+        ...values
+    ].sort((a, b)=>a < b ? -1 : a > b ? 1 : 0);
+    const index = Math.ceil((sorted.length - 1) * (percentile / 100));
+    return sorted[index];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/ethereum",
-  "version": "3.0.0-nightly.20251214",
+  "version": "3.0.0-nightly.20251217",
   "type": "module",
   "exports": {
     "./account": "./dest/account.js",
@@ -17,6 +17,7 @@
     "./forwarder-proxy": "./dest/forwarder_proxy.js",
     "./l1-artifacts": "./dest/l1_artifacts.js",
     "./l1-contract-addresses": "./dest/l1_contract_addresses.js",
+    "./l1-fee-analysis": "./dest/l1_tx_utils/l1_fee_analyzer.js",
     "./l1-reader": "./dest/l1_reader.js",
     "./l1-tx-utils": "./dest/l1_tx_utils/index.js",
     "./l1-tx-utils-with-blobs": "./dest/l1_tx_utils/index-blobs.js",
@@ -48,10 +49,10 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/blob-lib": "3.0.0-nightly.20251214",
-    "@aztec/constants": "3.0.0-nightly.20251214",
-    "@aztec/foundation": "3.0.0-nightly.20251214",
-    "@aztec/l1-artifacts": "3.0.0-nightly.20251214",
+    "@aztec/blob-lib": "3.0.0-nightly.20251217",
+    "@aztec/constants": "3.0.0-nightly.20251217",
+    "@aztec/foundation": "3.0.0-nightly.20251217",
+    "@aztec/l1-artifacts": "3.0.0-nightly.20251217",
     "@viem/anvil": "^0.0.10",
     "dotenv": "^16.0.3",
     "lodash.chunk": "^4.2.0",

package/src/deploy_aztec_l1_contracts.ts

@@ -10,7 +10,9 @@ import { fileURLToPath } from '@aztec/foundation/url';
 import { bn254 } from '@noble/curves/bn254';
 import type { Abi, Narrow } from 'abitype';
 import { spawn } from 'child_process';
-import { dirname, resolve } from 'path';
+import { cp, mkdtemp, rm } from 'fs/promises';
+import { tmpdir } from 'os';
+import { dirname, join, resolve } from 'path';
 import readline from 'readline';
 import type { Hex } from 'viem';
 import { foundry, mainnet } from 'viem/chains';
@@ -75,6 +77,17 @@ function runProcess<T>(
   return promise;
 }
 
+/**
+ * Copies the foundry cache folder to a temporary location to avoid conflicts when running forge in parallel.
+ * The cache folder is small metadata that links to the out folder, so this is a fast operation.
+ */
+async function copyFoundryCacheToTemp(l1ContractsPath: string): Promise<string> {
+  const cacheFolder = join(l1ContractsPath, 'cache');
+  const tempCacheFolder = await mkdtemp(join(tmpdir(), 'foundry-cache-'));
+  await cp(cacheFolder, tempCacheFolder, { recursive: true });
+  return tempCacheFolder;
+}
+
 // Covers an edge where where we may have a cached BlobLib that is not meant for production.
 // Despite the profile apparently sometimes cached code remains (so says Lasse after his ignition-monorepo arc).
 async function maybeForgeForceProductionBuild(l1ContractsPath: string, script: string, chainId: number) {
@@ -203,6 +216,7 @@ export async function deployAztecL1Contracts(
   privateKey: `0x${string}`,
   chainId: number,
   args: DeployAztecL1ContractsArgs,
+  verifyContracts = false,
 ): Promise<DeployAztecL1ContractsReturnType> {
   logger.info(`Deploying L1 contracts with config: ${jsonStringify(args)}`);
   if (args.initialValidators && args.initialValidators.length > 0 && args.existingTokenAddress) {
@@ -246,90 +260,101 @@ export async function deployAztecL1Contracts(
   const FORGE_SCRIPT = 'script/deploy/DeployAztecL1Contracts.s.sol';
   await maybeForgeForceProductionBuild(l1ContractsPath, FORGE_SCRIPT, chainId);
 
-  // From heuristic testing. More caused issues with anvil.
-  const MAGIC_ANVIL_BATCH_SIZE = 12;
-  // Anvil seems to stall with unbounded batch size. Otherwise no max batch size is desirable.
-  // On sepolia and mainnet, we verify on etherscan (if etherscan API key is in env)
-  const forgeArgs = [
-    'script',
-    FORGE_SCRIPT,
-    '--sig',
-    'run()',
-    '--private-key',
-    privateKey,
-    '--rpc-url',
-    rpcUrl,
-    '--broadcast',
-    ...(chainId === foundry.id ? ['--batch-size', MAGIC_ANVIL_BATCH_SIZE.toString()] : ['--verify']),
-  ];
-  const forgeEnv = {
-    // Env vars required by l1-contracts/script/deploy/DeploymentConfiguration.sol.
-    NETWORK: getActiveNetworkName(),
-    FOUNDRY_PROFILE: chainId === mainnet.id ? 'production' : undefined,
-    ...getDeployAztecL1ContractsEnvVars(args),
-  };
-  const result = await runProcess<ForgeL1ContractsDeployResult>('forge', forgeArgs, forgeEnv, l1ContractsPath);
-  if (!result) {
-    throw new Error('Forge script did not output deployment result');
-  }
-  logger.info(`Deployed L1 contracts with L1 addresses: ${jsonStringify(result)}`);
-
-  const rollup = new RollupContract(l1Client, result.rollupAddress);
+  // Copy cache to temp location to avoid conflicts when running forge in parallel
+  const tempCachePath = await copyFoundryCacheToTemp(l1ContractsPath);
+
+  try {
+    // From heuristic testing. More caused issues with anvil.
+    const MAGIC_ANVIL_BATCH_SIZE = 12;
+    // Anvil seems to stall with unbounded batch size. Otherwise no max batch size is desirable.
+    // On sepolia and mainnet, we verify on etherscan (if etherscan API key is in env)
+    const forgeArgs = [
+      'script',
+      FORGE_SCRIPT,
+      '--sig',
+      'run()',
+      '--private-key',
+      privateKey,
+      '--rpc-url',
+      rpcUrl,
+      '--broadcast',
+      ...(chainId === foundry.id ? ['--batch-size', MAGIC_ANVIL_BATCH_SIZE.toString()] : []),
+      ...(verifyContracts ? ['--verify'] : []),
+    ];
+    const forgeEnv = {
+      // Protect against root leaving deployment files in docker that cannot be used later.
+      FOUNDRY_BROADCAST: process.getuid?.() === 0 ? 'broadcast-root' : tempCachePath,
+      // Env vars required by l1-contracts/script/deploy/DeploymentConfiguration.sol.
+      NETWORK: getActiveNetworkName(),
+      FOUNDRY_PROFILE: chainId === mainnet.id ? 'production' : undefined,
+      FOUNDRY_CACHE_PATH: tempCachePath,
+      ...getDeployAztecL1ContractsEnvVars(args),
+    };
+    const result = await runProcess<ForgeL1ContractsDeployResult>('forge', forgeArgs, forgeEnv, l1ContractsPath);
+    if (!result) {
+      throw new Error('Forge script did not output deployment result');
+    }
+    logger.info(`Deployed L1 contracts with L1 addresses: ${jsonStringify(result)}`);
 
-  if (isAnvilTestChain(chainId)) {
-    // @note  We make a time jump PAST the very first slot to not have to deal with the edge case of the first slot.
-    //        The edge case being that the genesis block is already occupying slot 0, so we cannot have another block.
-    try {
-      // Need to get the time
-      const currentSlot = await rollup.getSlotNumber();
+    const rollup = new RollupContract(l1Client, result.rollupAddress);
 
-      if (currentSlot === 0) {
-        const ts = Number(await rollup.getTimestampForSlot(SlotNumber(1)));
-        await rpcCall('evm_setNextBlockTimestamp', [ts]);
-        await rpcCall('hardhat_mine', [1]);
+    if (isAnvilTestChain(chainId)) {
+      // @note  We make a time jump PAST the very first slot to not have to deal with the edge case of the first slot.
+      //        The edge case being that the genesis block is already occupying slot 0, so we cannot have another block.
+      try {
+        // Need to get the time
         const currentSlot = await rollup.getSlotNumber();
 
-        if (currentSlot !== 1) {
-          throw new Error(`Error jumping time: current slot is ${currentSlot}`);
+        if (currentSlot === 0) {
+          const ts = Number(await rollup.getTimestampForSlot(SlotNumber(1)));
+          await rpcCall('evm_setNextBlockTimestamp', [ts]);
+          await rpcCall('hardhat_mine', [1]);
+          const currentSlot = await rollup.getSlotNumber();
+
+          if (currentSlot !== 1) {
+            throw new Error(`Error jumping time: current slot is ${currentSlot}`);
+          }
+          logger.info(`Jumped to slot 1`);
         }
-        logger.info(`Jumped to slot 1`);
+      } catch (e) {
+        throw new Error(`Error jumping time: ${e}`);
       }
-    } catch (e) {
-      throw new Error(`Error jumping time: ${e}`);
     }
-  }
 
-  return {
-    l1Client,
-    rollupVersion: result.rollupVersion,
-    l1ContractAddresses: {
-      rollupAddress: EthAddress.fromString(result.rollupAddress),
-      registryAddress: EthAddress.fromString(result.registryAddress),
-      inboxAddress: EthAddress.fromString(result.inboxAddress),
-      outboxAddress: EthAddress.fromString(result.outboxAddress),
-      feeJuiceAddress: EthAddress.fromString(result.feeAssetAddress),
-      feeJuicePortalAddress: EthAddress.fromString(result.feeJuicePortalAddress),
-      coinIssuerAddress: EthAddress.fromString(result.coinIssuerAddress),
-      rewardDistributorAddress: EthAddress.fromString(result.rewardDistributorAddress),
-      governanceProposerAddress: EthAddress.fromString(result.governanceProposerAddress),
-      governanceAddress: EthAddress.fromString(result.governanceAddress),
-      stakingAssetAddress: EthAddress.fromString(result.stakingAssetAddress),
-      slashFactoryAddress: result.slashFactoryAddress ? EthAddress.fromString(result.slashFactoryAddress) : undefined,
-      feeAssetHandlerAddress: result.feeAssetHandlerAddress
-        ? EthAddress.fromString(result.feeAssetHandlerAddress)
-        : undefined,
-      stakingAssetHandlerAddress: result.stakingAssetHandlerAddress
-        ? EthAddress.fromString(result.stakingAssetHandlerAddress)
-        : undefined,
-      zkPassportVerifierAddress: result.zkPassportVerifierAddress
-        ? EthAddress.fromString(result.zkPassportVerifierAddress)
-        : undefined,
-      gseAddress: result.gseAddress ? EthAddress.fromString(result.gseAddress) : undefined,
-      dateGatedRelayerAddress: result.dateGatedRelayerAddress
-        ? EthAddress.fromString(result.dateGatedRelayerAddress)
-        : undefined,
-    },
-  };
+    return {
+      l1Client,
+      rollupVersion: result.rollupVersion,
+      l1ContractAddresses: {
+        rollupAddress: EthAddress.fromString(result.rollupAddress),
+        registryAddress: EthAddress.fromString(result.registryAddress),
+        inboxAddress: EthAddress.fromString(result.inboxAddress),
+        outboxAddress: EthAddress.fromString(result.outboxAddress),
+        feeJuiceAddress: EthAddress.fromString(result.feeAssetAddress),
+        feeJuicePortalAddress: EthAddress.fromString(result.feeJuicePortalAddress),
+        coinIssuerAddress: EthAddress.fromString(result.coinIssuerAddress),
+        rewardDistributorAddress: EthAddress.fromString(result.rewardDistributorAddress),
+        governanceProposerAddress: EthAddress.fromString(result.governanceProposerAddress),
+        governanceAddress: EthAddress.fromString(result.governanceAddress),
+        stakingAssetAddress: EthAddress.fromString(result.stakingAssetAddress),
+        slashFactoryAddress: result.slashFactoryAddress ? EthAddress.fromString(result.slashFactoryAddress) : undefined,
+        feeAssetHandlerAddress: result.feeAssetHandlerAddress
+          ? EthAddress.fromString(result.feeAssetHandlerAddress)
+          : undefined,
+        stakingAssetHandlerAddress: result.stakingAssetHandlerAddress
+          ? EthAddress.fromString(result.stakingAssetHandlerAddress)
+          : undefined,
+        zkPassportVerifierAddress: result.zkPassportVerifierAddress
+          ? EthAddress.fromString(result.zkPassportVerifierAddress)
+          : undefined,
+        gseAddress: result.gseAddress ? EthAddress.fromString(result.gseAddress) : undefined,
+        dateGatedRelayerAddress: result.dateGatedRelayerAddress
+          ? EthAddress.fromString(result.dateGatedRelayerAddress)
+          : undefined,
+      },
+    };
+  } finally {
+    await rm(tempCachePath, { recursive: true, force: true });
+  }
 }
 
 export const DEPLOYER_ADDRESS: Hex = '0x4e59b44847b379578588920cA78FbF26c0B4956C';
@@ -509,37 +534,46 @@ export const deployRollupForUpgrade = async (
   const FORGE_SCRIPT = 'script/deploy/DeployRollupForUpgrade.s.sol';
   await maybeForgeForceProductionBuild(l1ContractsPath, FORGE_SCRIPT, chainId);
 
-  const forgeArgs = [
-    'script',
-    FORGE_SCRIPT,
-    '--sig',
-    'run()',
-    '--private-key',
-    privateKey,
-    '--rpc-url',
-    rpcUrl,
-    '--broadcast',
-  ];
-  const forgeEnv = {
-    FOUNDRY_PROFILE: chainId === mainnet.id ? 'production' : undefined,
-    // Env vars required by l1-contracts/script/deploy/RollupConfiguration.sol.
-    REGISTRY_ADDRESS: registryAddress.toString(),
-    NETWORK: getActiveNetworkName(),
-    ...getDeployRollupForUpgradeEnvVars(args),
-  };
-
-  const result = await runProcess<ForgeRollupUpgradeResult>('forge', forgeArgs, forgeEnv, l1ContractsPath);
-  if (!result) {
-    throw new Error('Forge script did not output deployment result');
-  }
+  // Copy cache to temp location to avoid conflicts when running forge in parallel
+  const tempCachePath = await copyFoundryCacheToTemp(l1ContractsPath);
+
+  try {
+    const forgeArgs = [
+      'script',
+      FORGE_SCRIPT,
+      '--sig',
+      'run()',
+      '--private-key',
+      privateKey,
+      '--rpc-url',
+      rpcUrl,
+      '--broadcast',
+    ];
+    const forgeEnv = {
+      FOUNDRY_PROFILE: chainId === mainnet.id ? 'production' : undefined,
+      // Env vars required by l1-contracts/script/deploy/RollupConfiguration.sol.
+      REGISTRY_ADDRESS: registryAddress.toString(),
+      NETWORK: getActiveNetworkName(),
+      FOUNDRY_CACHE_PATH: tempCachePath,
+      FOUNDRY_BROADCAST: tempCachePath,
+      ...getDeployRollupForUpgradeEnvVars(args),
+    };
+
+    const result = await runProcess<ForgeRollupUpgradeResult>('forge', forgeArgs, forgeEnv, l1ContractsPath);
+    if (!result) {
+      throw new Error('Forge script did not output deployment result');
+    }
 
-  const extendedClient = createExtendedL1Client([rpcUrl], privateKey);
+    const extendedClient = createExtendedL1Client([rpcUrl], privateKey);
 
-  // Create RollupContract wrapper for the deployed rollup
-  const rollup = new RollupContract(extendedClient, result.rollupAddress);
+    // Create RollupContract wrapper for the deployed rollup
+    const rollup = new RollupContract(extendedClient, result.rollupAddress);
 
-  return {
-    rollup,
-    slashFactoryAddress: result.slashFactoryAddress,
-  };
+    return {
+      rollup,
+      slashFactoryAddress: result.slashFactoryAddress,
+    };
+  } finally {
+    await rm(tempCachePath, { recursive: true, force: true });
+  }
 };