@pimlico/alto 0.0.0-main.20250617T153448 → 0.0.0-main.20250622T171316
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/setupServer.js +20 -11
- package/esm/cli/setupServer.js.map +1 -1
- package/esm/executor/executor.js +20 -16
- package/esm/executor/executor.js.map +1 -1
- package/esm/executor/executorManager.d.ts +14 -85
- package/esm/executor/executorManager.js +114 -527
- package/esm/executor/executorManager.js.map +1 -1
- package/esm/executor/getBundleStatus.d.ts +25 -0
- package/esm/executor/getBundleStatus.js +35 -0
- package/esm/executor/getBundleStatus.js.map +1 -0
- package/esm/executor/userOpMonitor.d.ts +92 -0
- package/esm/executor/userOpMonitor.js +299 -0
- package/esm/executor/userOpMonitor.js.map +1 -0
- package/esm/mempool/mempool.d.ts +19 -16
- package/esm/mempool/mempool.js +48 -39
- package/esm/mempool/mempool.js.map +1 -1
- package/esm/rpc/methods/debug_bundler_sendBundleNow.js +9 -1
- package/esm/rpc/methods/debug_bundler_sendBundleNow.js.map +1 -1
- package/esm/rpc/methods/eth_estimateUserOperationGas.js +2 -5
- package/esm/rpc/methods/eth_estimateUserOperationGas.js.map +1 -1
- package/esm/rpc/methods/eth_getUserOperationReceipt.js +1 -1
- package/esm/rpc/methods/eth_getUserOperationReceipt.js.map +1 -1
- package/esm/rpc/methods/pimlico_getUserOperationStatus.d.ts +6 -6
- package/esm/rpc/rpcHandler.d.ts +4 -1
- package/esm/rpc/rpcHandler.js +3 -1
- package/esm/rpc/rpcHandler.js.map +1 -1
- package/esm/store/createMempoolStore.js +3 -3
- package/esm/store/createMempoolStore.js.map +1 -1
- package/esm/store/createRedisStore.d.ts +3 -3
- package/esm/store/createRedisStore.js.map +1 -1
- package/esm/store/createStore.d.ts +3 -3
- package/esm/store/createStore.js.map +1 -1
- package/esm/store/index.d.ts +8 -13
- package/esm/store/index.js.map +1 -1
- package/esm/types/mempool.d.ts +7 -29
- package/esm/types/mempool.js +1 -7
- package/esm/types/mempool.js.map +1 -1
- package/esm/types/schemas.d.ts +25 -57
- package/esm/types/schemas.js +4 -6
- package/esm/types/schemas.js.map +1 -1
- package/esm/utils/userop.d.ts +1 -30
- package/esm/utils/userop.js +62 -161
- package/esm/utils/userop.js.map +1 -1
- package/package.json +1 -1
package/esm/cli/setupServer.js
CHANGED
|
@@ -5,6 +5,7 @@ import { RpcHandler, SafeValidator, Server, UnsafeValidator } from "../rpc/index
|
|
|
5
5
|
import { validateAndRefillWallets } from "../executor/senderManager/validateAndRefill.js";
|
|
6
6
|
import { flushOnStartUp } from "../executor/senderManager/flushOnStartUp.js";
|
|
7
7
|
import { createMempoolStore } from "../store/createMempoolStore.js";
|
|
8
|
+
import { UserOpMonitor } from "../executor/userOpMonitor.js";
|
|
8
9
|
const getReputationManager = (config) => {
|
|
9
10
|
if (config.safeMode) {
|
|
10
11
|
return new ReputationManager(config);
|
|
@@ -33,6 +34,7 @@ const getMempool = ({ config, monitor, reputationManager, validator, metrics, ev
|
|
|
33
34
|
return new Mempool({
|
|
34
35
|
config,
|
|
35
36
|
monitor,
|
|
37
|
+
metrics,
|
|
36
38
|
store: createMempoolStore({ config, metrics }),
|
|
37
39
|
reputationManager,
|
|
38
40
|
validator,
|
|
@@ -48,20 +50,18 @@ const getExecutor = ({ config, eventManager }) => {
|
|
|
48
50
|
eventManager
|
|
49
51
|
});
|
|
50
52
|
};
|
|
51
|
-
const getExecutorManager = ({ config, executor, mempool,
|
|
53
|
+
const getExecutorManager = ({ config, executor, mempool, senderManager, metrics, gasPriceManager, userOpMonitor }) => {
|
|
52
54
|
return new ExecutorManager({
|
|
53
55
|
config,
|
|
54
56
|
executor,
|
|
57
|
+
userOpMonitor,
|
|
55
58
|
mempool,
|
|
56
|
-
monitor,
|
|
57
59
|
senderManager,
|
|
58
|
-
reputationManager,
|
|
59
60
|
metrics,
|
|
60
|
-
gasPriceManager
|
|
61
|
-
eventManager
|
|
61
|
+
gasPriceManager
|
|
62
62
|
});
|
|
63
63
|
};
|
|
64
|
-
const getRpcHandler = ({ config, validator, mempool, executor, monitor, executorManager, reputationManager, metrics, gasPriceManager, eventManager }) => {
|
|
64
|
+
const getRpcHandler = ({ config, validator, mempool, executor, monitor, executorManager, reputationManager, userOpMonitor, metrics, gasPriceManager, eventManager }) => {
|
|
65
65
|
return new RpcHandler({
|
|
66
66
|
config,
|
|
67
67
|
validator,
|
|
@@ -70,6 +70,7 @@ const getRpcHandler = ({ config, validator, mempool, executor, monitor, executor
|
|
|
70
70
|
monitor,
|
|
71
71
|
executorManager,
|
|
72
72
|
reputationManager,
|
|
73
|
+
userOpMonitor,
|
|
73
74
|
metrics,
|
|
74
75
|
eventManager,
|
|
75
76
|
gasPriceManager
|
|
@@ -137,16 +138,23 @@ export const setupServer = async ({ config, registry, metrics, senderManager, ga
|
|
|
137
138
|
config,
|
|
138
139
|
eventManager
|
|
139
140
|
});
|
|
141
|
+
const userOpMonitor = new UserOpMonitor({
|
|
142
|
+
config,
|
|
143
|
+
mempool,
|
|
144
|
+
monitor,
|
|
145
|
+
metrics,
|
|
146
|
+
reputationManager,
|
|
147
|
+
eventManager,
|
|
148
|
+
senderManager
|
|
149
|
+
});
|
|
140
150
|
const executorManager = getExecutorManager({
|
|
151
|
+
userOpMonitor,
|
|
141
152
|
config,
|
|
142
153
|
executor,
|
|
143
154
|
mempool,
|
|
144
|
-
monitor,
|
|
145
155
|
senderManager,
|
|
146
|
-
reputationManager,
|
|
147
156
|
metrics,
|
|
148
|
-
gasPriceManager
|
|
149
|
-
eventManager
|
|
157
|
+
gasPriceManager
|
|
150
158
|
});
|
|
151
159
|
const rpcEndpoint = getRpcHandler({
|
|
152
160
|
config,
|
|
@@ -156,6 +164,7 @@ export const setupServer = async ({ config, registry, metrics, senderManager, ga
|
|
|
156
164
|
monitor,
|
|
157
165
|
executorManager,
|
|
158
166
|
reputationManager,
|
|
167
|
+
userOpMonitor,
|
|
159
168
|
metrics,
|
|
160
169
|
gasPriceManager,
|
|
161
170
|
eventManager
|
|
@@ -185,7 +194,7 @@ export const setupServer = async ({ config, registry, metrics, senderManager, ga
|
|
|
185
194
|
const outstanding = [...(await mempool.dumpOutstanding(entryPoint))];
|
|
186
195
|
const submitted = [...(await mempool.dumpSubmittedOps(entryPoint))];
|
|
187
196
|
const processing = [...(await mempool.dumpProcessing(entryPoint))];
|
|
188
|
-
await
|
|
197
|
+
await mempool.dropUserOps(entryPoint, [
|
|
189
198
|
...outstanding.map((userOp) => ({
|
|
190
199
|
...userOp,
|
|
191
200
|
reason: "shutdown"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupServer.js","sourceRoot":"","sources":["../../cli/setupServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAsB,MAAM,gBAAgB,CAAA;AAC9E,OAAO,EAAE,YAAY,EAAwB,MAAM,gBAAgB,CAAA;AACnE,OAAO,EAEH,OAAO,EACP,OAAO,EACP,qBAAqB,EACrB,iBAAiB,EACpB,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAK9E,OAAO,EAAE,wBAAwB,EAAE,MAAM,6CAA6C,CAAA;AACtF,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAA;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"setupServer.js","sourceRoot":"","sources":["../../cli/setupServer.ts"],"names":[],"mappings":"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"}
|
package/esm/executor/executor.js
CHANGED
|
@@ -175,17 +175,21 @@ export class Executor {
|
|
|
175
175
|
logger: childLogger
|
|
176
176
|
});
|
|
177
177
|
if (filterOpsResult.status === "unhandled_error") {
|
|
178
|
-
childLogger.error("encountered
|
|
178
|
+
childLogger.error("encountered unhandled failure during filterOps simulation");
|
|
179
179
|
return {
|
|
180
|
-
|
|
181
|
-
|
|
180
|
+
success: false,
|
|
181
|
+
reason: "filterops_failed",
|
|
182
|
+
rejectedUserOps: filterOpsResult.rejectedUserOps,
|
|
183
|
+
recoverableOps: []
|
|
182
184
|
};
|
|
183
185
|
}
|
|
184
186
|
if (filterOpsResult.status === "all_ops_rejected") {
|
|
185
|
-
childLogger.warn("all ops failed simulation");
|
|
187
|
+
childLogger.warn("all ops failed filterOps simulation");
|
|
186
188
|
return {
|
|
187
|
-
|
|
188
|
-
|
|
189
|
+
success: false,
|
|
190
|
+
reason: "filterops_failed",
|
|
191
|
+
rejectedUserOps: filterOpsResult.rejectedUserOps,
|
|
192
|
+
recoverableOps: []
|
|
189
193
|
};
|
|
190
194
|
}
|
|
191
195
|
let { userOpsToBundle, rejectedUserOps, bundleGasUsed, bundleGasLimit, totalBeneficiaryFees } = filterOpsResult;
|
|
@@ -251,10 +255,10 @@ export class Executor {
|
|
|
251
255
|
sentry.captureException(err);
|
|
252
256
|
childLogger.error({ err: JSON.stringify(err) }, "unknown error submitting bundle transaction");
|
|
253
257
|
return {
|
|
258
|
+
success: false,
|
|
259
|
+
reason: "generic_error",
|
|
254
260
|
rejectedUserOps,
|
|
255
|
-
userOpsToBundle
|
|
256
|
-
status: "submission_generic_error",
|
|
257
|
-
reason: "INTERNAL FAILURE"
|
|
261
|
+
recoverableOps: userOpsToBundle
|
|
258
262
|
};
|
|
259
263
|
}
|
|
260
264
|
// Check if executor has insufficient funds
|
|
@@ -264,29 +268,29 @@ export class Executor {
|
|
|
264
268
|
err: jsonStringifyWithBigint(err)
|
|
265
269
|
}, "executor has insufficient funds");
|
|
266
270
|
return {
|
|
271
|
+
success: false,
|
|
272
|
+
reason: "insufficient_funds",
|
|
267
273
|
rejectedUserOps,
|
|
268
|
-
userOpsToBundle
|
|
269
|
-
status: "submission_insufficient_funds_error"
|
|
274
|
+
recoverableOps: userOpsToBundle
|
|
270
275
|
};
|
|
271
276
|
}
|
|
272
277
|
childLogger.error({
|
|
273
278
|
err: jsonStringifyWithBigint(err)
|
|
274
279
|
}, "error submitting bundle transaction");
|
|
275
280
|
return {
|
|
281
|
+
success: false,
|
|
282
|
+
reason: "generic_error",
|
|
276
283
|
rejectedUserOps,
|
|
277
|
-
userOpsToBundle
|
|
278
|
-
status: "submission_generic_error",
|
|
279
|
-
reason: e
|
|
284
|
+
recoverableOps: userOpsToBundle
|
|
280
285
|
};
|
|
281
286
|
}
|
|
282
287
|
const userOpsBundled = userOpsToBundle;
|
|
283
288
|
const bundleResult = {
|
|
284
|
-
|
|
289
|
+
success: true,
|
|
285
290
|
userOpsBundled,
|
|
286
291
|
rejectedUserOps,
|
|
287
292
|
transactionHash,
|
|
288
293
|
transactionRequest: {
|
|
289
|
-
gas: bundleGasLimit,
|
|
290
294
|
maxFeePerGas,
|
|
291
295
|
maxPriorityFeePerGas,
|
|
292
296
|
nonce
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../executor/executor.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../executor/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,118 +1,47 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import type {
|
|
3
|
-
import { type BundlingMode, type
|
|
1
|
+
import type { GasPriceManager } from "../handlers/index.js";
|
|
2
|
+
import type { Mempool } from "../mempool/index.js";
|
|
3
|
+
import { type BundlingMode, type SubmittedBundleInfo, UserOperationBundle } from "../types/index.js";
|
|
4
4
|
import type { Metrics } from "../utils/index.js";
|
|
5
|
-
import {
|
|
5
|
+
import { Hex } from "viem";
|
|
6
6
|
import type { Executor } from "./executor.js";
|
|
7
7
|
import type { AltoConfig } from "../createConfig.js";
|
|
8
8
|
import { SenderManager } from "./senderManager/index.js";
|
|
9
9
|
import { GasPriceParameters } from "../types/index.js";
|
|
10
|
+
import { UserOpMonitor } from "./userOpMonitor.js";
|
|
10
11
|
export declare class ExecutorManager {
|
|
11
12
|
private senderManager;
|
|
12
13
|
private config;
|
|
13
14
|
private executor;
|
|
14
15
|
private mempool;
|
|
15
|
-
private monitor;
|
|
16
16
|
private logger;
|
|
17
17
|
private metrics;
|
|
18
|
-
private reputationManager;
|
|
19
|
-
private unWatch;
|
|
20
18
|
private gasPriceManager;
|
|
21
|
-
private eventManager;
|
|
22
19
|
private opsCount;
|
|
23
20
|
private bundlingMode;
|
|
24
|
-
private
|
|
25
|
-
private
|
|
21
|
+
private userOpMonitor;
|
|
22
|
+
private unWatch;
|
|
26
23
|
private currentlyHandlingBlock;
|
|
27
|
-
|
|
28
|
-
constructor({ config, executor, mempool, monitor, reputationManager, metrics, gasPriceManager, eventManager, senderManager }: {
|
|
24
|
+
constructor({ config, executor, mempool, metrics, gasPriceManager, senderManager, userOpMonitor }: {
|
|
29
25
|
config: AltoConfig;
|
|
30
26
|
executor: Executor;
|
|
31
27
|
mempool: Mempool;
|
|
32
|
-
monitor: Monitor;
|
|
33
|
-
reputationManager: InterfaceReputationManager;
|
|
34
28
|
metrics: Metrics;
|
|
35
29
|
gasPriceManager: GasPriceManager;
|
|
36
|
-
eventManager: EventManager;
|
|
37
30
|
senderManager: SenderManager;
|
|
31
|
+
userOpMonitor: UserOpMonitor;
|
|
38
32
|
});
|
|
39
33
|
setBundlingMode(bundleMode: BundlingMode): Promise<void>;
|
|
40
34
|
autoScalingBundling(): Promise<void>;
|
|
41
|
-
startWatchingBlocks(
|
|
42
|
-
sendBundleNow(): Promise<Hash | undefined>;
|
|
35
|
+
startWatchingBlocks(): void;
|
|
43
36
|
getBaseFee(): Promise<bigint>;
|
|
44
37
|
sendBundleToExecutor(userOpBundle: UserOperationBundle): Promise<Hex | undefined>;
|
|
45
38
|
stopWatchingBlocks(): void;
|
|
46
|
-
private
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
entryPoint: Address;
|
|
51
|
-
blockNumber: bigint;
|
|
52
|
-
}): Promise<void>;
|
|
53
|
-
getUserOperationReceipt(userOperationHash: HexData32): Promise<{
|
|
54
|
-
sender: `0x${string}`;
|
|
55
|
-
userOpHash: `0x${string}`;
|
|
56
|
-
nonce: bigint;
|
|
57
|
-
success: boolean;
|
|
58
|
-
actualGasCost: bigint;
|
|
59
|
-
actualGasUsed: bigint;
|
|
60
|
-
entryPoint: `0x${string}`;
|
|
61
|
-
logs: {
|
|
62
|
-
address: `0x${string}`;
|
|
63
|
-
data: `0x${string}`;
|
|
64
|
-
logIndex: bigint;
|
|
65
|
-
transactionIndex: bigint;
|
|
66
|
-
transactionHash: `0x${string}`;
|
|
67
|
-
blockHash: `0x${string}`;
|
|
68
|
-
blockNumber: bigint;
|
|
69
|
-
topics: `0x${string}`[];
|
|
70
|
-
}[];
|
|
71
|
-
receipt: {
|
|
72
|
-
to: `0x${string}` | null;
|
|
73
|
-
gasUsed: bigint;
|
|
74
|
-
status: bigint | null;
|
|
75
|
-
contractAddress: `0x${string}` | null;
|
|
76
|
-
transactionIndex: bigint;
|
|
77
|
-
transactionHash: `0x${string}`;
|
|
78
|
-
blockHash: `0x${string}`;
|
|
79
|
-
blockNumber: bigint;
|
|
80
|
-
from: `0x${string}`;
|
|
81
|
-
cumulativeGasUsed: bigint;
|
|
82
|
-
logs: {
|
|
83
|
-
address: `0x${string}`;
|
|
84
|
-
data: `0x${string}`;
|
|
85
|
-
logIndex: bigint;
|
|
86
|
-
transactionIndex: bigint;
|
|
87
|
-
transactionHash: `0x${string}`;
|
|
88
|
-
blockHash: `0x${string}`;
|
|
89
|
-
blockNumber: bigint;
|
|
90
|
-
topics: `0x${string}`[];
|
|
91
|
-
}[];
|
|
92
|
-
logsBloom: string;
|
|
93
|
-
effectiveGasPrice?: bigint | null | undefined;
|
|
94
|
-
};
|
|
95
|
-
paymaster?: `0x${string}` | undefined;
|
|
96
|
-
reason?: `0x${string}` | undefined;
|
|
97
|
-
} | null>;
|
|
98
|
-
handleBlock(blockNumber: bigint): Promise<void>;
|
|
99
|
-
replaceTransaction({ txInfo, gasPriceParams, networkBaseFee, reason }: {
|
|
100
|
-
txInfo: TransactionInfo;
|
|
101
|
-
gasPriceParams: GasPriceParameters;
|
|
39
|
+
private handleBlock;
|
|
40
|
+
replaceTransaction({ submittedBundle, networkGasPrice, networkBaseFee, reason }: {
|
|
41
|
+
submittedBundle: SubmittedBundleInfo;
|
|
42
|
+
networkGasPrice: GasPriceParameters;
|
|
102
43
|
networkBaseFee: bigint;
|
|
103
44
|
reason: "gas_price" | "stuck";
|
|
104
45
|
}): Promise<void>;
|
|
105
|
-
markUserOperationsAsReplaced(userOpsReplaced: UserOpInfo[], newTxInfo: TransactionInfo): Promise<void>;
|
|
106
|
-
markUserOperationsAsSubmitted(userOpInfos: UserOpInfo[], transactionInfo: TransactionInfo): Promise<void>;
|
|
107
|
-
resubmitUserOperations(userOps: UserOpInfo[], entryPoint: Address, reason: string): Promise<void>;
|
|
108
|
-
failedToReplaceTransaction({ oldTxHash, rejectedUserOps, reason, entryPoint }: {
|
|
109
|
-
oldTxHash: Hex;
|
|
110
|
-
rejectedUserOps: RejectedUserOp[];
|
|
111
|
-
reason: string;
|
|
112
|
-
entryPoint: Address;
|
|
113
|
-
}): Promise<void>;
|
|
114
|
-
removeSubmitted(entryPoint: Address, userOps: UserOpInfo[]): Promise<void>;
|
|
115
|
-
markUserOpsIncluded(userOps: UserOpInfo[], entryPoint: Address, blockNumber: bigint, transactionHash: Hash, userOperationDetails: Record<string, any>): Promise<void>;
|
|
116
|
-
dropUserOps(entryPoint: Address, rejectedUserOps: RejectedUserOp[]): Promise<void>;
|
|
117
46
|
}
|
|
118
47
|
//# sourceMappingURL=executorManager.d.ts.map
|