@pimlico/alto 0.0.18 → 0.0.20

package/esm/utils/entryPointOverrides.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"entryPointOverrides.js","sourceRoot":"","sources":["../../utils/entryPointOverrides.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,gBAAgB,EAChB,SAAS,EACT,GAAG,EACH,KAAK,EACR,MAAM,MAAM,CAAA;AAGb,OAAO,oBAAoB,MAAM,iFAAiF,CAAC;IAC/G,IAAI,EAAE,MAAM;CACf,CAAA;AACD,OAAO,oBAAoB,MAAM,iFAAiF,CAAC;IAC/G,IAAI,EAAE,MAAM;CACf,CAAA;AACD,OAAO,oBAAoB,MAAM,iFAAiF,CAAC;IAC/G,IAAI,EAAE,MAAM;CACf,CAAA;AACD,OAAO,oBAAoB,MAAM,iFAAiF,CAAC;IAC/G,IAAI,EAAE,MAAM;CACf,CAAA;AAED,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,UAAmB,EAAE,EAAE;IAC5D,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAA;IAC/C,MAAM,KAAK,GAAG,GAAG,CACb,gBAAgB,CAAC;QACb,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,EAAE;KACZ,CAAC,EACF,EAAE,IAAI,EAAE,EAAE,EAAE,CACf,CAAA;IAED,OAAO;QACH,IAAI;QACJ,KAAK;KACR,CAAA;AACL,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,EACtC,OAAO,EACP,UAAU,EACV,aAAa,EAKhB,EAAiB,EAAE;IAChB,MAAM,qBAAqB,GAAG,wBAAwB,CAAC,UAAU,CAAC,CAAA;IAClE,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAA;IAC9D,MAAM,YAAY,GAAG,KAAK,CAAC,aAAa,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAA;IAEvD,mEAAmE;IACnE,MAAM,aAAa,GAAG,SAAS,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAA;IACzD,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAA;IAEzE,IAAI,IAAS,CAAA;IACb,QAAQ,OAAO,EAAE,CAAC;QACd,KAAK,KAAK,CAAC,CAAC,CAAC;YACT,IAAI,GAAG,oBAAoB,CAAC,gBAAgB,CAAC,MAAa,CAAA;YAC1D,MAAK;QACT,CAAC;QACD,KAAK,KAAK,CAAC,CAAC,CAAC;YACT,IAAI,GAAG,oBAAoB,CAAC,gBAAgB,CAAC,MAAa,CAAA;YAC1D,MAAK;QACT,CAAC;QACD,KAAK,KAAK,CAAC,CAAC,CAAC;YACT,IAAI,GAAG,oBAAoB,CAAC,gBAAgB,CAAC,MAAa,CAAA;YAC1D,MAAK;QACT,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACN,IAAI,GAAG,oBAAoB,CAAC,gBAAgB,CAAC,MAAa,CAAA;QAC9D,CAAC;IACL,CAAC;IAED,OAAO;QACH;YACI,OAAO,EAAE,UAAU;YACnB,IAAI;YACJ,SAAS,EAAE;gBACP;oBACI,IAAI,EAAE,qBAAqB,CAAC,IAAI;oBAChC,KAAK,EAAE,qBAAqB,CAAC,KAAK;iBACrC;gBACD;oBACI,IAAI,EAAE,WAAW;oBACjB,KAAK,EAAE,YAAY;iBACtB;gBACD;oBACI,IAAI,EAAE,aAAa;oBACnB,KAAK,EAAE,cAAc;iBACxB;aACJ;SACJ;KACJ,CAAA;AACL,CAAC,CAAA"}

package/esm/utils/helpers.d.ts

@@ -1,9 +1,11 @@
 import type { StateOverrides, UserOperation } from "../types/index.js";
+export declare const jsonStringifyWithBigint: (obj: unknown) => string;
+export declare const recoverableJsonStringifyWithBigint: (obj: unknown) => string;
+export declare const recoverableJsonParseWithBigint: (str: string) => any;
 export declare const areAddressesEqual: (a: string, b: string) => boolean;
-export declare function getRevertErrorData(err: unknown): `0x${string}` | undefined;
 export declare function getAAError(errorMsg: string): string | undefined;
