@aztec/ethereum 0.0.1-commit.03f7ef2 → 0.0.1-commit.04d373f

package/dest/l1_contract_addresses.js

@@ -1,11 +1,11 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { schemas, zodFor } from '@aztec/foundation/schemas';
+import { schemas } from '@aztec/foundation/schemas';
 import { z } from 'zod';
 /**
- * The names of the current L1 contract addresses.
+ * Required L1 contract address keys.
  * NOTE: When changing this list, make sure to update CLI & CI scripts accordingly.
  * For reference: https://github.com/AztecProtocol/aztec-packages/pull/5553
- */ export const L1ContractsNames = [
+ */ const REQUIRED_L1_CONTRACT_ADDRESS_KEYS = [
     'rollupAddress',
     'registryAddress',
     'inboxAddress',
@@ -18,84 +18,103 @@ import { z } from 'zod';
     'governanceAddress',
     'stakingAssetAddress'
 ];
-export const L1ContractAddressesSchema = zodFor()(z.object({
-    rollupAddress: schemas.EthAddress,
-    registryAddress: schemas.EthAddress,
-    inboxAddress: schemas.EthAddress,
-    outboxAddress: schemas.EthAddress,
-    feeJuiceAddress: schemas.EthAddress,
-    stakingAssetAddress: schemas.EthAddress,
-    feeJuicePortalAddress: schemas.EthAddress,
-    coinIssuerAddress: schemas.EthAddress,
-    rewardDistributorAddress: schemas.EthAddress,
-    governanceProposerAddress: schemas.EthAddress,
-    governanceAddress: schemas.EthAddress,
-    slashFactoryAddress: schemas.EthAddress.optional(),
-    feeAssetHandlerAddress: schemas.EthAddress.optional(),
-    stakingAssetHandlerAddress: schemas.EthAddress.optional(),
-    zkPassportVerifierAddress: schemas.EthAddress.optional(),
-    gseAddress: schemas.EthAddress.optional(),
-    dateGatedRelayerAddress: schemas.EthAddress.optional()
-}));
+/** Optional L1 contract address keys — present only in some deployments. */ export const OPTIONAL_L1_CONTRACT_ADDRESS_KEYS = [
+    'feeAssetHandlerAddress',
+    'stakingAssetHandlerAddress',
+    'zkPassportVerifierAddress',
+    'gseAddress',
+    'dateGatedRelayerAddress'
+];
+/**
+ * Names of required L1 contract addresses.
+ * NOTE: When changing the set of contracts, update CLI & CI scripts accordingly.
+ * For reference: https://github.com/AztecProtocol/aztec-packages/pull/5553
+ */ export const L1ContractsNames = REQUIRED_L1_CONTRACT_ADDRESS_KEYS;
 const parseEnv = (val)=>EthAddress.fromString(val);
-export const l1ContractAddressesMapping = {
-    registryAddress: {
-        env: 'REGISTRY_CONTRACT_ADDRESS',
-        description: 'The deployed L1 registry contract address.',
-        parseEnv
-    },
-    slashFactoryAddress: {
-        env: 'SLASH_FACTORY_CONTRACT_ADDRESS',
-        description: 'The deployed L1 slashFactory contract address',
-        parseEnv
-    },
-    feeAssetHandlerAddress: {
-        env: 'FEE_ASSET_HANDLER_CONTRACT_ADDRESS',
-        description: 'The deployed L1 feeAssetHandler contract address',
-        parseEnv
-    },
-    rollupAddress: {
-        description: 'The deployed L1 rollup contract address.',
-        parseEnv
-    },
-    inboxAddress: {
-        description: 'The deployed L1 inbox contract address.',
-        parseEnv
-    },
-    outboxAddress: {
-        description: 'The deployed L1 outbox contract address.',
-        parseEnv
-    },
-    feeJuiceAddress: {
-        description: 'The deployed L1 Fee Juice contract address.',
-        parseEnv
-    },
-    stakingAssetAddress: {
-        description: 'The deployed L1 staking asset contract address.',
-        parseEnv
-    },
-    feeJuicePortalAddress: {
-        description: 'The deployed L1 Fee Juice portal contract address.',
-        parseEnv
-    },
-    coinIssuerAddress: {
-        description: 'The deployed L1 coinIssuer contract address',
-        parseEnv
-    },
-    rewardDistributorAddress: {
-        description: 'The deployed L1 rewardDistributor contract address',
-        parseEnv
-    },
-    governanceProposerAddress: {
-        description: 'The deployed L1 governanceProposer contract address',
-        parseEnv
-    },
-    governanceAddress: {
-        description: 'The deployed L1 governance contract address',
-        parseEnv
-    },
-    stakingAssetHandlerAddress: {
-        description: 'The deployed L1 stakingAssetHandler contract address',
-        parseEnv
-    }
+const addrEnv = (description, env)=>({
+        description,
+        parseEnv,
+        ...env && {
+            env
+        }
+    });
+/**
+ * Config mapping for all L1 contract addresses.
+ * This is the single source of truth for which contract addresses exist and how to parse them.
+ */ export const l1ContractAddressesMapping = {
+    rollupAddress: addrEnv('The deployed L1 rollup contract address.'),
+    registryAddress: addrEnv('The deployed L1 registry contract address.', 'REGISTRY_CONTRACT_ADDRESS'),
+    inboxAddress: addrEnv('The deployed L1 inbox contract address.'),
+    outboxAddress: addrEnv('The deployed L1 outbox contract address.'),
+    feeJuiceAddress: addrEnv('The deployed L1 Fee Juice contract address.'),
+    feeJuicePortalAddress: addrEnv('The deployed L1 Fee Juice portal contract address.'),
+    coinIssuerAddress: addrEnv('The deployed L1 coinIssuer contract address'),
+    rewardDistributorAddress: addrEnv('The deployed L1 rewardDistributor contract address'),
+    governanceProposerAddress: addrEnv('The deployed L1 governanceProposer contract address'),
+    governanceAddress: addrEnv('The deployed L1 governance contract address'),
+    stakingAssetAddress: addrEnv('The deployed L1 staking asset contract address.'),
+    feeAssetHandlerAddress: addrEnv('The deployed L1 feeAssetHandler contract address', 'FEE_ASSET_HANDLER_CONTRACT_ADDRESS'),
+    stakingAssetHandlerAddress: addrEnv('The deployed L1 stakingAssetHandler contract address'),
+    zkPassportVerifierAddress: addrEnv('The deployed L1 ZK passport verifier contract address'),
+    gseAddress: addrEnv('The deployed L1 GSE contract address'),
+    dateGatedRelayerAddress: addrEnv('The deployed L1 date-gated relayer contract address')
 };
+export const L1ContractAddressesSchema = z.object({
+    ...Object.fromEntries(REQUIRED_L1_CONTRACT_ADDRESS_KEYS.map((k)=>[
+            k,
+            schemas.EthAddress
+        ])),
+    ...Object.fromEntries(OPTIONAL_L1_CONTRACT_ADDRESS_KEYS.map((k)=>[
+            k,
+            schemas.EthAddress.optional()
+        ]))
+});
+/**
+ * Selects entries from {@link l1ContractAddressesMapping} so composed configs can reuse the same
+ * env vars, descriptions, and parsers without duplicating definitions.
+ *
+ * @example
+ * ```ts
+ * const mappings = {
+ *   ...pickL1ContractAddressMappings('rollupAddress'),
+ *   nodeId: { ... },
+ * };
+ * ```
+ */ export function pickL1ContractAddressMappings(...keys) {
+    return Object.fromEntries(keys.map((key)=>[
+            key,
+            l1ContractAddressesMapping[key]
+        ]));
+}
+/**
+ * Like {@link pickL1ContractAddressMappings}, but returns a fragment of {@link L1ContractAddressesSchema}'s shape for
+ * spreading into `z.object({ ...pickL1ContractAddressesSchemaShape('rollupAddress'), localField: z... })`.
+ */ export function pickL1ContractAddressesSchema(...keys) {
+    return Object.fromEntries(keys.map((key)=>[
+            key,
+            L1ContractAddressesSchema.shape[key]
+        ]));
+}
+/** Builds an {@link L1ContractAddresses} object from config that stores those fields at the top level. */ export function pickL1ContractAddresses(config) {
+    const result = {};
+    for (const key of REQUIRED_L1_CONTRACT_ADDRESS_KEYS){
+        result[key] = config[key];
+    }
+    for (const key of OPTIONAL_L1_CONTRACT_ADDRESS_KEYS){
+        const v = config[key];
+        if (v !== undefined) {
+            result[key] = v;
+        }
+    }
+    return result;
+}
+export function randomL1ContractAddresses(includeOptional = false) {
+    const keys = includeOptional ? [
+        ...L1ContractsNames,
+        ...OPTIONAL_L1_CONTRACT_ADDRESS_KEYS
+    ] : L1ContractsNames;
+    return Object.fromEntries(keys.map((name)=>[
+            name,
+            EthAddress.random()
+        ]));
+}

package/dest/l1_reader.d.ts

@@ -1,18 +1,18 @@
 import { type ConfigMappingsType } from '@aztec/foundation/config';
 import { type L1ContractAddresses } from './l1_contract_addresses.js';
 /** Configuration of the L1GlobalReader. */
-export interface L1ReaderConfig {
+export type L1ReaderConfig = {
     /** List of URLs of Ethereum RPC nodes that services will connect to (comma separated). */
     l1RpcUrls: string[];
     /** The RPC Url of the ethereum debug host for trace and debug methods. */
     l1DebugRpcUrls: string[];
     /** The chain ID of the ethereum host. */
     l1ChainId: number;
-    /** The deployed l1 contract addresses */
-    l1Contracts: L1ContractAddresses;
     /** The polling interval viem uses in ms */
     viemPollingIntervalMS: number;
-}
+    /** Timeout for HTTP requests to the L1 RPC node in ms. */
+    l1HttpTimeoutMS?: number;
+} & L1ContractAddresses;
 export declare const l1ReaderConfigMappings: ConfigMappingsType<L1ReaderConfig>;
 export declare function getL1ReaderConfigFromEnv(): L1ReaderConfig;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfcmVhZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvbDFfcmVhZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGtCQUFrQixFQUE2QyxNQUFNLDBCQUEwQixDQUFDO0FBRTlHLE9BQU8sRUFBRSxLQUFLLG1CQUFtQixFQUE4QixNQUFNLDRCQUE0QixDQUFDO0FBRWxHLDJDQUEyQztBQUMzQyxNQUFNLFdBQVcsY0FBYztJQUM3QiwwRkFBMEY7SUFDMUYsU0FBUyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3BCLDBFQUEwRTtJQUMxRSxjQUFjLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDekIseUNBQXlDO0lBQ3pDLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIseUNBQXlDO0lBQ3pDLFdBQVcsRUFBRSxtQkFBbUIsQ0FBQztJQUNqQywyQ0FBMkM7SUFDM0MscUJBQXFCLEVBQUUsTUFBTSxDQUFDO0NBQy9CO0FBRUQsZUFBTyxNQUFNLHNCQUFzQixFQUFFLGtCQUFrQixDQUFDLGNBQWMsQ0EyQnJFLENBQUM7QUFFRix3QkFBZ0Isd0JBQXdCLElBQUksY0FBYyxDQUV6RCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfcmVhZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvbDFfcmVhZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLGtCQUFrQixFQUl4QixNQUFNLDBCQUEwQixDQUFDO0FBRWxDLE9BQU8sRUFBRSxLQUFLLG1CQUFtQixFQUE4QixNQUFNLDRCQUE0QixDQUFDO0FBRWxHLDJDQUEyQztBQUMzQyxNQUFNLE1BQU0sY0FBYyxHQUFHO0lBQzNCLDBGQUEwRjtJQUMxRixTQUFTLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDcEIsMEVBQTBFO0lBQzFFLGNBQWMsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUN6Qix5Q0FBeUM7SUFDekMsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQiwyQ0FBMkM7SUFDM0MscUJBQXFCLEVBQUUsTUFBTSxDQUFDO0lBQzlCLDBEQUEwRDtJQUMxRCxlQUFlLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDMUIsR0FBRyxtQkFBbUIsQ0FBQztBQUV4QixlQUFPLE1BQU0sc0JBQXNCLEVBQUUsa0JBQWtCLENBQUMsY0FBYyxDQTZCckUsQ0FBQztBQUVGLHdCQUFnQix3QkFBd0IsSUFBSSxjQUFjLENBRXpEIn0=

package/dest/l1_reader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l1_reader.d.ts","sourceRoot":"","sources":["../src/l1_reader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAA6C,MAAM,0BAA0B,CAAC;AAE9G,OAAO,EAAE,KAAK,mBAAmB,EAA8B,MAAM,4BAA4B,CAAC;AAElG,2CAA2C;AAC3C,MAAM,WAAW,cAAc;IAC7B,0FAA0F;IAC1F,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,0EAA0E;IAC1E,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,yCAAyC;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,yCAAyC;IACzC,WAAW,EAAE,mBAAmB,CAAC;IACjC,2CAA2C;IAC3C,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AAED,eAAO,MAAM,sBAAsB,EAAE,kBAAkB,CAAC,cAAc,CA2BrE,CAAC;AAEF,wBAAgB,wBAAwB,IAAI,cAAc,CAEzD"}
+{"version":3,"file":"l1_reader.d.ts","sourceRoot":"","sources":["../src/l1_reader.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,KAAK,mBAAmB,EAA8B,MAAM,4BAA4B,CAAC;AAElG,2CAA2C;AAC3C,MAAM,MAAM,cAAc,GAAG;IAC3B,0FAA0F;IAC1F,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,0EAA0E;IAC1E,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,yCAAyC;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,2CAA2C;IAC3C,qBAAqB,EAAE,MAAM,CAAC;IAC9B,0DAA0D;IAC1D,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,GAAG,mBAAmB,CAAC;AAExB,eAAO,MAAM,sBAAsB,EAAE,kBAAkB,CAAC,cAAc,CA6BrE,CAAC;AAEF,wBAAgB,wBAAwB,IAAI,cAAc,CAEzD"}

package/dest/l1_reader.js

@@ -1,13 +1,9 @@
-import { getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
+import { getConfigFromMappings, numberConfigHelper, optionalNumberConfigHelper } from '@aztec/foundation/config';
 import { l1ContractAddressesMapping } from './l1_contract_addresses.js';
 export const l1ReaderConfigMappings = {
-    l1Contracts: {
-        description: 'The deployed L1 contract addresses',
-        nested: l1ContractAddressesMapping
-    },
     l1ChainId: {
         env: 'L1_CHAIN_ID',
-        parseEnv: (val)=>+val,
+        ...optionalNumberConfigHelper(),
         description: 'The chain ID of the ethereum host.'
     },
     l1RpcUrls: {
@@ -26,7 +22,13 @@ export const l1ReaderConfigMappings = {
         env: 'L1_READER_VIEM_POLLING_INTERVAL_MS',
         description: 'The polling interval viem uses in ms',
         ...numberConfigHelper(1_000)
-    }
+    },
+    l1HttpTimeoutMS: {
+        env: 'ETHEREUM_HTTP_TIMEOUT_MS',
+        description: 'Timeout for HTTP requests to the L1 RPC node in ms.',
+        ...optionalNumberConfigHelper()
+    },
+    ...l1ContractAddressesMapping
 };
 export function getL1ReaderConfigFromEnv() {
     return getConfigFromMappings(l1ReaderConfigMappings);

package/dest/l1_tx_utils/config.d.ts

@@ -52,8 +52,14 @@ export interface L1TxUtilsConfig {
      * How long a tx nonce can be unseen in the mempool before considering it dropped
      */
     txUnseenConsideredDroppedMs?: number;
+    /** Enable tx delayer. When true, wraps the viem client to intercept and delay txs. Test-only. */
+    enableDelayer?: boolean;
+    /** Max seconds into an L1 slot for tx inclusion. Txs sent later are deferred to next slot. Only used when enableDelayer is true. */
+    txDelayerMaxInclusionTimeIntoSlot?: number;
+    /** How many seconds an L1 slot lasts. */
+    ethereumSlotDuration?: number;
 }
 export declare const l1TxUtilsConfigMappings: ConfigMappingsType<L1TxUtilsConfig>;
 export declare const defaultL1TxUtilsConfig: Required<L1TxUtilsConfig>;
 export declare function getL1TxUtilsConfigEnvVars(): L1TxUtilsConfig;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbDFfdHhfdXRpbHMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLGtCQUFrQixFQU14QixNQUFNLDBCQUEwQixDQUFDO0FBRWxDLE1BQU0sV0FBVyxlQUFlO0lBQzlCOztPQUVHO0lBQ0gsd0JBQXdCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbEM7O09BRUc7SUFDSCxPQUFPLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDakI7O09BRUc7SUFDSCxXQUFXLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDckI7O09BRUc7SUFDSCx5QkFBeUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNuQzs7T0FFRztJQUNILDhCQUE4QixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ3hDOztPQUVHO0lBQ0gsd0JBQXdCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbEM7O09BRUc7SUFDSCxrQkFBa0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUM1Qjs7T0FFRztJQUNILGVBQWUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN6Qjs7T0FFRztJQUNILFdBQVcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNyQjs7T0FFRztJQUNILFdBQVcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNyQjs7T0FFRztJQUNILGlCQUFpQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQzVCOztPQUVHO0lBQ0gsNEJBQTRCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDdEM7O09BRUc7SUFDSCwyQkFBMkIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUN0QztBQUVELGVBQU8sTUFBTSx1QkFBdUIsRUFBRSxrQkFBa0IsQ0FBQyxlQUFlLENBZ0Z2RSxDQUFDO0FBR0YsZUFBTyxNQUFNLHNCQUFzQiwyQkFFTCxDQUFDO0FBRS9CLHdCQUFnQix5QkFBeUIsSUFBSSxlQUFlLENBRTNEIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbDFfdHhfdXRpbHMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLGtCQUFrQixFQU94QixNQUFNLDBCQUEwQixDQUFDO0FBRWxDLE1BQU0sV0FBVyxlQUFlO0lBQzlCOztPQUVHO0lBQ0gsd0JBQXdCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbEM7O09BRUc7SUFDSCxPQUFPLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDakI7O09BRUc7SUFDSCxXQUFXLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDckI7O09BRUc7SUFDSCx5QkFBeUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNuQzs7T0FFRztJQUNILDhCQUE4QixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ3hDOztPQUVHO0lBQ0gsd0JBQXdCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbEM7O09BRUc7SUFDSCxrQkFBa0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUM1Qjs7T0FFRztJQUNILGVBQWUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN6Qjs7T0FFRztJQUNILFdBQVcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNyQjs7T0FFRztJQUNILFdBQVcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNyQjs7T0FFRztJQUNILGlCQUFpQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQzVCOztPQUVHO0lBQ0gsNEJBQTRCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDdEM7O09BRUc7SUFDSCwyQkFBMkIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNyQyxpR0FBaUc7SUFDakcsYUFBYSxDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQ3hCLG9JQUFvSTtJQUNwSSxpQ0FBaUMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUMzQyx5Q0FBeUM7SUFDekMsb0JBQW9CLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDL0I7QUFFRCxlQUFPLE1BQU0sdUJBQXVCLEVBQUUsa0JBQWtCLENBQUMsZUFBZSxDQTZGdkUsQ0FBQztBQUdGLGVBQU8sTUFBTSxzQkFBc0IsMkJBRUwsQ0FBQztBQUUvQix3QkFBZ0IseUJBQXlCLElBQUksZUFBZSxDQUUzRCJ9

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

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/l1_tx_utils/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAMxB,MAAM,0BAA0B,CAAC;AAElC,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC;;OAEG;IACH,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC;;OAEG;IACH,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC;;OAEG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;OAEG;IACH,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC;;OAEG;IACH,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC;AAED,eAAO,MAAM,uBAAuB,EAAE,kBAAkB,CAAC,eAAe,CAgFvE,CAAC;AAGF,eAAO,MAAM,sBAAsB,2BAEL,CAAC;AAE/B,wBAAgB,yBAAyB,IAAI,eAAe,CAE3D"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/l1_tx_utils/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAOxB,MAAM,0BAA0B,CAAC;AAElC,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC;;OAEG;IACH,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC;;OAEG;IACH,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC;;OAEG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;OAEG;IACH,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC;;OAEG;IACH,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,iGAAiG;IACjG,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,oIAAoI;IACpI,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,yCAAyC;IACzC,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,eAAO,MAAM,uBAAuB,EAAE,kBAAkB,CAAC,eAAe,CA6FvE,CAAC;AAGF,eAAO,MAAM,sBAAsB,2BAEL,CAAC;AAE/B,wBAAgB,yBAAyB,IAAI,eAAe,CAE3D"}

package/dest/l1_tx_utils/config.js

@@ -1,4 +1,4 @@
-import { booleanConfigHelper, floatConfigHelper, 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)',
@@ -84,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

package/dest/l1_tx_utils/constants.d.ts

@@ -1,5 +1,5 @@
 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;

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;

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=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2wxX3R4X3V0aWxzL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBSXZELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzdELE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLFVBQVUsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUN4RSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLFVBQVUsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ2hFLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUk3Qyx3QkFBZ0IsNkJBQTZCLENBQzNDLE1BQU0sRUFBRSx3QkFBd0IsRUFDaEMsSUFBSSxDQUFDLEVBQUU7SUFDTCxNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDaEIsWUFBWSxDQUFDLEVBQUUsWUFBWSxDQUFDO0lBQzVCLEtBQUssQ0FBQyxFQUFFLFVBQVUsQ0FBQztJQUNuQixPQUFPLENBQUMsRUFBRSxZQUFZLENBQUM7Q0FDeEIsRUFDRCxNQUFNLENBQUMsRUFBRSxPQUFPLENBQUMsZUFBZSxDQUFDLEdBQUc7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQTtDQUFFLEdBQ2pFLFNBQVMsQ0FZWDtBQUVELHdCQUFnQiw0QkFBNEIsQ0FDMUMsTUFBTSxFQUFFLFVBQVUsRUFDbEIsTUFBTSxFQUFFLFNBQVMsRUFDakIsSUFBSSxDQUFDLEVBQUU7SUFDTCxNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDaEIsWUFBWSxDQUFDLEVBQUUsWUFBWSxDQUFDO0lBQzVCLEtBQUssQ0FBQyxFQUFFLFVBQVUsQ0FBQztJQUNuQixPQUFPLENBQUMsRUFBRSxZQUFZLENBQUM7Q0FDeEIsRUFDRCxNQUFNLENBQUMsRUFBRSxPQUFPLENBQUMsZUFBZSxDQUFDLEdBQUc7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQTtDQUFFLEdBQ2pFLFNBQVMsQ0FnQlgifQ==
+//# 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

@@ -1,9 +1,10 @@
 import type { PriorityFeeStrategy } from './types.js';
-export { HISTORICAL_BLOCK_COUNT, executeStrategy, type PriorityFeeStrategy, type PriorityFeeStrategyContext, type PriorityFeeStrategyResult, } 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9sMV90eF91dGlscy9mZWUtc3RyYXRlZ2llcy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUV0RCxPQUFPLEVBQ0wsc0JBQXNCLEVBQ3RCLGVBQWUsRUFDZixLQUFLLG1CQUFtQixFQUN4QixLQUFLLDBCQUEwQixFQUMvQixLQUFLLHlCQUF5QixHQUMvQixNQUFNLFlBQVksQ0FBQztBQUVwQixPQUFPLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUVwRTs7O0dBR0c7QUFDSCxlQUFPLE1BQU0sK0JBQStCLEVBQUUsbUJBQW1CLEVBR2hFLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9sMV90eF91dGlscy9mZWUtc3RyYXRlZ2llcy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUV0RCxPQUFPLEVBQ0wsc0JBQXNCLEVBQ3RCLEtBQUssbUJBQW1CLEVBQ3hCLEtBQUssMEJBQTBCLEVBQy9CLEtBQUsseUJBQXlCLEdBQy9CLE1BQU0sWUFBWSxDQUFDO0FBRXBCLE9BQU8sRUFBRSw0QkFBNEIsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3BFLE9BQU8sRUFBRSxpQ0FBaUMsRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBRXZGOzs7R0FHRztBQUNILGVBQU8sTUFBTSwrQkFBK0IsRUFBRSxtQkFBbUIsRUFHaEUsQ0FBQyJ9

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

@@ -1 +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,eAAe,EACf,KAAK,mBAAmB,EACxB,KAAK,0BAA0B,EAC/B,KAAK,yBAAyB,GAC/B,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAEpE;;;GAGG;AACH,eAAO,MAAM,+BAA+B,EAAE,mBAAmB,EAGhE,CAAC"}
+{"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

@@ -1,7 +1,8 @@
 import { P75AllTxsPriorityFeeStrategy } from './p75_competitive.js';
 import { P75BlobTxsOnlyPriorityFeeStrategy } from './p75_competitive_blob_txs_only.js';
-export { HISTORICAL_BLOCK_COUNT, executeStrategy } from './types.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.

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

@@ -1,18 +1,8 @@
-import type { ViemClient } from '../../types.js';
 import { type PriorityFeeStrategy } from './types.js';
-/**
- * Type for the promises required by the competitive strategy
- */
-type P75AllTxsStrategyPromises = {
-    networkEstimate: Promise<bigint>;
-    pendingBlock: Promise<Awaited<ReturnType<ViemClient['getBlock']>> | null>;
-    feeHistory: Promise<Awaited<ReturnType<ViemClient['getFeeHistory']>> | null>;
-};
 /**
  * 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<P75AllTxsStrategyPromises>;
-export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicDc1X2NvbXBldGl0aXZlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbDFfdHhfdXRpbHMvZmVlLXN0cmF0ZWdpZXMvcDc1X2NvbXBldGl0aXZlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBR2pELE9BQU8sRUFFTCxLQUFLLG1CQUFtQixFQUd6QixNQUFNLFlBQVksQ0FBQztBQUVwQjs7R0FFRztBQUNILEtBQUsseUJBQXlCLEdBQUc7SUFDL0IsZUFBZSxFQUFFLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNqQyxZQUFZLEVBQUUsT0FBTyxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUMsQ0FBQztJQUMxRSxVQUFVLEVBQUUsT0FBTyxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUMsQ0FBQztDQUM5RSxDQUFDO0FBRUY7Ozs7R0FJRztBQUNILGVBQU8sTUFBTSw0QkFBNEIsRUFBRSxtQkFBbUIsQ0FBQyx5QkFBeUIsQ0FrSXZGLENBQUMifQ==
+export declare const P75AllTxsPriorityFeeStrategy: PriorityFeeStrategy;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicDc1X2NvbXBldGl0aXZlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbDFfdHhfdXRpbHMvZmVlLXN0cmF0ZWdpZXMvcDc1X2NvbXBldGl0aXZlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU9BLE9BQU8sRUFFTCxLQUFLLG1CQUFtQixFQUd6QixNQUFNLFlBQVksQ0FBQztBQUVwQjs7OztHQUlHO0FBQ0gsZUFBTyxNQUFNLDRCQUE0QixFQUFFLG1CQStJMUMsQ0FBQyJ9

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

@@ -1 +1 @@
-{"version":3,"file":"p75_competitive.d.ts","sourceRoot":"","sources":["../../../src/l1_tx_utils/fee-strategies/p75_competitive.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGjD,OAAO,EAEL,KAAK,mBAAmB,EAGzB,MAAM,YAAY,CAAC;AAEpB;;GAEG;AACH,KAAK,yBAAyB,GAAG;IAC/B,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACjC,YAAY,EAAE,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAC1E,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;CAC9E,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,4BAA4B,EAAE,mBAAmB,CAAC,yBAAyB,CAkIvF,CAAC"}
+{"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

@@ -10,40 +10,56 @@ import { HISTORICAL_BLOCK_COUNT } from './types.js';
  */ export const P75AllTxsPriorityFeeStrategy = {
     name: 'Competitive (P75 + History) - CURRENT',
     id: 'p75_pending_txs_and_history_all_txs',
-    getRequiredPromises (client) {
-        return {
-            networkEstimate: client.estimateMaxPriorityFeePerGas().catch(()=>0n),
-            pendingBlock: client.getBlock({
+    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),
-            feeHistory: client.getFeeHistory({
+            client.getFeeHistory({
                 blockCount: HISTORICAL_BLOCK_COUNT,
                 rewardPercentiles: [
                     75
                 ],
                 blockTag: 'latest'
             }).catch(()=>null)
-        };
-    },
-    calculate (results, context) {
-        const { logger } = context;
-        // Extract network estimate from settled result
-        const networkEstimate = results.networkEstimate.status === 'fulfilled' && typeof results.networkEstimate.value === 'bigint' ? results.networkEstimate.value : 0n;
+        ]);
+        // 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 from settled result
-        const pendingBlock = results.pendingBlock.status === 'fulfilled' ? results.pendingBlock.value : null;
+        // 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;
                 }
-                const fee = tx.maxPriorityFeePerGas || 0n;
-                return fee;
+                return tx.maxPriorityFeePerGas || 0n;
             }).filter((fee)=>fee > 0n);
             if (pendingFees.length > 0) {
                 // Use 75th percentile of pending fees to be competitive
@@ -59,8 +75,8 @@ import { HISTORICAL_BLOCK_COUNT } from './types.js';
                 });
             }
         }
-        // Extract fee history from settled result
-        const feeHistory = results.feeHistory.status === 'fulfilled' ? results.feeHistory.value : null;
+        // 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
@@ -87,7 +103,7 @@ import { HISTORICAL_BLOCK_COUNT } from './types.js';
         // Sanity check: cap competitive fee at 100x network estimate to avoid using unrealistic fees
         const maxReasonableFee = networkEstimate * 100n;
         if (competitiveFee > maxReasonableFee && networkEstimate > 0n) {
-            logger?.warn('Competitive fee exceeds sanity cap, using capped value', {
+            logger?.debug('Competitive fee exceeds sanity cap, using capped value', {
                 competitiveFee: formatGwei(competitiveFee),
                 networkEstimate: formatGwei(networkEstimate),
                 cappedTo: formatGwei(maxReasonableFee)
@@ -105,6 +121,8 @@ import { HISTORICAL_BLOCK_COUNT } from './types.js';
         debugInfo.finalFeeGwei = formatGwei(competitiveFee);
         return {
             priorityFee: competitiveFee,
+            latestBlock,
+            blobBaseFee,
             debugInfo
         };
     }

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

@@ -1,14 +1,6 @@
 import { type GetFeeHistoryReturnType } from 'viem';
 import type { ViemClient } from '../../types.js';
 import { type PriorityFeeStrategy } from './types.js';
-/**
- * Type for the promises required by the competitive strategy
- */
-type P75AllTxsStrategyPromises = {
-    networkEstimate: Promise<bigint>;
-    pendingBlock: Promise<Awaited<ReturnType<ViemClient['getBlock']>> | null>;
-    feeHistory: Promise<Awaited<ReturnType<ViemClient['getFeeHistory']>> | null>;
-};
 /**
  * Fetches historical blocks and calculates reward percentiles for blob transactions only.
  * Returns data in the same format as getFeeHistory for easy drop-in replacement.
@@ -27,6 +19,5 @@ export declare function getBlobPriorityFeeHistory(client: ViemClient, blockCount
  * 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<P75AllTxsStrategyPromises>;
-export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicDc1X2NvbXBldGl0aXZlX2Jsb2JfdHhzX29ubHkuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9sMV90eF91dGlscy9mZWUtc3RyYXRlZ2llcy9wNzVfY29tcGV0aXRpdmVfYmxvYl90eHNfb25seS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsS0FBSyx1QkFBdUIsRUFBYyxNQUFNLE1BQU0sQ0FBQztBQUVoRSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUdqRCxPQUFPLEVBRUwsS0FBSyxtQkFBbUIsRUFHekIsTUFBTSxZQUFZLENBQUM7QUFFcEI7O0dBRUc7QUFDSCxLQUFLLHlCQUF5QixHQUFHO0lBQy9CLGVBQWUsRUFBRSxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDakMsWUFBWSxFQUFFLE9BQU8sQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLEdBQUcsSUFBSSxDQUFDLENBQUM7SUFDMUUsVUFBVSxFQUFFLE9BQU8sQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDLEdBQUcsSUFBSSxDQUFDLENBQUM7Q0FDOUUsQ0FBQztBQUVGOzs7Ozs7Ozs7R0FTRztBQUNILHdCQUFzQix5QkFBeUIsQ0FDN0MsTUFBTSxFQUFFLFVBQVUsRUFDbEIsVUFBVSxFQUFFLE1BQU0sRUFDbEIsaUJBQWlCLEVBQUUsTUFBTSxFQUFFLEdBQzFCLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBQyxDQXNFbEM7QUFFRDs7Ozs7O0dBTUc7QUFDSCxlQUFPLE1BQU0saUNBQWlDLEVBQUUsbUJBQW1CLENBQUMseUJBQXlCLENBNEg1RixDQUFDIn0=
+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

@@ -1 +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;;GAEG;AACH,KAAK,yBAAyB,GAAG;IAC/B,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACjC,YAAY,EAAE,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAC1E,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;CAC9E,CAAC;AAEF;;;;;;;;;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,mBAAmB,CAAC,yBAAyB,CA4H5F,CAAC"}
+{"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"}