@aztec/ethereum 2.1.0-rc.9 → 2.1.1-rc.1

package/dest/l1_tx_utils/readonly_l1_tx_utils.js

@@ -1,4 +1,4 @@
-import { getKeys, merge, pick, times } from '@aztec/foundation/collection';
+import { getKeys, median, 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';
@@ -7,6 +7,7 @@ import { MethodNotFoundRpcError, MethodNotSupportedRpcError, decodeErrorResult,
 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 { getCalldataGasUsage, tryGetCustomErrorNameContractFunction } from './utils.js';
+const HISTORICAL_BLOCK_COUNT = 5;
 export class ReadOnlyL1TxUtils {
     client;
     logger;
@@ -35,21 +36,128 @@ 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);
-        const block = await this.client.getBlock({
-            blockTag: 'latest'
-        });
-        const baseFee = block.baseFeePerGas ?? 0n;
+        // Make all RPC calls in parallel upfront with retry logic
+        const latestBlockPromise = this.tryTwice(()=>this.client.getBlock({
+                blockTag: 'latest'
+            }), 'Getting latest block');
+        const networkEstimatePromise = gasConfig.fixedPriorityFeePerGas ? null : this.tryTwice(()=>this.client.estimateMaxPriorityFeePerGas(), 'Estimating max priority fee per gas');
+        const pendingBlockPromise = gasConfig.fixedPriorityFeePerGas ? null : this.tryTwice(()=>this.client.getBlock({
+                blockTag: 'pending',
+                includeTransactions: true
+            }), 'Getting pending block');
+        const feeHistoryPromise = gasConfig.fixedPriorityFeePerGas ? null : 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([
+            latestBlockPromise,
+            networkEstimatePromise ?? Promise.resolve(0n),
+            pendingBlockPromise ?? Promise.resolve(null),
+            feeHistoryPromise ?? Promise.resolve(null),
+            blobBaseFeePromise ?? Promise.resolve(0n)
+        ]);
+        // Extract results
+        const baseFee = latestBlockResult.status === 'fulfilled' && typeof latestBlockResult.value === 'object' && latestBlockResult.value.baseFeePerGas ? latestBlockResult.value.baseFeePerGas : 0n;
         // Get blob base fee if available
         let blobBaseFee = 0n;
-        if (isBlobTx) {
-            try {
-                blobBaseFee = await retry(()=>this.client.getBlobBaseFee(), 'Getting L1 blob base fee', makeBackoff(times(2, ()=>1)), this.logger, true);
-            } catch  {
-                this.logger?.warn('Failed to get L1 blob base fee', attempt);
-            }
+        if (isBlobTx && blobBaseFeeResult.status === 'fulfilled' && typeof blobBaseFeeResult.value === 'bigint') {
+            blobBaseFee = blobBaseFeeResult.value;
+        } else if (isBlobTx) {
+            this.logger?.warn('Failed to get L1 blob base fee', attempt);
         }
         let priorityFee;
         if (gasConfig.fixedPriorityFeePerGas) {
@@ -59,8 +167,8 @@ export class ReadOnlyL1TxUtils {
             // try to maintain precision up to 1000000 wei
             priorityFee = BigInt(gasConfig.fixedPriorityFeePerGas * 1_000_000) * (WEI_CONST / 1_000_000n);
         } else {
-            // Get initial priority fee from the network
-            priorityFee = await this.client.estimateMaxPriorityFeePerGas();
+            // Get competitive priority fee (includes network estimate + analysis)
+            priorityFee = this.getCompetitivePriorityFee(networkEstimateResult, pendingBlockResult, feeHistoryResult);
         }
         let maxFeePerGas = baseFee;
         let maxFeePerBlobGas = blobBaseFee;
@@ -81,26 +189,50 @@ export class ReadOnlyL1TxUtils {
             // multiply by 100 & divide by 100 to maintain some precision
             const minPriorityFee = previousGasPrice.maxPriorityFeePerGas * (100_00n + BigInt(bumpPercentage * 1_00)) / 100_00n;
             const minMaxFee = previousGasPrice.maxFeePerGas * (100_00n + BigInt(bumpPercentage * 1_00)) / 100_00n;
-            // Add priority fee to maxFeePerGas
-            maxFeePerGas += priorityFee;
-            // Use maximum between current network values and minimum required values
-            priorityFee = priorityFee > minPriorityFee ? priorityFee : minPriorityFee;
+            let competitivePriorityFee = priorityFee;
+            if (!gasConfig.fixedPriorityFeePerGas) {
+                // Apply bump percentage to competitive fee
+                competitivePriorityFee = priorityFee * (100_00n + BigInt(configBump * 1_00)) / 100_00n;
+                this.logger?.debug(`Speed-up attempt ${attempt}: using competitive fee strategy`, {
+                    networkEstimate: formatGwei(priorityFee),
+                    competitiveFee: formatGwei(competitivePriorityFee),
+                    minRequired: formatGwei(minPriorityFee),
+                    bumpPercentage: configBump
+                });
+            }
+            // Use maximum between competitive fee and minimum required bump
+            const finalPriorityFee = competitivePriorityFee > minPriorityFee ? competitivePriorityFee : minPriorityFee;
+            const feeSource = finalPriorityFee === competitivePriorityFee ? 'competitive' : 'minimum-bump';
+            priorityFee = finalPriorityFee;
+            // Add the final priority fee to maxFeePerGas
+            maxFeePerGas += finalPriorityFee;
             maxFeePerGas = maxFeePerGas > minMaxFee ? maxFeePerGas : minMaxFee;
+            if (!gasConfig.fixedPriorityFeePerGas) {
+                this.logger?.debug(`Speed-up fee decision: using ${feeSource} fee`, {
+                    finalPriorityFee: formatGwei(finalPriorityFee)
+                });
+            }
         } else {
-            // first attempt, just bump priority fee, unless it's a fixed config
+            // First attempt: apply configured bump percentage to competitive fee
             // multiply by 100 & divide by 100 to maintain some precision
             if (!gasConfig.fixedPriorityFeePerGas) {
                 priorityFee = priorityFee * (100_00n + BigInt((gasConfig.priorityFeeBumpPercentage || 0) * 1_00)) / 100_00n;
+                this.logger?.debug('Initial transaction: using competitive fee from market analysis', {
+                    networkEstimate: formatGwei(priorityFee)
+                });
             }
             maxFeePerGas += priorityFee;
         }
+        // maxGwei and maxBlobGwei are hard limits
+        const effectiveMaxGwei = gasConfig.maxGwei * WEI_CONST;
+        const effectiveMaxBlobGwei = gasConfig.maxBlobGwei * WEI_CONST;
         // Ensure we don't exceed maxGwei
-        const maxGweiInWei = gasConfig.maxGwei * WEI_CONST;
-        maxFeePerGas = maxFeePerGas > maxGweiInWei ? maxGweiInWei : maxFeePerGas;
+        if (effectiveMaxGwei > 0n) {
+            maxFeePerGas = maxFeePerGas > effectiveMaxGwei ? effectiveMaxGwei : maxFeePerGas;
+        }
         // Ensure we don't exceed maxBlobGwei
-        if (maxFeePerBlobGas) {
-            const maxBlobGweiInWei = gasConfig.maxBlobGwei * WEI_CONST;
-            maxFeePerBlobGas = maxFeePerBlobGas > maxBlobGweiInWei ? maxBlobGweiInWei : maxFeePerBlobGas;
+        if (maxFeePerBlobGas && effectiveMaxBlobGwei > 0n) {
+            maxFeePerBlobGas = maxFeePerBlobGas > effectiveMaxBlobGwei ? effectiveMaxBlobGwei : maxFeePerBlobGas;
         }
         // Ensure priority fee doesn't exceed max fee
         const maxPriorityFeePerGas = priorityFee > maxFeePerGas ? maxFeePerGas : priorityFee;
@@ -291,4 +423,9 @@ export class ReadOnlyL1TxUtils {
         });
         return bumpedGasLimit;
     }
+    /**
+   * Helper function to retry RPC calls twice
+   */ tryTwice(fn, description) {
+        return retry(fn, description, makeBackoff(times(2, ()=>0)), this.logger, true);
+    }
 }

package/dest/zkPassportVerifierAddress.js

@@ -2,7 +2,7 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 /**
  * The address of the zk passport verifier on sepolia
  * get address from: ROOT/l1-contracts/lib/circuits/src/solidity/deployments/deployment-11155111.json
- */ export const ZK_PASSPORT_VERIFIER_ADDRESS = EthAddress.fromString('0xBec82dec0747C9170D760D5aba9cc44929B17C05');
+ */ export const ZK_PASSPORT_VERIFIER_ADDRESS = EthAddress.fromString('0x3101Bad9eA5fACadA5554844a1a88F7Fe48D4DE0');
 /**
  * The default domain of the zk passport site
  */ export const ZK_PASSPORT_DOMAIN = 'testnet.aztec.network';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/ethereum",
-  "version": "2.1.0-rc.9",
+  "version": "2.1.1-rc.1",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -31,16 +31,16 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/blob-lib": "2.1.0-rc.9",
-    "@aztec/constants": "2.1.0-rc.9",
-    "@aztec/foundation": "2.1.0-rc.9",
-    "@aztec/l1-artifacts": "2.1.0-rc.9",
+    "@aztec/blob-lib": "2.1.1-rc.1",
+    "@aztec/constants": "2.1.1-rc.1",
+    "@aztec/foundation": "2.1.1-rc.1",
+    "@aztec/l1-artifacts": "2.1.1-rc.1",
     "@viem/anvil": "^0.0.10",
     "dotenv": "^16.0.3",
     "lodash.chunk": "^4.2.0",
     "lodash.pickby": "^4.5.0",
     "tslib": "^2.4.0",
-    "viem": "2.23.7",
+    "viem": "npm:@spalladino/viem@2.38.2-eip7594.0",
     "zod": "^3.23.8"
   },
   "devDependencies": {

package/src/config.ts

@@ -138,7 +138,7 @@ const TestnetGovernanceConfiguration = {
   gracePeriod: 1n * 24n * 60n * 60n, // 1 day
   quorum: 2n * 10n ** 17n, // 20%
   requiredYeaMargin: 1n * 10n ** 17n, // 10%
-  minimumVotes: 1250n * 200_000n * 10n ** 18n,
+  minimumVotes: 100n * 200_000n * 10n ** 18n,
 };
 
 const StagingIgnitionGovernanceConfiguration = {
@@ -156,6 +156,21 @@ const StagingIgnitionGovernanceConfiguration = {
   minimumVotes: 1250n * 200_000n * 10n ** 18n,
 };
 
+const MainnetGovernanceConfiguration = {
+  proposeConfig: {
+    lockDelay: 90n * 24n * 60n * 60n,
+    lockAmount: 258_750_000n * 10n ** 18n,
+  },
+
+  votingDelay: 3n * 24n * 60n * 60n,
+  votingDuration: 7n * 24n * 60n * 60n,
+  executionDelay: 7n * 24n * 60n * 60n,
+  gracePeriod: 7n * 24n * 60n * 60n,
+  quorum: 2n * 10n ** 17n, // 20%
+  requiredYeaMargin: 33n * 10n ** 16n, // 33%
+  minimumVotes: 1000n * 200_000n * 10n ** 18n,
+};
+
 export const getGovernanceConfiguration = (networkName: NetworkNames) => {
   switch (networkName) {
     case 'local':
@@ -166,6 +181,8 @@ export const getGovernanceConfiguration = (networkName: NetworkNames) => {
       return TestnetGovernanceConfiguration;
     case 'staging-ignition':
       return StagingIgnitionGovernanceConfiguration;
+    case 'mainnet':
+      return MainnetGovernanceConfiguration;
     default:
       throw new Error(`Unrecognized network name: ${networkName}`);
   }
@@ -182,6 +199,13 @@ const DefaultRewardConfig = {
   blockReward: 500n * 10n ** 18n,
 };
 
+const MainnetRewardConfig = {
+  sequencerBps: 7_000,
+  rewardDistributor: EthAddress.ZERO.toString(),
+  booster: EthAddress.ZERO.toString(),
+  blockReward: 400n * 10n ** 18n,
+};
+
 export const getRewardConfig = (networkName: NetworkNames) => {
   switch (networkName) {
     case 'local':
@@ -189,6 +213,8 @@ export const getRewardConfig = (networkName: NetworkNames) => {
     case 'testnet':
     case 'staging-ignition':
       return DefaultRewardConfig;
+    case 'mainnet':
+      return MainnetRewardConfig;
     default:
       throw new Error(`Unrecognized network name: ${networkName}`);
   }
@@ -198,11 +224,11 @@ export const getRewardBoostConfig = () => {
   // The reward configuration is specified with a precision of 1e5, and we use the same across
   // all networks.
   return {
-    increment: 125000, // 1.25
-    maxScore: 15000000, // 150
-    a: 1000, // 0.01
-    k: 1000000, // 10
-    minimum: 100000, // 1
+    increment: 125_000, // 1.25
+    maxScore: 15_000_000, // 150
+    a: 1_000, // 0.01
+    k: 1_000_000, // 10
+    minimum: 100_000, // 1
   };
 };
 
@@ -224,11 +250,11 @@ const StagingPublicEntryQueueConfig = {
 };
 
 const TestnetEntryQueueConfig = {
-  bootstrapValidatorSetSize: 750n,
-  bootstrapFlushSize: 32n,
-  normalFlushSizeMin: 32n,
-  normalFlushSizeQuotient: 2475n,
-  maxQueueFlushSize: 32n,
+  bootstrapValidatorSetSize: 48n,
+  bootstrapFlushSize: 48n,
+  normalFlushSizeMin: 4n,
+  normalFlushSizeQuotient: 2048n,
+  maxQueueFlushSize: 8n,
 };
 
 const StagingIgnitionEntryQueueConfig = {
@@ -239,6 +265,14 @@ const StagingIgnitionEntryQueueConfig = {
   maxQueueFlushSize: 24n,
 };
 
+const MainnetEntryQueueConfig = {
+  bootstrapValidatorSetSize: 500n,
+  bootstrapFlushSize: 500n,
+  normalFlushSizeMin: 1n,
+  normalFlushSizeQuotient: 2_048n,
+  maxQueueFlushSize: 8n,
+};
+
 export const getEntryQueueConfig = (networkName: NetworkNames) => {
   switch (networkName) {
     case 'local':
@@ -249,6 +283,8 @@ export const getEntryQueueConfig = (networkName: NetworkNames) => {
       return TestnetEntryQueueConfig;
     case 'staging-ignition':
       return StagingIgnitionEntryQueueConfig;
+    case 'mainnet':
+      return MainnetEntryQueueConfig;
     default:
       throw new Error(`Unrecognized network name: ${networkName}`);
   }