@pimlico/alto 0.0.18 → 0.0.20

package/esm/store/createMempoolStore.js

@@ -1,9 +1,7 @@
-import { createMemoryOutstandingQueue } from "./createMemoryOutstandingStore.js";
-import { createMemoryStore } from "./createStore.js";
-import { createRedisOutstandingQueue } from "./createRedisOutstandingStore.js";
-import { createRedisStore } from "./createRedisStore.js";
+import { createOutstandingQueue, createProcessingStore } from "./index.js";
+import * as sentry from "@sentry/node";
 export const createMempoolStore = ({ config, metrics }) => {
-    let logger = config.getLogger({ module: "mempool-store" }, {
+    const logger = config.getLogger({ module: "mempool-store" }, {
         level: config.logLevel
     });
     const storeHandlers = new Map();
@@ -16,55 +14,27 @@ export const createMempoolStore = ({ config, metrics }) => {
         return handlers;
     };
     for (const entryPoint of config.entrypoints) {
-        let outstanding;
-        let processing;
-        let submitted;
-        if (config.redisMempoolUrl) {
-            outstanding = createRedisOutstandingQueue({
-                config,
-                entryPoint
-            });
-            processing = createRedisStore({
-                config,
-                entryPoint,
-                storeType: "processing"
-            });
-            submitted = createRedisStore({
-                config,
-                entryPoint,
-                storeType: "submitted"
-            });
-            logger.info("Using redis for outstanding, processing, submitted mempools");
-        }
-        else {
-            outstanding = createMemoryOutstandingQueue({
-                config
-            });
-            processing = createMemoryStore({
-                config
-            });
-            submitted = createMemoryStore({
-                config
-            });
-            logger.info("Using memory for outstanding, processing, submitted mempools");
-        }
+        const outstanding = createOutstandingQueue({
+            config,
+            entryPoint,
+            logger
+        });
+        const processing = createProcessingStore({
+            config,
+            entryPoint
+        });
         storeHandlers.set(entryPoint, {
-            processing,
-            submitted,
-            outstanding
+            outstanding,
+            processing
         });
     }
-    const logAddOperation = (userOpHash, storeType) => {
-        logger.debug({ userOpHash, store: storeType }, `added user op to ${storeType} mempool`);
-        metrics.userOperationsInMempool.labels({ status: storeType }).inc();
-    };
     const logRemoveOperation = (userOpHash, storeType, removed) => {
         if (!removed) {
             logger.warn({ userOpHash, store: storeType }, "tried to remove non-existent user op from mempool");
             return;
         }
         logger.debug({ userOpHash, store: storeType }, "removed user op from mempool");
-        metrics.userOperationsInMempool.labels({ status: storeType }).dec();
+        metrics.userOpsInMempool.labels({ status: storeType }).dec();
     };
     const logDumpOperation = (storeType) => {
         logger.trace({
@@ -73,112 +43,129 @@ export const createMempoolStore = ({ config, metrics }) => {
     };
     return {
         // Methods used for bundling
-        popOutstanding: async (entryPoint) => {
-            const { outstanding } = getStoreHandlers(entryPoint);
-            return await outstanding.pop();
-        },
-        peekOutstanding: async (entryPoint) => {
-            const { outstanding } = getStoreHandlers(entryPoint);
-            return await outstanding.peek();
+        popOutstanding: async (entryPoint, count) => {
+            try {
+                const { outstanding } = getStoreHandlers(entryPoint);
+                return await outstanding.pop(count);
+            }
+            catch (err) {
+                logger.error({ err }, "Failed to pop from outstanding mempool, defaulting to empty array");
+                sentry.captureException(err);
+                return [];
+            }
         },
         // State handling
-        addOutstanding: async ({ entryPoint, userOpInfo }) => {
+        addOutstanding: async ({ entryPoint, userOpInfos }) => {
             const { outstanding } = getStoreHandlers(entryPoint);
-            logAddOperation(userOpInfo.userOpHash, "outstanding");
-            await outstanding.add(userOpInfo);
-        },
-        addProcessing: ({ entryPoint, userOpInfo }) => {
-            const { processing } = getStoreHandlers(entryPoint);
-            logAddOperation(userOpInfo.userOpHash, "processing");
-            processing.add(userOpInfo);
-            return Promise.resolve();
-        },
-        addSubmitted: ({ entryPoint, submittedUserOp }) => {
-            const { submitted } = getStoreHandlers(entryPoint);
-            logAddOperation(submittedUserOp.userOpHash, "submitted");
-            submitted.add(submittedUserOp);
-            return Promise.resolve();
+            metrics.userOpsInMempool
+                .labels({ status: "outstanding" })
+                .inc(userOpInfos.length);
+            try {
+                await outstanding.add(userOpInfos);
+            }
+            catch (err) {
+                logger.error({ err }, "Failed to add to outstanding mempool");
+                sentry.captureException(err);
+            }
         },
         removeOutstanding: async ({ entryPoint, userOpHash }) => {
-            const { outstanding } = getStoreHandlers(entryPoint);
-            const removed = await outstanding.remove(userOpHash);
-            logRemoveOperation(userOpHash, "outstanding", removed);
-        },
-        removeProcessing: async ({ entryPoint, userOpHash }) => {
-            const { processing } = getStoreHandlers(entryPoint);
-            const removed = await processing.remove(userOpHash);
-            logRemoveOperation(userOpHash, "processing", removed);
-        },
-        removeSubmitted: async ({ entryPoint, userOpHash }) => {
-            const { submitted } = getStoreHandlers(entryPoint);
-            const removed = await submitted.remove(userOpHash);
-            logRemoveOperation(userOpHash, "submitted", removed);
+            try {
+                const { outstanding } = getStoreHandlers(entryPoint);
+                const removed = await outstanding.remove([userOpHash]);
+                logRemoveOperation(userOpHash, "outstanding", removed.length > 0);
+            }
+            catch (err) {
+                logger.error({ err }, "Failed to remove from outstanding mempool");
+                sentry.captureException(err);
+            }
         },
         dumpOutstanding: async (entryPoint) => {
             const { outstanding } = getStoreHandlers(entryPoint);
             logDumpOperation("outstanding");
             return await outstanding.dumpLocal();
         },
-        dumpProcessing: async (entryPoint) => {
-            const { processing } = getStoreHandlers(entryPoint);
-            logDumpOperation("processing");
-            return await processing.dumpLocal();
+        // Methods to mark/unmark userOps that are being processed.
+        addProcessing: async ({ entryPoint, userOpInfo }) => {
+            try {
+                const { processing } = getStoreHandlers(entryPoint);
+                await processing.addProcessing(userOpInfo);
+            }
+            catch (err) {
+                logger.error({ err }, "Failed to track active userOp");
+                sentry.captureException(err);
+            }
         },
-        dumpSubmitted: async (entryPoint) => {
-            const { submitted } = getStoreHandlers(entryPoint);
-            logDumpOperation("submitted");
-            return await submitted.dumpLocal();
+        removeProcessing: async ({ entryPoint, userOpInfo }) => {
+            try {
+                const { processing } = getStoreHandlers(entryPoint);
+                await processing.removeProcessing(userOpInfo);
+            }
+            catch (err) {
+                logger.error({ err }, "Failed to untrack active userOp");
+                sentry.captureException(err);
+            }
         },
-        // Check if the userOp is already in the mempool
-        isInMempool: async ({ userOpHash, entryPoint }) => {
-            const { outstanding, processing, submitted } = getStoreHandlers(entryPoint);
-            const [inOutstanding, inProcessing, inSubmitted] = await Promise.all([
+        // Check if the userOp is already in the mempool or conflicts with existing userOps.
+        checkDuplicatesAndConflicts: async ({ entryPoint, userOp, userOpHash }) => {
+            const { outstanding, processing } = getStoreHandlers(entryPoint);
+            const [isInOutstanding, isInProcessing, wouldConflict] = await Promise.all([
                 outstanding.contains(userOpHash),
-                processing.contains(userOpHash),
-                submitted.contains(userOpHash)
+                processing.isProcessing(userOpHash),
+                processing.wouldConflict(userOp)
             ]);
-            return inOutstanding || inProcessing || inSubmitted;
-        },
-        validateSubmittedOrProcessing: async ({ entryPoint, userOp }) => {
-            const { submitted, processing } = getStoreHandlers(entryPoint);
-            const [submittedConflict, processingConflict] = await Promise.all([
-                submitted.findConflicting(userOp),
-                processing.findConflicting(userOp)
-            ]);
-            const conflicting = submittedConflict || processingConflict;
-            if (conflicting?.reason === "conflicting_nonce") {
+            // Check if already known (in outstanding or processing).
+            if (isInOutstanding || isInProcessing) {
+                return {
+                    valid: false,
+                    reason: "Already known"
+                };
+            }
+            if (wouldConflict === "conflicting_nonce") {
                 return {
                     valid: false,
                     reason: "AA25 invalid account nonce: Another UserOperation with same sender and nonce is already being processed"
                 };
             }
-            if (conflicting?.reason === "conflicting_deployment") {
+            if (wouldConflict === "conflicting_deployment") {
                 return {
                     valid: false,
                     reason: "AA25 invalid account deployment: Another deployment operation for this sender is already being processed"
                 };
             }
+            if (wouldConflict === "conflicting_7702_auth") {
+                return {
+                    valid: false,
+                    reason: "AA10 sender already constructed: Sender already has an inflight EIP-7702 authorization"
+                };
+            }
             return { valid: true };
         },
         popConflictingOustanding: async ({ entryPoint, userOp }) => {
-            const { outstanding } = getStoreHandlers(entryPoint);
-            return await outstanding.popConflicting(userOp);
+            try {
+                const { outstanding } = getStoreHandlers(entryPoint);
+                return await outstanding.popConflicting(userOp);
+            }
+            catch (err) {
+                logger.error({ err }, "Failed to popConflicting from outstanding mempool, defaulting to undefined");
+                sentry.captureException(err);
+                return undefined;
+            }
         },
-        validateSenderLimits: ({ entryPoint, userOp }) => {
+        validateSenderLimits: async ({ entryPoint, userOp }) => {
             const { outstanding } = getStoreHandlers(entryPoint);
             if (!outstanding.validateParallelLimit(userOp)) {
-                return Promise.resolve({
+                return {
                     valid: false,
                     reason: "AA25 invalid account nonce: Maximum number of parallel user operations for that is allowed for this sender reached"
-                });
+                };
             }
             if (!outstanding.validateQueuedLimit(userOp)) {
-                return Promise.resolve({
+                return {
                     valid: false,
                     reason: "AA25 invalid account nonce: Maximum number of queued user operations reached for this sender and nonce key"
-                });
+                };
             }
-            return Promise.resolve({ valid: true });
+            return { valid: true };
         },
         // misc
         getQueuedOutstandingUserOps: async ({ userOp, entryPoint }) => {

package/esm/store/createMempoolStore.js.map

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

package/esm/store/index.d.ts

@@ -1,81 +1,5 @@
-import type { Address, HexData32, SubmittedUserOp, UserOpInfo, UserOperation } from "../types/index.js";
-export type StoreType = "outstanding" | "processing" | "submitted";
-export type UserOpType = UserOpInfo | SubmittedUserOp;
-export type ConflictingOutstandingType = {
-    reason: "conflicting_nonce" | "conflicting_deployment";
-    userOpInfo: UserOpInfo;
-} | undefined;
-export type ConflictingStoreType = {
-    reason: "conflicting_nonce" | "conflicting_deployment";
-    userOp: UserOperation;
-} | undefined;
-type ValidationResult = {
-    valid: true;
-} | {
-    valid: false;
-    reason: string;
-};
-export type EntryPointUserOpInfoParam = {
-    entryPoint: Address;
-    userOpInfo: UserOpInfo;
-};
-export type EntryPointSubmittedUserOpParam = {
-    entryPoint: Address;
-    submittedUserOp: SubmittedUserOp;
-};
-export type EntryPointUserOpHashParam = {
-    entryPoint: Address;
-    userOpHash: HexData32;
-};
-export type EntryPointUserOpParam = {
-    userOp: UserOperation;
-    entryPoint: Address;
-};
-export type MempoolStore = {
-    peekOutstanding: (entryPoint: Address) => Promise<UserOpInfo | undefined>;
-    popOutstanding: (entryPoint: Address) => Promise<UserOpInfo | undefined>;
-    addOutstanding: (args: EntryPointUserOpInfoParam) => Promise<void>;
-    addProcessing: (args: EntryPointUserOpInfoParam) => Promise<void>;
-    addSubmitted: (args: EntryPointSubmittedUserOpParam) => Promise<void>;
-    removeOutstanding: (args: EntryPointUserOpHashParam) => Promise<void>;
-    removeProcessing: (args: EntryPointUserOpHashParam) => Promise<void>;
-    removeSubmitted: (args: EntryPointUserOpHashParam) => Promise<void>;
-    dumpOutstanding: (entryPoint: Address) => Promise<UserOpInfo[]>;
-    dumpProcessing: (entryPoint: Address) => Promise<UserOpInfo[]>;
-    dumpSubmitted: (entryPoint: Address) => Promise<SubmittedUserOp[]>;
-    isInMempool: (args: EntryPointUserOpHashParam) => Promise<boolean>;
-    popConflictingOustanding: (args: {
-        entryPoint: Address;
-        userOp: UserOperation;
-    }) => Promise<ConflictingOutstandingType>;
-    validateSubmittedOrProcessing: (args: EntryPointUserOpParam) => Promise<ValidationResult>;
-    validateSenderLimits: (args: {
-        entryPoint: Address;
-        userOp: UserOperation;
-    }) => Promise<ValidationResult>;
-    getQueuedOutstandingUserOps: (args: {
-        userOp: UserOperation;
-        entryPoint: Address;
-    }) => Promise<UserOperation[]>;
-    clearOutstanding: (entryPoint: Address) => Promise<void>;
-};
-export type BaseStore<T extends UserOpType = UserOpType> = {
-    add: (op: T) => Promise<void>;
-    remove: (userOpHash: HexData32) => Promise<boolean>;
-    contains: (userOpHash: HexData32) => Promise<boolean>;
-    dumpLocal: () => Promise<T[]>;
-};
-export type Store<T extends UserOpType> = BaseStore<T> & {
-    findConflicting: (args: UserOperation) => Promise<ConflictingStoreType>;
-};
-export type OutstandingStore = BaseStore<UserOpInfo> & {
-    clear: () => Promise<void>;
-    popConflicting: (args: UserOperation) => Promise<ConflictingOutstandingType>;
-    validateQueuedLimit: (userOp: UserOperation) => boolean;
-    validateParallelLimit: (userOp: UserOperation) => boolean;
-    getQueuedUserOps: (userOp: UserOperation) => Promise<UserOperation[]>;
-    peek: () => Promise<UserOpInfo | undefined>;
-    pop: () => Promise<UserOpInfo | undefined>;
-};
-export { createMempoolStore } from "./createMempoolStore.js";
+export * from "./types.js";
+export * from "./outstanding/index.js";
+export * from "./processing/index.js";
+export * from "./createMempoolStore.js";
 //# sourceMappingURL=index.d.ts.map

package/esm/store/index.js

@@ -1,2 +1,5 @@
-export { createMempoolStore } from "./createMempoolStore.js";
+export * from "./types.js";
+export * from "./outstanding/index.js";
+export * from "./processing/index.js";
+export * from "./createMempoolStore.js";
 //# sourceMappingURL=index.js.map

package/esm/store/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../store/index.ts"],"names":[],"mappings":"AAsHA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../store/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,sBAAsB,CAAA"}

package/esm/store/outstanding/index.d.ts

@@ -0,0 +1,13 @@
+import { type OutstandingStore } from "../index.js";
+import type { Logger } from "../../utils/index.js";
+import type { Address } from "viem";
+import type { AltoConfig } from "../../createConfig.js";
+export declare const createOutstandingQueue: ({ config, entryPoint, logger }: {
+    config: AltoConfig;
+    entryPoint: Address;
+    logger: Logger;
+}) => OutstandingStore;
+export * from "./types.js";
+export * from "./memory.js";
+export * from "./redis.js";
+//# sourceMappingURL=index.d.ts.map

package/esm/store/outstanding/index.js

@@ -0,0 +1,16 @@
+import { createMemoryOutstandingQueue, createRedisOutstandingQueue } from "../index.js";
+export const createOutstandingQueue = ({ config, entryPoint, logger }) => {
+    if (config.enableHorizontalScaling && config.redisEndpoint) {
+        return createRedisOutstandingQueue({
+            config,
+            entryPoint,
+            redisEndpoint: config.redisEndpoint,
+            logger
+        });
+    }
+    return createMemoryOutstandingQueue({ config, logger });
+};
+export * from "./types.js";
+export * from "./memory.js";
+export * from "./redis.js";
+//# sourceMappingURL=index.js.map

package/esm/store/outstanding/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../store/outstanding/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,4BAA4B,EAC5B,2BAA2B,EAC9B,MAAM,aAAa,CAAA;AAKpB,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,EACnC,MAAM,EACN,UAAU,EACV,MAAM,EAKT,EAAoB,EAAE;IACnB,IAAI,MAAM,CAAC,uBAAuB,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;QACzD,OAAO,2BAA2B,CAAC;YAC/B,MAAM;YACN,UAAU;YACV,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,MAAM;SACT,CAAC,CAAA;IACN,CAAC;IACD,OAAO,4BAA4B,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;AAC3D,CAAC,CAAA;AAED,cAAc,SAAS,CAAA;AACvB,cAAc,UAAU,CAAA;AACxB,cAAc,SAAS,CAAA"}

package/esm/store/outstanding/memory.d.ts

@@ -0,0 +1,29 @@
+import type { HexData32, UserOpInfo, UserOperation } from "../../types/index.js";
+import type { Logger } from "../../utils/index.js";
+import type { AltoConfig } from "../../createConfig.js";
+import type { ConflictingOutstandingType, OutstandingStore } from "./types.js";
+export declare class MemoryOutstanding implements OutstandingStore {
+    private readonly pendingOps;
+    private readonly hashLookup;
+    private readonly logger;
+    private readonly config;
+    private priorityQueue;
+    constructor(config: AltoConfig);
+    private dump;
+    private addToPriorityQueue;
+    validateQueuedLimit(userOp: UserOperation): boolean;
+    validateParallelLimit(userOp: UserOperation): boolean;
+    popConflicting(userOp: UserOperation): Promise<ConflictingOutstandingType>;
+    contains(userOpHash: HexData32): Promise<boolean>;
+    pop(count: number): Promise<UserOpInfo[]>;
+    add(userOpInfos: UserOpInfo[]): Promise<void>;
+    getQueuedUserOps(userOp: UserOperation): Promise<UserOperation[]>;
+    remove(userOpHashes: HexData32[]): Promise<UserOpInfo[]>;
+    dumpLocal(): Promise<UserOpInfo[]>;
+    clear(): Promise<void>;
+}
+export declare const createMemoryOutstandingQueue: ({ config, logger }: {
+    config: AltoConfig;
+    logger: Logger;
+}) => OutstandingStore;
+//# sourceMappingURL=memory.d.ts.map