-export declare function getAuthorizationStateOverrides({ userOperations, stateOverrides }: {
-    userOperations: UserOperation[];
+export declare function getAuthorizationStateOverrides({ userOps, stateOverrides }: {
+    userOps: UserOperation[];
     stateOverrides?: StateOverrides;
 }): Partial<Record<`0x${string}`, {
     balance?: bigint | undefined;

package/esm/utils/helpers.js

@@ -1,4 +1,36 @@
-import { BaseError, getAddress, concat } from "viem";
+import { concat, getAddress } from "viem";
+import { getEip7702AuthAddress } from "./eip7702.js";
+/// Convert an object to JSON string, handling bigint values
+export const jsonStringifyWithBigint = (obj) => {
+    return JSON.stringify(obj, (_key, value) => typeof value === "bigint" ? value.toString() : value);
+};
+/// Convert an object to JSON string, handling bigint values
+export const recoverableJsonStringifyWithBigint = (obj) => {
+    return JSON.stringify(obj, (_key, value) => typeof value === "bigint"
+        ? {
+            type: "bigint",
+            value: value.toString()
+        }
+        : value);
+};
+export const recoverableJsonParseWithBigint = (str) => {
+    return JSON.parse(str, (_key, value) => {
+        if (value !== null &&
+            typeof value === "object" &&
+            "type" in value &&
+            value.type === "bigint" &&
+            "value" in value &&
+            typeof value.value === "string") {
+            try {
+                return BigInt(value.value);
+            }
+            catch {
+                return value;
+            }
+        }
+        return value;
+    });
+};
 /// Ensure proper equality by converting both addresses into their checksum type
 export const areAddressesEqual = (a, b) => {
     try {
@@ -8,13 +40,6 @@ export const areAddressesEqual = (a, b) => {
         return false;
     }
 };
-export function getRevertErrorData(err) {
-    if (!(err instanceof BaseError)) {
-        return undefined;
-    }
-    const error = err.walk();
-    return typeof error?.data === "object" ? error.data?.data : error.data;
-}
 export function getAAError(errorMsg) {
     const uppercase = errorMsg.toUpperCase();
     const match = uppercase.match(/AA\d{2}/);
@@ -25,17 +50,15 @@ function getAuthorizationStateOverride({ authorization }) {
     const code = concat(["0xef0100", authorization.address]);
     return { code };
 }
-export function getAuthorizationStateOverrides({ userOperations, stateOverrides }) {
+export function getAuthorizationStateOverrides({ userOps, stateOverrides }) {
     const overrides = { ...(stateOverrides ?? {}) };
-    for (const op of userOperations) {
+    for (const op of userOps) {
         if (op.eip7702Auth) {
             overrides[op.sender] = {
                 ...(overrides[op.sender] || {}),
                 ...getAuthorizationStateOverride({
                     authorization: {
-                        address: "address" in op.eip7702Auth
-                            ? op.eip7702Auth.address
-                            : op.eip7702Auth.contractAddress,
+                        address: getEip7702AuthAddress(op.eip7702Auth),
                         chainId: op.eip7702Auth.chainId,
                         nonce: op.eip7702Auth.nonce,
                         r: op.eip7702Auth.r,

package/esm/utils/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../utils/helpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAyB,UAAU,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAG3E,gFAAgF;AAChF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;IACtD,IAAI,CAAC;QACD,OAAO,UAAU,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,CAAA;IAC1C,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,KAAK,CAAA;IAChB,CAAC;AACL,CAAC,CAAA;AAED,MAAM,UAAU,kBAAkB,CAAC,GAAY;IAC3C,IAAI,CAAC,CAAC,GAAG,YAAY,SAAS,CAAC,EAAE,CAAC;QAC9B,OAAO,SAAS,CAAA;IACpB,CAAC;IACD,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,EAAsB,CAAA;IAC5C,OAAO,OAAO,KAAK,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAA;AAC1E,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,QAAgB;IACvC,MAAM,SAAS,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAA;IACxC,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IACxC,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AACvC,CAAC;AAED,uGAAuG;AACvG,SAAS,6BAA6B,CAAC,EACnC,aAAa,EAGhB;IACG,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,UAAU,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,CAAA;IACxD,OAAO,EAAE,IAAI,EAAE,CAAA;AACnB,CAAC;AAED,MAAM,UAAU,8BAA8B,CAAC,EAC3C,cAAc,EACd,cAAc,EAIjB;IACG,MAAM,SAAS,GAAmB,EAAE,GAAG,CAAC,cAAc,IAAI,EAAE,CAAC,EAAE,CAAA;IAE/D,KAAK,MAAM,EAAE,IAAI,cAAc,EAAE,CAAC;QAC9B,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YACjB,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG;gBACnB,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;gBAC/B,GAAG,6BAA6B,CAAC;oBAC7B,aAAa,EAAE;wBACX,OAAO,EACH,SAAS,IAAI,EAAE,CAAC,WAAW;4BACvB,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO;4BACxB,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,eAAe;wBACxC,OAAO,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO;wBAC/B,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK;wBAC3B,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC;wBACnB,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC;wBACnB,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC;wBACnB,OAAO,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO;qBAClC;iBACJ,CAAC;aACL,CAAA;QACL,CAAC;IACL,CAAC;IAED,OAAO,SAAS,CAAA;AACpB,CAAC"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../utils/helpers.ts"],"names":[],"mappings":"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"}

package/esm/utils/index.d.ts

@@ -1,8 +1,8 @@
 export * from "./logger.js";
 export * from "./metrics.js";
 export * from "./bigInt.js";
-export * from "./validation.js";
 export * from "./userop.js";
 export * from "./helpers.js";
-export { Logger } from "pino";
+export * from "./asyncTimeout.js";
+export type { Logger } from "pino";
 //# sourceMappingURL=index.d.ts.map

package/esm/utils/index.js

@@ -1,7 +1,7 @@
 export * from "./logger.js";
 export * from "./metrics.js";
 export * from "./bigInt.js";
-export * from "./validation.js";
 export * from "./userop.js";
 export * from "./helpers.js";
+export * from "./asyncTimeout.js";
 //# sourceMappingURL=index.js.map

package/esm/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,cAAc,CAAA;AAC5B,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,gBAAgB,CAAA"}

package/esm/utils/metrics.d.ts

@@ -3,26 +3,28 @@ export type Metrics = ReturnType<typeof createMetrics>;
 export declare function createMetrics(registry: Registry, register?: boolean): {
     httpRequests: Counter<"code" | "method" | "route" | "rpc_method" | "rpc_status">;
     httpRequestsDuration: Histogram<"code" | "method" | "route" | "rpc_method" | "rpc_status" | "api_version">;
-    userOperationsInMempool: Gauge<"status">;
+    userOpsInMempool: Gauge<"status">;
     walletsAvailable: Gauge<never>;
     walletsTotal: Gauge<never>;
-    userOperationsOnChain: Counter<"status">;
-    userOperationsSubmitted: Counter<"status">;
+    userOpsOnChain: Counter<"status">;
+    userOpsSubmitted: Counter<"status">;
     bundlesIncluded: Counter<never>;
     bundlesSubmitted: Counter<"status">;
-    userOperationsReceived: Counter<"type" | "status">;
-    userOperationsValidationSuccess: Counter<never>;
-    userOperationsValidationFailure: Counter<never>;
-    userOperationInclusionDuration: Histogram<never>;
+    userOpsReceived: Counter<"type" | "status">;
+    userOpsValidationSuccess: Counter<never>;
+    userOpsValidationFailure: Counter<never>;
+    userOpInclusionDuration: Histogram<never>;
     verificationGasLimitEstimationTime: Histogram<never>;
     verificationGasLimitEstimationCount: Histogram<never>;
     replacedTransactions: Counter<"reason" | "status">;
-    userOperationsResubmitted: Counter<never>;
+    userOpsResubmitted: Counter<never>;
+    userOpsDropped: Counter<"reason">;
     utilityWalletBalance: Gauge<never>;
     utilityWalletInsufficientBalance: Gauge<never>;
     executorWalletsBalances: Gauge<"wallet">;
     executorWalletsMinBalance: Gauge<never>;
-    emittedOpEvents: Counter<"status" | "event_type">;
     walletsProcessingTime: Histogram<never>;
+    userOpsSubmissionAttempts: Histogram<never>;
+    altoSecondValidationFailed: Counter<never>;
 };
 //# sourceMappingURL=metrics.d.ts.map

package/esm/utils/metrics.js

@@ -1,6 +1,11 @@
 import { Counter, Gauge, Histogram, collectDefaultMetrics } from "prom-client";
 export function createMetrics(registry, register = true) {
-    collectDefaultMetrics({ register: registry });
+    // Skip default metrics collection in development mode or when running in Bun
+    // to avoid compatibility issues
+    const isBun = typeof globalThis.Bun !== "undefined";
+    if (!isBun) {
+        collectDefaultMetrics({ register: registry });
+    }
     const registers = register ? [registry] : [];
     const httpRequests = new Counter({
         name: "alto_requests_total",
@@ -27,7 +32,7 @@ export function createMetrics(registry, register = true) {
         ],
         registers
     });
-    const userOperationsInMempool = new Gauge({
+    const userOpsInMempool = new Gauge({
         name: "alto_user_operations_in_mempool_count",
         help: "Number of user operations in mempool",
         labelNames: ["status"],
@@ -45,13 +50,13 @@ export function createMetrics(registry, register = true) {
         labelNames: [],
         registers
     });
-    const userOperationsOnChain = new Counter({
+    const userOpsOnChain = new Counter({
         name: "alto_user_operations_on_chain_total",
         help: "Number of user operations on-chain by status",
         labelNames: ["status"],
         registers
     });
-    const userOperationsSubmitted = new Counter({
+    const userOpsSubmitted = new Counter({
         name: "alto_user_operations_submitted_total",
         help: "Number of user operations bundles submitted on-chain",
         labelNames: ["status"],
@@ -69,25 +74,25 @@ export function createMetrics(registry, register = true) {
         labelNames: ["status"],
         registers
     });
-    const userOperationsReceived = new Counter({
+    const userOpsReceived = new Counter({
         name: "alto_user_operations_received_total",
         help: "Number of user operations received",
         labelNames: ["status", "type"],
         registers
     });
-    const userOperationsValidationSuccess = new Counter({
+    const userOpsValidationSuccess = new Counter({
         name: "alto_user_operations_validation_success_total",
         help: "Number of user operations successfully validated",
         labelNames: [],
         registers
     });
-    const userOperationsValidationFailure = new Counter({
+    const userOpsValidationFailure = new Counter({
         name: "alto_user_operations_validation_failure_total",
         help: "Number of user operations failed to validate",
         labelNames: [],
         registers
     });
-    const userOperationInclusionDuration = new Histogram({
+    const userOpInclusionDuration = new Histogram({
         name: "alto_user_operation_inclusion_duration_seconds",
         help: "Duration of user operation inclusion from first submission to inclusion on-chain",
         labelNames: [],
@@ -117,12 +122,24 @@ export function createMetrics(registry, register = true) {
         labelNames: ["reason", "status"],
         registers
     });
-    const userOperationsResubmitted = new Counter({
+    const userOpsResubmitted = new Counter({
         name: "alto_user_operations_resubmitted_total",
         help: "Number of user operations resubmitted",
         labelNames: [],
         registers
     });
+    const userOpsDropped = new Counter({
+        name: "alto_user_operations_dropped_total",
+        help: "Number of user operations dropped from mempool",
+        labelNames: ["reason"],
+        registers
+    });
+    const userOpsSubmissionAttempts = new Histogram({
+        name: "alto_user_operations_attempts_before_inclusion",
+        help: "Number of submission attempts needed before a user operation was included on-chain",
+        labelNames: [],
+        registers
+    });
     const utilityWalletBalance = new Gauge({
         name: "alto_utility_wallet_balance",
         help: "Balance of the utility wallet",
@@ -147,42 +164,44 @@ export function createMetrics(registry, register = true) {
         labelNames: [],
         registers
     });
-    const emittedOpEvents = new Counter({
-        name: "alto_emitted_user_operation_events",
-        help: "Total number of emitted UserOperation status events",
-        labelNames: ["event_type", "status"],
-        registers
-    });
     const walletsProcessingTime = new Histogram({
         name: "alto_executor_wallets_processing_duration_seconds",
         help: "Time spent processing user operations by executor wallets",
         labelNames: [],
         registers
     });
+    const altoSecondValidationFailed = new Counter({
+        name: "alto_second_validation_failed",
+        help: "Number of times alto's second estimation failed during eth_estimateUserOperationGas and we returned 2x gas limits",
+        labelNames: [],
+        registers
+    });
     return {
         httpRequests,
         httpRequestsDuration,
-        userOperationsInMempool,
+        userOpsInMempool,
         walletsAvailable,
         walletsTotal,
-        userOperationsOnChain,
-        userOperationsSubmitted,
+        userOpsOnChain,
+        userOpsSubmitted,
         bundlesIncluded,
         bundlesSubmitted,
-        userOperationsReceived,
-        userOperationsValidationSuccess,
-        userOperationsValidationFailure,
-        userOperationInclusionDuration,
+        userOpsReceived,
+        userOpsValidationSuccess,
+        userOpsValidationFailure,
+        userOpInclusionDuration,
         verificationGasLimitEstimationTime,
         verificationGasLimitEstimationCount,
         replacedTransactions,
-        userOperationsResubmitted,
+        userOpsResubmitted,
+        userOpsDropped,
         utilityWalletBalance,
         utilityWalletInsufficientBalance,
         executorWalletsBalances,
         executorWalletsMinBalance,
-        emittedOpEvents,
-        walletsProcessingTime
+        walletsProcessingTime,
+        userOpsSubmissionAttempts,
+        altoSecondValidationFailed
     };
 }
 //# sourceMappingURL=metrics.js.map

package/esm/utils/metrics.js.map

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

package/esm/utils/minMaxQueue/createMemoryMinMaxQueue.d.ts

@@ -1,5 +1,5 @@
-import { MinMaxQueue } from "./index.js";
-import { AltoConfig } from "../../createConfig.js";
+import type { MinMaxQueue } from "./index.js";
+import type { AltoConfig } from "../../createConfig.js";
 export declare const createMemoryMinMaxQueue: ({ config }: {
     config: AltoConfig;
 }) => MinMaxQueue;

package/esm/utils/minMaxQueue/createMemoryMinMaxQueue.js

@@ -43,10 +43,10 @@ export const createMemoryMinMaxQueue = ({ config }) => {
             return latestValue;
         },
         getMinValue: async () => {
-            return minDeque.length ? minDeque[0].value : null;
+            return minDeque.length > 0 ? minDeque[0].value : null;
         },
         getMaxValue: async () => {
-            return maxDeque.length ? maxDeque[0].value : null;
+            return maxDeque.length > 0 ? maxDeque[0].value : null;
         }
     };
 };

package/esm/utils/minMaxQueue/createMemoryMinMaxQueue.js.map

@@ -1 +1 @@
-{"version":3,"file":"createMemoryMinMaxQueue.js","sourceRoot":"","sources":["../../../utils/minMaxQueue/createMemoryMinMaxQueue.ts"],"names":[],"mappings":"AAKA,MAAM,YAAY,GAAG,CACjB,KAAa,EACb,aAAqB,EACrB,QAAsB,EACtB,QAAsB,EAC+C,EAAE;IACvE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAA,CAAC,8BAA8B;IACnE,MAAM,UAAU,GAAG,SAAS,GAAG,aAAa,CAAA;IAE5C,yBAAyB;IACzB,MAAM,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CACpC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,IAAI,UAAU,CAC3C,CAAA;IACD,MAAM,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CACpC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,IAAI,UAAU,CAC3C,CAAA;IAED,yBAAyB;IACzB,OACI,gBAAgB,CAAC,MAAM;QACvB,gBAAgB,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,KAAK,EAC9D,CAAC;QACC,gBAAgB,CAAC,GAAG,EAAE,CAAA;IAC1B,CAAC;IACD,gBAAgB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAA;IAE3C,yBAAyB;IACzB,OACI,gBAAgB,CAAC,MAAM;QACvB,gBAAgB,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,KAAK,EAC9D,CAAC;QACC,gBAAgB,CAAC,GAAG,EAAE,CAAA;IAC1B,CAAC;IACD,gBAAgB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAA;IAE3C,OAAO;QACH,QAAQ,EAAE,gBAAgB;QAC1B,QAAQ,EAAE,gBAAgB;QAC1B,SAAS;KACZ,CAAA;AACL,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,EACpC,MAAM,EACe,EAAe,EAAE;IACtC,MAAM,aAAa,GAAG,MAAM,CAAC,cAAc,CAAA;IAE3C,oCAAoC;IACpC,IAAI,QAAQ,GAAiB,EAAE,CAAA;IAC/B,oCAAoC;IACpC,IAAI,QAAQ,GAAiB,EAAE,CAAA;IAC/B,IAAI,WAAW,GAAkB,IAAI,CAAA;IAErC,OAAO;QACH,SAAS,EAAE,KAAK,EAAE,KAAa,EAAE,EAAE;YAC/B,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;gBACf,OAAM;YACV,CAAC;YAED,MAAM,MAAM,GAAG,YAAY,CACvB,KAAK,EACL,aAAa,EACb,QAAQ,EACR,QAAQ,CACX,CAAA;YACD,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAA;YAC1B,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAA;YAC1B,WAAW,GAAG,KAAK,CAAA;QACvB,CAAC;QACD,cAAc,EAAE,KAAK,IAAI,EAAE;YACvB,OAAO,WAAW,CAAA;QACtB,CAAC;QACD,WAAW,EAAE,KAAK,IAAI,EAAE;YACpB,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;QACrD,CAAC;QACD,WAAW,EAAE,KAAK,IAAI,EAAE;YACpB,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;QACrD,CAAC;KACJ,CAAA;AACL,CAAC,CAAA"}
+{"version":3,"file":"createMemoryMinMaxQueue.js","sourceRoot":"","sources":["../../../utils/minMaxQueue/createMemoryMinMaxQueue.ts"],"names":[],"mappings":"AAKA,MAAM,YAAY,GAAG,CACjB,KAAa,EACb,aAAqB,EACrB,QAAsB,EACtB,QAAsB,EAC+C,EAAE;IACvE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAA,CAAC,8BAA8B;IACnE,MAAM,UAAU,GAAG,SAAS,GAAG,aAAa,CAAA;IAE5C,yBAAyB;IACzB,MAAM,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CACpC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,IAAI,UAAU,CAC3C,CAAA;IACD,MAAM,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CACpC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,IAAI,UAAU,CAC3C,CAAA;IAED,yBAAyB;IACzB,OACI,gBAAgB,CAAC,MAAM;QACvB,gBAAgB,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,KAAK,EAC9D,CAAC;QACC,gBAAgB,CAAC,GAAG,EAAE,CAAA;IAC1B,CAAC;IACD,gBAAgB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAA;IAE3C,yBAAyB;IACzB,OACI,gBAAgB,CAAC,MAAM;QACvB,gBAAgB,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,KAAK,EAC9D,CAAC;QACC,gBAAgB,CAAC,GAAG,EAAE,CAAA;IAC1B,CAAC;IACD,gBAAgB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAA;IAE3C,OAAO;QACH,QAAQ,EAAE,gBAAgB;QAC1B,QAAQ,EAAE,gBAAgB;QAC1B,SAAS;KACZ,CAAA;AACL,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,EACpC,MAAM,EACe,EAAe,EAAE;IACtC,MAAM,aAAa,GAAG,MAAM,CAAC,cAAc,CAAA;IAE3C,oCAAoC;IACpC,IAAI,QAAQ,GAAiB,EAAE,CAAA;IAC/B,oCAAoC;IACpC,IAAI,QAAQ,GAAiB,EAAE,CAAA;IAC/B,IAAI,WAAW,GAAkB,IAAI,CAAA;IAErC,OAAO;QACH,SAAS,EAAE,KAAK,EAAE,KAAa,EAAE,EAAE;YAC/B,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;gBACf,OAAM;YACV,CAAC;YAED,MAAM,MAAM,GAAG,YAAY,CACvB,KAAK,EACL,aAAa,EACb,QAAQ,EACR,QAAQ,CACX,CAAA;YACD,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAA;YAC1B,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAA;YAC1B,WAAW,GAAG,KAAK,CAAA;QACvB,CAAC;QACD,cAAc,EAAE,KAAK,IAAI,EAAE;YACvB,OAAO,WAAW,CAAA;QACtB,CAAC;QACD,WAAW,EAAE,KAAK,IAAI,EAAE;YACpB,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;QACzD,CAAC;QACD,WAAW,EAAE,KAAK,IAAI,EAAE;YACpB,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;QACzD,CAAC;KACJ,CAAA;AACL,CAAC,CAAA"}

package/esm/utils/minMaxQueue/createRedisMinMaxQueue.d.ts

@@ -1,7 +1,29 @@
-import { MinMaxQueue } from "./index.js";
-import { AltoConfig } from "../../createConfig.js";
-export declare const createRedisMinMaxQueue: ({ config, keyPrefix }: {
+/**
+ * MinMaxQueue implementation in Redis using a single sorted set
+ *
+ * ## Data Structure
+ * - Uses a Redis sorted set where:
+ *   - Score: timestamp when value was added (seconds since epoch)
+ *   - Member: the actual bigint value (stored as string)
+ *
+ * ## Flow
+ * 1. **Adding values**: New values are added/updated with current timestamp as score
+ * 2. **Reading values**: Queries filter out expired entries based on timestamp
+ * 3. **Cleanup**: Background process runs every minute to remove expired entries
+ *
+ * ## Optimization Strategy
+ * - Lazy cleanup: expired entries filtered on read, bulk removed by background process (removing is expensive)
+ *
+ * ## TTL Management
+ * - Entries expire based on `queueValidity` (configured via `gasPriceExpiry`)
+ * - Background cleanup prevents unbounded growth
+ * - Read operations ignore expired entries without removing them
+ */
+import type { MinMaxQueue } from "./index.js";
+import type { AltoConfig } from "../../createConfig.js";
+export declare const createRedisMinMaxQueue: ({ config, queueName, redisEndpoint }: {
     config: AltoConfig;
-    keyPrefix: string;
+    queueName: string;
+    redisEndpoint: string;
 }) => MinMaxQueue;
 //# sourceMappingURL=createRedisMinMaxQueue.d.ts.map

package/esm/utils/minMaxQueue/createRedisMinMaxQueue.js

@@ -1,98 +1,138 @@
+/**
+ * MinMaxQueue implementation in Redis using a single sorted set
+ *
+ * ## Data Structure
+ * - Uses a Redis sorted set where:
+ *   - Score: timestamp when value was added (seconds since epoch)
+ *   - Member: the actual bigint value (stored as string)
+ *
+ * ## Flow
+ * 1. **Adding values**: New values are added/updated with current timestamp as score
+ * 2. **Reading values**: Queries filter out expired entries based on timestamp
+ * 3. **Cleanup**: Background process runs every minute to remove expired entries
+ *
+ * ## Optimization Strategy
+ * - Lazy cleanup: expired entries filtered on read, bulk removed by background process (removing is expensive)
+ *
+ * ## TTL Management
+ * - Entries expire based on `queueValidity` (configured via `gasPriceExpiry`)
+ * - Background cleanup prevents unbounded growth
+ * - Read operations ignore expired entries without removing them
+ */
 import Redis from "ioredis";
-// Sorted TTL queue, one queue to keep track of values and other queue to keep track of TTL.
+import * as sentry from "@sentry/node";
 class SortedTtlSet {
     redis;
-    valueKey;
-    timestampKey;
+    redisKey; // Single sorted set: score = timestamp, member = value
     queueValidity;
-    constructor({ keyPrefix, config }) {
-        if (!config.redisGasPriceQueueUrl) {
-            throw new Error("Redis URL not provided");
-        }
-        const redis = new Redis(config.redisGasPriceQueueUrl);
+    cleanupInterval = null;
+    constructor({ queueName, config, redisEndpoint }) {
+        const redis = new Redis(redisEndpoint);
         const queueValidity = config.gasPriceExpiry;
-        const redisKey = `${config.chainId}:${keyPrefix}`;
         this.redis = redis;
-        this.valueKey = `${redisKey}:value`;
-        this.timestampKey = `${redisKey}:timestamp`;
+        this.redisKey = `${config.redisKeyPrefix}:${config.chainId}:${queueName}`;
         this.queueValidity = queueValidity;
+        // Start background cleanup every minute
+        this.startBackgroundCleanup();
     }
-    async add(value) {
-        await this.pruneExpiredEntries();
-        if (value === 0n) {
-            return;
+    startBackgroundCleanup() {
+        // Run cleanup every minute
+        this.cleanupInterval = setInterval(() => {
+            this.cleanup().catch((err) => {
+                sentry.captureException(err);
+            });
+        }, 60 * 1_000);
+        // Allow process to exit even if interval is active
+        if (this.cleanupInterval.unref) {
+            this.cleanupInterval.unref();
         }
-        const now = Date.now() / 1_000;
-        const valueStr = value.toString();
-        // Check if value exists in the value set
-        const exists = await this.redis.zscore(this.valueKey, valueStr);
-        if (exists) {
-            // If value exists, only update its timestamp
-            const multi = this.redis.multi();
-            multi.zrem(this.timestampKey, valueStr); // Remove old timestamp
-            multi.zadd(this.timestampKey, now, valueStr); // Add new timestamp
-            await multi.exec();
+    }
+    async cleanup() {
+        const cutoffTime = Date.now() / 1_000 - this.queueValidity * 5;
+        await this.redis.zremrangebyscore(this.redisKey, "-inf", `(${cutoffTime}`);
+    }
+    async add(value, logger) {
+        try {
+            if (value === 0n) {
+                return;
+            }
+            const now = Date.now() / 1_000;
+            const valueStr = value.toString();
+            // Add or update (if exists) with current timestamp
+            await this.redis.zadd(this.redisKey, now, valueStr);
         }
-        else {
-            // If it's a new value, add entry to timestamp and value queues
-            const multi = this.redis.multi();
-            multi.zadd(this.timestampKey, now, valueStr);
-            multi.zadd(this.valueKey, valueStr, valueStr);
-            await multi.exec();
+        catch (err) {
+            logger.error({ err }, "Failed to save value to minMaxQueue");
+            sentry.captureException(err);
         }
     }
-    async pruneExpiredEntries() {
-        const timestamp = Date.now() / 1_000;
-        const cutoffTime = timestamp - this.queueValidity;
-        // Get expired unique IDs from time queue
-        const expiredMembers = await this.redis.zrangebyscore(this.timestampKey, "-inf", `(${cutoffTime}` // exclusive upper bound
-        );
-        if (expiredMembers.length) {
-            const multi = this.redis.multi();
-            // Remove expired entries from both sets
-            multi.zrem(this.timestampKey, ...expiredMembers);
-            multi.zrem(this.valueKey, ...expiredMembers);
-            await multi.exec();
-        }
+    getValidCutoffTime() {
+        return Date.now() / 1_000 - this.queueValidity;
     }
-    async getMin() {
-        // Prune expired entries
-        await this.pruneExpiredEntries();
-        // Get the smallest value from the value set
-        const values = await this.redis.zrange(this.valueKey, 0, 0);
-        if (!values.length)
+    async getMin(logger) {
+        try {
+            // Get all valid (non-expired) values
+            const validValues = await this.redis.zrangebyscore(this.redisKey, this.getValidCutoffTime(), "+inf");
+            if (validValues.length === 0) {
+                return null;
+            }
+            // Find minimum value among valid entries
+            const bigIntValues = validValues.map(BigInt);
+            return bigIntValues.reduce((min, val) => (val < min ? val : min));
+        }
+        catch (err) {
+            logger.error({ err }, "Failed to get min value");
+            sentry.captureException(err);
             return null;
-        return BigInt(values[0]);
+        }
     }
-    async getMax() {
-        // Prune expired entries
-        await this.pruneExpiredEntries();
-        // Get the largest value from the value set (using reverse range)
-        const values = await this.redis.zrange(this.valueKey, -1, -1);
-        if (!values.length)
+    async getMax(logger) {
+        try {
+            // Get all valid (non-expired) values
+            const validValues = await this.redis.zrangebyscore(this.redisKey, this.getValidCutoffTime(), "+inf");
+            if (validValues.length === 0) {
+                return null;
+            }
+            // Find maximum value among valid entries
+            const bigIntValues = validValues.map(BigInt);
+            return bigIntValues.reduce((max, val) => (val > max ? val : max));
+        }
+        catch (err) {
+            logger.error({ err }, "Failed to get max value");
+            sentry.captureException(err);
             return null;
-        return BigInt(values[0]);
+        }
     }
-    async getLatestValue() {
-        // Prune expired entries
-        await this.pruneExpiredEntries();
-        // Get the member with highest TTL (most recent timestamp)
-        const values = await this.redis.zrange(this.timestampKey, -1, -1);
-        if (!values.length)
+    async getLatestValue(logger) {
+        try {
+            // Get the most recently added value (highest timestamp) that's still valid
+            const validValues = await this.redis.zrevrangebyscore(this.redisKey, "+inf", this.getValidCutoffTime(), "LIMIT", 0, 1);
+            if (validValues.length === 0) {
+                return null;
+            }
+            return BigInt(validValues[0]);
+        }
+        catch (err) {
+            logger.error({ err }, "Failed to get latest value");
+            sentry.captureException(err);
             return null;
-        return BigInt(values[0]);
+        }
     }
 }
-export const createRedisMinMaxQueue = ({ config, keyPrefix }) => {
+export const createRedisMinMaxQueue = ({ config, queueName, redisEndpoint }) => {
     const queue = new SortedTtlSet({
         config,
-        keyPrefix: `${keyPrefix}:minMaxQueue`
+        redisEndpoint,
+        queueName
+    });
+    const logger = config.getLogger({ module: "minMaxQueue" }, {
+        level: config.logLevel
     });
     return {
-        saveValue: async (value) => queue.add(value),
-        getLatestValue: async () => queue.getLatestValue(),
-        getMinValue: async () => queue.getMin(),
-        getMaxValue: async () => queue.getMax()
+        saveValue: async (value) => queue.add(value, logger),
+        getLatestValue: async () => queue.getLatestValue(logger),
+        getMinValue: async () => queue.getMin(logger),
+        getMaxValue: async () => queue.getMax(logger)
     };
 };
 //# sourceMappingURL=createRedisMinMaxQueue.js.map