@pimlico/alto 0.0.0-main.20260116T120343 → 0.0.0-main.20260121T150514
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
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { getUserOpHashes } from "../executor/index.js";
|
|
1
2
|
import { recoverableJsonParseWithBigint, recoverableJsonStringifyWithBigint } from "../utils/index.js";
|
|
2
3
|
import Queue from "bull";
|
|
3
4
|
import Redis from "ioredis";
|
|
@@ -55,9 +56,38 @@ async function dropAllOperationsOnShutdown({ config, mempool, logger }) {
|
|
|
55
56
|
}
|
|
56
57
|
}));
|
|
57
58
|
}
|
|
59
|
+
async function resubmitPendingBundlesToOutstanding({ mempool, bundleManager, logger }) {
|
|
60
|
+
const pendingBundles = bundleManager.getPendingBundles();
|
|
61
|
+
if (pendingBundles.length === 0) {
|
|
62
|
+
logger.info("[SHUTDOWN] No pending bundles to resubmit");
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
// Process all bundles in parallel
|
|
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
|
|
74
|
+
await mempool.store.addOutstanding({
|
|
75
|
+
entryPoint,
|
|
76
|
+
userOpInfos: userOps
|
|
77
|
+
});
|
|
78
|
+
logger.info({ userOpHashes: getUserOpHashes(userOps) }, "[SHUTDOWN] Resubmitted pending bundle userOps to outstanding");
|
|
79
|
+
}));
|
|
80
|
+
}
|
|
58
81
|
export async function persistShutdownState({ mempool, bundleManager, statusManager, config, logger }) {
|
|
59
|
-
// When horizontal scaling is enabled,
|
|
82
|
+
// When horizontal scaling is enabled, outstanding and processing stores
|
|
83
|
+
// are already in Redis. We just need to move pending bundle userOps
|
|
84
|
+
// back to outstanding so they can be picked up by another instance.
|
|
60
85
|
if (config.enableHorizontalScaling) {
|
|
86
|
+
await resubmitPendingBundlesToOutstanding({
|
|
87
|
+
mempool,
|
|
88
|
+
bundleManager,
|
|
89
|
+
logger
|
|
90
|
+
});
|
|
61
91
|
return;
|
|
62
92
|
}
|
|
63
93
|
if (!config.redisEndpoint) {
|
package/esm/cli/shutDown.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shutDown.js","sourceRoot":"","sources":["../../cli/shutDown.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"shutDown.js","sourceRoot":"","sources":["../../cli/shutDown.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { getUserOpHashes } from "../executor/index.js";
|
|
1
2
|
import { createOutstandingQueue, createProcessingStore } from "./index.js";
|
|
2
3
|
import * as sentry from "@sentry/node";
|
|
3
4
|
export const createMempoolStore = ({ config, metrics }) => {
|
|
@@ -46,7 +47,11 @@ export const createMempoolStore = ({ config, metrics }) => {
|
|
|
46
47
|
popOutstanding: async (entryPoint, count) => {
|
|
47
48
|
try {
|
|
48
49
|
const { outstanding } = getStoreHandlers(entryPoint);
|
|
49
|
-
|
|
50
|
+
const poppedUserOps = await outstanding.pop(count);
|
|
51
|
+
if (poppedUserOps.length > 0) {
|
|
52
|
+
logger.info({ userOpHashes: getUserOpHashes(poppedUserOps) }, "popped userOps from outstanding");
|
|
53
|
+
}
|
|
54
|
+
return poppedUserOps;
|
|
50
55
|
}
|
|
51
56
|
catch (err) {
|
|
52
57
|
logger.error({ err }, "Failed to pop from outstanding mempool, defaulting to empty array");
|
|
@@ -120,16 +125,16 @@ export const createMempoolStore = ({ config, metrics }) => {
|
|
|
120
125
|
reason: "Already known"
|
|
121
126
|
};
|
|
122
127
|
}
|
|
123
|
-
if (wouldConflict === "
|
|
128
|
+
if (wouldConflict === "conflicting_deployment") {
|
|
124
129
|
return {
|
|
125
130
|
valid: false,
|
|
126
|
-
reason: "
|
|
131
|
+
reason: "AA10 invalid account deployment: Another deployment operation for this sender is already being processed"
|
|
127
132
|
};
|
|
128
133
|
}
|
|
129
|
-
if (wouldConflict === "
|
|
134
|
+
if (wouldConflict === "conflicting_nonce") {
|
|
130
135
|
return {
|
|
131
136
|
valid: false,
|
|
132
|
-
reason: "AA25 invalid account
|
|
137
|
+
reason: "AA25 invalid account nonce: Another UserOperation with same sender and nonce is already being processed"
|
|
133
138
|
};
|
|
134
139
|
}
|
|
135
140
|
if (wouldConflict === "conflicting_7702_auth") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createMempoolStore.js","sourceRoot":"","sources":["../../store/createMempoolStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAQH,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,
|
|
1
|
+
{"version":3,"file":"createMempoolStore.js","sourceRoot":"","sources":["../../store/createMempoolStore.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.20260121T150514",
|
|
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",
|