feat: competitive priority fee pricing

spypsy · spypsy · commit 076ce5f38009 · 2025-10-31T09:35:22.000Z
diff --git a/spartan/aztec-network/templates/boot-node.yaml b/spartan/aztec-network/templates/boot-node.yaml
@@ -100,8 +100,18 @@ spec:
               value: "{{ .Values.aztec.proofSubmissionWindow }}"
             - name: L1_GAS_PRICE_MAX
               value: "{{ .Values.ethereum.l1GasPriceMax }}"
+            {{- if .Values.ethereum.l1FixedPriorityFeePerGas }}
             - name: L1_FIXED_PRIORITY_FEE_PER_GAS
               value: "{{ .Values.ethereum.l1FixedPriorityFeePerGas }}"
+            {{- end }}
+            {{- if .Values.ethereum.l1PriorityFeeBumpPercentage }}
+            - name: L1_PRIORITY_FEE_BUMP_PERCENTAGE
+              value: {{ .Values.ethereum.l1PriorityFeeBumpPercentage | quote }}
+            {{- end }}
+            {{- if .Values.ethereum.l1PriorityFeeRetryBumpPercentage }}
+            - name: L1_PRIORITY_FEE_RETRY_BUMP_PERCENTAGE
+              value: {{ .Values.ethereum.l1PriorityFeeRetryBumpPercentage | quote }}
+            {{- end }}
             - name: AZTEC_MANA_TARGET
               value: "{{ .Values.aztec.manaTarget }}"
             - name: REAL_VERIFIER
diff --git a/spartan/aztec-network/templates/prover-node.yaml b/spartan/aztec-network/templates/prover-node.yaml
@@ -159,8 +159,18 @@ spec:
               value: "{{ .Values.proverNode.failedEpochStore }}"
             - name: L1_CHAIN_ID
               value: "{{ .Values.ethereum.chainId }}"
+            {{- if .Values.proverNode.l1FixedPriorityFeePerGas }}
             - name: L1_FIXED_PRIORITY_FEE_PER_GAS
               value: {{ .Values.proverNode.l1FixedPriorityFeePerGas | quote }}
+            {{- end }}
+            {{- if .Values.proverNode.l1PriorityFeeBumpPercentage }}
+            - name: L1_PRIORITY_FEE_BUMP_PERCENTAGE
+              value: {{ .Values.proverNode.l1PriorityFeeBumpPercentage | quote }}
+            {{- end }}
+            {{- if .Values.proverNode.l1PriorityFeeRetryBumpPercentage }}
+            - name: L1_PRIORITY_FEE_RETRY_BUMP_PERCENTAGE
+              value: {{ .Values.proverNode.l1PriorityFeeRetryBumpPercentage | quote }}
+            {{- end }}
             - name: L1_GAS_LIMIT_BUFFER_PERCENTAGE
               value: {{ .Values.proverNode.l1GasLimitBufferPercentage | quote }}
             - name: L1_GAS_PRICE_MAX
diff --git a/spartan/aztec-network/templates/validator.yaml b/spartan/aztec-network/templates/validator.yaml
@@ -164,8 +164,18 @@ spec:
               value: {{ .Values.validator.viemPollingInterval | quote }}
             - name: SEQ_VIEM_POLLING_INTERVAL_MS
               value: {{ .Values.validator.viemPollingInterval | quote }}
+            {{- if .Values.validator.l1FixedPriorityFeePerGas }}
             - name: L1_FIXED_PRIORITY_FEE_PER_GAS
               value: {{ .Values.validator.l1FixedPriorityFeePerGas | quote }}
