@pimlico/alto 0.0.0-main.20250710T212717 → 0.0.0-main.20250710T215433

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.
@@ -20,6 +20,7 @@ export declare class ExecutorManager {
20
20
  private bundlingMode;
21
21
  private userOpMonitor;
22
22
  private unWatch;
23
+ private currentlyHandlingBlock;
23
24
  constructor({ config, executor, mempool, metrics, gasPriceManager, senderManager, userOpMonitor }: {
24
25
  config: AltoConfig;
25
26
  executor: Executor;
@@ -12,6 +12,7 @@ export class ExecutorManager {
12
12
  bundlingMode;
13
13
  userOpMonitor;
14
14
  unWatch;
15
+ currentlyHandlingBlock = false;
15
16
  constructor({ config, executor, mempool, metrics, gasPriceManager, senderManager, userOpMonitor }) {
16
17
  this.config = config;
17
18
  this.executor = executor;
@@ -144,7 +145,6 @@ export class ExecutorManager {
144
145
  submissionAttempts: userOpInfo.submissionAttempts + 1
145
146
  }));
146
147
  const submittedBundle = {
147
- uid: transactionHash,
148
148
  executor: wallet,
149
149
  transactionHash,
150
150
  transactionRequest,
@@ -176,10 +176,15 @@ export class ExecutorManager {
176
176
  }
177
177
  }
178
178
  async handleBlock(blockNumber) {
179
+ if (this.currentlyHandlingBlock) {
180
+ return;
181
+ }
182
+ this.currentlyHandlingBlock = true;
179
183
  // Process the block and get the results
180
184
  const pendingBundles = await this.userOpMonitor.processBlock(blockNumber);
181
185
  if (pendingBundles.length === 0) {
182
186
  this.stopWatchingBlocks();
187
+ this.currentlyHandlingBlock = false;
183
188
  return;
184
189
  }
185
190
  // for all still not included check if needs to be replaced (based on gas price)
@@ -213,7 +218,7 @@ export class ExecutorManager {
213
218
  });
214
219
  }
215
220
  }));
216
- this.userOpMonitor.finishProcessing(pendingBundles);
221
+ this.currentlyHandlingBlock = false;
217
222
  }
218
223
  async replaceTransaction({ submittedBundle, networkGasPrice, networkBaseFee, reason }) {
219
224
  const { bundle, executor, transactionRequest, transactionHash: oldTxHash } = submittedBundle;
@@ -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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"}
@@ -27,7 +27,6 @@ export declare class UserOpMonitor {
27
27
  eventManager: EventManager;
28
28
  senderManager: SenderManager;
29
29
  });
30
- finishProcessing(pendingBundles: SubmittedBundleInfo[]): void;
31
30
  processBlock(blockNumber: bigint): Promise<SubmittedBundleInfo[]>;
32
31
  refreshBundleStatus(submittedBundle: SubmittedBundleInfo): Promise<boolean>;
33
32
  trackBundle(submittedBundle: SubmittedBundleInfo): void;
@@ -28,28 +28,17 @@ export class UserOpMonitor {
28
28
  level: config.executorLogLevel || config.logLevel
29
29
  });
30
30
  }
31
- finishProcessing(pendingBundles) {
32
- for (const pendingBundle of pendingBundles) {
33
- const bundle = this.pendingBundles.get(pendingBundle.uid);
34
- if (bundle) {
35
- bundle.processingBlock = false;
36
- }
37
- }
38
- }
39
31
  async processBlock(blockNumber) {
40
32
  // Update the cached block number whenever we receive a new block.
41
33
  this.cachedLatestBlock = { value: blockNumber, timestamp: Date.now() };
42
34
  // Refresh the statuses of all pending bundles.
43
- const pendingBundles = Array.from(this.pendingBundles.values()).filter((bundle) => bundle.processingBlock !== true);
44
- const refreshResults = (await Promise.all(pendingBundles.map(async (bundle) => {
35
+ const pendingBundles = Array.from(this.pendingBundles.values());
36
+ const refreshResults = await Promise.all(pendingBundles.map(async (bundle) => {
45
37
  const needsProcessing = await this.refreshBundleStatus(bundle);
46
38
  return needsProcessing ? bundle : null;
47
- }))).filter((bundle) => bundle !== null);
48
- for (const bundle of refreshResults) {
49
- bundle.processingBlock = true;
50
- }
39
+ }));
51
40
  // Return only bundles that still need processing
52
- return refreshResults;
41
+ return refreshResults.filter((bundle) => bundle !== null);
53
42
  }
54
43
  async refreshBundleStatus(submittedBundle) {
55
44
  let bundleReceipt = await getBundleStatus({
@@ -101,7 +90,8 @@ export class UserOpMonitor {
101
90
  return true;
102
91
  }
103
92
  trackBundle(submittedBundle) {
104
- this.pendingBundles.set(submittedBundle.uid, submittedBundle);
93
+ const executor = submittedBundle.executor.address;
94
+ this.pendingBundles.set(executor, submittedBundle);
105
95
  }
106
96
  // Helpers //
107
97
  async getLatestBlockWithCache() {
@@ -134,16 +124,16 @@ export class UserOpMonitor {
134
124
  }
135
125
  // Free executors and remove userOps from mempool.
136
126
  async freeSubmittedBundle(submittedBundle) {
137
- const { executor, bundle, uid } = submittedBundle;
127
+ const { executor, bundle } = submittedBundle;
138
128
  const { userOps, entryPoint } = bundle;
139
- this.pendingBundles.delete(uid);
129
+ this.pendingBundles.delete(executor.address);
140
130
  await this.senderManager.markWalletProcessed(executor);
141
131
  await this.mempool.removeSubmittedUserOps({ entryPoint, userOps });
142
132
  }
143
133
  // Stop tracking bundle in event resubmit fails
144
134
  async stopTrackingBundle(submittedBundle) {
145
- const { uid } = submittedBundle;
146
- this.pendingBundles.delete(uid);
135
+ const { executor } = submittedBundle;
136
+ this.pendingBundles.delete(executor.address);
147
137
  }
148
138
  async processIncludedUserOp(userOpInfo, userOpReceipt, transactionHash, blockNumber, entryPoint) {
149
139
  const { userOpHash, userOp, submissionAttempts, addedToMempool } = userOpInfo;
@@ -1 +1 @@
1
- {"version":3,"file":"userOpMonitor.js","sourceRoot":"","sources":["../../executor/userOpMonitor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"userOpMonitor.js","sourceRoot":"","sources":["../../executor/userOpMonitor.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,6 @@ import type { Address, Prettify } from "viem";
3
3
  import { EntryPointVersion } from "viem/account-abstraction";
4
4
  import type { Account } from "viem/accounts";
5
5
  export type SubmittedBundleInfo = {
6
- uid: string;
7
6
  transactionHash: HexData32;
8
7
  previousTransactionHashes: HexData32[];
9
8
  transactionRequest: {
@@ -14,7 +13,6 @@ export type SubmittedBundleInfo = {
14
13
  bundle: UserOperationBundle;
15
14
  executor: Account;
16
15
  lastReplaced: number;
17
- processingBlock?: boolean;
18
16
  };
19
17
  export type UserOperationBundle = {
20
18
  entryPoint: Address;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pimlico/alto",
3
- "version": "0.0.0-main.20250710T212717",
3
+ "version": "0.0.0-main.20250710T215433",
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",