@pimlico/alto 0.0.0-main.20250908T105720 → 0.0.0-main.20250930T125129
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/config/bundler.d.ts +12 -0
- package/esm/cli/config/bundler.js +2 -0
- package/esm/cli/config/bundler.js.map +1 -1
- package/esm/cli/config/options.js +11 -0
- package/esm/cli/config/options.js.map +1 -1
- package/esm/cli/setupServer.js +11 -11
- package/esm/cli/setupServer.js.map +1 -1
- package/esm/cli/shutDown.d.ts +5 -5
- package/esm/cli/shutDown.js +20 -60
- package/esm/cli/shutDown.js.map +1 -1
- package/esm/executor/{userOpMonitor.d.ts → bundleManager.d.ts} +4 -4
- package/esm/executor/{userOpMonitor.js → bundleManager.js} +50 -37
- package/esm/executor/bundleManager.js.map +1 -0
- package/esm/executor/executorManager.d.ts +4 -4
- package/esm/executor/executorManager.js +23 -24
- package/esm/executor/executorManager.js.map +1 -1
- package/esm/executor/index.d.ts +1 -1
- package/esm/executor/index.js +1 -1
- package/esm/executor/senderManager/createRedisSenderManager.js +1 -2
- package/esm/executor/senderManager/createRedisSenderManager.js.map +1 -1
- package/esm/handlers/arbitrumGasPriceManager.js +2 -2
- package/esm/handlers/gasPriceManager.js +3 -3
- package/esm/handlers/mantleGasPriceManager.js +4 -4
- package/esm/handlers/optimismManager.js +1 -1
- package/esm/mempool/mempool.d.ts +3 -11
- package/esm/mempool/mempool.js +91 -93
- package/esm/mempool/mempool.js.map +1 -1
- package/esm/mempool/monitoring.d.ts +1 -1
- package/esm/mempool/monitoring.js +30 -21
- package/esm/mempool/monitoring.js.map +1 -1
- package/esm/receiptCache/createMemoryReceiptCache.js +8 -5
- package/esm/receiptCache/createMemoryReceiptCache.js.map +1 -1
- package/esm/receiptCache/createRedisReceiptCache.js +13 -11
- package/esm/receiptCache/createRedisReceiptCache.js.map +1 -1
- package/esm/receiptCache/index.d.ts +4 -1
- package/esm/receiptCache/index.js.map +1 -1
- package/esm/rpc/methods/eth_getUserOperationReceipt.js +1 -1
- package/esm/rpc/methods/pimlico_sendUserOperationNow.js +4 -1
- package/esm/rpc/methods/pimlico_sendUserOperationNow.js.map +1 -1
- package/esm/rpc/rpcHandler.d.ts +4 -4
- package/esm/rpc/rpcHandler.js +3 -3
- package/esm/store/createMempoolStore.d.ts +1 -1
- package/esm/store/createMempoolStore.js +51 -143
- package/esm/store/createMempoolStore.js.map +1 -1
- package/esm/store/index.d.ts +4 -75
- package/esm/store/index.js +4 -1
- package/esm/store/index.js.map +1 -1
- package/esm/store/outstanding/index.d.ts +13 -0
- package/esm/store/outstanding/index.js +16 -0
- package/esm/store/outstanding/index.js.map +1 -0
- package/esm/store/{createMemoryOutstandingStore.d.ts → outstanding/memory.d.ts} +11 -10
- package/esm/store/outstanding/memory.js +249 -0
- package/esm/store/outstanding/memory.js.map +1 -0
- package/esm/store/outstanding/redis.d.ts +11 -0
- package/esm/store/outstanding/redis.js +201 -0
- package/esm/store/outstanding/redis.js.map +1 -0
- package/esm/store/outstanding/types.d.ts +18 -0
- package/esm/store/outstanding/types.js +2 -0
- package/esm/store/outstanding/types.js.map +1 -0
- package/esm/store/processing/index.d.ts +11 -0
- package/esm/store/processing/index.js +17 -0
- package/esm/store/processing/index.js.map +1 -0
- package/esm/store/processing/memory.d.ts +14 -0
- package/esm/store/processing/memory.js +46 -0
- package/esm/store/processing/memory.js.map +1 -0
- package/esm/store/processing/redis.d.ts +21 -0
- package/esm/store/processing/redis.js +69 -0
- package/esm/store/processing/redis.js.map +1 -0
- package/esm/store/processing/types.d.ts +9 -0
- package/esm/store/processing/types.js +2 -0
- package/esm/store/processing/types.js.map +1 -0
- package/esm/store/types.d.ts +49 -0
- package/esm/store/types.js +2 -0
- package/esm/store/types.js.map +1 -0
- package/esm/utils/minMaxQueue/createRedisMinMaxQueue.d.ts +23 -2
- package/esm/utils/minMaxQueue/createRedisMinMaxQueue.js +83 -60
- package/esm/utils/minMaxQueue/createRedisMinMaxQueue.js.map +1 -1
- package/esm/utils/minMaxQueue/index.d.ts +2 -2
- package/esm/utils/minMaxQueue/index.js +2 -2
- package/esm/utils/minMaxQueue/index.js.map +1 -1
- package/esm/utils/userop.d.ts +1 -0
- package/esm/utils/userop.js +6 -0
- package/esm/utils/userop.js.map +1 -1
- package/package.json +1 -1
- package/esm/cli/config/redisKeys.d.ts +0 -9
- package/esm/cli/config/redisKeys.js +0 -16
- package/esm/cli/config/redisKeys.js.map +0 -1
- package/esm/executor/userOpMonitor.js.map +0 -1
- package/esm/store/createMemoryOutstandingStore.js +0 -240
- package/esm/store/createMemoryOutstandingStore.js.map +0 -1
- package/esm/store/createRedisOutstandingStore.d.ts +0 -28
- package/esm/store/createRedisOutstandingStore.js +0 -341
- package/esm/store/createRedisOutstandingStore.js.map +0 -1
- package/esm/store/createRedisStore.d.ts +0 -10
- package/esm/store/createRedisStore.js +0 -128
- package/esm/store/createRedisStore.js.map +0 -1
- package/esm/store/createStore.d.ts +0 -6
- package/esm/store/createStore.js +0 -66
- package/esm/store/createStore.js.map +0 -1
|
@@ -4,7 +4,7 @@ import { TransactionReceiptNotFoundError, decodeEventLog, getAbiItem, getAddress
|
|
|
4
4
|
import { entryPoint07Abi } from "viem/account-abstraction";
|
|
5
5
|
import { filterOpsAndEstimateGas } from "./filterOpsAndEstimateGas.js";
|
|
6
6
|
import { getBundleStatus } from "./getBundleStatus.js";
|
|
7
|
-
export class
|
|
7
|
+
export class BundleManager {
|
|
8
8
|
reputationManager;
|
|
9
9
|
config;
|
|
10
10
|
mempool;
|
|
@@ -37,7 +37,7 @@ export class UserOpMonitor {
|
|
|
37
37
|
getPendingBundles() {
|
|
38
38
|
return Array.from(this.pendingBundles.values());
|
|
39
39
|
}
|
|
40
|
-
|
|
40
|
+
getBundleStatuses(pendingBundles) {
|
|
41
41
|
return Promise.all(pendingBundles.map((bundle) => {
|
|
42
42
|
return getBundleStatus({
|
|
43
43
|
submittedBundle: bundle,
|
|
@@ -52,15 +52,20 @@ export class UserOpMonitor {
|
|
|
52
52
|
const { transactionHash, blockNumber, userOpReceipts } = bundleReceipt;
|
|
53
53
|
// Cleanup bundle
|
|
54
54
|
await this.freeSubmittedBundle(submittedBundle);
|
|
55
|
-
// Process
|
|
56
|
-
//
|
|
55
|
+
// Process all userOps in parallel (non-blocking)
|
|
56
|
+
// The IIFE returns immediately, allowing the caller to continue
|
|
57
57
|
return (async () => {
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
}
|
|
58
|
+
const userOpsBatch = userOps.map((userOpInfo) => ({
|
|
59
|
+
userOpInfo,
|
|
60
|
+
userOpReceipt: userOpReceipts[userOpInfo.userOpHash]
|
|
61
|
+
}));
|
|
62
|
+
// Batch cache receipts
|
|
63
|
+
await this.receiptCache.set(userOps.map(({ userOpHash }) => ({
|
|
64
|
+
userOpHash,
|
|
65
|
+
receipt: userOpReceipts[userOpHash]
|
|
66
|
+
})));
|
|
67
|
+
// Batch process userOps
|
|
68
|
+
await this.processIncludedUserOps(userOpsBatch, transactionHash, blockNumber, entryPoint, blockReceivedTimestamp);
|
|
64
69
|
})();
|
|
65
70
|
}
|
|
66
71
|
/**
|
|
@@ -111,7 +116,7 @@ export class UserOpMonitor {
|
|
|
111
116
|
});
|
|
112
117
|
if (status === "not_found") {
|
|
113
118
|
const { userOpHash } = userOpInfo;
|
|
114
|
-
await this.monitor.
|
|
119
|
+
await this.monitor.setStatus([userOpHash], {
|
|
115
120
|
status: "failed",
|
|
116
121
|
transactionHash
|
|
117
122
|
});
|
|
@@ -147,36 +152,39 @@ export class UserOpMonitor {
|
|
|
147
152
|
const { userOps, entryPoint } = bundle;
|
|
148
153
|
this.stopTrackingBundle(submittedBundle);
|
|
149
154
|
await this.senderManager.markWalletProcessed(executor);
|
|
150
|
-
await this.mempool.
|
|
155
|
+
await this.mempool.removeProcessing({ entryPoint, userOps });
|
|
151
156
|
}
|
|
152
157
|
// Stop tracking bundle in event resubmit fails
|
|
153
158
|
stopTrackingBundle(submittedBundle) {
|
|
154
159
|
this.pendingBundles.delete(submittedBundle.uid);
|
|
155
160
|
}
|
|
156
|
-
async
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
this.logger.info({ userOpHash, transactionHash, inclusionTimeMs }, "user op included");
|
|
160
|
-
// Update status
|
|
161
|
-
await this.monitor.setUserOpStatus(userOpHash, {
|
|
161
|
+
async processIncludedUserOps(userOpsBatch, transactionHash, blockNumber, entryPoint, blockReceivedTimestamp) {
|
|
162
|
+
// Update all statuses in one batch
|
|
163
|
+
await this.monitor.setStatus(userOpsBatch.map(({ userOpInfo }) => userOpInfo.userOpHash), {
|
|
162
164
|
status: "included",
|
|
163
165
|
transactionHash
|
|
164
166
|
});
|
|
165
|
-
//
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
this.
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
167
|
+
// Process each userOp
|
|
168
|
+
for (const { userOpInfo, userOpReceipt } of userOpsBatch) {
|
|
169
|
+
const { userOpHash, userOp, submissionAttempts, addedToMempool } = userOpInfo;
|
|
170
|
+
const inclusionTimeMs = blockReceivedTimestamp - addedToMempool;
|
|
171
|
+
this.logger.info({ userOpHash, transactionHash, inclusionTimeMs }, "user op included");
|
|
172
|
+
// Log metric
|
|
173
|
+
this.metrics.userOpsOnChain.labels({ status: "included" }).inc();
|
|
174
|
+
// Emit appropriate event
|
|
175
|
+
if (userOpReceipt.success) {
|
|
176
|
+
this.eventManager.emitIncludedOnChain(userOpHash, transactionHash, blockNumber);
|
|
177
|
+
}
|
|
178
|
+
else {
|
|
179
|
+
this.eventManager.emitExecutionRevertedOnChain(userOpHash, transactionHash, userOpReceipt.reason || "0x", blockNumber);
|
|
180
|
+
}
|
|
181
|
+
// Track metrics
|
|
182
|
+
this.metrics.userOpInclusionDuration.observe(inclusionTimeMs / 1000);
|
|
183
|
+
this.metrics.userOpsSubmissionAttempts.observe(submissionAttempts);
|
|
184
|
+
// Update reputation
|
|
185
|
+
const accountDeployed = this.checkAccountDeployment(userOpReceipt, userOp.sender);
|
|
186
|
+
this.reputationManager.updateUserOpIncludedStatus(userOp, entryPoint, accountDeployed);
|
|
173
187
|
}
|
|
174
|
-
// Track metrics
|
|
175
|
-
this.metrics.userOpInclusionDuration.observe(inclusionTimeMs / 1000);
|
|
176
|
-
this.metrics.userOpsSubmissionAttempts.observe(submissionAttempts);
|
|
177
|
-
// Update reputation
|
|
178
|
-
const accountDeployed = this.checkAccountDeployment(userOpReceipt, userOp.sender);
|
|
179
|
-
this.reputationManager.updateUserOpIncludedStatus(userOp, entryPoint, accountDeployed);
|
|
180
188
|
}
|
|
181
189
|
async getUserOpStatus({ userOpInfo, entryPoint, bundlerTxs, blockReceivedTimestamp, blockWaitCount = 0 }) {
|
|
182
190
|
const { userOpHash } = userOpInfo;
|
|
@@ -188,15 +196,20 @@ export class UserOpMonitor {
|
|
|
188
196
|
const { receipt } = userOpReceipt;
|
|
189
197
|
const { blockNumber, transactionHash } = receipt;
|
|
190
198
|
// Cache the receipt
|
|
191
|
-
await this.receiptCache.set(
|
|
192
|
-
|
|
199
|
+
await this.receiptCache.set([
|
|
200
|
+
{
|
|
201
|
+
userOpHash: userOpInfo.userOpHash,
|
|
202
|
+
receipt: userOpReceipt
|
|
203
|
+
}
|
|
204
|
+
]);
|
|
205
|
+
await this.processIncludedUserOps([{ userOpInfo, userOpReceipt }], transactionHash, blockNumber, entryPoint, blockReceivedTimestamp);
|
|
193
206
|
// userOp was bundled by this bundler
|
|
194
207
|
return "included";
|
|
195
208
|
}
|
|
196
209
|
if (userOpReceipt) {
|
|
197
210
|
const transactionHash = userOpReceipt.receipt.transactionHash;
|
|
198
211
|
const blockNumber = userOpReceipt.receipt.blockNumber;
|
|
199
|
-
await this.monitor.
|
|
212
|
+
await this.monitor.setStatus([userOpHash], {
|
|
200
213
|
status: "included",
|
|
201
214
|
transactionHash
|
|
202
215
|
});
|
|
@@ -320,7 +333,7 @@ export class UserOpMonitor {
|
|
|
320
333
|
const receipt = await getTransactionReceipt(txHash);
|
|
321
334
|
const userOpReceipt = parseUserOpReceipt(userOpHash, receipt);
|
|
322
335
|
// Cache the receipt before returning
|
|
323
|
-
await this.receiptCache.set(userOpHash, userOpReceipt);
|
|
336
|
+
await this.receiptCache.set([{ userOpHash, receipt: userOpReceipt }]);
|
|
324
337
|
return userOpReceipt;
|
|
325
338
|
}
|
|
326
339
|
checkAccountDeployment(userOpReceipt, sender) {
|
|
@@ -340,4 +353,4 @@ export class UserOpMonitor {
|
|
|
340
353
|
});
|
|
341
354
|
}
|
|
342
355
|
}
|
|
343
|
-
//# sourceMappingURL=
|
|
356
|
+
//# sourceMappingURL=bundleManager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bundleManager.js","sourceRoot":"","sources":["../../executor/bundleManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,9 @@ import type { GasPriceParameters } from "../types/index.js";
|
|
|
5
5
|
import { type Metrics } from "../utils/index.js";
|
|
6
6
|
import type { Hex } from "viem";
|
|
7
7
|
import type { AltoConfig } from "../createConfig.js";
|
|
8
|
+
import type { BundleManager } from "./bundleManager.js";
|
|
8
9
|
import type { Executor } from "./executor.js";
|
|
9
10
|
import type { SenderManager } from "./senderManager/index.js";
|
|
10
|
-
import type { UserOpMonitor } from "./userOpMonitor.js";
|
|
11
11
|
export declare class ExecutorManager {
|
|
12
12
|
private senderManager;
|
|
13
13
|
private config;
|
|
@@ -18,17 +18,17 @@ export declare class ExecutorManager {
|
|
|
18
18
|
private gasPriceManager;
|
|
19
19
|
private opsCount;
|
|
20
20
|
private bundlingMode;
|
|
21
|
-
private
|
|
21
|
+
private bundleManager;
|
|
22
22
|
private unWatch;
|
|
23
23
|
private currentlyHandlingBlock;
|
|
24
|
-
constructor({ config, executor, mempool, metrics, gasPriceManager, senderManager,
|
|
24
|
+
constructor({ config, executor, mempool, metrics, gasPriceManager, senderManager, bundleManager }: {
|
|
25
25
|
config: AltoConfig;
|
|
26
26
|
executor: Executor;
|
|
27
27
|
mempool: Mempool;
|
|
28
28
|
metrics: Metrics;
|
|
29
29
|
gasPriceManager: GasPriceManager;
|
|
30
30
|
senderManager: SenderManager;
|
|
31
|
-
|
|
31
|
+
bundleManager: BundleManager;
|
|
32
32
|
});
|
|
33
33
|
setBundlingMode(bundleMode: BundlingMode): Promise<void>;
|
|
34
34
|
autoScalingBundling(): Promise<void>;
|
|
@@ -12,10 +12,10 @@ export class ExecutorManager {
|
|
|
12
12
|
gasPriceManager;
|
|
13
13
|
opsCount = [];
|
|
14
14
|
bundlingMode;
|
|
15
|
-
|
|
15
|
+
bundleManager;
|
|
16
16
|
unWatch;
|
|
17
17
|
currentlyHandlingBlock = false;
|
|
18
|
-
constructor({ config, executor, mempool, metrics, gasPriceManager, senderManager,
|
|
18
|
+
constructor({ config, executor, mempool, metrics, gasPriceManager, senderManager, bundleManager }) {
|
|
19
19
|
this.config = config;
|
|
20
20
|
this.executor = executor;
|
|
21
21
|
this.mempool = mempool;
|
|
@@ -26,7 +26,7 @@ export class ExecutorManager {
|
|
|
26
26
|
this.gasPriceManager = gasPriceManager;
|
|
27
27
|
this.senderManager = senderManager;
|
|
28
28
|
this.bundlingMode = this.config.bundleMode;
|
|
29
|
-
this.
|
|
29
|
+
this.bundleManager = bundleManager;
|
|
30
30
|
if (this.bundlingMode === "auto") {
|
|
31
31
|
this.autoScalingBundling();
|
|
32
32
|
}
|
|
@@ -43,7 +43,7 @@ export class ExecutorManager {
|
|
|
43
43
|
async autoScalingBundling() {
|
|
44
44
|
const now = Date.now();
|
|
45
45
|
this.opsCount = this.opsCount.filter((timestamp) => now - timestamp < RPM_WINDOW);
|
|
46
|
-
const bundles = await this.mempool.getBundles();
|
|
46
|
+
const bundles = await this.mempool.getBundles(this.config.maxBundleCount);
|
|
47
47
|
if (bundles.length > 0) {
|
|
48
48
|
// Count total ops and add timestamps
|
|
49
49
|
const totalOps = bundles.reduce((sum, bundle) => sum + bundle.userOps.length, 0);
|
|
@@ -151,7 +151,7 @@ export class ExecutorManager {
|
|
|
151
151
|
// Check each rejected userOp for frontrun or included
|
|
152
152
|
const results = await Promise.all(rejectedUserOps.map(async (userOpInfo) => ({
|
|
153
153
|
userOpInfo,
|
|
154
|
-
status: await this.
|
|
154
|
+
status: await this.bundleManager.getUserOpStatus({
|
|
155
155
|
userOpInfo,
|
|
156
156
|
entryPoint,
|
|
157
157
|
bundlerTxs: [],
|
|
@@ -167,7 +167,7 @@ export class ExecutorManager {
|
|
|
167
167
|
const confirmedUserOps = results
|
|
168
168
|
.filter(({ status }) => ["frontran", "included"].includes(status))
|
|
169
169
|
.map(({ userOpInfo }) => userOpInfo);
|
|
170
|
-
await this.mempool.
|
|
170
|
+
await this.mempool.removeProcessing({
|
|
171
171
|
entryPoint,
|
|
172
172
|
userOps: confirmedUserOps
|
|
173
173
|
});
|
|
@@ -208,11 +208,10 @@ export class ExecutorManager {
|
|
|
208
208
|
lastReplaced: Date.now()
|
|
209
209
|
};
|
|
210
210
|
// Track bundle and start loop to watch blocks
|
|
211
|
-
this.
|
|
211
|
+
this.bundleManager.trackBundle(submittedBundle);
|
|
212
212
|
this.startWatchingBlocks();
|
|
213
213
|
await this.mempool.markUserOpsAsSubmitted({
|
|
214
214
|
userOps: submittedBundle.bundle.userOps,
|
|
215
|
-
entryPoint: submittedBundle.bundle.entryPoint,
|
|
216
215
|
transactionHash: submittedBundle.transactionHash
|
|
217
216
|
});
|
|
218
217
|
await this.mempool.dropUserOps(entryPoint, rejectedUserOps);
|
|
@@ -231,38 +230,38 @@ export class ExecutorManager {
|
|
|
231
230
|
}
|
|
232
231
|
this.currentlyHandlingBlock = true;
|
|
233
232
|
const blockReceivedTimestamp = Date.now();
|
|
234
|
-
const pendingBundles = this.
|
|
233
|
+
const pendingBundles = this.bundleManager.getPendingBundles();
|
|
235
234
|
if (pendingBundles.length === 0) {
|
|
236
235
|
this.stopWatchingBlocks();
|
|
237
236
|
this.currentlyHandlingBlock = false;
|
|
238
237
|
return;
|
|
239
238
|
}
|
|
240
|
-
const [
|
|
241
|
-
this.
|
|
239
|
+
const [bundleStatuses, networkGasPrice, networkBaseFee] = await Promise.all([
|
|
240
|
+
this.bundleManager.getBundleStatuses(pendingBundles),
|
|
242
241
|
this.gasPriceManager.tryGetNetworkGasPrice().catch(() => ({
|
|
243
242
|
maxFeePerGas: 0n,
|
|
244
243
|
maxPriorityFeePerGas: 0n
|
|
245
244
|
})),
|
|
246
245
|
this.getBaseFee().catch(() => 0n)
|
|
247
246
|
]);
|
|
248
|
-
await Promise.all(
|
|
249
|
-
if (
|
|
250
|
-
await this.
|
|
247
|
+
await Promise.all(bundleStatuses.map(async (bundleStatus, index) => {
|
|
248
|
+
if (bundleStatus.status === "included") {
|
|
249
|
+
await this.bundleManager.processIncludedBundle({
|
|
251
250
|
submittedBundle: pendingBundles[index],
|
|
252
|
-
bundleReceipt:
|
|
251
|
+
bundleReceipt: bundleStatus,
|
|
253
252
|
blockReceivedTimestamp
|
|
254
253
|
});
|
|
255
254
|
}
|
|
256
|
-
if (
|
|
257
|
-
await this.
|
|
255
|
+
if (bundleStatus.status === "reverted") {
|
|
256
|
+
await this.bundleManager.processRevertedBundle({
|
|
258
257
|
blockReceivedTimestamp,
|
|
259
258
|
submittedBundle: pendingBundles[index],
|
|
260
|
-
bundleReceipt:
|
|
259
|
+
bundleReceipt: bundleStatus,
|
|
261
260
|
block
|
|
262
261
|
});
|
|
263
262
|
}
|
|
264
263
|
// can be potentially resubmitted - so we first submit it again to optimize for the speed
|
|
265
|
-
if (
|
|
264
|
+
if (bundleStatus.status === "not_found") {
|
|
266
265
|
this.potentiallyResubmitBundle({
|
|
267
266
|
blockReceivedTimestamp,
|
|
268
267
|
submittedBundle: pendingBundles[index],
|
|
@@ -280,7 +279,7 @@ export class ExecutorManager {
|
|
|
280
279
|
maxPriorityFeePerGas < networkGasPrice.maxPriorityFeePerGas;
|
|
281
280
|
const isStuck = Date.now() - lastReplaced > this.config.resubmitStuckTimeout;
|
|
282
281
|
if (isGasPriceTooLow) {
|
|
283
|
-
this.
|
|
282
|
+
this.bundleManager.stopTrackingBundle(submittedBundle);
|
|
284
283
|
this.replaceTransaction({
|
|
285
284
|
blockReceivedTimestamp,
|
|
286
285
|
submittedBundle,
|
|
@@ -290,7 +289,7 @@ export class ExecutorManager {
|
|
|
290
289
|
});
|
|
291
290
|
}
|
|
292
291
|
else if (isStuck) {
|
|
293
|
-
this.
|
|
292
|
+
this.bundleManager.stopTrackingBundle(submittedBundle);
|
|
294
293
|
this.replaceTransaction({
|
|
295
294
|
blockReceivedTimestamp,
|
|
296
295
|
submittedBundle,
|
|
@@ -371,7 +370,7 @@ export class ExecutorManager {
|
|
|
371
370
|
// Check each rejected userOp for frontrun or included
|
|
372
371
|
const results = await Promise.all(rejectedUserOps.map(async (userOpInfo) => ({
|
|
373
372
|
userOpInfo,
|
|
374
|
-
status: await this.
|
|
373
|
+
status: await this.bundleManager.getUserOpStatus({
|
|
375
374
|
userOpInfo,
|
|
376
375
|
entryPoint,
|
|
377
376
|
bundlerTxs: [
|
|
@@ -396,7 +395,7 @@ export class ExecutorManager {
|
|
|
396
395
|
const confirmedUserOps = results
|
|
397
396
|
.filter(({ status }) => ["frontran", "included"].includes(status))
|
|
398
397
|
.map(({ userOpInfo }) => userOpInfo);
|
|
399
|
-
await this.mempool.
|
|
398
|
+
await this.mempool.removeProcessing({
|
|
400
399
|
entryPoint,
|
|
401
400
|
userOps: confirmedUserOps
|
|
402
401
|
});
|
|
@@ -435,7 +434,7 @@ export class ExecutorManager {
|
|
|
435
434
|
}
|
|
436
435
|
};
|
|
437
436
|
// Track bundle and start loop to watch blocks
|
|
438
|
-
this.
|
|
437
|
+
this.bundleManager.trackBundle(newTxInfo);
|
|
439
438
|
this.startWatchingBlocks();
|
|
440
439
|
// Drop all userOperations that were rejected during simulation.
|
|
441
440
|
await this.mempool.dropUserOps(entryPoint, rejectedUserOps);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executorManager.js","sourceRoot":"","sources":["../../executor/executorManager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"executorManager.js","sourceRoot":"","sources":["../../executor/executorManager.ts"],"names":[],"mappings":"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"}
|
package/esm/executor/index.d.ts
CHANGED
package/esm/executor/index.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import Redis from "ioredis";
|
|
2
2
|
import { getAvailableWallets } from "./index.js";
|
|
3
|
-
import { getRedisKeys } from "../../cli/config/redisKeys.js";
|
|
4
3
|
async function createRedisQueue({ redis, name, entries }) {
|
|
5
4
|
const hasElements = await redis.llen(name);
|
|
6
5
|
// Ensure queue is populated on startup
|
|
@@ -28,7 +27,7 @@ export const createRedisSenderManager = async ({ config, metrics, redisEndpoint
|
|
|
28
27
|
level: config.executorLogLevel || config.logLevel
|
|
29
28
|
});
|
|
30
29
|
const redis = new Redis(redisEndpoint);
|
|
31
|
-
const redisQueueName =
|
|
30
|
+
const redisQueueName = `${config.redisKeyPrefix}:${config.chainId}:sender-manager`;
|
|
32
31
|
const redisQueue = await createRedisQueue({
|
|
33
32
|
redis,
|
|
34
33
|
name: redisQueueName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createRedisSenderManager.js","sourceRoot":"","sources":["../../../executor/senderManager/createRedisSenderManager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,SAAS,CAAA;AAE3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,GAAG,CAAA;
|
|
1
|
+
{"version":3,"file":"createRedisSenderManager.js","sourceRoot":"","sources":["../../../executor/senderManager/createRedisSenderManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,11 +5,11 @@ export class ArbitrumManager {
|
|
|
5
5
|
l2BaseFeeQueue;
|
|
6
6
|
constructor({ config }) {
|
|
7
7
|
this.l1BaseFeeQueue = createMinMaxQueue({
|
|
8
|
-
|
|
8
|
+
queueName: "l1-base-fee-queue",
|
|
9
9
|
config
|
|
10
10
|
});
|
|
11
11
|
this.l2BaseFeeQueue = createMinMaxQueue({
|
|
12
|
-
|
|
12
|
+
queueName: "l2-base-fee-queue",
|
|
13
13
|
config
|
|
14
14
|
});
|
|
15
15
|
}
|
|
@@ -23,15 +23,15 @@ export class GasPriceManager {
|
|
|
23
23
|
});
|
|
24
24
|
this.baseFeePerGasQueue = createMinMaxQueue({
|
|
25
25
|
config,
|
|
26
|
-
|
|
26
|
+
queueName: "base-fee-per-gas-queue"
|
|
27
27
|
});
|
|
28
28
|
this.maxFeePerGasQueue = createMinMaxQueue({
|
|
29
29
|
config,
|
|
30
|
-
|
|
30
|
+
queueName: "max-fee-per-gas-queue"
|
|
31
31
|
});
|
|
32
32
|
this.maxPriorityFeePerGasQueue = createMinMaxQueue({
|
|
33
33
|
config,
|
|
34
|
-
|
|
34
|
+
queueName: "max-priority-fee-per-gas-queue"
|
|
35
35
|
});
|
|
36
36
|
// Periodically update gas prices if specified
|
|
37
37
|
if (this.config.gasPriceRefreshInterval > 0) {
|
|
@@ -6,19 +6,19 @@ export class MantleManager {
|
|
|
6
6
|
l1GasPriceQueue;
|
|
7
7
|
constructor({ config }) {
|
|
8
8
|
this.tokenRatioQueue = createMinMaxQueue({
|
|
9
|
-
|
|
9
|
+
queueName: "token-ratio-queue",
|
|
10
10
|
config
|
|
11
11
|
});
|
|
12
12
|
this.scalarQueue = createMinMaxQueue({
|
|
13
|
-
|
|
13
|
+
queueName: "scalar-queue",
|
|
14
14
|
config
|
|
15
15
|
});
|
|
16
16
|
this.l1GasPriceQueue = createMinMaxQueue({
|
|
17
|
-
|
|
17
|
+
queueName: "l1-gas-price-queue",
|
|
18
18
|
config
|
|
19
19
|
});
|
|
20
20
|
this.rollupDataGasAndOverheadQueue = createMinMaxQueue({
|
|
21
|
-
|
|
21
|
+
queueName: "rollup-data-gas-and-overhead-queue",
|
|
22
22
|
config
|
|
23
23
|
});
|
|
24
24
|
}
|
package/esm/mempool/mempool.d.ts
CHANGED
|
@@ -25,9 +25,8 @@ export declare class Mempool {
|
|
|
25
25
|
store: MempoolStore;
|
|
26
26
|
eventManager: EventManager;
|
|
27
27
|
});
|
|
28
|
-
markUserOpsAsSubmitted({ userOps,
|
|
28
|
+
markUserOpsAsSubmitted({ userOps, transactionHash }: {
|
|
29
29
|
userOps: UserOpInfo[];
|
|
30
|
-
entryPoint: Address;
|
|
31
30
|
transactionHash: Hex;
|
|
32
31
|
}): Promise<void>;
|
|
33
32
|
resubmitUserOps({ userOps, entryPoint, reason }: {
|
|
@@ -36,17 +35,11 @@ export declare class Mempool {
|
|
|
36
35
|
reason: string;
|
|
37
36
|
}): Promise<void>;
|
|
38
37
|
dropUserOps(entryPoint: Address, rejectedUserOps: RejectedUserOp[]): Promise<void>;
|
|
39
|
-
|
|
40
|
-
userOps: UserOpInfo[];
|
|
41
|
-
entryPoint: Address;
|
|
42
|
-
}): Promise<void>;
|
|
43
|
-
removeSubmittedUserOps({ userOps, entryPoint }: {
|
|
38
|
+
removeProcessing({ userOps, entryPoint }: {
|
|
44
39
|
userOps: UserOpInfo[];
|
|
45
40
|
entryPoint: Address;
|
|
46
41
|
}): Promise<void>;
|
|
47
42
|
dumpOutstanding(entryPoint: Address): Promise<UserOpInfo[]>;
|
|
48
|
-
dumpProcessing(entryPoint: Address): Promise<UserOpInfo[]>;
|
|
49
|
-
dumpSubmittedOps(entryPoint: Address): Promise<UserOpInfo[]>;
|
|
50
43
|
checkEntityMultipleRoleViolation(entryPoint: Address, op: UserOperation): Promise<void>;
|
|
51
44
|
getKnownEntities(entryPoint: Address): Promise<{
|
|
52
45
|
sender: Set<Address>;
|
|
@@ -88,10 +81,9 @@ export declare class Mempool {
|
|
|
88
81
|
storageMap: StorageMap;
|
|
89
82
|
}>;
|
|
90
83
|
getBundles(maxBundleCount?: number): Promise<UserOperationBundle[]>;
|
|
91
|
-
process({ maxGasLimit, entryPoint,
|
|
84
|
+
process({ maxGasLimit, entryPoint, maxBundleCount }: {
|
|
92
85
|
maxGasLimit: bigint;
|
|
93
86
|
entryPoint: Address;
|
|
94
|
-
minOpsPerBundle: number;
|
|
95
87
|
maxBundleCount?: number;
|
|
96
88
|
}): Promise<UserOperationBundle[]>;
|
|
97
89
|
clear(): void;
|