+            {{- end }}
+            {{- if .Values.validator.l1PriorityFeeBumpPercentage }}
+            - name: L1_PRIORITY_FEE_BUMP_PERCENTAGE
+              value: {{ .Values.validator.l1PriorityFeeBumpPercentage | quote }}
+            {{- end }}
+            {{- if .Values.validator.l1PriorityFeeRetryBumpPercentage }}
+            - name: L1_PRIORITY_FEE_RETRY_BUMP_PERCENTAGE
+              value: {{ .Values.validator.l1PriorityFeeRetryBumpPercentage | quote }}
+            {{- end }}
             - name: L1_GAS_LIMIT_BUFFER_PERCENTAGE
               value: {{ .Values.validator.l1GasLimitBufferPercentage | quote }}
             - name: L1_GAS_PRICE_MAX
diff --git a/spartan/aztec-network/values/archival-node.yaml b/spartan/aztec-network/values/archival-node.yaml
@@ -12,7 +12,8 @@ network:
 ethereum:
   chainId: "11155111"
   l1GasPriceMax: 1000
-  l1FixedPriorityFeePerGas: 3
+  l1PriorityFeeBumpPercentage: 30
+  l1PriorityFeeRetryBumpPercentage: 80
 
 aztec:
   realProofs: true
diff --git a/spartan/aztec-network/values/ci-fast-epoch.yaml b/spartan/aztec-network/values/ci-fast-epoch.yaml
@@ -14,7 +14,8 @@ telemetry:
   enabled: false
 
 validator:
-  l1FixedPriorityFeePerGas: 1
+  l1PriorityFeeBumpPercentage: 30
+  l1PriorityFeeRetryBumpPercentage: 80
   replicas: 4
   gke:
     spotEnabled: false
diff --git a/spartan/aztec-network/values/ci-sepolia.yaml b/spartan/aztec-network/values/ci-sepolia.yaml
@@ -9,7 +9,8 @@ aztec:
 ethereum:
   chainId: "11155111"
   l1GasPriceMax: 500
-  l1FixedPriorityFeePerGas: 3
+  l1PriorityFeeBumpPercentage: 30
+  l1PriorityFeeRetryBumpPercentage: 80
   execution:
     externalHosts: ""
   beacon:
@@ -21,7 +22,8 @@ telemetry:
   enabled: false
 
 validator:
-  l1FixedPriorityFeePerGas: 3
+  l1PriorityFeeBumpPercentage: 30
+  l1PriorityFeeRetryBumpPercentage: 80
   l1GasLimitBufferPercentage: 15
   replicas: 8
   resources:
diff --git a/spartan/aztec-network/values/ignition-testnet.yaml b/spartan/aztec-network/values/ignition-testnet.yaml
@@ -23,13 +23,15 @@ bootNode:
   externalHost: "http://localhost:8080"
 
 proverNode:
-  l1FixedPriorityFeePerGas: 3
+  l1PriorityFeeBumpPercentage: 30
+  l1PriorityFeeRetryBumpPercentage: 80
   l1GasLimitBufferPercentage: 15
   l1GasPriceMax: 1000
 
 validator:
   replicas: 3
-  l1FixedPriorityFeePerGas: 3
+  l1PriorityFeeBumpPercentage: 30
+  l1PriorityFeeRetryBumpPercentage: 80
   l1GasLimitBufferPercentage: 15
   l1GasPriceMax: 1000
   sequencer:
@@ -55,4 +57,5 @@ proverAgent:
 ethereum:
   chainId: "11155111"
   l1GasPriceMax: 1000
-  l1FixedPriorityFeePerGas: 3
+  l1PriorityFeeBumpPercentage: 30
+  l1PriorityFeeRetryBumpPercentage: 80
diff --git a/spartan/aztec-network/values/rc-2.yaml b/spartan/aztec-network/values/rc-2.yaml
@@ -24,7 +24,8 @@ ethereum:
     apiKeyHeader: ""
 
 validator:
-  l1FixedPriorityFeePerGas: 2
+  l1PriorityFeeBumpPercentage: 30
+  l1PriorityFeeRetryBumpPercentage: 80
   l1GasLimitBufferPercentage: 15
   replicas: 48
   l1GasPriceMax: 500
