@pimlico/alto 0.0.0-main.20250123T175913 → 0.0.0-main.20250124T131133

package/lib/cli/config/bundler.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.optionArgsSchema = exports.gasEstimationArgsSchema = exports.debugArgsSchema = exports.logArgsSchema = exports.rpcArgsSchema = exports.serverArgsSchema = exports.compatibilityArgsSchema = exports.bundlerArgsSchema = void 0;
+exports.optionArgsSchema = exports.gasEstimationArgsSchema = exports.debugArgsSchema = exports.logArgsSchema = exports.rpcArgsSchema = exports.serverArgsSchema = exports.compatibilityArgsSchema = exports.executorArgsSchema = exports.bundlerArgsSchema = void 0;
 const types_1 = require("../../types/index.js");
 const accounts_1 = require("viem/accounts");
 const zod_1 = require("zod");
@@ -17,33 +17,7 @@ exports.bundlerArgsSchema = zod_1.z.object({
         return validatedAddresses;
     }),
     "deterministic-deployer-address": types_1.addressSchema,
-    "entrypoint-simulation-contract": zod_1.z.preprocess((v) => (v === "" ? undefined : v), types_1.addressSchema.optional()),
-    "refill-helper-contract": types_1.addressSchema.optional(),
-    "no-profit-bundling": zod_1.z.boolean(),
     "safe-mode": zod_1.z.boolean(),
-    "utility-private-key": types_1.hexData32Schema
-        .transform((val) => (0, accounts_1.privateKeyToAccount)(val))
-        .optional(),
-    "utility-wallet-monitor": zod_1.z.boolean(),
-    "utility-wallet-monitor-interval": zod_1.z.number(),
-    "executor-private-keys": zod_1.z.union([
-        zod_1.z
-            .array(types_1.hexData32Schema)
-            .transform((vals) => vals.map((val) => (0, accounts_1.privateKeyToAccount)(val))),
-        zod_1.z
-            .string()
-            .regex(/^0x(?:[0-9a-f]{2}){32}(?:,0x(?:[0-9a-f]{2}){32})*$/)
-            .transform((val) => val
-            .split(",")
-            .map((val) => (0, accounts_1.privateKeyToAccount)(val)))
-    ]),
-    "max-executors": zod_1.z.number().int().min(0).optional(),
-    "min-executor-balance": zod_1.z
-        .string()
-        .transform((val) => BigInt(val))
-        .optional(),
-    "executor-refill-interval": zod_1.z.number().int().min(0),
-    "executor-gas-multiplier": zod_1.z.string().transform((val) => BigInt(val)),
     "min-entity-stake": zod_1.z.number().int().min(0),
     "min-entity-unstake-delay": zod_1.z.number().int().min(0),
     "max-bundle-wait": zod_1.z.number().int().min(0),
@@ -85,11 +59,40 @@ exports.bundlerArgsSchema = zod_1.z.object({
             return true;
         return values.every((value) => rpcMethodNames.includes(value));
     }, `Unknown method specified, available methods: ${rpcMethodNames.join(",")}`),
-    "refilling-wallets": zod_1.z.boolean().default(true),
-    "aa95-gas-multiplier": zod_1.z.string().transform((val) => BigInt(val)),
     "enable-instant-bundling-endpoint": zod_1.z.boolean(),
     "enable-experimental-7702-endpoints": zod_1.z.boolean()
 });
