@pimlico/alto 0.0.0-main.20260121T201101 → 0.0.0-main.20260126T192247
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm/cli/shutDown.js +13 -22
- package/esm/cli/shutDown.js.map +1 -1
- package/esm/mempool/mempool.d.ts +1 -0
- package/esm/mempool/mempool.js +29 -13
- package/esm/mempool/mempool.js.map +1 -1
- package/esm/rpc/methods/pimlico_sendUserOperationNow.js +1 -1
- package/esm/rpc/methods/pimlico_sendUserOperationNow.js.map +1 -1
- package/esm/store/createMempoolStore.js +11 -6
- package/esm/store/createMempoolStore.js.map +1 -1
- package/esm/store/processing/memory.d.ts +4 -2
- package/esm/store/processing/memory.js +39 -21
- package/esm/store/processing/memory.js.map +1 -1
- package/esm/store/processing/redis.d.ts +4 -2
- package/esm/store/processing/redis.js +62 -28
- package/esm/store/processing/redis.js.map +1 -1
- package/esm/store/processing/types.d.ts +3 -2
- package/esm/store/types.d.ts +3 -2
- package/esm/utils/userop.d.ts +18 -0
- package/esm/utils/userop.js +15 -31
- package/esm/utils/userop.js.map +1 -1
- package/package.json +4 -4
package/esm/cli/shutDown.js
CHANGED
|
@@ -56,36 +56,27 @@ async function dropAllOperationsOnShutdown({ config, mempool, logger }) {
|
|
|
56
56
|
}
|
|
57
57
|
}));
|
|
58
58
|
}
|
|
59
|
-
async function
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
await Promise.all(pendingBundles.map(async (submittedBundle) => {
|
|
67
|
-
const { entryPoint, userOps } = submittedBundle.bundle;
|
|
68
|
-
// Remove all userOps from processing in parallel
|
|
69
|
-
await Promise.all(userOps.map((userOpInfo) => mempool.store.removeProcessing({
|
|
70
|
-
entryPoint,
|
|
71
|
-
userOpInfo
|
|
72
|
-
})));
|
|
73
|
-
// Add all userOps from this bundle back to outstanding
|
|
59
|
+
async function resubmitProcessingToOutstanding({ mempool, config, logger }) {
|
|
60
|
+
await Promise.all(config.entrypoints.map(async (entryPoint) => {
|
|
61
|
+
const processingUserOps = await mempool.flushProcessing(entryPoint);
|
|
62
|
+
if (processingUserOps.length === 0) {
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
// Add back to outstanding
|
|
74
66
|
await mempool.store.addOutstanding({
|
|
75
67
|
entryPoint,
|
|
76
|
-
userOpInfos:
|
|
68
|
+
userOpInfos: processingUserOps
|
|
77
69
|
});
|
|
78
|
-
logger.info({ userOpHashes: getUserOpHashes(
|
|
70
|
+
logger.info({ userOpHashes: getUserOpHashes(processingUserOps) }, "[SHUTDOWN] Resubmitted processing userOps to outstanding");
|
|
79
71
|
}));
|
|
80
72
|
}
|
|
81
73
|
export async function persistShutdownState({ mempool, bundleManager, statusManager, config, logger }) {
|
|
82
|
-
// When horizontal scaling is enabled, outstanding
|
|
83
|
-
//
|
|
84
|
-
// back to outstanding so they can be picked up by another instance.
|
|
74
|
+
// When horizontal scaling is enabled, we keep outstanding store in redis so that outstanding userOps can be picked up by other instances.
|
|
75
|
+
// We flush all locally processing userOps and push them to outstanding redis to be picked up by the next alto instance.
|
|
85
76
|
if (config.enableHorizontalScaling) {
|
|
86
|
-
await
|
|
77
|
+
await resubmitProcessingToOutstanding({
|
|
87
78
|
mempool,
|
|
88
|
-
|
|
79
|
+
config,
|
|
89
80
|
logger
|
|
90
81
|
});
|
|
91
82
|
return;
|
package/esm/cli/shutDown.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shutDown.js","sourceRoot":"","sources":["../../cli/shutDown.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAOhD,OAAO,EACH,8BAA8B,EAC9B,kCAAkC,EACrC,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,MAAM,MAAM,CAAA;AACxB,OAAO,KAAK,MAAM,SAAS,CAAA;AAI3B,MAAM,YAAY,GAAG,CAAC,OAAe,EAAE,EAAE,CAAC,4BAA4B,OAAO,EAAE,CAAA;AAE/E,yDAAyD;AACzD,SAAS,sBAAsB,CAC3B,MAA2B;IAE3B,MAAM,eAAe,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAA;IAC/C,OAAO;QACH,eAAe;QACf,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,eAAe,EAAE,MAAM,CAAC,eAAe;QACvC,yBAAyB,EAAE,MAAM,CAAC,yBAAyB;QAC3D,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;QAC7C,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,YAAY,EAAE,MAAM,CAAC,YAAY;KACpC,CAAA;AACL,CAAC;AAED,0DAA0D;AAC1D,uEAAuE;AACvE,SAAS,wBAAwB,CAC7B,gBAAiD,EACjD,aAA4B,EAC5B,MAAc;IAEd,MAAM,UAAU,GAAG,aAAa,CAAC,aAAa,EAAE,CAAA;IAChD,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAC5B,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,KAAK,gBAAgB,CAAC,eAAe,CAClE,CAAA;IAED,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,MAAM,CAAC,IAAI,CACP,EAAE,eAAe,EAAE,gBAAgB,CAAC,eAAe,EAAE,EACrD,0EAA0E,CAC7E,CAAA;QACD,OAAO,IAAI,CAAA;IACf,CAAC;IAED,OAAO;QACH,QAAQ;QACR,GAAG,EAAE,gBAAgB,CAAC,GAAG;QACzB,eAAe,EAAE,gBAAgB,CAAC,eAAe;QACjD,yBAAyB,EAAE,gBAAgB,CAAC,yBAAyB;QACrE,kBAAkB,EAAE,gBAAgB,CAAC,kBAAkB;QACvD,MAAM,EAAE,gBAAgB,CAAC,MAAM;QAC/B,YAAY,EAAE,gBAAgB,CAAC,YAAY;KAC9C,CAAA;AACL,CAAC;AAED,KAAK,UAAU,2BAA2B,CAAC,EACvC,MAAM,EACN,OAAO,EACP,MAAM,EACiD;IACvD,MAAM,OAAO,CAAC,GAAG,CACb,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;QACxC,IAAI,CAAC;YACD,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,CAAA;YAE7D,MAAM,eAAe,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBACjD,GAAG,MAAM;gBACT,MAAM,EAAE,UAAU;aACrB,CAAC,CAAC,CAAA;YAEH,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,MAAM,OAAO,CAAC,WAAW,CAAC,UAAU,EAAE,eAAe,CAAC,CAAA;YAC1D,CAAC;YAED,MAAM,CAAC,IAAI,CACP;gBACI,WAAW,EAAE,WAAW,CAAC,MAAM;aAClC,EACD,mDAAmD,CACtD,CAAA;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CACR,EAAE,GAAG,EAAE,UAAU,EAAE,EACnB,gFAAgF,CACnF,CAAA;YACD,kCAAkC;QACtC,CAAC;IACL,CAAC,CAAC,CACL,CAAA;AACL,CAAC;AAED,KAAK,UAAU,
|
|
1
|
+
{"version":3,"file":"shutDown.js","sourceRoot":"","sources":["../../cli/shutDown.ts"],"names":[],"mappings":"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"}
|
package/esm/mempool/mempool.d.ts
CHANGED
|
@@ -40,6 +40,7 @@ export declare class Mempool {
|
|
|
40
40
|
entryPoint: Address;
|
|
41
41
|
}): Promise<void>;
|
|
42
42
|
dumpOutstanding(entryPoint: Address): Promise<UserOpInfo[]>;
|
|
43
|
+
flushProcessing(entryPoint: Address): Promise<UserOpInfo[]>;
|
|
43
44
|
checkEntityMultipleRoleViolation(entryPoint: Address, op: UserOperation): Promise<void>;
|
|
44
45
|
getKnownEntities(entryPoint: Address): Promise<{
|
|
45
46
|
sender: Set<Address>;
|
package/esm/mempool/mempool.js
CHANGED
|
@@ -65,7 +65,7 @@ export class Mempool {
|
|
|
65
65
|
// Complete processing before re-adding to outstanding pool.
|
|
66
66
|
await this.store.removeProcessing({
|
|
67
67
|
entryPoint,
|
|
68
|
-
userOpInfo
|
|
68
|
+
userOpInfos: [userOpInfo]
|
|
69
69
|
});
|
|
70
70
|
const [success, failureReason] = await this.add({
|
|
71
71
|
userOpInfo,
|
|
@@ -88,7 +88,7 @@ export class Mempool {
|
|
|
88
88
|
// Complete processing since userOp is dropped.
|
|
89
89
|
await this.store.removeProcessing({
|
|
90
90
|
entryPoint,
|
|
91
|
-
|
|
91
|
+
userOpInfos: [rejectedUserOp]
|
|
92
92
|
});
|
|
93
93
|
this.eventManager.emitDropped(userOpHash, reason, getAAError(reason));
|
|
94
94
|
await this.statusManager.set([userOpHash], {
|
|
@@ -106,17 +106,18 @@ export class Mempool {
|
|
|
106
106
|
// Remove userOps from processing store.
|
|
107
107
|
// should be called when userOps are included onchain.
|
|
108
108
|
async removeProcessing({ userOps, entryPoint }) {
|
|
109
|
-
await
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
});
|
|
114
|
-
}));
|
|
109
|
+
await this.store.removeProcessing({
|
|
110
|
+
entryPoint,
|
|
111
|
+
userOpInfos: userOps
|
|
112
|
+
});
|
|
115
113
|
}
|
|
116
114
|
// === Methods for dropping mempool entries === //
|
|
117
115
|
async dumpOutstanding(entryPoint) {
|
|
118
116
|
return await this.store.dumpOutstanding(entryPoint);
|
|
119
117
|
}
|
|
118
|
+
async flushProcessing(entryPoint) {
|
|
119
|
+
return await this.store.flushProcessing(entryPoint);
|
|
120
|
+
}
|
|
120
121
|
// === Methods for entity management === //
|
|
121
122
|
async checkEntityMultipleRoleViolation(entryPoint, op) {
|
|
122
123
|
if (!this.config.safeMode) {
|
|
@@ -461,12 +462,22 @@ export class Mempool {
|
|
|
461
462
|
if (poppedUserOps.length === 0) {
|
|
462
463
|
return [];
|
|
463
464
|
}
|
|
465
|
+
// Track popped userOps as processing immediately to prevent loss on shutdown
|
|
466
|
+
await this.store.addProcessing({
|
|
467
|
+
entryPoint,
|
|
468
|
+
userOpInfos: poppedUserOps
|
|
469
|
+
});
|
|
464
470
|
// Keep track of unused ops from the batch
|
|
465
471
|
const unusedUserOps = [...poppedUserOps];
|
|
466
472
|
while (unusedUserOps.length > 0) {
|
|
467
473
|
// If maxBundles is set and we reached the limit, put back all unused ops and break.
|
|
468
474
|
if (maxBundleCount && bundles.length >= maxBundleCount) {
|
|
469
475
|
if (unusedUserOps.length > 0) {
|
|
476
|
+
// Remove from processing before putting back to outstanding
|
|
477
|
+
await this.store.removeProcessing({
|
|
478
|
+
entryPoint,
|
|
479
|
+
userOpInfos: unusedUserOps
|
|
480
|
+
});
|
|
470
481
|
await this.store.addOutstanding({
|
|
471
482
|
entryPoint,
|
|
472
483
|
userOpInfos: unusedUserOps
|
|
@@ -511,6 +522,11 @@ export class Mempool {
|
|
|
511
522
|
entryPoint
|
|
512
523
|
});
|
|
513
524
|
if (skipResult.skip) {
|
|
525
|
+
// Remove from processing since it's going back to outstanding or being dropped
|
|
526
|
+
await this.store.removeProcessing({
|
|
527
|
+
entryPoint,
|
|
528
|
+
userOpInfos: [currentUserOp]
|
|
529
|
+
});
|
|
514
530
|
// Re-add to outstanding
|
|
515
531
|
if (!skipResult.removeOutstanding) {
|
|
516
532
|
await this.store.addOutstanding({
|
|
@@ -539,16 +555,16 @@ export class Mempool {
|
|
|
539
555
|
storageMap = skipResult.storageMap;
|
|
540
556
|
touchedEip7702Auth = skipResult.touchedEip7702Auth;
|
|
541
557
|
this.reputationManager.decreaseUserOpCount(userOp);
|
|
542
|
-
// Track the operation as active (being bundled).
|
|
543
|
-
await this.store.addProcessing({
|
|
544
|
-
entryPoint,
|
|
545
|
-
userOpInfo: currentUserOp
|
|
546
|
-
});
|
|
547
558
|
// Add userOp to current bundle.
|
|
548
559
|
currentBundle.userOps.push(currentUserOp);
|
|
549
560
|
// Try to fetch more userOps if we've exhausted this batch.
|
|
550
561
|
if (unusedUserOps.length === 0) {
|
|
551
562
|
const morePoppedOps = await this.store.popOutstanding(entryPoint, batchSize);
|
|
563
|
+
// Track newly popped userOps as processing immediately
|
|
564
|
+
await this.store.addProcessing({
|
|
565
|
+
entryPoint,
|
|
566
|
+
userOpInfos: morePoppedOps
|
|
567
|
+
});
|
|
552
568
|
unusedUserOps.push(...morePoppedOps);
|
|
553
569
|
}
|
|
554
570
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mempool.js","sourceRoot":"","sources":["../../mempool/mempool.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"mempool.js","sourceRoot":"","sources":["../../mempool/mempool.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,7 +45,7 @@ export const pimlicoSendUserOperationNowHandler = createMethodHandler({
|
|
|
45
45
|
};
|
|
46
46
|
rpcHandler.mempool.store.addProcessing({
|
|
47
47
|
entryPoint,
|
|
48
|
-
userOpInfo
|
|
48
|
+
userOpInfos: [userOpInfo]
|
|
49
49
|
});
|
|
50
50
|
const result = await rpcHandler.executorManager.sendBundleToExecutor(bundle);
|
|
51
51
|
if (!result) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pimlico_sendUserOperationNow.js","sourceRoot":"","sources":["../../../rpc/methods/pimlico_sendUserOperationNow.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,aAAa,EACb,QAAQ,EAGR,iCAAiC,EACpC,MAAM,aAAa,CAAA;AACpB,OAAO,EACH,aAAa,EACb,wBAAwB,EACxB,kBAAkB,EACrB,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAE5D,MAAM,CAAC,MAAM,kCAAkC,GAAG,mBAAmB,CAAC;IAClE,MAAM,EAAE,8BAA8B;IACtC,MAAM,EAAE,iCAAiC;IACzC,OAAO,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE;QAClD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,6BAA6B,EAAE,CAAC;YACnD,MAAM,IAAI,QAAQ,CACd,sDAAsD,EACtD,aAAa,CAAC,aAAa,CAC9B,CAAA;QACL,CAAC;QAED,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,MAAM,CAAA;QACnC,UAAU,CAAC,2BAA2B,CAAC,UAAU,CAAC,CAAA;QAElD,0EAA0E;QAC1E,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,UAAU,CAAC,oBAAoB,CAAC;YAC/D,MAAM;YACN,UAAU;SACb,CAAC,CAAA;QACF,IAAI,CAAC,WAAW,EAAE,CAAC;YACf,MAAM,IAAI,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,aAAa,CAAC,CAAA;QAChE,CAAC;QAED,MAAM,UAAU,GAAG,aAAa,CAAC;YAC7B,MAAM;YACN,iBAAiB,EAAE,UAAU;YAC7B,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO;SACrC,CAAC,CAAA;QAEF,6BAA6B;QAC7B,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC,GAChC,MAAM,UAAU,CAAC,sBAAsB,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAA;QACnE,IAAI,CAAC,aAAa,EAAE,CAAC;YACjB,MAAM,IAAI,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,aAAa,CAAC,CAAA;QAClE,CAAC;QAED,iBAAiB;QACjB,MAAM,UAAU,GAAe;YAC3B,MAAM;YACN,UAAU;YACV,cAAc,EAAE,IAAI,CAAC,GAAG,EAAE;YAC1B,kBAAkB,EAAE,CAAC;SACxB,CAAA;QAED,kBAAkB;QAClB,MAAM,OAAO,GAAG,wBAAwB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;QAE5D,MAAM,MAAM,GAAwB;YAChC,UAAU;YACV,OAAO,EAAE,CAAC,UAAU,CAAC;YACrB,OAAO;YACP,kBAAkB,EAAE,CAAC;SACxB,CAAA;QACD,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC;YACnC,UAAU;YACV,UAAU;
|
|
1
|
+
{"version":3,"file":"pimlico_sendUserOperationNow.js","sourceRoot":"","sources":["../../../rpc/methods/pimlico_sendUserOperationNow.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,aAAa,EACb,QAAQ,EAGR,iCAAiC,EACpC,MAAM,aAAa,CAAA;AACpB,OAAO,EACH,aAAa,EACb,wBAAwB,EACxB,kBAAkB,EACrB,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAE5D,MAAM,CAAC,MAAM,kCAAkC,GAAG,mBAAmB,CAAC;IAClE,MAAM,EAAE,8BAA8B;IACtC,MAAM,EAAE,iCAAiC;IACzC,OAAO,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE;QAClD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,6BAA6B,EAAE,CAAC;YACnD,MAAM,IAAI,QAAQ,CACd,sDAAsD,EACtD,aAAa,CAAC,aAAa,CAC9B,CAAA;QACL,CAAC;QAED,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,MAAM,CAAA;QACnC,UAAU,CAAC,2BAA2B,CAAC,UAAU,CAAC,CAAA;QAElD,0EAA0E;QAC1E,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,UAAU,CAAC,oBAAoB,CAAC;YAC/D,MAAM;YACN,UAAU;SACb,CAAC,CAAA;QACF,IAAI,CAAC,WAAW,EAAE,CAAC;YACf,MAAM,IAAI,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,aAAa,CAAC,CAAA;QAChE,CAAC;QAED,MAAM,UAAU,GAAG,aAAa,CAAC;YAC7B,MAAM;YACN,iBAAiB,EAAE,UAAU;YAC7B,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO;SACrC,CAAC,CAAA;QAEF,6BAA6B;QAC7B,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC,GAChC,MAAM,UAAU,CAAC,sBAAsB,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAA;QACnE,IAAI,CAAC,aAAa,EAAE,CAAC;YACjB,MAAM,IAAI,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,aAAa,CAAC,CAAA;QAClE,CAAC;QAED,iBAAiB;QACjB,MAAM,UAAU,GAAe;YAC3B,MAAM;YACN,UAAU;YACV,cAAc,EAAE,IAAI,CAAC,GAAG,EAAE;YAC1B,kBAAkB,EAAE,CAAC;SACxB,CAAA;QAED,kBAAkB;QAClB,MAAM,OAAO,GAAG,wBAAwB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;QAE5D,MAAM,MAAM,GAAwB;YAChC,UAAU;YACV,OAAO,EAAE,CAAC,UAAU,CAAC;YACrB,OAAO;YACP,kBAAkB,EAAE,CAAC;SACxB,CAAA;QACD,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC;YACnC,UAAU;YACV,WAAW,EAAE,CAAC,UAAU,CAAC;SAC5B,CAAC,CAAA;QACF,MAAM,MAAM,GACR,MAAM,UAAU,CAAC,eAAe,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAA;QAEjE,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,QAAQ,CACd,0CAA0C,EAC1C,aAAa,CAAC,aAAa,CAC9B,CAAA;QACL,CAAC;QAED,oBAAoB;QACpB,MAAM,OAAO,GACT,MAAM,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,yBAAyB,CAAC;YAC3D,IAAI,EAAE,MAAM;YACZ,eAAe,EAAE,GAAG;SACvB,CAAC,CAAA;QAEN,OAAO,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;IAClD,CAAC;CACJ,CAAC,CAAA"}
|
|
@@ -90,23 +90,23 @@ export const createMempoolStore = ({ config, metrics }) => {
|
|
|
90
90
|
return await outstanding.dumpLocal();
|
|
91
91
|
},
|
|
92
92
|
// Methods to mark/unmark userOps that are being processed.
|
|
93
|
-
addProcessing: async ({ entryPoint,
|
|
93
|
+
addProcessing: async ({ entryPoint, userOpInfos }) => {
|
|
94
94
|
try {
|
|
95
95
|
const { processing } = getStoreHandlers(entryPoint);
|
|
96
|
-
await processing.addProcessing(
|
|
96
|
+
await processing.addProcessing(userOpInfos);
|
|
97
97
|
}
|
|
98
98
|
catch (err) {
|
|
99
|
-
logger.error({ err }, "Failed to track active
|
|
99
|
+
logger.error({ err }, "Failed to track active userOps");
|
|
100
100
|
sentry.captureException(err);
|
|
101
101
|
}
|
|
102
102
|
},
|
|
103
|
-
removeProcessing: async ({ entryPoint,
|
|
103
|
+
removeProcessing: async ({ entryPoint, userOpInfos }) => {
|
|
104
104
|
try {
|
|
105
105
|
const { processing } = getStoreHandlers(entryPoint);
|
|
106
|
-
await processing.removeProcessing(
|
|
106
|
+
await processing.removeProcessing(userOpInfos);
|
|
107
107
|
}
|
|
108
108
|
catch (err) {
|
|
109
|
-
logger.error({ err }, "Failed to untrack active
|
|
109
|
+
logger.error({ err }, "Failed to untrack active userOps");
|
|
110
110
|
sentry.captureException(err);
|
|
111
111
|
}
|
|
112
112
|
},
|
|
@@ -181,6 +181,11 @@ export const createMempoolStore = ({ config, metrics }) => {
|
|
|
181
181
|
const { outstanding } = getStoreHandlers(entryPoint);
|
|
182
182
|
await outstanding.clear();
|
|
183
183
|
logger.debug({ store: "outstanding" }, "cleared mempool");
|
|
184
|
+
},
|
|
185
|
+
// Flush all processing userOps for an entrypoint and return them
|
|
186
|
+
flushProcessing: async (entryPoint) => {
|
|
187
|
+
const { processing } = getStoreHandlers(entryPoint);
|
|
188
|
+
return await processing.flush();
|
|
184
189
|
}
|
|
185
190
|
};
|
|
186
191
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createMempoolStore.js","sourceRoot":"","sources":["../../store/createMempoolStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,
|
|
1
|
+
{"version":3,"file":"createMempoolStore.js","sourceRoot":"","sources":["../../store/createMempoolStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAOH,sBAAsB,EACtB,qBAAqB,EACxB,MAAM,aAAa,CAAA;AAGpB,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AAItC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,EAC/B,MAAM,EACN,OAAO,EACgC,EAAgB,EAAE;IACzD,MAAM,MAAM,GAAW,MAAM,CAAC,SAAS,CACnC,EAAE,MAAM,EAAE,eAAe,EAAE,EAC3B;QACI,KAAK,EAAE,MAAM,CAAC,QAAQ;KACzB,CACJ,CAAA;IAED,MAAM,aAAa,GAMf,IAAI,GAAG,EAAE,CAAA;IAEb,2DAA2D;IAC3D,MAAM,gBAAgB,GAAG,CAAC,UAAmB,EAAE,EAAE;QAC7C,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QAC9C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CACX,2CAA2C,UAAU,EAAE,CAC1D,CAAA;QACL,CAAC;QACD,OAAO,QAAQ,CAAA;IACnB,CAAC,CAAA;IAED,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;QAC1C,MAAM,WAAW,GAAG,sBAAsB,CAAC;YACvC,MAAM;YACN,UAAU;YACV,MAAM;SACT,CAAC,CAAA;QAEF,MAAM,UAAU,GAAG,qBAAqB,CAAC;YACrC,MAAM;YACN,UAAU;SACb,CAAC,CAAA;QAEF,aAAa,CAAC,GAAG,CAAC,UAAU,EAAE;YAC1B,WAAW;YACX,UAAU;SACb,CAAC,CAAA;IACN,CAAC;IAED,MAAM,kBAAkB,GAAG,CACvB,UAAqB,EACrB,SAAoB,EACpB,OAAgB,EAClB,EAAE;QACA,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,MAAM,CAAC,IAAI,CACP,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,EAChC,mDAAmD,CACtD,CAAA;YACD,OAAM;QACV,CAAC;QAED,MAAM,CAAC,KAAK,CACR,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,EAChC,8BAA8B,CACjC,CAAA;QAED,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,GAAG,EAAE,CAAA;IAChE,CAAC,CAAA;IAED,MAAM,gBAAgB,GAAG,CAAC,SAAoB,EAAE,EAAE;QAC9C,MAAM,CAAC,KAAK,CACR;YACI,KAAK,EAAE,SAAS;SACnB,EACD,iBAAiB,CACpB,CAAA;IACL,CAAC,CAAA;IAED,OAAO;QACH,4BAA4B;QAC5B,cAAc,EAAE,KAAK,EAAE,UAAmB,EAAE,KAAa,EAAE,EAAE;YACzD,IAAI,CAAC;gBACD,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAA;gBACpD,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;gBAElD,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC3B,MAAM,CAAC,IAAI,CACP,EAAE,YAAY,EAAE,eAAe,CAAC,aAAa,CAAC,EAAE,EAChD,iCAAiC,CACpC,CAAA;gBACL,CAAC;gBAED,OAAO,aAAa,CAAA;YACxB,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,MAAM,CAAC,KAAK,CACR,EAAE,GAAG,EAAE,EACP,mEAAmE,CACtE,CAAA;gBACD,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAA;gBAC5B,OAAO,EAAE,CAAA;YACb,CAAC;QACL,CAAC;QAED,iBAAiB;QACjB,cAAc,EAAE,KAAK,EAAE,EACnB,UAAU,EACV,WAAW,EACc,EAAE,EAAE;YAC7B,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAA;YACpD,OAAO,CAAC,gBAAgB;iBACnB,MAAM,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;iBACjC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;YAC5B,IAAI,CAAC;gBACD,MAAM,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;YACtC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,sCAAsC,CAAC,CAAA;gBAC7D,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAA;YAChC,CAAC;QACL,CAAC;QACD,iBAAiB,EAAE,KAAK,EAAE,EACtB,UAAU,EACV,UAAU,EACc,EAAE,EAAE;YAC5B,IAAI,CAAC;gBACD,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAA;gBACpD,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC,CAAA;gBACtD,kBAAkB,CACd,UAAU,EACV,aAAa,EACb,OAAO,CAAC,MAAM,GAAG,CAAC,CACrB,CAAA;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,MAAM,CAAC,KAAK,CACR,EAAE,GAAG,EAAE,EACP,2CAA2C,CAC9C,CAAA;gBACD,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAA;YAChC,CAAC;QACL,CAAC;QACD,eAAe,EAAE,KAAK,EAAE,UAAmB,EAAE,EAAE;YAC3C,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAA;YACpD,gBAAgB,CAAC,aAAa,CAAC,CAAA;YAC/B,OAAO,MAAM,WAAW,CAAC,SAAS,EAAE,CAAA;QACxC,CAAC;QAED,2DAA2D;QAC3D,aAAa,EAAE,KAAK,EAAE,EAClB,UAAU,EACV,WAAW,EACc,EAAE,EAAE;YAC7B,IAAI,CAAC;gBACD,MAAM,EAAE,UAAU,EAAE,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAA;gBACnD,MAAM,UAAU,CAAC,aAAa,CAAC,WAAW,CAAC,CAAA;YAC/C,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,gCAAgC,CAAC,CAAA;gBACvD,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAA;YAChC,CAAC;QACL,CAAC;QACD,gBAAgB,EAAE,KAAK,EAAE,EACrB,UAAU,EACV,WAAW,EACc,EAAE,EAAE;YAC7B,IAAI,CAAC;gBACD,MAAM,EAAE,UAAU,EAAE,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAA;gBACnD,MAAM,UAAU,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAA;YAClD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,kCAAkC,CAAC,CAAA;gBACzD,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAA;YAChC,CAAC;QACL,CAAC;QAED,oFAAoF;QACpF,2BAA2B,EAAE,KAAK,EAAE,EAChC,UAAU,EACV,MAAM,EACN,UAAU,EAKb,EAAE,EAAE;YACD,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAA;YAEhE,MAAM,CAAC,eAAe,EAAE,cAAc,EAAE,aAAa,CAAC,GAClD,MAAM,OAAO,CAAC,GAAG,CAAC;gBACd,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC;gBAChC,UAAU,CAAC,YAAY,CAAC,UAAU,CAAC;gBACnC,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC;aACnC,CAAC,CAAA;YAEN,yDAAyD;YACzD,IAAI,eAAe,IAAI,cAAc,EAAE,CAAC;gBACpC,OAAO;oBACH,KAAK,EAAE,KAAK;oBACZ,MAAM,EAAE,eAAe;iBAC1B,CAAA;YACL,CAAC;YAED,IAAI,aAAa,KAAK,wBAAwB,EAAE,CAAC;gBAC7C,OAAO;oBACH,KAAK,EAAE,KAAK;oBACZ,MAAM,EAAE,0GAA0G;iBACrH,CAAA;YACL,CAAC;YAED,IAAI,aAAa,KAAK,mBAAmB,EAAE,CAAC;gBACxC,OAAO;oBACH,KAAK,EAAE,KAAK;oBACZ,MAAM,EAAE,yGAAyG;iBACpH,CAAA;YACL,CAAC;YAED,IAAI,aAAa,KAAK,uBAAuB,EAAE,CAAC;gBAC5C,OAAO;oBACH,KAAK,EAAE,KAAK;oBACZ,MAAM,EAAE,wFAAwF;iBACnG,CAAA;YACL,CAAC;YAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;QAC1B,CAAC;QAED,wBAAwB,EAAE,KAAK,EAAE,EAC7B,UAAU,EACV,MAAM,EACuC,EAAE,EAAE;YACjD,IAAI,CAAC;gBACD,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAA;gBACpD,OAAO,MAAM,WAAW,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;YACnD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,MAAM,CAAC,KAAK,CACR,EAAE,GAAG,EAAE,EACP,4EAA4E,CAC/E,CAAA;gBACD,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAA;gBAC5B,OAAO,SAAS,CAAA;YACpB,CAAC;QACL,CAAC;QAED,oBAAoB,EAAE,KAAK,EAAE,EACzB,UAAU,EACV,MAAM,EACuC,EAAE,EAAE;YACjD,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAA;YAEpD,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC7C,OAAO;oBACH,KAAK,EAAE,KAAK;oBACZ,MAAM,EAAE,oHAAoH;iBAC/H,CAAA;YACL,CAAC;YAED,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC3C,OAAO;oBACH,KAAK,EAAE,KAAK;oBACZ,MAAM,EAAE,4GAA4G;iBACvH,CAAA;YACL,CAAC;YAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;QAC1B,CAAC;QAED,OAAO;QACP,2BAA2B,EAAE,KAAK,EAAE,EAChC,MAAM,EACN,UAAU,EAIb,EAAE,EAAE;YACD,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAA;YACpD,OAAO,MAAM,WAAW,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;QACrD,CAAC;QACD,gBAAgB,EAAE,KAAK,EAAE,UAAmB,EAAE,EAAE;YAC5C,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAA;YACpD,MAAM,WAAW,CAAC,KAAK,EAAE,CAAA;YACzB,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,EAAE,iBAAiB,CAAC,CAAA;QAC7D,CAAC;QAED,iEAAiE;QACjE,eAAe,EAAE,KAAK,EAAE,UAAmB,EAAE,EAAE;YAC3C,MAAM,EAAE,UAAU,EAAE,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAA;YACnD,OAAO,MAAM,UAAU,CAAC,KAAK,EAAE,CAAA;QACnC,CAAC;KACJ,CAAA;AACL,CAAC,CAAA"}
|
|
@@ -7,10 +7,12 @@ export declare class InMemoryProcessingStore implements ProcessingStore {
|
|
|
7
7
|
private readonly processingSenderNonceSet;
|
|
8
8
|
private readonly processingDeploymentSet;
|
|
9
9
|
private readonly processingEip7702AuthSet;
|
|
10
|
+
private readonly processingUserOps;
|
|
10
11
|
private encodeSenderNonceId;
|
|
11
|
-
addProcessing(
|
|
12
|
-
removeProcessing(
|
|
12
|
+
addProcessing(userOpInfos: UserOpInfo[]): Promise<void>;
|
|
13
|
+
removeProcessing(userOpInfos: UserOpInfo[]): Promise<void>;
|
|
13
14
|
isProcessing(userOpHash: Hex): Promise<boolean>;
|
|
14
15
|
wouldConflict(userOp: UserOperation): Promise<ConflictType | undefined>;
|
|
16
|
+
flush(): Promise<UserOpInfo[]>;
|
|
15
17
|
}
|
|
16
18
|
//# sourceMappingURL=memory.d.ts.map
|
|
@@ -5,32 +5,44 @@ export class InMemoryProcessingStore {
|
|
|
5
5
|
processingSenderNonceSet = new Set();
|
|
6
6
|
processingDeploymentSet = new Set();
|
|
7
7
|
processingEip7702AuthSet = new Set();
|
|
8
|
+
// Map for full UserOpInfo storage (for shutdown recovery)
|
|
9
|
+
processingUserOps = new Map();
|
|
8
10
|
encodeSenderNonceId(sender, nonce) {
|
|
9
11
|
return `${sender}:${nonce}`;
|
|
10
12
|
}
|
|
11
|
-
async addProcessing(
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
13
|
+
async addProcessing(userOpInfos) {
|
|
14
|
+
for (const userOpInfo of userOpInfos) {
|
|
15
|
+
const { userOpHash, userOp } = userOpInfo;
|
|
16
|
+
const isDeploymentOp = isDeployment(userOp);
|
|
17
|
+
const senderNonceId = this.encodeSenderNonceId(userOp.sender, userOp.nonce);
|
|
18
|
+
// Add to processing sets
|
|
19
|
+
this.processingUserOpsSet.add(userOpHash);
|
|
20
|
+
this.processingSenderNonceSet.add(senderNonceId);
|
|
21
|
+
if (isDeploymentOp) {
|
|
22
|
+
this.processingDeploymentSet.add(userOp.sender);
|
|
23
|
+
}
|
|
24
|
+
if (userOp.eip7702Auth) {
|
|
25
|
+
this.processingEip7702AuthSet.add(userOp.sender);
|
|
26
|
+
}
|
|
27
|
+
// Store full UserOpInfo for shutdown recovery
|
|
28
|
+
this.processingUserOps.set(userOpHash, userOpInfo);
|
|
23
29
|
}
|
|
24
30
|
}
|
|
25
|
-
async removeProcessing(
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
this.
|
|
31
|
+
async removeProcessing(userOpInfos) {
|
|
32
|
+
if (userOpInfos.length === 0)
|
|
33
|
+
return;
|
|
34
|
+
for (const userOpInfo of userOpInfos) {
|
|
35
|
+
const { userOpHash, userOp } = userOpInfo;
|
|
36
|
+
const senderNonceId = this.encodeSenderNonceId(userOp.sender, userOp.nonce);
|
|
37
|
+
// Remove from all sets
|
|
38
|
+
this.processingUserOpsSet.delete(userOpHash);
|
|
39
|
+
this.processingSenderNonceSet.delete(senderNonceId);
|
|
40
|
+
this.processingDeploymentSet.delete(userOp.sender);
|
|
41
|
+
if (userOp.eip7702Auth) {
|
|
42
|
+
this.processingEip7702AuthSet.delete(userOp.sender);
|
|
43
|
+
}
|
|
44
|
+
// Remove from Map
|
|
45
|
+
this.processingUserOps.delete(userOpHash);
|
|
34
46
|
}
|
|
35
47
|
}
|
|
36
48
|
async isProcessing(userOpHash) {
|
|
@@ -54,5 +66,11 @@ export class InMemoryProcessingStore {
|
|
|
54
66
|
}
|
|
55
67
|
return undefined;
|
|
56
68
|
}
|
|
69
|
+
async flush() {
|
|
70
|
+
// get all userOps before clearing sets
|
|
71
|
+
const userOpInfos = Array.from(this.processingUserOps.values());
|
|
72
|
+
await this.removeProcessing(userOpInfos);
|
|
73
|
+
return userOpInfos;
|
|
74
|
+
}
|
|
57
75
|
}
|
|
58
76
|
//# sourceMappingURL=memory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../../store/processing/memory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAK1C,MAAM,OAAO,uBAAuB;IAChC,kEAAkE;IACjD,oBAAoB,GAAG,IAAI,GAAG,EAAO,CAAA;IACrC,wBAAwB,GAAG,IAAI,GAAG,EAAU,CAAA;IAC5C,uBAAuB,GAAG,IAAI,GAAG,EAAW,CAAA;IAC5C,wBAAwB,GAAG,IAAI,GAAG,EAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../../store/processing/memory.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,15 +9,17 @@ export declare class RedisProcessingStore implements ProcessingStore {
|
|
|
9
9
|
private readonly processingSenderNonceSet;
|
|
10
10
|
private readonly processingDeploymentSet;
|
|
11
11
|
private readonly processingEip7702AuthSet;
|
|
12
|
+
private readonly localStore;
|
|
12
13
|
private encodeSenderNonceId;
|
|
13
14
|
constructor({ config, entryPoint, redisEndpoint }: {
|
|
14
15
|
config: AltoConfig;
|
|
15
16
|
entryPoint: Address;
|
|
16
17
|
redisEndpoint: string;
|
|
17
18
|
});
|
|
18
|
-
addProcessing(
|
|
19
|
-
removeProcessing(
|
|
19
|
+
addProcessing(userOpInfos: UserOpInfo[]): Promise<void>;
|
|
20
|
+
removeProcessing(userOpInfos: UserOpInfo[]): Promise<void>;
|
|
20
21
|
isProcessing(userOpHash: Hex): Promise<boolean>;
|
|
21
22
|
wouldConflict(userOp: UserOperation): Promise<ConflictType | undefined>;
|
|
23
|
+
flush(): Promise<UserOpInfo[]>;
|
|
22
24
|
}
|
|
23
25
|
//# sourceMappingURL=redis.d.ts.map
|
|
@@ -1,11 +1,27 @@
|
|
|
1
1
|
import { isDeployment } from "../../utils/index.js";
|
|
2
2
|
import { Redis } from "ioredis";
|
|
3
|
+
import { InMemoryProcessingStore } from "./memory.js";
|
|
4
|
+
// Hybrid Redis + In-Memory Processing Store
|
|
5
|
+
//
|
|
6
|
+
// This store uses a dual-storage approach:
|
|
7
|
+
// 1. Redis Sets: Shared across all Alto instances for cross-instance conflict
|
|
8
|
+
// detection. When multiple instances run in horizontal scaling mode, each
|
|
9
|
+
// instance can check if a userOp would conflict with one being processed
|
|
10
|
+
// by another instance.
|
|
11
|
+
// 2. Local In-Memory Store: Tracks only this instance's processing userOps.
|
|
12
|
+
// On shutdown, we flush this local store to recover userOps that were
|
|
13
|
+
// mid-processing and push them back to outstanding for another instance
|
|
14
|
+
// to pick up. We can't use Redis alone for this because we'd pull userOps
|
|
15
|
+
// being processed by other instances.
|
|
3
16
|
export class RedisProcessingStore {
|
|
4
17
|
redis;
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
18
|
+
// Redis Sets for conflict detection (shared across all instances)
|
|
19
|
+
processingUserOpsSet;
|
|
20
|
+
processingSenderNonceSet;
|
|
21
|
+
processingDeploymentSet;
|
|
22
|
+
processingEip7702AuthSet;
|
|
23
|
+
// Local store for this instance's userOps (for shutdown recovery)
|
|
24
|
+
localStore = new InMemoryProcessingStore();
|
|
9
25
|
encodeSenderNonceId(sender, nonce) {
|
|
10
26
|
return `${sender}:${nonce}`;
|
|
11
27
|
}
|
|
@@ -17,35 +33,47 @@ export class RedisProcessingStore {
|
|
|
17
33
|
this.processingDeploymentSet = `${redisPrefix}:deployment`;
|
|
18
34
|
this.processingEip7702AuthSet = `${redisPrefix}:eip7702Auth`;
|
|
19
35
|
}
|
|
20
|
-
async addProcessing(
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
36
|
+
async addProcessing(userOpInfos) {
|
|
37
|
+
if (userOpInfos.length === 0)
|
|
38
|
+
return;
|
|
39
|
+
// Store locally for this instance's shutdown recovery
|
|
40
|
+
await this.localStore.addProcessing(userOpInfos);
|
|
41
|
+
// Store in Redis for cross-instance conflict detection
|
|
25
42
|
const multi = this.redis.multi();
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
43
|
+
for (const userOpInfo of userOpInfos) {
|
|
44
|
+
const { userOpHash, userOp } = userOpInfo;
|
|
45
|
+
const isDeploymentOp = isDeployment(userOp);
|
|
46
|
+
const senderNonceId = this.encodeSenderNonceId(userOp.sender, userOp.nonce);
|
|
47
|
+
multi.sadd(this.processingUserOpsSet, userOpHash);
|
|
48
|
+
multi.sadd(this.processingSenderNonceSet, senderNonceId);
|
|
49
|
+
if (isDeploymentOp) {
|
|
50
|
+
multi.sadd(this.processingDeploymentSet, userOp.sender);
|
|
51
|
+
}
|
|
52
|
+
if (userOp.eip7702Auth) {
|
|
53
|
+
multi.sadd(this.processingEip7702AuthSet, userOp.sender);
|
|
54
|
+
}
|
|
33
55
|
}
|
|
34
56
|
await multi.exec();
|
|
35
57
|
}
|
|
36
|
-
async removeProcessing(
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
const senderNonceId = this.encodeSenderNonceId(userOp.sender, userOp.nonce);
|
|
40
|
-
// Use MULTI for atomic removal in single round trip
|
|
58
|
+
async removeProcessing(userOpInfos) {
|
|
59
|
+
if (userOpInfos.length === 0)
|
|
60
|
+
return;
|
|
41
61
|
const multi = this.redis.multi();
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
62
|
+
// Remove from local store
|
|
63
|
+
await this.localStore.removeProcessing(userOpInfos);
|
|
64
|
+
// Remove from Redis
|
|
65
|
+
for (const userOpInfo of userOpInfos) {
|
|
66
|
+
const { userOpHash, userOp } = userOpInfo;
|
|
67
|
+
const isDeploymentOp = isDeployment(userOp);
|
|
68
|
+
const senderNonceId = this.encodeSenderNonceId(userOp.sender, userOp.nonce);
|
|
69
|
+
multi.srem(this.processingUserOpsSet, userOpHash);
|
|
70
|
+
multi.srem(this.processingSenderNonceSet, senderNonceId);
|
|
71
|
+
if (isDeploymentOp) {
|
|
72
|
+
multi.srem(this.processingDeploymentSet, userOp.sender);
|
|
73
|
+
}
|
|
74
|
+
if (userOp.eip7702Auth) {
|
|
75
|
+
multi.srem(this.processingEip7702AuthSet, userOp.sender);
|
|
76
|
+
}
|
|
49
77
|
}
|
|
50
78
|
await multi.exec();
|
|
51
79
|
}
|
|
@@ -81,5 +109,11 @@ export class RedisProcessingStore {
|
|
|
81
109
|
}
|
|
82
110
|
return undefined;
|
|
83
111
|
}
|
|
112
|
+
async flush() {
|
|
113
|
+
const userOpInfos = await this.localStore.flush();
|
|
114
|
+
// remove the local processing userOps from redis
|
|
115
|
+
await this.removeProcessing(userOpInfos);
|
|
116
|
+
return userOpInfos;
|
|
117
|
+
}
|
|
84
118
|
}
|
|
85
119
|
//# sourceMappingURL=redis.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../store/processing/redis.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../store/processing/redis.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,10 @@ import type { UserOpInfo, UserOperation } from "../../types/index.js";
|
|
|
2
2
|
import type { Hex } from "viem";
|
|
3
3
|
import type { ConflictType } from "../types.js";
|
|
4
4
|
export interface ProcessingStore {
|
|
5
|
-
addProcessing(
|
|
6
|
-
removeProcessing(
|
|
5
|
+
addProcessing(userOpInfos: UserOpInfo[]): Promise<void>;
|
|
6
|
+
removeProcessing(userOpInfos: UserOpInfo[]): Promise<void>;
|
|
7
7
|
isProcessing(userOpHash: Hex): Promise<boolean>;
|
|
8
8
|
wouldConflict(userOp: UserOperation): Promise<ConflictType | undefined>;
|
|
9
|
+
flush(): Promise<UserOpInfo[]>;
|
|
9
10
|
}
|
|
10
11
|
//# sourceMappingURL=types.d.ts.map
|
package/esm/store/types.d.ts
CHANGED
|
@@ -26,8 +26,8 @@ export type MempoolStore = {
|
|
|
26
26
|
addOutstanding: (args: EntryPointUserOpInfosParam) => Promise<void>;
|
|
27
27
|
removeOutstanding: (args: EntryPointUserOpHashParam) => Promise<void>;
|
|
28
28
|
dumpOutstanding: (entryPoint: Address) => Promise<UserOpInfo[]>;
|
|
29
|
-
addProcessing: (args:
|
|
30
|
-
removeProcessing: (args:
|
|
29
|
+
addProcessing: (args: EntryPointUserOpInfosParam) => Promise<void>;
|
|
30
|
+
removeProcessing: (args: EntryPointUserOpInfosParam) => Promise<void>;
|
|
31
31
|
checkDuplicatesAndConflicts: (args: {
|
|
32
32
|
entryPoint: Address;
|
|
33
33
|
userOp: UserOperation;
|
|
@@ -46,5 +46,6 @@ export type MempoolStore = {
|
|
|
46
46
|
entryPoint: Address;
|
|
47
47
|
}) => Promise<UserOperation[]>;
|
|
48
48
|
clearOutstanding: (entryPoint: Address) => Promise<void>;
|
|
49
|
+
flushProcessing: (entryPoint: Address) => Promise<UserOpInfo[]>;
|
|
49
50
|
};
|
|
50
51
|
//# sourceMappingURL=types.d.ts.map
|
package/esm/utils/userop.d.ts
CHANGED
|
@@ -18,6 +18,15 @@ export declare function toViemUserOp(userOp: UserOperation07 | UserOperation08 |
|
|
|
18
18
|
paymasterPostOpGasLimit: bigint | undefined;
|
|
19
19
|
factory: `0x${string}` | undefined;
|
|
20
20
|
factoryData: `0x${string}` | undefined;
|
|
21
|
+
authorization: {
|
|
22
|
+
address: `0x${string}`;
|
|
23
|
+
chainId: number;
|
|
24
|
+
nonce: number;
|
|
25
|
+
r: `0x${string}`;
|
|
26
|
+
s: `0x${string}`;
|
|
27
|
+
yParity: number;
|
|
28
|
+
v: bigint | undefined;
|
|
29
|
+
} | undefined;
|
|
21
30
|
sender: `0x${string}`;
|
|
22
31
|
nonce: bigint;
|
|
23
32
|
callData: `0x${string}`;
|
|
@@ -52,6 +61,15 @@ export declare function toViemUserOp(userOp: UserOperation07 | UserOperation08 |
|
|
|
52
61
|
paymasterPostOpGasLimit: bigint | undefined;
|
|
53
62
|
factory: `0x${string}` | undefined;
|
|
54
63
|
factoryData: `0x${string}` | undefined;
|
|
64
|
+
authorization: {
|
|
65
|
+
address: `0x${string}`;
|
|
66
|
+
chainId: number;
|
|
67
|
+
nonce: number;
|
|
68
|
+
r: `0x${string}`;
|
|
69
|
+
s: `0x${string}`;
|
|
70
|
+
yParity: number;
|
|
71
|
+
v: bigint | undefined;
|
|
72
|
+
} | undefined;
|
|
55
73
|
sender: `0x${string}`;
|
|
56
74
|
nonce: bigint;
|
|
57
75
|
callData: `0x${string}`;
|
package/esm/utils/userop.js
CHANGED
|
@@ -92,6 +92,17 @@ function unpackPaymasterAndData(paymasterAndData) {
|
|
|
92
92
|
}
|
|
93
93
|
// Convert Alto's UserOperation07/08/09 (with null) to viem's format (with undefined)
|
|
94
94
|
export function toViemUserOp(userOp) {
|
|
95
|
+
const authorization = userOp.eip7702Auth
|
|
96
|
+
? {
|
|
97
|
+
address: getEip7702AuthAddress(userOp.eip7702Auth),
|
|
98
|
+
chainId: userOp.eip7702Auth.chainId,
|
|
99
|
+
nonce: userOp.eip7702Auth.nonce,
|
|
100
|
+
r: userOp.eip7702Auth.r,
|
|
101
|
+
s: userOp.eip7702Auth.s,
|
|
102
|
+
yParity: userOp.eip7702Auth.yParity,
|
|
103
|
+
v: userOp.eip7702Auth.v
|
|
104
|
+
}
|
|
105
|
+
: undefined;
|
|
95
106
|
const base = {
|
|
96
107
|
...userOp,
|
|
97
108
|
paymaster: userOp.paymaster ?? undefined,
|
|
@@ -99,7 +110,8 @@ export function toViemUserOp(userOp) {
|
|
|
99
110
|
paymasterVerificationGasLimit: userOp.paymasterVerificationGasLimit ?? undefined,
|
|
100
111
|
paymasterPostOpGasLimit: userOp.paymasterPostOpGasLimit ?? undefined,
|
|
101
112
|
factory: userOp.factory ?? undefined,
|
|
102
|
-
factoryData: userOp.factoryData ?? undefined
|
|
113
|
+
factoryData: userOp.factoryData ?? undefined,
|
|
114
|
+
authorization
|
|
103
115
|
};
|
|
104
116
|
// UserOperation09 has paymasterSignature field
|
|
105
117
|
if ("paymasterSignature" in userOp) {
|
|
@@ -148,47 +160,19 @@ export function getAddressFromInitCodeOrPaymasterAndData(data) {
|
|
|
148
160
|
}
|
|
149
161
|
export function getUserOpHash({ userOp, entryPointAddress, chainId }) {
|
|
150
162
|
if (isVersion09(userOp, entryPointAddress)) {
|
|
151
|
-
const authorization = userOp.eip7702Auth
|
|
152
|
-
? {
|
|
153
|
-
address: getEip7702AuthAddress(userOp.eip7702Auth),
|
|
154
|
-
chainId: userOp.eip7702Auth.chainId,
|
|
155
|
-
nonce: userOp.eip7702Auth.nonce,
|
|
156
|
-
r: userOp.eip7702Auth.r,
|
|
157
|
-
s: userOp.eip7702Auth.s,
|
|
158
|
-
yParity: userOp.eip7702Auth.yParity,
|
|
159
|
-
v: userOp.eip7702Auth.v
|
|
160
|
-
}
|
|
161
|
-
: undefined;
|
|
162
163
|
return getUserOperationHash({
|
|
163
164
|
chainId,
|
|
164
165
|
entryPointAddress,
|
|
165
166
|
entryPointVersion: "0.9",
|
|
166
|
-
userOperation:
|
|
167
|
-
...toViemUserOp(userOp),
|
|
168
|
-
authorization
|
|
169
|
-
}
|
|
167
|
+
userOperation: toViemUserOp(userOp)
|
|
170
168
|
});
|
|
171
169
|
}
|
|
172
170
|
if (isVersion08(userOp, entryPointAddress)) {
|
|
173
|
-
const authorization = userOp.eip7702Auth
|
|
174
|
-
? {
|
|
175
|
-
address: getEip7702AuthAddress(userOp.eip7702Auth),
|
|
176
|
-
chainId: userOp.eip7702Auth.chainId,
|
|
177
|
-
nonce: userOp.eip7702Auth.nonce,
|
|
178
|
-
r: userOp.eip7702Auth.r,
|
|
179
|
-
s: userOp.eip7702Auth.s,
|
|
180
|
-
yParity: userOp.eip7702Auth.yParity,
|
|
181
|
-
v: userOp.eip7702Auth.v
|
|
182
|
-
}
|
|
183
|
-
: undefined;
|
|
184
171
|
return getUserOperationHash({
|
|
185
172
|
chainId,
|
|
186
173
|
entryPointAddress,
|
|
187
174
|
entryPointVersion: "0.8",
|
|
188
|
-
userOperation:
|
|
189
|
-
...toViemUserOp(userOp),
|
|
190
|
-
authorization
|
|
191
|
-
}
|
|
175
|
+
userOperation: toViemUserOp(userOp)
|
|
192
176
|
});
|
|
193
177
|
}
|
|
194
178
|
if (isVersion07(userOp)) {
|
package/esm/utils/userop.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userop.js","sourceRoot":"","sources":["../../utils/userop.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"userop.js","sourceRoot":"","sources":["../../utils/userop.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pimlico/alto",
|
|
3
|
-
"version": "0.0.0-main.
|
|
3
|
+
"version": "0.0.0-main.20260126T192247",
|
|
4
4
|
"description": "A performant and modular ERC-4337 Bundler written in Typescript",
|
|
5
5
|
"repository": "https://github.com/pimlicolabs/alto.git",
|
|
6
6
|
"author": "Pimlico",
|
|
@@ -37,8 +37,8 @@
|
|
|
37
37
|
"lint:fix": "eslint src/**/*.ts --fix"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@fastify/websocket": "^10.0.1",
|
|
41
40
|
"@fastify/cors": "8.4.2",
|
|
41
|
+
"@fastify/websocket": "^10.0.1",
|
|
42
42
|
"@opentelemetry/api": "^1.9.0",
|
|
43
43
|
"@opentelemetry/core": "^1.25.1",
|
|
44
44
|
"@opentelemetry/exporter-trace-otlp-proto": "^0.52.1",
|
|
@@ -52,11 +52,11 @@
|
|
|
52
52
|
"@opentelemetry/semantic-conventions": "^1.25.1",
|
|
53
53
|
"@pimlico/opentelemetry-instrumentation-viem": "^0.0.4",
|
|
54
54
|
"@sentry/node": "^9.15.0",
|
|
55
|
+
"@types/bull": "^4.10.4",
|
|
55
56
|
"@types/node": "^18.16.3",
|
|
56
57
|
"@types/ws": "^8.5.10",
|
|
57
58
|
"abitype": "^0.8.0",
|
|
58
59
|
"async-mutex": "^0.4.0",
|
|
59
|
-
"@types/bull": "^4.10.4",
|
|
60
60
|
"bull": "^4.15.1",
|
|
61
61
|
"dotenv": "^16.0.3",
|
|
62
62
|
"fastify": "^4.25.2",
|
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
"pino-pretty": "^10.0.0",
|
|
69
69
|
"prom-client": "^14.2.0",
|
|
70
70
|
"type-fest": "^4.35.0",
|
|
71
|
-
"viem": "^2.
|
|
71
|
+
"viem": "^2.44.4",
|
|
72
72
|
"yargs": "^17.7.1",
|
|
73
73
|
"zod": "^3.21.4",
|
|
74
74
|
"zod-validation-error": "^1.3.0"
|