@@ -63,4 +64,3 @@ bot:
       memory: "8Gi"
       cpu: "7"
       ephemeral-storage: "8Gi"
-
diff --git a/spartan/aztec-network/values/sepolia-3-validators-with-metrics.yaml b/spartan/aztec-network/values/sepolia-3-validators-with-metrics.yaml
@@ -19,7 +19,8 @@ ethereum:
     apiKeyHeader:
 
 validator:
-  l1FixedPriorityFeePerGas: 2
+  l1PriorityFeeBumpPercentage: 30
+  l1PriorityFeeRetryBumpPercentage: 80
   l1GasLimitBufferPercentage: 15
   l1GasPriceMax: 500
   replicas: 3
diff --git a/spartan/aztec-network/values/sepolia-48-validators-with-metrics.yaml b/spartan/aztec-network/values/sepolia-48-validators-with-metrics.yaml
@@ -19,7 +19,8 @@ ethereum:
     apiKeyHeader: ""
 
 validator:
-  l1FixedPriorityFeePerGas: 2
+  l1PriorityFeeBumpPercentage: 30
+  l1PriorityFeeRetryBumpPercentage: 80
   l1GasLimitBufferPercentage: 15
   l1GasPriceMax: 500
   replicas: 48
diff --git a/spartan/aztec-network/values/sepolia-48-validators-with-proving-and-metrics.yaml b/spartan/aztec-network/values/sepolia-48-validators-with-proving-and-metrics.yaml
@@ -24,7 +24,8 @@ ethereum:
     apiKeyHeader: ""
 
 validator:
-  l1FixedPriorityFeePerGas: 2
+  l1PriorityFeeBumpPercentage: 30
+  l1PriorityFeeRetryBumpPercentage: 80
   l1GasLimitBufferPercentage: 15
   replicas: 48
   l1GasPriceMax: 500
@@ -65,4 +66,3 @@ bot:
       memory: "8Gi"
       cpu: "7"
       ephemeral-storage: "8Gi"
-
diff --git a/spartan/terraform/deploy-aztec-infra/values/prover.yaml b/spartan/terraform/deploy-aztec-infra/values/prover.yaml
@@ -1,7 +1,8 @@
 node:
   node:
     env:
-      L1_FIXED_PRIORITY_FEE_PER_GAS: 3
+      L1_PRIORITY_FEE_BUMP_PERCENTAGE: 30
+      L1_PRIORITY_FEE_RETRY_BUMP_PERCENTAGE: 80
     preStartScript: |
       export TX_COLLECTION_NODE_RPC_URLS=$(bash /scripts/resolve-node-hosts.sh $NODE_HOSTS)
       source /scripts/setup-prover-keystore.sh
diff --git a/spartan/terraform/deploy-aztec-infra/values/validator.yaml b/spartan/terraform/deploy-aztec-infra/values/validator.yaml
@@ -15,7 +15,8 @@ validator:
       fi
 
     env:
-      L1_FIXED_PRIORITY_FEE_PER_GAS: 3
+      L1_PRIORITY_FEE_BUMP_PERCENTAGE: 30
+      L1_PRIORITY_FEE_RETRY_BUMP_PERCENTAGE: 80
 
   persistence:
     enabled: true
diff --git a/yarn-project/ethereum/src/deploy_l1_contracts.test.ts b/yarn-project/ethereum/src/deploy_l1_contracts.test.ts
@@ -85,11 +85,10 @@ describe('deploy_l1_contracts', () => {
         vkTreeRoot,
         protocolContractsHash,
         genesisArchiveRoot,
-        l1TxConfig: { checkIntervalMs: 100 },
         realVerifier: false,
         ...args,
       },
-      undefined,
+      { checkIntervalMs: 100, priorityFeeBumpPercentage: 0 },
       false,
     );
 