+exports.executorArgsSchema = zod_1.z.object({
+    "enable-fastlane": zod_1.z.boolean(),
+    "resubmit-stuck-timeout": zod_1.z.number().int().min(0).default(15_000),
+    "refilling-wallets": zod_1.z.boolean().default(true),
+    "aa95-gas-multiplier": zod_1.z.string().transform((val) => BigInt(val)),
+    "refill-helper-contract": types_1.addressSchema.optional(),
+    "no-profit-bundling": zod_1.z.boolean(),
+    "utility-private-key": types_1.hexData32Schema
+        .transform((val) => (0, accounts_1.privateKeyToAccount)(val))
+        .optional(),
+    "utility-wallet-monitor": zod_1.z.boolean(),
+    "utility-wallet-monitor-interval": zod_1.z.number(),
+    "executor-private-keys": zod_1.z.union([
+        zod_1.z
+            .array(types_1.hexData32Schema)
+            .transform((vals) => vals.map((val) => (0, accounts_1.privateKeyToAccount)(val))),
+        zod_1.z
+            .string()
+            .regex(/^0x(?:[0-9a-f]{2}){32}(?:,0x(?:[0-9a-f]{2}){32})*$/)
+            .transform((val) => val
+            .split(",")
+            .map((val) => (0, accounts_1.privateKeyToAccount)(val)))
+    ]),
+    "max-executors": zod_1.z.number().int().min(0).optional(),
+    "min-executor-balance": zod_1.z
+        .string()
+        .transform((val) => BigInt(val))
+        .optional(),
+    "executor-refill-interval": zod_1.z.number().int().min(0),
+    "executor-gas-multiplier": zod_1.z.string().transform((val) => BigInt(val))
+});
 exports.compatibilityArgsSchema = zod_1.z.object({
     "chain-type": zod_1.z.enum([
         "default",
@@ -159,6 +162,7 @@ exports.debugArgsSchema = zod_1.z.object({
     tenderly: zod_1.z.boolean()
 });
 exports.gasEstimationArgsSchema = zod_1.z.object({
+    "entrypoint-simulation-contract": zod_1.z.preprocess((v) => (v === "" ? undefined : v), types_1.addressSchema.optional()),
     "binary-search-tolerance-delta": zod_1.z
         .string()
         .transform((val) => BigInt(val))
@@ -194,6 +198,7 @@ exports.optionArgsSchema = zod_1.z.object({
     ...exports.serverArgsSchema.shape,
     ...exports.rpcArgsSchema.shape,
     ...exports.debugArgsSchema.shape,
-    ...exports.gasEstimationArgsSchema.shape
+    ...exports.gasEstimationArgsSchema.shape,
+    ...exports.executorArgsSchema.shape
 });
 //# sourceMappingURL=bundler.js.map

package/lib/cli/config/bundler.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundler.js","sourceRoot":"","sources":["../../../cli/config/bundler.ts"],"names":[],"mappings":";;;AAAA,uCAMoB;AAEpB,4CAAiE;AACjE,6BAAuB;AAEvB,MAAM,QAAQ,GAAG,OAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAA;AAE7E,MAAM,cAAc,GAAG,4BAAoB,CAAC,OAAO,CAAC,GAAG,CACnD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CACV,CAAA;AAEb,QAAA,iBAAiB,GAAG,OAAC,CAAC,MAAM,CAAC;IACtC,WAAW,EAAE,OAAC;SACT,MAAM,EAAE;SACR,KAAK,CAAC,oCAA4B,CAAC;SACnC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE;QACf,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAChC,MAAM,kBAAkB,GAAG,SAAS,CAAC,GAAG,CACpC,CAAC,OAAO,EAAE,EAAE,CAAC,qBAAa,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,yCAAyC;SAC7F,CAAA;QACD,OAAO,kBAAkB,CAAA;IAC7B,CAAC,CAAC;IACN,gCAAgC,EAAE,qBAAa;IAC/C,gCAAgC,EAAE,OAAC,CAAC,UAAU,CAC1C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EACjC,qBAAa,CAAC,QAAQ,EAAE,CAC3B;IACD,wBAAwB,EAAE,qBAAa,CAAC,QAAQ,EAAE;IAClD,oBAAoB,EAAE,OAAC,CAAC,OAAO,EAAE;IACjC,WAAW,EAAE,OAAC,CAAC,OAAO,EAAE;IACxB,qBAAqB,EAAE,uBAAe;SACjC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,8BAAmB,EAAC,GAAG,CAAmB,CAAC;SAC9D,QAAQ,EAAE;IACf,wBAAwB,EAAE,OAAC,CAAC,OAAO,EAAE;IACrC,iCAAiC,EAAE,OAAC,CAAC,MAAM,EAAE;IAC7C,uBAAuB,EAAE,OAAC,CAAC,KAAK,CAAC;QAC7B,OAAC;aACI,KAAK,CAAC,uBAAe,CAAC;aACtB,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAChB,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,8BAAmB,EAAC,GAAG,CAAmB,CAAC,CAChE;QACL,OAAC;aACI,MAAM,EAAE;aACR,KAAK,CAAC,oDAAoD,CAAC;aAC3D,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CACf,GAAG;aACE,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CACA,CAAC,GAAG,EAAE,EAAE,CACJ,IAAA,8BAAmB,EAAC,GAAU,CAAmB,CACxD,CACR;KACR,CAAC;IACF,eAAe,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACnD,sBAAsB,EAAE,OAAC;SACpB,MAAM,EAAE;SACR,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SAC/B,QAAQ,EAAE;IACf,0BAA0B,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACnD,yBAAyB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAErE,kBAAkB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,0BAA0B,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAEnD,iBAAiB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1C,iBAAiB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAE1C,gBAAgB,EAAE,OAAC;SACd,MAAM,EAAE;SACR,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SAC/B,OAAO,CAAC,KAAK,CAAC;IACnB,yBAAyB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAClD,kBAAkB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,uBAAuB,EAAE,OAAC;SACrB,MAAM,EAAE;SACR,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;SAClD,MAAM,CACH,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAC/B,oEAAoE,CACvE;SACA,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IACtE,4BAA4B,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAErD,0BAA0B,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IAC/D,wBAAwB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAC5D,mCAAmC,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IAC9D,oBAAoB,EAAE,OAAC;SAClB,MAAM,EAAE;SACR,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SAC/B,OAAO,CAAC,UAAU,CAAC;IACxB,aAAa,EAAE,OAAC;SACX,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,SAAS,CAAC,CAAC,GAAkB,EAAE,EAAE;QAC9B,IAAI,GAAG,KAAK,IAAI;YAAE,OAAO,IAAI,CAAA;QAE7B,OAAO,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACzB,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;QACf,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO,IAAI,CAAA;QAEhC,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,CAAA;IAC5B,CAAC,EAAE,+CAA+C,CAAC;SAClD,MAAM,CACH,CAAC,MAAM,EAAE,EAAE;QACP,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO,IAAI,CAAA;QAEhC,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,KAAa,EAAE,EAAE,CAClC,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CACjC,CAAA;IACL,CAAC,EACD,gDAAgD,cAAc,CAAC,IAAI,CAC/D,GAAG,CACN,EAAE,CACN;IACL,mBAAmB,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IAC9C,qBAAqB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACjE,kCAAkC,EAAE,OAAC,CAAC,OAAO,EAAE;IAC/C,oCAAoC,EAAE,OAAC,CAAC,OAAO,EAAE;CACpD,CAAC,CAAA;AAEW,QAAA,uBAAuB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC5C,YAAY,EAAE,OAAC,CAAC,IAAI,CAAC;QACjB,SAAS;QACT,UAAU;QACV,UAAU;QACV,QAAQ;QACR,QAAQ;QACR,OAAO;KACV,CAAC;IACF,qBAAqB,EAAE,OAAC,CAAC,OAAO,EAAE;IAClC,aAAa,EAAE,OAAC;SACX,MAAM,EAAE;SACR,KAAK,CAAC,uBAAuB,CAAC;SAC9B,QAAQ,EAAE;SACV,OAAO,CAAC,OAAO,CAAC;SAChB,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAiB,CAAC;IACvD,qBAAqB,EAAE,OAAC;SACnB,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SAClB,QAAQ,EAAE;SACV,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAiB,CAAC;IAC1C,kBAAkB,EAAE,OAAC,CAAC,OAAO,EAAE;IAC/B,6BAA6B,EAAE,OAAC,CAAC,OAAO,EAAE;IAC1C,yCAAyC,EAAE,OAAC,CAAC,OAAO,EAAE;IACtD,gCAAgC,EAAE,OAAC;SAC9B,MAAM,EAAE;SACR,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SAC/B,QAAQ,EAAE;CAClB,CAAC,CAAA;AAEW,QAAA,gBAAgB,GAAG,OAAC,CAAC,MAAM,CAAC;IACrC,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7B,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC3C,SAAS,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;IACrC,4BAA4B,EAAE,OAAC;SAC1B,MAAM,EAAE;SACR,GAAG,EAAE;SACL,GAAG,CAAC,IAAI,CAAC;SACT,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,OAAO;CACpC,CAAC,CAAA;AAEW,QAAA,aAAa,GAAG,OAAC,CAAC,MAAM,CAAC;IAClC,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;IAC3B,0BAA0B,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;IACvD,kBAAkB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,iBAAiB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACrD,mBAAmB,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IACzD,uBAAuB,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;CACjE,CAAC,CAAA;AAEW,QAAA,aAAa,GAAG,OAAC,CAAC,MAAM,CAAC;IAClC,sBAAsB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7C,gCAAgC,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACvD,IAAI,EAAE,OAAC,CAAC,OAAO,EAAE;IACjB,cAAc,EAAE,OAAC,CAAC,MAAM,EAAE;IAC1B,WAAW,EAAE,QAAQ;IACrB,yBAAyB,EAAE,QAAQ,CAAC,QAAQ,EAAE;IAC9C,yBAAyB,EAAE,QAAQ,CAAC,QAAQ,EAAE;IAC9C,eAAe,EAAE,QAAQ,CAAC,QAAQ,EAAE;IACpC,mBAAmB,EAAE,QAAQ,CAAC,QAAQ,EAAE;IACxC,oBAAoB,EAAE,QAAQ,CAAC,QAAQ,EAAE;IACzC,8BAA8B,EAAE,QAAQ,CAAC,QAAQ,EAAE;IACnD,wBAAwB,EAAE,QAAQ,CAAC,QAAQ,EAAE;CAChD,CAAC,CAAA;AAEW,QAAA,eAAe,GAAG,OAAC,CAAC,MAAM,CAAC;IACpC,aAAa,EAAE,OAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACzC,wBAAwB,EAAE,OAAC,CAAC,OAAO,EAAE;IACrC,kBAAkB,EAAE,OAAC,CAAC,OAAO,EAAE;IAC/B,0CAA0C,EAAE,OAAC,CAAC,OAAO,EAAE;IACvD,6BAA6B,EAAE,OAAC,CAAC,OAAO,EAAE;IAC1C,QAAQ,EAAE,OAAC,CAAC,OAAO,EAAE;CACxB,CAAC,CAAA;AAEW,QAAA,uBAAuB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC5C,+BAA+B,EAAE,OAAC;SAC7B,MAAM,EAAE;SACR,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SAC/B,OAAO,CAAC,MAAM,CAAC;IACpB,6BAA6B,EAAE,OAAC;SAC3B,MAAM,EAAE;SACR,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SAC/B,OAAO,CAAC,SAAS,CAAC;IACvB,8BAA8B,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1E,8BAA8B,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1E,sCAAsC,EAAE,OAAC;SACpC,MAAM,EAAE;SACR,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACpC,gDAAgD,EAAE,OAAC;SAC9C,MAAM,EAAE;SACR,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACpC,2BAA2B,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACvE,mCAAmC,EAAE,OAAC;SACjC,MAAM,EAAE;SACR,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACpC,6CAA6C,EAAE,OAAC;SAC3C,MAAM,EAAE;SACR,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACpC,wCAAwC,EAAE,OAAC;SACtC,MAAM,EAAE;SACR,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACpC,gCAAgC,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;CAC/E,CAAC,CAAA;AAuBW,QAAA,gBAAgB,GAAG,OAAC,CAAC,MAAM,CAAC;IACrC,GAAG,yBAAiB,CAAC,KAAK;IAC1B,GAAG,+BAAuB,CAAC,KAAK;IAChC,GAAG,qBAAa,CAAC,KAAK;IACtB,GAAG,wBAAgB,CAAC,KAAK;IACzB,GAAG,qBAAa,CAAC,KAAK;IACtB,GAAG,uBAAe,CAAC,KAAK;IACxB,GAAG,+BAAuB,CAAC,KAAK;CACnC,CAAC,CAAA"}
+{"version":3,"file":"bundler.js","sourceRoot":"","sources":["../../../cli/config/bundler.ts"],"names":[],"mappings":"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"}

package/lib/cli/config/options.d.ts

@@ -1,7 +1,8 @@
 import type { CliCommand, CliCommandOptions } from "../util.js";
-import type { IBundlerArgsInput, ICompatibilityArgsInput, IDebugArgsInput, IGasEstimationArgsInput, ILogArgsInput, IOptionsInput, IRpcArgsInput, IServerArgsInput } from "./bundler.js";
+import type { IBundlerArgsInput, ICompatibilityArgsInput, IDebugArgsInput, IExecutorArgsInput, IGasEstimationArgsInput, ILogArgsInput, IOptionsInput, IRpcArgsInput, IServerArgsInput } from "./bundler.js";
 export declare const bundlerOptions: CliCommandOptions<IBundlerArgsInput>;
 export declare const gasEstimationOptions: CliCommandOptions<IGasEstimationArgsInput>;
+export declare const executorOptions: CliCommandOptions<IExecutorArgsInput>;
 export declare const compatibilityOptions: CliCommandOptions<ICompatibilityArgsInput>;
 export declare const serverOptions: CliCommandOptions<IServerArgsInput>;
 export declare const rpcOptions: CliCommandOptions<IRpcArgsInput>;

package/lib/cli/config/options.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bundlerCommand = exports.debugOptions = exports.logOptions = exports.rpcOptions = exports.serverOptions = exports.compatibilityOptions = exports.gasEstimationOptions = exports.bundlerOptions = void 0;
+exports.bundlerCommand = exports.debugOptions = exports.logOptions = exports.rpcOptions = exports.serverOptions = exports.compatibilityOptions = exports.executorOptions = exports.gasEstimationOptions = exports.bundlerOptions = void 0;
 const handler_1 = require("../handler.js");
 exports.bundlerOptions = {
     entrypoints: {
@@ -16,54 +16,6 @@ exports.bundlerOptions = {
         require: false,
         default: "0x4e59b44847b379578588920ca78fbf26c0b4956c"
     },
-    "entrypoint-simulation-contract": {
-        description: "Address of the EntryPoint simulations contract",
-        type: "string",
-        alias: "c",
-        require: false
-    },
-    "refill-helper-contract": {
-        description: "Address of the Executor refill helper contract",
-        type: "string",
-        require: false
-    },
-    "executor-private-keys": {
-        description: "Private keys of the executor accounts split by commas",
-        type: "string",
-        alias: "x",
-        require: true
-    },
-    "utility-private-key": {
-        description: "Private key of the utility account",
-        type: "string",
-        alias: "u",
-        require: false
-    },
-    "utility-wallet-monitor": {
-        description: "Either to enable utility wallet monitor or not",
-        type: "boolean",
-        default: true
-    },
-    "utility-wallet-monitor-interval": {
-        description: "Interval for checking utility wallet balance",
-        type: "number",
-        default: 15 * 1000 // 15 seconds
-    },
-    "max-executors": {
-        description: "Maximum number of executor accounts to use from the list of executor private keys",
-        type: "number",
-        require: false
-    },
-    "min-executor-balance": {
-        description: "Minimum balance required for each executor account (below which the utility account will refill)",
-        type: "string"
-    },
-    "executor-refill-interval": {
-        description: "Interval to refill the signer balance (seconds)",
-        type: "number",
-        require: true,
-        default: 60 * 20
-    },
     "min-entity-stake": {
         description: "Minimum stake required for a relay (in 10e18)",
         type: "number",
@@ -100,11 +52,6 @@ exports.bundlerOptions = {
         require: false,
         default: "100"
     },
-    "no-profit-bundling": {
-        description: "Bundle tx such that all beneficiary fees are spent on gas fees",
-        type: "boolean",
-        default: false
-    },
     "gas-price-floor-percent": {
         description: "The minimum percentage of incoming user operation gas prices compared to the gas price used by the bundler to submit bundles",
         type: "number",
@@ -159,18 +106,6 @@ exports.bundlerOptions = {
         require: false,
         default: null
     },
-    "refilling-wallets": {
-        description: "Enable refilling wallets",
-        type: "boolean",
-        require: false,
-        default: true
-    },
-    "aa95-gas-multiplier": {
-        description: "Amount to multiply the current gas limit by if the bundling tx fails due to AA95",
-        type: "string",
-        require: false,
-        default: "125"
-    },
     "enable-instant-bundling-endpoint": {
         description: "Should the bundler enable the pimlico_sendUserOperationNow endpoint",
         type: "boolean",
@@ -180,14 +115,15 @@ exports.bundlerOptions = {
         description: "Should the bundler enable the pimlico_experimental_sendUserOperation7702 and pimlico_experimental_estimateUserOperationGas7702 endpoint",
         type: "boolean",
         default: false
-    },
-    "executor-gas-multiplier": {
-        description: "Amount to scale the gas estimations used for bundling",
-        type: "string",
-        default: "100"
     }
 };
 exports.gasEstimationOptions = {
+    "entrypoint-simulation-contract": {
+        description: "Address of the EntryPoint simulations contract",
+        type: "string",
+        alias: "c",
+        require: false
+    },
     "binary-search-tolerance-delta": {
         description: "Defines the threshold for when to stop the gas estimation binary search",
         type: "string",
@@ -255,6 +191,83 @@ exports.gasEstimationOptions = {
         default: "2000000"
     }
 };
+exports.executorOptions = {
+    "enable-fastlane": {
+        description: "Enable bundling v0.6 userOperations using the pfl_sendRawTransactionConditional endpoint",
+        type: "boolean",
+        default: false
+    },
+    "resubmit-stuck-timeout": {
+        description: "Amount of time before retrying a failed userOperation (in ms)",
+        type: "number",
+        require: true,
+        default: 10_000
+    },
+    "aa95-gas-multiplier": {
+        description: "Amount to multiply the current gas limit by if the bundling tx fails due to AA95",
+        type: "string",
+        require: false,
+        default: "125"
+    },
+    "refilling-wallets": {
+        description: "Enable refilling wallets",
+        type: "boolean",
+        require: false,
+        default: true
+    },
+    "executor-gas-multiplier": {
+        description: "Amount to scale the gas estimations used for bundling",
+        type: "string",
+        default: "100"
+    },
+    "no-profit-bundling": {
+        description: "Bundle tx such that all beneficiary fees are spent on gas fees",
+        type: "boolean",
+        default: false
+    },
+    "refill-helper-contract": {
+        description: "Address of the Executor refill helper contract",
+        type: "string",
+        require: false
+    },
+    "executor-private-keys": {
+        description: "Private keys of the executor accounts split by commas",
+        type: "string",
+        alias: "x",
+        require: true
+    },
+    "utility-private-key": {
+        description: "Private key of the utility account",
+        type: "string",
+        alias: "u",
+        require: false
+    },
+    "utility-wallet-monitor": {
+        description: "Either to enable utility wallet monitor or not",
+        type: "boolean",
+        default: true
+    },
+    "utility-wallet-monitor-interval": {
+        description: "Interval for checking utility wallet balance",
+        type: "number",
+        default: 15 * 1000 // 15 seconds
+    },
+    "max-executors": {
+        description: "Maximum number of executor accounts to use from the list of executor private keys",
+        type: "number",
+        require: false
+    },
+    "min-executor-balance": {
+        description: "Minimum balance required for each executor account (below which the utility account will refill)",
+        type: "string"
+    },
+    "executor-refill-interval": {
+        description: "Interval to refill the signer balance (seconds)",
+        type: "number",
+        require: true,
+        default: 60 * 20
+    }
+};
 exports.compatibilityOptions = {
     "chain-type": {
         description: "Indicates what type of chain the bundler is running on",

package/lib/cli/config/options.js.map

@@ -1 +1 @@
-{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../cli/config/options.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../cli/config/options.ts"],"names":[],"mappings":"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"}

package/lib/executor/executor.d.ts

@@ -14,6 +14,7 @@ export interface GasEstimateResult {
 export type HandleOpsTxParam = {
     ops: PackedUserOperation[];
     isUserOpVersion06: boolean;
+    isReplacementTx: boolean;
     entryPoint: Address;
 };
 export type ReplaceTransactionResult = {

package/lib/executor/executor.js

@@ -30,6 +30,7 @@ const sentry = __importStar(require("@sentry/node"));
 const async_mutex_1 = require("async-mutex");
 const viem_1 = require("viem");
 const utils_2 = require("./utils.js");
+const fastlane_1 = require("./fastlane.js");
 class Executor {
     // private unWatch: WatchBlocksReturnType | undefined
     config;
@@ -75,8 +76,8 @@ class Executor {
             this.markWalletProcessed(transactionInfo.executor);
             return { status: "failed" };
         }
-        newRequest.maxFeePerGas = (0, utils_1.maxBigInt)(gasPriceParameters.maxFeePerGas, (newRequest.maxFeePerGas * 11n + 9n) / 10n);
-        newRequest.maxPriorityFeePerGas = (0, utils_1.maxBigInt)(gasPriceParameters.maxPriorityFeePerGas, (newRequest.maxPriorityFeePerGas * 11n + 9n) / 10n);
+        newRequest.maxFeePerGas = (0, utils_1.scaleBigIntByPercent)(gasPriceParameters.maxFeePerGas, 115n);
+        newRequest.maxPriorityFeePerGas = (0, utils_1.scaleBigIntByPercent)(gasPriceParameters.maxPriorityFeePerGas, 115n);
         newRequest.account = transactionInfo.executor;
         const opsWithHashes = transactionInfo.userOperationInfos.map((opInfo) => {
             const op = opInfo.userOperation;
@@ -163,6 +164,7 @@ class Executor {
             : (0, utils_1.toPackedUserOperation)(op.userOperation));
         txParam = {
             isUserOpVersion06,
+            isReplacementTx: true,
             ops: userOps,
             entryPoint: transactionInfo.entryPoint
         };
@@ -287,19 +289,30 @@ class Executor {
         // Try sending the transaction and updating relevant fields if there is an error.
         while (attempts < maxAttempts) {
             try {
+                if (this.config.enableFastlane &&
+                    isUserOpVersion06 &&
+                    !txParam.isReplacementTx &&
+                    attempts === 0) {
+                    const serializedTransaction = await this.config.walletClient.signTransaction(request);
+                    transactionHash = await (0, fastlane_1.sendPflConditional)({
+                        serializedTransaction,
+                        publicClient: this.config.publicClient,
+                        walletClient: this.config.walletClient,
+                        logger: this.logger
+                    });
+                    break;
+                }
                 transactionHash =
                     await this.config.walletClient.sendTransaction(request);
                 break;
             }
             catch (e) {
                 isTransactionUnderPriced = false;
-                let isErrorHandled = false;
                 if (e instanceof viem_1.BaseError) {
                     if ((0, utils_2.isTransactionUnderpricedError)(e)) {
                         this.logger.warn("Transaction underpriced, retrying");
                         request.maxFeePerGas = (0, utils_1.scaleBigIntByPercent)(request.maxFeePerGas, 150n);
                         request.maxPriorityFeePerGas = (0, utils_1.scaleBigIntByPercent)(request.maxPriorityFeePerGas, 150n);
-                        isErrorHandled = true;
                         isTransactionUnderPriced = true;
                     }
                 }
@@ -314,22 +327,19 @@ class Executor {
                                 address: request.from,
                                 blockTag: "pending"
                             });
-                        isErrorHandled = true;
                     }
                     if (cause instanceof viem_1.IntrinsicGasTooLowError) {
                         this.logger.warn("Intrinsic gas too low, retrying");
                         request.gas = (0, utils_1.scaleBigIntByPercent)(request.gas, 150n);
-                        isErrorHandled = true;
                     }
                     // This is thrown by OP-Stack chains that use proxyd.
                     // ref: https://github.com/ethereum-optimism/optimism/issues/2618#issuecomment-1630272888
                     if (cause.details?.includes("no backends available")) {
                         this.logger.warn("no backends avaiable error, retrying after 500ms");
                         await new Promise((resolve) => setTimeout(resolve, 500));
-                        isErrorHandled = true;
                     }
                 }
-                if (attempts === maxAttempts || !isErrorHandled) {
+                if (attempts === maxAttempts) {
                     throw error;
                 }
                 attempts++;
@@ -528,6 +538,7 @@ class Executor {
             transactionHash = await this.sendHandleOpsTransaction({
                 txParam: {
                     ops: userOps,
+                    isReplacementTx: false,
                     isUserOpVersion06,
                     entryPoint
                 },

package/lib/executor/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../executor/executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../executor/executor.ts"],"names":[],"mappings":"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"}

package/lib/executor/executorManager.js

@@ -503,7 +503,8 @@ class ExecutorManager {
         // for any left check if enough time has passed, if so replace
         const transactionInfos2 = getTransactionsFromUserOperationEntries(this.mempool.dumpSubmittedOps());
         await Promise.all(transactionInfos2.map(async (txInfo) => {
-            if (Date.now() - txInfo.lastReplaced < 5 * 60 * 1000) {
+            if (Date.now() - txInfo.lastReplaced <
+                this.config.resubmitStuckTimeout) {
                 return;
             }
             await this.replaceTransaction(txInfo, "stuck");