@aztec/ethereum 0.0.1-commit.b655e406 → 0.0.1-commit.b6e433891

package/dest/l1_tx_utils/config.js

@@ -1,4 +1,4 @@
-import { bigintConfigHelper, booleanConfigHelper, getConfigFromMappings, getDefaultConfig, numberConfigHelper } from '@aztec/foundation/config';
+import { booleanConfigHelper, floatConfigHelper, getConfigFromMappings, getDefaultConfig, numberConfigHelper, optionalNumberConfigHelper } from '@aztec/foundation/config';
 export const l1TxUtilsConfigMappings = {
     gasLimitBufferPercentage: {
         description: 'How much to increase calculated gas limit by (percentage)',
@@ -8,12 +8,18 @@ export const l1TxUtilsConfigMappings = {
     maxGwei: {
         description: 'Maximum gas price in gwei to be used for transactions.',
         env: 'L1_GAS_PRICE_MAX',
-        ...bigintConfigHelper(2000n)
+        fallback: [
+            'L1_FEE_PER_GAS_GWEI_MAX'
+        ],
+        ...floatConfigHelper(2000)
     },
     maxBlobGwei: {
         description: 'Maximum blob fee per gas in gwei',
         env: 'L1_BLOB_FEE_PER_GAS_MAX',
-        ...bigintConfigHelper(3000n)
+        fallback: [
+            'L1_BLOB_FEE_PER_GAS_GWEI_MAX'
+        ],
+        ...floatConfigHelper(3000)
     },
     priorityFeeBumpPercentage: {
         description: 'How much to increase priority fee by each attempt (percentage)',
@@ -25,10 +31,24 @@ export const l1TxUtilsConfigMappings = {
         env: 'L1_PRIORITY_FEE_RETRY_BUMP_PERCENTAGE',
         ...numberConfigHelper(50)
     },
-    fixedPriorityFeePerGas: {
-        description: 'Fixed priority fee per gas in Gwei. Overrides any priority fee bump percentage',
-        env: 'L1_FIXED_PRIORITY_FEE_PER_GAS',
-        ...numberConfigHelper(0)
+    minimumPriorityFeePerGas: {
+        description: 'Minimum priority fee per gas in Gwei. Acts as a floor for the computed priority fee. If network conditions require a higher fee, the higher fee will be used.',
+        env: 'L1_MINIMUM_PRIORITY_FEE_PER_GAS_GWEI',
+        fallback: [
+            'L1_FIXED_PRIORITY_FEE_PER_GAS',
+            'L1_FIXED_PRIORITY_FEE_PER_GAS_GWEI'
+        ],
+        deprecatedFallback: [
+            {
+                env: 'L1_FIXED_PRIORITY_FEE_PER_GAS',
+                message: deprecatedFixedFeeMessage('L1_FIXED_PRIORITY_FEE_PER_GAS')
+            },
+            {
+                env: 'L1_FIXED_PRIORITY_FEE_PER_GAS_GWEI',
+                message: deprecatedFixedFeeMessage('L1_FIXED_PRIORITY_FEE_PER_GAS_GWEI')
+            }
+        ],
+        ...floatConfigHelper(0)
     },
     maxSpeedUpAttempts: {
         description: 'Maximum number of speed-up attempts',
@@ -64,6 +84,19 @@ export const l1TxUtilsConfigMappings = {
         description: 'How long a tx nonce can be unseen in the mempool before considering it dropped',
         env: 'L1_TX_MONITOR_TX_UNSEEN_CONSIDERED_DROPPED_MS',
         ...numberConfigHelper(6 * 12 * 1000)
+    },
+    enableDelayer: {
+        description: 'Enable tx delayer for testing.',
+        ...booleanConfigHelper(false)
+    },
+    txDelayerMaxInclusionTimeIntoSlot: {
+        description: 'Max seconds into L1 slot for tx inclusion when delayer is enabled.',
+        ...optionalNumberConfigHelper()
+    },
+    ethereumSlotDuration: {
+        env: 'ETHEREUM_SLOT_DURATION',
+        description: 'How many seconds an L1 slot lasts.',
+        ...numberConfigHelper(12)
     }
 };
 // We abuse the fact that all mappings above have a non null default value and force-type this to Required
@@ -71,3 +104,6 @@ export const defaultL1TxUtilsConfig = getDefaultConfig(l1TxUtilsConfigMappings);
 export function getL1TxUtilsConfigEnvVars() {
     return getConfigFromMappings(l1TxUtilsConfigMappings);
 }
+function deprecatedFixedFeeMessage(envVar) {
+    return `Environment variable ${envVar} is deprecated. It is now used as a MINIMUM priority fee rather than a fixed value. ` + 'Please use L1_MINIMUM_PRIORITY_FEE_PER_GAS_GWEI instead. If network conditions require a higher fee, the higher fee will be used.';
+}

package/dest/l1_tx_utils/constants.d.ts

@@ -1,6 +1,12 @@
 export declare const WEI_CONST = 1000000000n;
-export declare const LARGE_GAS_LIMIT = 12000000n;
+export declare const MAX_L1_TX_LIMIT = 16777216n;
 export declare const MIN_REPLACEMENT_BUMP_PERCENTAGE = 10;
 export declare const MIN_BLOB_REPLACEMENT_BUMP_PERCENTAGE = 100;
 export declare const BLOCK_TIME_MS = 12000;
-//# sourceMappingURL=constants.d.ts.map
+export declare const GAS_PER_BLOB = 131072n;
+export declare const BLOB_CAPACITY_SCHEDULE: {
+    timestamp: number;
+    target: number;
+    max: number;
+}[];
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbDFfdHhfdXRpbHMvY29uc3RhbnRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLGVBQU8sTUFBTSxTQUFTLGNBQWlCLENBQUM7QUFHeEMsZUFBTyxNQUFNLGVBQWUsWUFBYyxDQUFDO0FBSTNDLGVBQU8sTUFBTSwrQkFBK0IsS0FBSyxDQUFDO0FBSWxELGVBQU8sTUFBTSxvQ0FBb0MsTUFBTSxDQUFDO0FBR3hELGVBQU8sTUFBTSxhQUFhLFFBQVMsQ0FBQztBQUdwQyxlQUFPLE1BQU0sWUFBWSxVQUFVLENBQUM7QUFHcEMsZUFBTyxNQUFNLHNCQUFzQjs7OztHQUtsQyxDQUFDIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/l1_tx_utils/constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,SAAS,cAAiB,CAAC;AAGxC,eAAO,MAAM,eAAe,YAAc,CAAC;AAI3C,eAAO,MAAM,+BAA+B,KAAK,CAAC;AAIlD,eAAO,MAAM,oCAAoC,MAAM,CAAC;AAGxD,eAAO,MAAM,aAAa,QAAS,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/l1_tx_utils/constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,SAAS,cAAiB,CAAC;AAGxC,eAAO,MAAM,eAAe,YAAc,CAAC;AAI3C,eAAO,MAAM,+BAA+B,KAAK,CAAC;AAIlD,eAAO,MAAM,oCAAoC,MAAM,CAAC;AAGxD,eAAO,MAAM,aAAa,QAAS,CAAC;AAGpC,eAAO,MAAM,YAAY,UAAU,CAAC;AAGpC,eAAO,MAAM,sBAAsB;;;;GAKlC,CAAC"}

package/dest/l1_tx_utils/constants.js

@@ -2,8 +2,8 @@
 // 1_000_000_000 Wei = 1 Gwei
 // 1_000_000_000_000_000_000 Wei = 1 ETH
 export const WEI_CONST = 1_000_000_000n;
-// @note using this large gas limit to avoid the issue of `gas limit too low` when estimating gas in reth
-export const LARGE_GAS_LIMIT = 12_000_000n;
+// EIP-7825: protocol-level cap on tx gas limit (2^24). Clients reject above this.
+export const MAX_L1_TX_LIMIT = 16_777_216n;
 // setting a minimum bump percentage to 10% due to geth's implementation
 // https://github.com/ethereum/go-ethereum/blob/e3d61e6db028c412f74bc4d4c7e117a9e29d0de0/core/txpool/legacypool/list.go#L298
 export const MIN_REPLACEMENT_BUMP_PERCENTAGE = 10;
@@ -12,3 +12,28 @@ export const MIN_REPLACEMENT_BUMP_PERCENTAGE = 10;
 export const MIN_BLOB_REPLACEMENT_BUMP_PERCENTAGE = 100;
 // Avg ethereum block time is ~12s
 export const BLOCK_TIME_MS = 12_000;
+// Gas per blob (EIP-4844)
+export const GAS_PER_BLOB = 131072n;
+// Blob capacity schedule based on Ethereum upgrades
+export const BLOB_CAPACITY_SCHEDULE = [
+    {
+        timestamp: 1734357600,
+        target: 14,
+        max: 21
+    },
+    {
+        timestamp: 1733752800,
+        target: 10,
+        max: 15
+    },
+    {
+        timestamp: 1733234400,
+        target: 6,
+        max: 9
+    },
+    {
+        timestamp: 0,
+        target: 6,
+        max: 9
+    }
+];

package/dest/l1_tx_utils/factory.d.ts

@@ -1,3 +1,5 @@
+import type { BlobKzgInstance } from '@aztec/blob-lib/types';
+import { EthAddress } from '@aztec/foundation/eth-address';
 import type { Logger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
 import type { EthSigner } from '../eth-signer/eth-signer.js';
@@ -5,20 +7,26 @@ 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';
-export declare function createL1TxUtilsFromViemWallet(client: ExtendedViemWalletClient, deps?: {
+import { Delayer } from './tx_delayer.js';
+import type { SigningCallback } from './types.js';
+/** Source of signing capability: either a wallet client or a separate client + signer. */
+export type L1SignerSource = ExtendedViemWalletClient | {
+    client: ViemClient;
+    signer: EthSigner;
+};
+export declare function resolveSignerSource(source: L1SignerSource): {
+    client: ViemClient;
+    address: EthAddress;
+    signingCallback: SigningCallback;
+};
+export declare function createL1TxUtils(source: L1SignerSource, deps?: {
     logger?: Logger;
     dateProvider?: DateProvider;
     store?: IL1TxStore;
     metrics?: IL1TxMetrics;
+    kzg?: BlobKzgInstance;
+    delayer?: Delayer;
 }, config?: Partial<L1TxUtilsConfig> & {
     debugMaxGasLimit?: boolean;
 }): L1TxUtils;
-export declare function createL1TxUtilsFromEthSigner(client: ViemClient, signer: EthSigner, deps?: {
-    logger?: Logger;
-    dateProvider?: DateProvider;
-    store?: IL1TxStore;
-    metrics?: IL1TxMetrics;
-}, config?: Partial<L1TxUtilsConfig> & {
-    debugMaxGasLimit?: boolean;
-}): L1TxUtils;
-//# sourceMappingURL=factory.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2wxX3R4X3V0aWxzL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDN0QsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV2RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUM3RCxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxVQUFVLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxVQUFVLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUNoRSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFN0MsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzFDLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUVsRCwwRkFBMEY7QUFDMUYsTUFBTSxNQUFNLGNBQWMsR0FBRyx3QkFBd0IsR0FBRztJQUFFLE1BQU0sRUFBRSxVQUFVLENBQUM7SUFBQyxNQUFNLEVBQUUsU0FBUyxDQUFBO0NBQUUsQ0FBQztBQUVsRyx3QkFBZ0IsbUJBQW1CLENBQUMsTUFBTSxFQUFFLGNBQWMsR0FBRztJQUMzRCxNQUFNLEVBQUUsVUFBVSxDQUFDO0lBQ25CLE9BQU8sRUFBRSxVQUFVLENBQUM7SUFDcEIsZUFBZSxFQUFFLGVBQWUsQ0FBQztDQUNsQyxDQWNBO0FBRUQsd0JBQWdCLGVBQWUsQ0FDN0IsTUFBTSxFQUFFLGNBQWMsRUFDdEIsSUFBSSxDQUFDLEVBQUU7SUFDTCxNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDaEIsWUFBWSxDQUFDLEVBQUUsWUFBWSxDQUFDO0lBQzVCLEtBQUssQ0FBQyxFQUFFLFVBQVUsQ0FBQztJQUNuQixPQUFPLENBQUMsRUFBRSxZQUFZLENBQUM7SUFDdkIsR0FBRyxDQUFDLEVBQUUsZUFBZSxDQUFDO0lBQ3RCLE9BQU8sQ0FBQyxFQUFFLE9BQU8sQ0FBQztDQUNuQixFQUNELE1BQU0sQ0FBQyxFQUFFLE9BQU8sQ0FBQyxlQUFlLENBQUMsR0FBRztJQUFFLGdCQUFnQixDQUFDLEVBQUUsT0FBTyxDQUFBO0NBQUUsR0FDakUsU0FBUyxDQWVYIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/l1_tx_utils/factory.ts"],"names":[],"mappings":"AACA,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;AAI7C,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,wBAAwB,EAChC,IAAI,CAAC,EAAE;IACL,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,OAAO,CAAC,EAAE,YAAY,CAAC;CACxB,EACD,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAE,GACjE,SAAS,CAYX;AAED,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,SAAS,EACjB,IAAI,CAAC,EAAE;IACL,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,OAAO,CAAC,EAAE,YAAY,CAAC;CACxB,EACD,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAE,GACjE,SAAS,CAgBX"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/l1_tx_utils/factory.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,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,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,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElD,0FAA0F;AAC1F,MAAM,MAAM,cAAc,GAAG,wBAAwB,GAAG;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAE,CAAC;AAElG,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,cAAc,GAAG;IAC3D,MAAM,EAAE,UAAU,CAAC;IACnB,OAAO,EAAE,UAAU,CAAC;IACpB,eAAe,EAAE,eAAe,CAAC;CAClC,CAcA;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,cAAc,EACtB,IAAI,CAAC,EAAE;IACL,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,GAAG,CAAC,EAAE,eAAe,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,EACD,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAE,GACjE,SAAS,CAeX"}

package/dest/l1_tx_utils/factory.js

@@ -1,12 +1,22 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { L1TxUtils } from './l1_tx_utils.js';
 import { createViemSigner } from './signer.js';
-export function createL1TxUtilsFromViemWallet(client, deps, config) {
-    return new L1TxUtils(client, EthAddress.fromString(client.account.address), createViemSigner(client), deps?.logger, deps?.dateProvider, config, config?.debugMaxGasLimit ?? false, deps?.store, deps?.metrics);
-}
-export function createL1TxUtilsFromEthSigner(client, signer, deps, config) {
-    const callback = async (transaction, _signingAddress)=>{
-        return (await signer.signTransaction(transaction)).toViemTransactionSignature();
+export function resolveSignerSource(source) {
+    if ('account' in source && source.account) {
+        return {
+            client: source,
+            address: EthAddress.fromString(source.account.address),
+            signingCallback: createViemSigner(source)
+        };
+    }
+    const { client, signer } = source;
+    return {
+        client,
+        address: signer.address,
+        signingCallback: async (tx, _addr)=>(await signer.signTransaction(tx)).toViemTransactionSignature()
     };
-    return new L1TxUtils(client, signer.address, callback, deps?.logger, deps?.dateProvider, config, config?.debugMaxGasLimit ?? false, deps?.store, deps?.metrics);
+}
+export function createL1TxUtils(source, deps, config) {
+    const { client, address, signingCallback } = resolveSignerSource(source);
+    return new L1TxUtils(client, address, signingCallback, deps?.logger, deps?.dateProvider, config, config?.debugMaxGasLimit ?? false, deps?.store, deps?.metrics, deps?.kzg, deps?.delayer);
 }

package/dest/l1_tx_utils/fee-strategies/index.d.ts

@@ -0,0 +1,10 @@
+import type { PriorityFeeStrategy } from './types.js';
+export { HISTORICAL_BLOCK_COUNT, type PriorityFeeStrategy, type PriorityFeeStrategyContext, type PriorityFeeStrategyResult, } from './types.js';
+export { P75AllTxsPriorityFeeStrategy } from './p75_competitive.js';
+export { P75BlobTxsOnlyPriorityFeeStrategy } from './p75_competitive_blob_txs_only.js';
+/**
+ * Default list of priority fee strategies to analyze.
+ * Add more strategies here for comparison.
+ */
+export declare const DEFAULT_PRIORITY_FEE_STRATEGIES: PriorityFeeStrategy[];
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9sMV90eF91dGlscy9mZWUtc3RyYXRlZ2llcy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUV0RCxPQUFPLEVBQ0wsc0JBQXNCLEVBQ3RCLEtBQUssbUJBQW1CLEVBQ3hCLEtBQUssMEJBQTBCLEVBQy9CLEtBQUsseUJBQXlCLEdBQy9CLE1BQU0sWUFBWSxDQUFDO0FBRXBCLE9BQU8sRUFBRSw0QkFBNEIsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3BFLE9BQU8sRUFBRSxpQ0FBaUMsRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBRXZGOzs7R0FHRztBQUNILGVBQU8sTUFBTSwrQkFBK0IsRUFBRSxtQkFBbUIsRUFHaEUsQ0FBQyJ9

package/dest/l1_tx_utils/fee-strategies/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/l1_tx_utils/fee-strategies/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEtD,OAAO,EACL,sBAAsB,EACtB,KAAK,mBAAmB,EACxB,KAAK,0BAA0B,EAC/B,KAAK,yBAAyB,GAC/B,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,iCAAiC,EAAE,MAAM,oCAAoC,CAAC;AAEvF;;;GAGG;AACH,eAAO,MAAM,+BAA+B,EAAE,mBAAmB,EAGhE,CAAC"}

package/dest/l1_tx_utils/fee-strategies/index.js

@@ -0,0 +1,12 @@
+import { P75AllTxsPriorityFeeStrategy } from './p75_competitive.js';
+import { P75BlobTxsOnlyPriorityFeeStrategy } from './p75_competitive_blob_txs_only.js';
+export { HISTORICAL_BLOCK_COUNT } from './types.js';
+export { P75AllTxsPriorityFeeStrategy } from './p75_competitive.js';
+export { P75BlobTxsOnlyPriorityFeeStrategy } from './p75_competitive_blob_txs_only.js';
+/**
+ * Default list of priority fee strategies to analyze.
+ * Add more strategies here for comparison.
+ */ export const DEFAULT_PRIORITY_FEE_STRATEGIES = [
+    P75AllTxsPriorityFeeStrategy,
+    P75BlobTxsOnlyPriorityFeeStrategy
+];

package/dest/l1_tx_utils/fee-strategies/p75_competitive.d.ts

@@ -0,0 +1,8 @@
+import { type PriorityFeeStrategy } from './types.js';
+/**
+ * Our current competitive priority fee strategy.
+ * Analyzes p75 of pending transactions and 5-block fee history to determine a competitive priority fee.
+ * Falls back to network estimate if data is unavailable.
+ */
+export declare const P75AllTxsPriorityFeeStrategy: PriorityFeeStrategy;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicDc1X2NvbXBldGl0aXZlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbDFfdHhfdXRpbHMvZmVlLXN0cmF0ZWdpZXMvcDc1X2NvbXBldGl0aXZlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU9BLE9BQU8sRUFFTCxLQUFLLG1CQUFtQixFQUd6QixNQUFNLFlBQVksQ0FBQztBQUVwQjs7OztHQUlHO0FBQ0gsZUFBTyxNQUFNLDRCQUE0QixFQUFFLG1CQStJMUMsQ0FBQyJ9

package/dest/l1_tx_utils/fee-strategies/p75_competitive.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"p75_competitive.d.ts","sourceRoot":"","sources":["../../../src/l1_tx_utils/fee-strategies/p75_competitive.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,KAAK,mBAAmB,EAGzB,MAAM,YAAY,CAAC;AAEpB;;;;GAIG;AACH,eAAO,MAAM,4BAA4B,EAAE,mBA+I1C,CAAC"}

package/dest/l1_tx_utils/fee-strategies/p75_competitive.js

@@ -0,0 +1,129 @@
+import { median } from '@aztec/foundation/collection';
+import { formatGwei } from 'viem';
+import { calculatePercentile } from '../../utils.js';
+import { WEI_CONST } from '../constants.js';
+import { HISTORICAL_BLOCK_COUNT } from './types.js';
+/**
+ * Our current competitive priority fee strategy.
+ * Analyzes p75 of pending transactions and 5-block fee history to determine a competitive priority fee.
+ * Falls back to network estimate if data is unavailable.
+ */ export const P75AllTxsPriorityFeeStrategy = {
+    name: 'Competitive (P75 + History) - CURRENT',
+    id: 'p75_pending_txs_and_history_all_txs',
+    async execute (client, context) {
+        const { isBlobTx, logger } = context;
+        // Fire all RPC calls in parallel
+        const [latestBlockResult, blobBaseFeeResult, networkEstimateResult, pendingBlockResult, feeHistoryResult] = await Promise.allSettled([
+            client.getBlock({
+                blockTag: 'latest'
+            }),
+            isBlobTx ? client.getBlobBaseFee() : Promise.resolve(undefined),
+            client.estimateMaxPriorityFeePerGas().catch(()=>0n),
+            client.getBlock({
+                blockTag: 'pending',
+                includeTransactions: true
+            }).catch(()=>null),
+            client.getFeeHistory({
+                blockCount: HISTORICAL_BLOCK_COUNT,
+                rewardPercentiles: [
+                    75
+                ],
+                blockTag: 'latest'
+            }).catch(()=>null)
+        ]);
+        // Extract latest block
+        if (latestBlockResult.status === 'rejected') {
+            throw new Error(`Failed to get latest block: ${latestBlockResult.reason}`);
+        }
+        const latestBlock = latestBlockResult.value;
+        // Extract blob base fee (only for blob txs)
+        let blobBaseFee;
+        if (isBlobTx) {
+            if (blobBaseFeeResult.status === 'fulfilled' && typeof blobBaseFeeResult.value === 'bigint') {
+                blobBaseFee = blobBaseFeeResult.value;
+            } else {
+                logger?.warn('Failed to get L1 blob base fee');
+            }
+        }
+        // Extract network estimate
+        const networkEstimate = networkEstimateResult.status === 'fulfilled' && typeof networkEstimateResult.value === 'bigint' ? networkEstimateResult.value : 0n;
+        let competitiveFee = networkEstimate;
+        const debugInfo = {
+            networkEstimateGwei: formatGwei(networkEstimate)
+        };
+        // Extract pending block
+        const pendingBlock = pendingBlockResult.status === 'fulfilled' ? pendingBlockResult.value : null;
+        // Analyze pending block transactions
+        if (pendingBlock?.transactions && pendingBlock.transactions.length > 0) {
+            const pendingFees = pendingBlock.transactions.map((tx)=>{
+                if (typeof tx === 'string') {
+                    return 0n;
+                }
+                return tx.maxPriorityFeePerGas || 0n;
+            }).filter((fee)=>fee > 0n);
+            if (pendingFees.length > 0) {
+                // Use 75th percentile of pending fees to be competitive
+                const pendingCompetitiveFee = calculatePercentile(pendingFees, 75);
+                if (pendingCompetitiveFee > competitiveFee) {
+                    competitiveFee = pendingCompetitiveFee;
+                }
+                debugInfo.pendingTxCount = pendingFees.length;
+                debugInfo.pendingP75Gwei = formatGwei(pendingCompetitiveFee);
+                logger?.debug('Analyzed pending transactions for competitive pricing', {
+                    pendingTxCount: pendingFees.length,
+                    pendingP75: formatGwei(pendingCompetitiveFee)
+                });
+            }
+        }
+        // Extract fee history
+        const feeHistory = feeHistoryResult.status === 'fulfilled' ? feeHistoryResult.value : null;
+        // Analyze fee history
+        if (feeHistory?.reward && feeHistory.reward.length > 0) {
+            // 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) {
+                    logger?.warn('Suspicious high fee in history', {
+                        historicalMedian: formatGwei(medianHistoricalFee),
+                        allP75Fees: percentile75Fees.map((f)=>formatGwei(f))
+                    });
+                }
+                if (medianHistoricalFee > competitiveFee) {
+                    competitiveFee = medianHistoricalFee;
+                }
+                debugInfo.historicalMedianGwei = formatGwei(medianHistoricalFee);
+                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
+        const maxReasonableFee = networkEstimate * 100n;
+        if (competitiveFee > maxReasonableFee && networkEstimate > 0n) {
+            logger?.debug('Competitive fee exceeds sanity cap, using capped value', {
+                competitiveFee: formatGwei(competitiveFee),
+                networkEstimate: formatGwei(networkEstimate),
+                cappedTo: formatGwei(maxReasonableFee)
+            });
+            competitiveFee = maxReasonableFee;
+            debugInfo.cappedToGwei = formatGwei(maxReasonableFee);
+        }
+        // Log final decision
+        if (competitiveFee > networkEstimate) {
+            logger?.debug('Using competitive fee from market analysis', {
+                networkEstimate: formatGwei(networkEstimate),
+                competitive: formatGwei(competitiveFee)
+            });
+        }
+        debugInfo.finalFeeGwei = formatGwei(competitiveFee);
+        return {
+            priorityFee: competitiveFee,
+            latestBlock,
+            blobBaseFee,
+            debugInfo
+        };
+    }
+};

package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.d.ts

@@ -0,0 +1,23 @@
+import { type GetFeeHistoryReturnType } from 'viem';
+import type { ViemClient } from '../../types.js';
+import { type PriorityFeeStrategy } from './types.js';
+/**
+ * Fetches historical blocks and calculates reward percentiles for blob transactions only.
+ * Returns data in the same format as getFeeHistory for easy drop-in replacement.
+ *
+ * @param client - Viem client to use for RPC calls
+ * @param blockCount - Number of historical blocks to fetch
+ * @param rewardPercentiles - Array of percentiles to calculate (e.g., [75] for 75th percentile)
+ * @returns Object with reward field containing percentile fees for each block, similar to getFeeHistory
+ * @throws Error if fetching blocks fails
+ */
+export declare function getBlobPriorityFeeHistory(client: ViemClient, blockCount: number, rewardPercentiles: number[]): Promise<GetFeeHistoryReturnType>;
+/**
+ * Similar to our current competitive priority fee strategy, but only considers blob transactions
+ * when calculating competitive priority fee for blob transactions.
+ * This strategy also has NO cap on the competitive fee if it's much higher than the network estimate.
+ * Analyzes p75 of pending transactions and 5-block fee history to determine a competitive priority fee.
+ * Falls back to network estimate if data is unavailable.
+ */
+export declare const P75BlobTxsOnlyPriorityFeeStrategy: PriorityFeeStrategy;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicDc1X2NvbXBldGl0aXZlX2Jsb2JfdHhzX29ubHkuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9sMV90eF91dGlscy9mZWUtc3RyYXRlZ2llcy9wNzVfY29tcGV0aXRpdmVfYmxvYl90eHNfb25seS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsS0FBSyx1QkFBdUIsRUFBYyxNQUFNLE1BQU0sQ0FBQztBQUVoRSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUdqRCxPQUFPLEVBRUwsS0FBSyxtQkFBbUIsRUFHekIsTUFBTSxZQUFZLENBQUM7QUFFcEI7Ozs7Ozs7OztHQVNHO0FBQ0gsd0JBQXNCLHlCQUF5QixDQUM3QyxNQUFNLEVBQUUsVUFBVSxFQUNsQixVQUFVLEVBQUUsTUFBTSxFQUNsQixpQkFBaUIsRUFBRSxNQUFNLEVBQUUsR0FDMUIsT0FBTyxDQUFDLHVCQUF1QixDQUFDLENBc0VsQztBQUVEOzs7Ozs7R0FNRztBQUNILGVBQU8sTUFBTSxpQ0FBaUMsRUFBRSxtQkF5SS9DLENBQUMifQ==

package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"p75_competitive_blob_txs_only.d.ts","sourceRoot":"","sources":["../../../src/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,uBAAuB,EAAc,MAAM,MAAM,CAAC;AAEhE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGjD,OAAO,EAEL,KAAK,mBAAmB,EAGzB,MAAM,YAAY,CAAC;AAEpB;;;;;;;;;GASG;AACH,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,UAAU,EAClB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EAAE,GAC1B,OAAO,CAAC,uBAAuB,CAAC,CAsElC;AAED;;;;;;GAMG;AACH,eAAO,MAAM,iCAAiC,EAAE,mBAyI/C,CAAC"}

package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.js

@@ -0,0 +1,191 @@
+import { median } from '@aztec/foundation/collection';
+import { formatGwei } from 'viem';
+import { calculatePercentile, isBlobTransaction } from '../../utils.js';
+import { WEI_CONST } from '../constants.js';
+import { HISTORICAL_BLOCK_COUNT } from './types.js';
+/**
+ * Fetches historical blocks and calculates reward percentiles for blob transactions only.
+ * Returns data in the same format as getFeeHistory for easy drop-in replacement.
+ *
+ * @param client - Viem client to use for RPC calls
+ * @param blockCount - Number of historical blocks to fetch
+ * @param rewardPercentiles - Array of percentiles to calculate (e.g., [75] for 75th percentile)
+ * @returns Object with reward field containing percentile fees for each block, similar to getFeeHistory
+ * @throws Error if fetching blocks fails
+ */ export async function getBlobPriorityFeeHistory(client, blockCount, rewardPercentiles) {
+    const latestBlockNumber = await client.getBlockNumber();
+    // Fetch multiple blocks in parallel
+    const blockPromises = Array.from({
+        length: blockCount
+    }, (_, i)=>client.getBlock({
+            blockNumber: latestBlockNumber - BigInt(i),
+            includeTransactions: true
+        }));
+    const blocks = await Promise.all(blockPromises);
+    // Process each block to extract blob transaction fees and other data
+    const baseFeePerGas = [];
+    const gasUsedRatio = [];
+    const reward = [];
+    for (const block of blocks){
+        // Collect base fee per gas
+        baseFeePerGas.push(block.baseFeePerGas || 0n);
+        // Calculate gas used ratio
+        const gasUsed = block.gasUsed || 0n;
+        const gasLimit = block.gasLimit || 1n; // Avoid division by zero
+        gasUsedRatio.push(Number(gasUsed) / Number(gasLimit));
+        if (!block.transactions || block.transactions.length === 0) {
+            // No transactions in this block - return zeros for each percentile
+            reward.push(rewardPercentiles.map(()=>0n));
+            continue;
+        }
+        // Extract priority fees from blob transactions only
+        const blobFees = block.transactions.map((tx)=>{
+            // Transaction can be just a hash string
+            if (typeof tx === 'string') {
+                return 0n;
+            }
+            if (!isBlobTransaction(tx)) {
+                return 0n;
+            }
+            return tx.maxPriorityFeePerGas || 0n;
+        }).filter((fee)=>fee > 0n);
+        if (blobFees.length === 0) {
+            // No blob transactions in this block - return zeros for each percentile
+            reward.push(rewardPercentiles.map(()=>0n));
+            continue;
+        }
+        // Calculate requested percentiles
+        const percentiles = rewardPercentiles.map((percentile)=>calculatePercentile(blobFees, percentile));
+        reward.push(percentiles);
+    }
+    // Calculate oldest block number (the last block in our array)
+    const oldestBlock = latestBlockNumber - BigInt(blockCount - 1);
+    // Reverse arrays to match getFeeHistory behavior (oldest first)
+    return {
+        baseFeePerGas: baseFeePerGas.reverse(),
+        gasUsedRatio: gasUsedRatio.reverse(),
+        oldestBlock,
+        reward: reward.reverse()
+    };
+}
+/**
+ * Similar to our current competitive priority fee strategy, but only considers blob transactions
+ * when calculating competitive priority fee for blob transactions.
+ * This strategy also has NO cap on the competitive fee if it's much higher than the network estimate.
+ * Analyzes p75 of pending transactions and 5-block fee history to determine a competitive priority fee.
+ * Falls back to network estimate if data is unavailable.
+ */ export const P75BlobTxsOnlyPriorityFeeStrategy = {
+    name: 'Competitive (P75 + History) - Blob Txs Only',
+    id: 'p75_pending_txs_and_history_blob_txs_only',
+    async execute (client, context) {
+        const { isBlobTx, logger } = context;
+        // Fire all RPC calls in parallel
+        const [latestBlockResult, blobBaseFeeResult, networkEstimateResult, pendingBlockResult, feeHistoryResult] = await Promise.allSettled([
+            client.getBlock({
+                blockTag: 'latest'
+            }),
+            isBlobTx ? client.getBlobBaseFee() : Promise.resolve(undefined),
+            client.estimateMaxPriorityFeePerGas().catch(()=>0n),
+            client.getBlock({
+                blockTag: 'pending',
+                includeTransactions: true
+            }).catch(()=>null),
+            isBlobTx ? getBlobPriorityFeeHistory(client, HISTORICAL_BLOCK_COUNT, [
+                75
+            ]) : client.getFeeHistory({
+                blockCount: HISTORICAL_BLOCK_COUNT,
+                rewardPercentiles: [
+                    75
+                ],
+                blockTag: 'latest'
+            }).catch(()=>null)
+        ]);
+        // Extract latest block (required)
+        if (latestBlockResult.status === 'rejected') {
+            throw new Error(`Failed to get latest block: ${latestBlockResult.reason}`);
+        }
+        const latestBlock = latestBlockResult.value;
+        // Extract blob base fee (only for blob txs)
+        let blobBaseFee;
+        if (isBlobTx) {
+            if (blobBaseFeeResult.status === 'fulfilled' && typeof blobBaseFeeResult.value === 'bigint') {
+                blobBaseFee = blobBaseFeeResult.value;
+            } else {
+                logger?.warn('Failed to get L1 blob base fee');
+            }
+        }
+        // Extract network estimate
+        const networkEstimate = networkEstimateResult.status === 'fulfilled' && typeof networkEstimateResult.value === 'bigint' ? networkEstimateResult.value : 0n;
+        let competitiveFee = networkEstimate;
+        const debugInfo = {
+            networkEstimateGwei: formatGwei(networkEstimate)
+        };
+        // Extract pending block
+        const pendingBlock = pendingBlockResult.status === 'fulfilled' ? pendingBlockResult.value : null;
+        // Analyze pending block transactions
+        if (pendingBlock?.transactions && pendingBlock.transactions.length > 0) {
+            const pendingFees = pendingBlock.transactions.map((tx)=>{
+                if (typeof tx === 'string') {
+                    return 0n;
+                }
+                if (isBlobTx) {
+                    if (!isBlobTransaction(tx)) {
+                        return 0n;
+                    }
+                }
+                return tx.maxPriorityFeePerGas || 0n;
+            }).filter((fee)=>fee > 0n);
+            if (pendingFees.length > 0) {
+                const pendingCompetitiveFee = calculatePercentile(pendingFees, 75);
+                if (pendingCompetitiveFee > competitiveFee) {
+                    competitiveFee = pendingCompetitiveFee;
+                }
+                debugInfo.pendingTxCount = pendingFees.length;
+                debugInfo.pendingP75Gwei = formatGwei(pendingCompetitiveFee);
+                logger?.debug('Analyzed pending transactions for competitive pricing', {
+                    pendingTxCount: pendingFees.length,
+                    pendingP75: formatGwei(pendingCompetitiveFee)
+                });
+            }
+        }
+        // Extract fee history
+        const feeHistory = feeHistoryResult.status === 'fulfilled' ? feeHistoryResult.value : null;
+        // Analyze fee history
+        if (feeHistory?.reward && feeHistory.reward.length > 0) {
+            // 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) {
+                    logger?.debug('Suspicious high fee in history', {
+                        historicalMedian: formatGwei(medianHistoricalFee),
+                        allP75Fees: percentile75Fees.map((f)=>formatGwei(f))
+                    });
+                }
+                if (medianHistoricalFee > competitiveFee) {
+                    competitiveFee = medianHistoricalFee;
+                }
+                debugInfo.historicalMedianGwei = formatGwei(medianHistoricalFee);
+                logger?.debug('Analyzed fee history for competitive pricing', {
+                    historicalMedian: formatGwei(medianHistoricalFee)
+                });
+            }
+        }
+        // Log final decision
+        if (competitiveFee > networkEstimate) {
+            logger?.debug('Using competitive fee from market analysis', {
+                networkEstimate: formatGwei(networkEstimate),
+                competitive: formatGwei(competitiveFee)
+            });
+        }
+        debugInfo.finalFeeGwei = formatGwei(competitiveFee);
+        return {
+            priorityFee: competitiveFee,
+            latestBlock,
+            blobBaseFee,
+            debugInfo
+        };
+    }
+};