@@ -296,9 +295,9 @@ describe('deploy_l1_contracts', () => {
         vkTreeRoot,
         protocolContractsHash,
         genesisArchiveRoot,
-        l1TxConfig: { checkIntervalMs: 100 },
         realVerifier: false,
       },
+      { checkIntervalMs: 100, priorityFeeBumpPercentage: 0 },
     );
 
     const governance = new GovernanceContract(deployment.l1ContractAddresses.governanceAddress, client);
diff --git a/yarn-project/ethereum/src/l1_tx_utils/config.ts b/yarn-project/ethereum/src/l1_tx_utils/config.ts
@@ -69,14 +69,14 @@ export const l1TxUtilsConfigMappings: ConfigMappingsType<L1TxUtilsConfig> = {
     ...numberConfigHelper(20),
   },
   maxGwei: {
-    description: 'Maximum gas price in gwei',
+    description: 'Maximum gas price in gwei to be used for transactions.',
     env: 'L1_GAS_PRICE_MAX',
-    ...bigintConfigHelper(500n),
+    ...bigintConfigHelper(2000n),
   },
   maxBlobGwei: {
     description: 'Maximum blob fee per gas in gwei',
     env: 'L1_BLOB_FEE_PER_GAS_MAX',
-    ...bigintConfigHelper(1_500n),
+    ...bigintConfigHelper(3000n),
   },
   priorityFeeBumpPercentage: {
     description: 'How much to increase priority fee by each attempt (percentage)',
@@ -106,7 +106,7 @@ export const l1TxUtilsConfigMappings: ConfigMappingsType<L1TxUtilsConfig> = {
   stallTimeMs: {
     description: 'How long before considering tx stalled',
     env: 'L1_TX_MONITOR_STALL_TIME_MS',
-    ...numberConfigHelper(24_000), // 24s, 2 ethereum slots
+    ...numberConfigHelper(12_000), // 12s, 1 ethereum slot
   },
   txTimeoutMs: {
     description: 'How long to wait for a tx to be mined before giving up. Set to 0 to disable.',
diff --git a/yarn-project/ethereum/src/l1_tx_utils/l1_tx_utils.test.ts b/yarn-project/ethereum/src/l1_tx_utils/l1_tx_utils.test.ts
@@ -439,6 +439,99 @@ describe('L1TxUtils', () => {
       expect(retryGasPrice.maxFeePerGas).toBe(expectedMaxFee);
     });
 
+    it('uses competitive fee from pending txs and fee history on retry attempts', async () => {
+      await cheatCodes.setNextBlockBaseFeePerGas(WEI_CONST);
+      await cheatCodes.evmMine();
+
+      // Mock pending block with transactions having higher fees
+      const originalGetBlock = l1Client.getBlock;
+      const mockPendingFee = WEI_CONST * 3n; // 3 gwei pending txs
+      l1Client.getBlock = ((params: any) => {
+        if (params?.blockTag === 'pending') {
+          return Promise.resolve({
+            transactions: [
+              { maxPriorityFeePerGas: WEI_CONST }, // 1 gwei
+              { maxPriorityFeePerGas: WEI_CONST * 2n }, // 2 gwei
+              { maxPriorityFeePerGas: mockPendingFee }, // 3 gwei
+              { maxPriorityFeePerGas: WEI_CONST * 4n }, // 4 gwei (outlier)
+            ],
+          } as any);
+        }
+        return originalGetBlock(params);
+      }) as any;
+
+      // Mock fee history to return moderate fees
+      const originalGetFeeHistory = l1Client.getFeeHistory;
+      const mockHistoricalFee = WEI_CONST * 2n; // 2 gwei (lower than pending)
+      l1Client.getFeeHistory = () =>
+        Promise.resolve({
+          baseFeePerGas: [WEI_CONST],
+          gasUsedRatio: [0.5],
+          oldestBlock: 1n,
+          reward: [
+            [WEI_CONST / 2n, WEI_CONST, mockHistoricalFee], // 25th, 50th, 75th percentile
+          ],
+        } as any);
+
+      const originalEstimate = l1Client.estimateMaxPriorityFeePerGas;
+      l1Client.estimateMaxPriorityFeePerGas = () => Promise.resolve(WEI_CONST); // 1 gwei
+
+      try {
+        const initialGasPrice = await gasUtils['getGasPrice']();
+
+        // Get retry gas price - should use competitive fee from pending (3 gwei at 75th percentile)
+        const retryGasPrice = await gasUtils['getGasPrice'](undefined, false, 1, initialGasPrice);
+
+        // Competitive fee should be: max(network=1gwei, historical=2gwei, pending=3gwei) = 3gwei, then bumped by 50%
+        const expectedCompetitiveFee = (mockPendingFee * 150n) / 100n; // 4.5 gwei
+
+        // The minimum bump from initial would be initialPriority * 1.5
+        const minBump = (initialGasPrice.maxPriorityFeePerGas * 150n) / 100n;
+
+        // Final should be max of competitive and minimum bump
+        const expectedPriorityFee = expectedCompetitiveFee > minBump ? expectedCompetitiveFee : minBump;
+
+        expect(retryGasPrice.maxPriorityFeePerGas).toBeGreaterThanOrEqual(expectedPriorityFee);
+      } finally {
+        // Restore original methods
+        l1Client.getBlock = originalGetBlock;
+        l1Client.getFeeHistory = originalGetFeeHistory;
+        l1Client.estimateMaxPriorityFeePerGas = originalEstimate;
+      }
+    });
+
+    it('falls back to network estimate when fee history is unavailable', async () => {
+      await cheatCodes.setNextBlockBaseFeePerGas(WEI_CONST);
+      await cheatCodes.evmMine();
+
+      // Mock fee history to throw an error (simulating unsupported RPC method)
+      const originalGetFeeHistory = l1Client.getFeeHistory;
+      l1Client.getFeeHistory = () => Promise.reject(new Error('Method not supported'));
+
+      const originalEstimate = l1Client.estimateMaxPriorityFeePerGas;
+      const mockBasePriorityFee = WEI_CONST * 2n; // 2 gwei
+      l1Client.estimateMaxPriorityFeePerGas = () => Promise.resolve(mockBasePriorityFee);
+
+      try {
+        const initialGasPrice = await gasUtils['getGasPrice']();
+
+        // Get retry gas price - should fallback to network estimate when fee history fails
+        const retryGasPrice = await gasUtils['getGasPrice'](undefined, false, 1, initialGasPrice);
+
+        // Should still get a valid price using network estimate fallback
+        expect(retryGasPrice.maxPriorityFeePerGas).toBeGreaterThan(0n);
+        expect(retryGasPrice.maxFeePerGas).toBeGreaterThan(0n);
+
+        // Should be at least the minimum bump
+        const minBump = (initialGasPrice.maxPriorityFeePerGas * 150n) / 100n;
+        expect(retryGasPrice.maxPriorityFeePerGas).toBeGreaterThanOrEqual(minBump);
+      } finally {
+        // Restore original methods
+        l1Client.getFeeHistory = originalGetFeeHistory;
+        l1Client.estimateMaxPriorityFeePerGas = originalEstimate;
+      }
+    });
+
     it('adds correct buffer to gas estimation', async () => {
       const request = {
         to: '0x1234567890123456789012345678901234567890' as `0x${string}`,
diff --git a/yarn-project/ethereum/src/l1_tx_utils/readonly_l1_tx_utils.ts b/yarn-project/ethereum/src/l1_tx_utils/readonly_l1_tx_utils.ts
diff --git a/yarn-project/foundation/src/collection/array.test.ts b/yarn-project/foundation/src/collection/array.test.ts
diff --git a/yarn-project/foundation/src/collection/array.ts b/yarn-project/foundation/src/collection/array.ts
