@pimlico/alto 0.0.0-main.20250123T121133 → 0.0.0-main.20250123T193838
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 +6 -0
- package/esm/cli/config/bundler.js +1 -0
- package/esm/cli/config/bundler.js.map +1 -1
- package/esm/cli/config/options.js +5 -0
- package/esm/cli/config/options.js.map +1 -1
- package/esm/executor/executor.d.ts +1 -0
- package/esm/executor/executor.js +51 -44
- package/esm/executor/executor.js.map +1 -1
- package/esm/executor/executorManager.d.ts +2 -2
- package/esm/executor/executorManager.js +12 -14
- package/esm/executor/executorManager.js.map +1 -1
- package/esm/executor/fastlane.d.ts +9 -0
- package/esm/executor/fastlane.js +37 -0
- package/esm/executor/fastlane.js.map +1 -0
- package/esm/executor/utils.d.ts +2 -2
- package/esm/executor/utils.js +10 -10
- package/esm/executor/utils.js.map +1 -1
- package/esm/mempool/mempool.d.ts +2 -2
- package/esm/mempool/mempool.js +49 -48
- package/esm/mempool/mempool.js.map +1 -1
- package/esm/rpc/estimation/gasEstimationHandler.d.ts +1 -3
- package/esm/rpc/estimation/gasEstimationHandler.js +1 -3
- package/esm/rpc/estimation/gasEstimationHandler.js.map +1 -1
- package/esm/rpc/estimation/gasEstimationsV06.d.ts +1 -3
- package/esm/rpc/estimation/gasEstimationsV06.js +8 -9
- package/esm/rpc/estimation/gasEstimationsV06.js.map +1 -1
- package/esm/rpc/estimation/gasEstimationsV07.d.ts +3 -6
- package/esm/rpc/estimation/gasEstimationsV07.js +15 -3
- package/esm/rpc/estimation/gasEstimationsV07.js.map +1 -1
- package/esm/rpc/nonceQueuer.d.ts +4 -4
- package/esm/rpc/nonceQueuer.js +9 -11
- package/esm/rpc/nonceQueuer.js.map +1 -1
- package/esm/rpc/rpcHandler.d.ts +5 -7
- package/esm/rpc/rpcHandler.js +14 -26
- package/esm/rpc/rpcHandler.js.map +1 -1
- package/esm/rpc/validation/UnsafeValidator.d.ts +5 -11
- package/esm/rpc/validation/UnsafeValidator.js +8 -13
- package/esm/rpc/validation/UnsafeValidator.js.map +1 -1
- package/esm/types/interfaces.d.ts +0 -6
- package/esm/types/mempool.d.ts +4 -7
- package/esm/types/mempool.js +0 -9
- package/esm/types/mempool.js.map +1 -1
- package/esm/types/schemas.d.ts +2682 -136
- package/esm/types/schemas.js +19 -24
- package/esm/types/schemas.js.map +1 -1
- package/esm/utils/metrics.d.ts +2 -2
- package/lib/cli/config/bundler.d.ts +6 -0
- package/lib/cli/config/bundler.js +1 -0
- package/lib/cli/config/bundler.js.map +1 -1
- package/lib/cli/config/options.js +5 -0
- package/lib/cli/config/options.js.map +1 -1
- package/lib/executor/executor.d.ts +1 -0
- package/lib/executor/executor.js +50 -43
- package/lib/executor/executor.js.map +1 -1
- package/lib/executor/executorManager.d.ts +2 -2
- package/lib/executor/executorManager.js +11 -13
- package/lib/executor/executorManager.js.map +1 -1
- package/lib/executor/fastlane.d.ts +9 -0
- package/lib/executor/fastlane.js +41 -0
- package/lib/executor/fastlane.js.map +1 -0
- package/lib/executor/utils.d.ts +2 -2
- package/lib/executor/utils.js +9 -9
- package/lib/executor/utils.js.map +1 -1
- package/lib/mempool/mempool.d.ts +2 -2
- package/lib/mempool/mempool.js +48 -47
- package/lib/mempool/mempool.js.map +1 -1
- package/lib/rpc/estimation/gasEstimationHandler.d.ts +1 -3
- package/lib/rpc/estimation/gasEstimationHandler.js +1 -3
- package/lib/rpc/estimation/gasEstimationHandler.js.map +1 -1
- package/lib/rpc/estimation/gasEstimationsV06.d.ts +1 -3
- package/lib/rpc/estimation/gasEstimationsV06.js +8 -9
- package/lib/rpc/estimation/gasEstimationsV06.js.map +1 -1
- package/lib/rpc/estimation/gasEstimationsV07.d.ts +3 -6
- package/lib/rpc/estimation/gasEstimationsV07.js +15 -3
- package/lib/rpc/estimation/gasEstimationsV07.js.map +1 -1
- package/lib/rpc/nonceQueuer.d.ts +4 -4
- package/lib/rpc/nonceQueuer.js +8 -10
- package/lib/rpc/nonceQueuer.js.map +1 -1
- package/lib/rpc/rpcHandler.d.ts +5 -7
- package/lib/rpc/rpcHandler.js +13 -25
- package/lib/rpc/rpcHandler.js.map +1 -1
- package/lib/rpc/validation/UnsafeValidator.d.ts +5 -11
- package/lib/rpc/validation/UnsafeValidator.js +8 -13
- package/lib/rpc/validation/UnsafeValidator.js.map +1 -1
- package/lib/types/interfaces.d.ts +0 -6
- package/lib/types/mempool.d.ts +4 -7
- package/lib/types/mempool.js +1 -12
- package/lib/types/mempool.js.map +1 -1
- package/lib/types/schemas.d.ts +2682 -136
- package/lib/types/schemas.js +19 -24
- package/lib/types/schemas.js.map +1 -1
- package/lib/utils/metrics.d.ts +2 -2
- package/package.json +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { EntryPointV06Abi
|
|
1
|
+
import { EntryPointV06Abi } from "../types/index.js";
|
|
2
2
|
import { getAAError, getBundleStatus, parseUserOperationReceipt, scaleBigIntByPercent } from "../utils/index.js";
|
|
3
3
|
import { TransactionReceiptNotFoundError, getAbiItem } from "viem";
|
|
4
4
|
function getTransactionsFromUserOperationEntries(entries) {
|
|
@@ -95,7 +95,7 @@ export class ExecutorManager {
|
|
|
95
95
|
if (!opEntryPointMap.has(op.entryPoint)) {
|
|
96
96
|
opEntryPointMap.set(op.entryPoint, []);
|
|
97
97
|
}
|
|
98
|
-
opEntryPointMap.get(op.entryPoint)?.push(op.
|
|
98
|
+
opEntryPointMap.get(op.entryPoint)?.push(op.userOperation);
|
|
99
99
|
}
|
|
100
100
|
const txHashes = [];
|
|
101
101
|
await Promise.all(this.config.entrypoints.map(async (entryPoint) => {
|
|
@@ -196,9 +196,7 @@ export class ExecutorManager {
|
|
|
196
196
|
if (!opEntryPointMap.has(op.entryPoint)) {
|
|
197
197
|
opEntryPointMap.set(op.entryPoint, []);
|
|
198
198
|
}
|
|
199
|
-
opEntryPointMap
|
|
200
|
-
.get(op.entryPoint)
|
|
201
|
-
?.push(op.mempoolUserOperation);
|
|
199
|
+
opEntryPointMap.get(op.entryPoint)?.push(op.userOperation);
|
|
202
200
|
}
|
|
203
201
|
await Promise.all(this.config.entrypoints.map(async (entryPoint) => {
|
|
204
202
|
const userOperations = opEntryPointMap.get(entryPoint);
|
|
@@ -276,23 +274,23 @@ export class ExecutorManager {
|
|
|
276
274
|
.inc(opInfos.length);
|
|
277
275
|
const { userOperationDetails } = bundlingStatus;
|
|
278
276
|
opInfos.map((opInfo) => {
|
|
279
|
-
const {
|
|
280
|
-
const opDetails = userOperationDetails[
|
|
277
|
+
const { userOperation, userOperationHash, entryPoint, firstSubmitted } = opInfo;
|
|
278
|
+
const opDetails = userOperationDetails[userOperationHash];
|
|
281
279
|
this.metrics.userOperationInclusionDuration.observe((Date.now() - firstSubmitted) / 1000);
|
|
282
|
-
this.mempool.removeSubmitted(
|
|
283
|
-
this.reputationManager.updateUserOperationIncludedStatus(
|
|
280
|
+
this.mempool.removeSubmitted(userOperationHash);
|
|
281
|
+
this.reputationManager.updateUserOperationIncludedStatus(userOperation, entryPoint, opDetails.accountDeployed);
|
|
284
282
|
if (opDetails.status === "succesful") {
|
|
285
|
-
this.eventManager.emitIncludedOnChain(
|
|
283
|
+
this.eventManager.emitIncludedOnChain(userOperationHash, transactionHash, blockNumber);
|
|
286
284
|
}
|
|
287
285
|
else {
|
|
288
|
-
this.eventManager.emitExecutionRevertedOnChain(
|
|
286
|
+
this.eventManager.emitExecutionRevertedOnChain(userOperationHash, transactionHash, opDetails.revertReason || "0x", blockNumber);
|
|
289
287
|
}
|
|
290
|
-
this.monitor.setUserOperationStatus(
|
|
288
|
+
this.monitor.setUserOperationStatus(userOperationHash, {
|
|
291
289
|
status: "included",
|
|
292
290
|
transactionHash
|
|
293
291
|
});
|
|
294
292
|
this.logger.info({
|
|
295
|
-
|
|
293
|
+
userOperationHash,
|
|
296
294
|
transactionHash
|
|
297
295
|
}, "user op included");
|
|
298
296
|
});
|
|
@@ -521,7 +519,7 @@ export class ExecutorManager {
|
|
|
521
519
|
}
|
|
522
520
|
if (replaceResult.status === "failed") {
|
|
523
521
|
txInfo.userOperationInfos.map((opInfo) => {
|
|
524
|
-
const userOperation =
|
|
522
|
+
const userOperation = opInfo.userOperation;
|
|
525
523
|
this.eventManager.emitDropped(opInfo.userOperationHash, "Failed to replace transaction");
|
|
526
524
|
this.logger.warn({
|
|
527
525
|
userOperation: JSON.stringify(userOperation, (_k, v) => typeof v === "bigint" ? v.toString() : v),
|
|
@@ -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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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { Logger } from "../utils/index.js";
|
|
2
|
+
import { SendRawTransactionReturnType, Hash, WalletClient, PublicClient } from "viem";
|
|
3
|
+
export declare function sendPflConditional({ serializedTransaction, publicClient, walletClient, logger }: {
|
|
4
|
+
serializedTransaction: Hash;
|
|
5
|
+
publicClient: PublicClient;
|
|
6
|
+
walletClient: WalletClient;
|
|
7
|
+
logger: Logger;
|
|
8
|
+
}): Promise<SendRawTransactionReturnType>;
|
|
9
|
+
//# sourceMappingURL=fastlane.d.ts.map
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { createClient, http, toHex, BaseError } from "viem";
|
|
2
|
+
const pflClient = createClient({
|
|
3
|
+
transport: http("https://polygon-rpc.fastlane.xyz")
|
|
4
|
+
});
|
|
5
|
+
export async function sendPflConditional({ serializedTransaction, publicClient, walletClient, logger }) {
|
|
6
|
+
try {
|
|
7
|
+
const blockNumberMin = await publicClient.getBlockNumber();
|
|
8
|
+
const blockNumberMax = blockNumberMin + 30n;
|
|
9
|
+
const timestampMin = Date.now() / 1000;
|
|
10
|
+
const timestampMax = timestampMin + 60;
|
|
11
|
+
const opts = {
|
|
12
|
+
//knownAccounts: {}
|
|
13
|
+
blockNumberMin: toHex(blockNumberMin),
|
|
14
|
+
blockNumberMax: toHex(blockNumberMax),
|
|
15
|
+
timestampMin: Math.floor(timestampMin),
|
|
16
|
+
timestampMax: Math.floor(timestampMax)
|
|
17
|
+
};
|
|
18
|
+
const txHash = (await pflClient.request({
|
|
19
|
+
// @ts-ignore
|
|
20
|
+
method: "pfl_sendRawTransactionConditional",
|
|
21
|
+
// @ts-ignore
|
|
22
|
+
params: [serializedTransaction, opts]
|
|
23
|
+
}));
|
|
24
|
+
if (!txHash) {
|
|
25
|
+
const error = new BaseError("FastLane API returned empty transaction hash");
|
|
26
|
+
error.details =
|
|
27
|
+
"PFL conditional transaction failed: No txHash in response";
|
|
28
|
+
throw error;
|
|
29
|
+
}
|
|
30
|
+
return txHash;
|
|
31
|
+
}
|
|
32
|
+
catch (e) {
|
|
33
|
+
logger.error("Error sending through pfl_sendRawTransactionConditional ", e?.details);
|
|
34
|
+
return await walletClient.sendRawTransaction({ serializedTransaction });
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
//# sourceMappingURL=fastlane.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fastlane.js","sourceRoot":"","sources":["../../executor/fastlane.ts"],"names":[],"mappings":"AACA,OAAO,EAEH,YAAY,EACZ,IAAI,EAKJ,KAAK,EACL,SAAS,EACZ,MAAM,MAAM,CAAA;AAEb,MAAM,SAAS,GAAG,YAAY,CAAC;IAC3B,SAAS,EAAE,IAAI,CAAC,kCAAkC,CAAC;CACtD,CAAC,CAAA;AAEF,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,EACrC,qBAAqB,EACrB,YAAY,EACZ,YAAY,EACZ,MAAM,EAMT;IACG,IAAI,CAAC;QACD,MAAM,cAAc,GAAG,MAAM,YAAY,CAAC,cAAc,EAAE,CAAA;QAC1D,MAAM,cAAc,GAAG,cAAc,GAAG,GAAG,CAAA;QAE3C,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAA;QACtC,MAAM,YAAY,GAAG,YAAY,GAAG,EAAE,CAAA;QAEtC,MAAM,IAAI,GAAG;YACT,mBAAmB;YACnB,cAAc,EAAE,KAAK,CAAC,cAAc,CAAC;YACrC,cAAc,EAAE,KAAK,CAAC,cAAc,CAAC;YACrC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;YACtC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;SACzC,CAAA;QAED,MAAM,MAAM,GAAG,CAAC,MAAM,SAAS,CAAC,OAAO,CAAC;YACpC,aAAa;YACb,MAAM,EAAE,mCAAmC;YAC3C,aAAa;YACb,MAAM,EAAE,CAAC,qBAAqB,EAAE,IAAI,CAAC;SACxC,CAAC,CAAQ,CAAA;QAEV,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,KAAK,GAAG,IAAI,SAAS,CACvB,8CAA8C,CACjD,CAAA;YACD,KAAK,CAAC,OAAO;gBACT,2DAA2D,CAAA;YAC/D,MAAM,KAAK,CAAA;QACf,CAAC;QAED,OAAO,MAAM,CAAA;IACjB,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QAClB,MAAM,CAAC,KAAK,CACR,0DAA0D,EACzD,CAAS,EAAE,OAAO,CACtB,CAAA;QACD,OAAO,MAAM,YAAY,CAAC,kBAAkB,CAAC,EAAE,qBAAqB,EAAE,CAAC,CAAA;IAC3E,CAAC;AACL,CAAC"}
|
package/esm/executor/utils.d.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import type { InterfaceReputationManager } from "../mempool/index.js";
|
|
2
|
-
import { type BundleResult, EntryPointV06Abi, EntryPointV07Abi, type TransactionInfo, type
|
|
2
|
+
import { type BundleResult, EntryPointV06Abi, EntryPointV07Abi, type TransactionInfo, type UserOperation, type UserOperationWithHash } from "../types/index.js";
|
|
3
3
|
import type { Logger } from "../utils/index.js";
|
|
4
4
|
import { type Account, type Address, type Chain, type GetContractReturnType, type PublicClient, type Transport, type WalletClient, BaseError } from "viem";
|
|
5
5
|
import { SignedAuthorizationList } from "viem/experimental";
|
|
6
6
|
export declare const isTransactionUnderpricedError: (e: BaseError) => boolean;
|
|
7
|
-
export declare const getAuthorizationList: (
|
|
7
|
+
export declare const getAuthorizationList: (userOperations: UserOperation[]) => SignedAuthorizationList | undefined;
|
|
8
8
|
export declare function simulatedOpsToResults(simulatedOps: {
|
|
9
9
|
owh: UserOperationWithHash;
|
|
10
10
|
reason: string | undefined;
|
package/esm/executor/utils.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { EntryPointV06Abi, EntryPointV07Abi,
|
|
1
|
+
import { EntryPointV06Abi, EntryPointV07Abi, failedOpErrorSchema, failedOpWithRevertErrorSchema } from "../types/index.js";
|
|
2
2
|
import { getRevertErrorData, isVersion06, parseViemError, scaleBigIntByPercent, toPackedUserOperation } from "../utils/index.js";
|
|
3
3
|
// biome-ignore lint/style/noNamespaceImport: explicitly make it clear when sentry is used
|
|
4
4
|
import * as sentry from "@sentry/node";
|
|
@@ -8,11 +8,11 @@ export const isTransactionUnderpricedError = (e) => {
|
|
|
8
8
|
?.toLowerCase()
|
|
9
9
|
.includes("replacement transaction underpriced");
|
|
10
10
|
};
|
|
11
|
-
export const getAuthorizationList = (
|
|
12
|
-
const authorizationList =
|
|
11
|
+
export const getAuthorizationList = (userOperations) => {
|
|
12
|
+
const authorizationList = userOperations
|
|
13
13
|
.map((op) => {
|
|
14
|
-
if (
|
|
15
|
-
return op.
|
|
14
|
+
if (op.eip7702Auth) {
|
|
15
|
+
return op.eip7702Auth;
|
|
16
16
|
}
|
|
17
17
|
return undefined;
|
|
18
18
|
})
|
|
@@ -27,7 +27,7 @@ export function simulatedOpsToResults(simulatedOps, transactionInfo) {
|
|
|
27
27
|
value: {
|
|
28
28
|
userOperation: {
|
|
29
29
|
entryPoint: transactionInfo.entryPoint,
|
|
30
|
-
|
|
30
|
+
userOperation: owh.userOperation,
|
|
31
31
|
userOperationHash: owh.userOperationHash,
|
|
32
32
|
lastReplaced: Date.now(),
|
|
33
33
|
firstSubmitted: Date.now()
|
|
@@ -40,7 +40,7 @@ export function simulatedOpsToResults(simulatedOps, transactionInfo) {
|
|
|
40
40
|
status: "failure",
|
|
41
41
|
error: {
|
|
42
42
|
entryPoint: transactionInfo.entryPoint,
|
|
43
|
-
userOperation: owh.
|
|
43
|
+
userOperation: owh.userOperation,
|
|
44
44
|
userOpHash: owh.userOperationHash,
|
|
45
45
|
reason: reason
|
|
46
46
|
}
|
|
@@ -52,7 +52,7 @@ export async function filterOpsAndEstimateGas(entryPoint, ep, wallet, ops, nonce
|
|
|
52
52
|
return { owh, reason: undefined };
|
|
53
53
|
});
|
|
54
54
|
let gasLimit;
|
|
55
|
-
const isUserOpV06 = isVersion06(simulatedOps[0].owh.
|
|
55
|
+
const isUserOpV06 = isVersion06(simulatedOps[0].owh.userOperation);
|
|
56
56
|
const gasOptions = onlyPre1559
|
|
57
57
|
? { gasPrice: maxFeePerGas }
|
|
58
58
|
: { maxFeePerGas, maxPriorityFeePerGas };
|
|
@@ -63,7 +63,7 @@ export async function filterOpsAndEstimateGas(entryPoint, ep, wallet, ops, nonce
|
|
|
63
63
|
const opsToSend = simulatedOps
|
|
64
64
|
.filter((op) => op.reason === undefined)
|
|
65
65
|
.map(({ owh }) => {
|
|
66
|
-
const op =
|
|
66
|
+
const op = owh.userOperation;
|
|
67
67
|
return isUserOpV06
|
|
68
68
|
? op
|
|
69
69
|
: toPackedUserOperation(op);
|
|
@@ -114,7 +114,7 @@ export async function filterOpsAndEstimateGas(entryPoint, ep, wallet, ops, nonce
|
|
|
114
114
|
failingOp.reason = `${errorData.reason}${errorData?.inner
|
|
115
115
|
? ` - ${errorData.inner}`
|
|
116
116
|
: ""}`;
|
|
117
|
-
reputationManager.crashedHandleOps(
|
|
117
|
+
reputationManager.crashedHandleOps(failingOp.owh.userOperation, entryPoint, failingOp.reason);
|
|
118
118
|
}
|
|
119
119
|
if (!(failedOpError.success || failedOpWithRevertError.success)) {
|
|
120
120
|
sentry.captureException(err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../executor/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAEH,gBAAgB,EAChB,gBAAgB,EAOhB,mBAAmB,EACnB,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../executor/utils.ts"],"names":[],"mappings":"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"}
|
package/esm/mempool/mempool.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { EventManager } from "../handlers/index.js";
|
|
2
|
-
import { type InterfaceValidator, type
|
|
2
|
+
import { type InterfaceValidator, type ReferencedCodeHashes, type StorageMap, type SubmittedUserOperation, type TransactionInfo, type UserOperation, type UserOperationInfo } from "../types/index.js";
|
|
3
3
|
import type { HexData32 } from "../types/index.js";
|
|
4
4
|
import type { Metrics } from "../utils/index.js";
|
|
5
5
|
import { type Address } from "viem";
|
|
@@ -36,7 +36,7 @@ export declare class MemoryMempool {
|
|
|
36
36
|
paymasters: Set<Address>;
|
|
37
37
|
factories: Set<Address>;
|
|
38
38
|
};
|
|
39
|
-
add(
|
|
39
|
+
add(userOperation: UserOperation, entryPoint: Address, referencedContracts?: ReferencedCodeHashes): [boolean, string];
|
|
40
40
|
shouldSkip(opInfo: UserOperationInfo, paymasterDeposit: {
|
|
41
41
|
[paymaster: string]: bigint;
|
|
42
42
|
}, stakedEntityCount: {
|
package/esm/mempool/mempool.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// import { MongoClient, Collection, Filter } from "mongodb"
|
|
2
2
|
// import { PublicClient, getContract } from "viem"
|
|
3
3
|
// import { EntryPointAbi } from "../types/EntryPoint"
|
|
4
|
-
import { EntryPointV06Abi, EntryPointV07Abi, RpcError, ValidationErrors
|
|
4
|
+
import { EntryPointV06Abi, EntryPointV07Abi, RpcError, ValidationErrors } from "../types/index.js";
|
|
5
5
|
import { getAddressFromInitCodeOrPaymasterAndData, getNonceKeyAndValue, getUserOperationHash, isVersion06, isVersion07 } from "../utils/index.js";
|
|
6
6
|
import { getAddress, getContract } from "viem";
|
|
7
7
|
import { ReputationStatuses } from "./reputationManager.js";
|
|
@@ -110,7 +110,7 @@ export class MemoryMempool {
|
|
|
110
110
|
factories: new Set()
|
|
111
111
|
};
|
|
112
112
|
for (const mempoolOp of allOps) {
|
|
113
|
-
const op =
|
|
113
|
+
const op = mempoolOp.userOperation;
|
|
114
114
|
entities.sender.add(op.sender);
|
|
115
115
|
const isUserOpV06 = isVersion06(op);
|
|
116
116
|
const paymaster = isUserOpV06
|
|
@@ -130,9 +130,8 @@ export class MemoryMempool {
|
|
|
130
130
|
}
|
|
131
131
|
// TODO: add check for adding a userop with conflicting nonce
|
|
132
132
|
// In case of concurrent requests
|
|
133
|
-
add(
|
|
134
|
-
const
|
|
135
|
-
const opHash = getUserOperationHash(op, entryPoint, this.config.publicClient.chain.id);
|
|
133
|
+
add(userOperation, entryPoint, referencedContracts) {
|
|
134
|
+
const opHash = getUserOperationHash(userOperation, entryPoint, this.config.publicClient.chain.id);
|
|
136
135
|
const outstandingOps = [...this.store.dumpOutstanding()];
|
|
137
136
|
const processedOrSubmittedOps = [
|
|
138
137
|
...this.store.dumpProcessing(),
|
|
@@ -148,48 +147,49 @@ export class MemoryMempool {
|
|
|
148
147
|
if (existingUserOperation) {
|
|
149
148
|
return [false, "Already known"];
|
|
150
149
|
}
|
|
151
|
-
if (processedOrSubmittedOps.find((
|
|
152
|
-
const
|
|
153
|
-
return (
|
|
154
|
-
|
|
150
|
+
if (processedOrSubmittedOps.find((opInfo) => {
|
|
151
|
+
const mempoolUserOp = opInfo.userOperation;
|
|
152
|
+
return (mempoolUserOp.sender === userOperation.sender &&
|
|
153
|
+
mempoolUserOp.nonce === userOperation.nonce);
|
|
155
154
|
})) {
|
|
156
155
|
return [
|
|
157
156
|
false,
|
|
158
157
|
"AA25 invalid account nonce: User operation is already in mempool and getting processed with same nonce and sender"
|
|
159
158
|
];
|
|
160
159
|
}
|
|
161
|
-
this.reputationManager.updateUserOperationSeenStatus(
|
|
162
|
-
const oldUserOp = [...outstandingOps, ...processedOrSubmittedOps].find((
|
|
163
|
-
const
|
|
164
|
-
const isSameSender =
|
|
165
|
-
if (isSameSender &&
|
|
160
|
+
this.reputationManager.updateUserOperationSeenStatus(userOperation, entryPoint);
|
|
161
|
+
const oldUserOp = [...outstandingOps, ...processedOrSubmittedOps].find((opInfo) => {
|
|
162
|
+
const mempoolUserOp = opInfo.userOperation;
|
|
163
|
+
const isSameSender = mempoolUserOp.sender === userOperation.sender;
|
|
164
|
+
if (isSameSender &&
|
|
165
|
+
mempoolUserOp.nonce === userOperation.nonce) {
|
|
166
166
|
return true;
|
|
167
167
|
}
|
|
168
168
|
// Check if there is already a userOperation with initCode + same sender (stops rejected ops due to AA10).
|
|
169
|
-
if (isVersion06(
|
|
170
|
-
isVersion06(
|
|
171
|
-
|
|
172
|
-
|
|
169
|
+
if (isVersion06(mempoolUserOp) &&
|
|
170
|
+
isVersion06(userOperation) &&
|
|
171
|
+
userOperation.initCode &&
|
|
172
|
+
userOperation.initCode !== "0x") {
|
|
173
173
|
return (isSameSender &&
|
|
174
|
-
|
|
175
|
-
|
|
174
|
+
mempoolUserOp.initCode &&
|
|
175
|
+
mempoolUserOp.initCode !== "0x");
|
|
176
176
|
}
|
|
177
177
|
// Check if there is already a userOperation with factory + same sender (stops rejected ops due to AA10).
|
|
178
|
-
if (isVersion07(
|
|
179
|
-
isVersion07(
|
|
180
|
-
|
|
181
|
-
|
|
178
|
+
if (isVersion07(mempoolUserOp) &&
|
|
179
|
+
isVersion07(userOperation) &&
|
|
180
|
+
userOperation.factory &&
|
|
181
|
+
userOperation.factory !== "0x") {
|
|
182
182
|
return (isSameSender &&
|
|
183
|
-
|
|
184
|
-
|
|
183
|
+
mempoolUserOp.factory &&
|
|
184
|
+
mempoolUserOp.factory !== "0x");
|
|
185
185
|
}
|
|
186
186
|
return false;
|
|
187
187
|
});
|
|
188
|
-
const isOldUserOpProcessingOrSubmitted = processedOrSubmittedOps.some((
|
|
188
|
+
const isOldUserOpProcessingOrSubmitted = processedOrSubmittedOps.some((submittedOp) => submittedOp.userOperationHash === oldUserOp?.userOperationHash);
|
|
189
189
|
if (oldUserOp) {
|
|
190
|
-
const oldOp =
|
|
190
|
+
const oldOp = oldUserOp.userOperation;
|
|
191
191
|
let reason = "AA10 sender already constructed: A conflicting userOperation with initCode for this sender is already in the mempool. bump the gas price by minimum 10%";
|
|
192
|
-
if (oldOp.nonce ===
|
|
192
|
+
if (oldOp.nonce === userOperation.nonce) {
|
|
193
193
|
reason =
|
|
194
194
|
"AA25 invalid account nonce: User operation already present in mempool, bump the gas price by minimum 10%";
|
|
195
195
|
}
|
|
@@ -198,9 +198,9 @@ export class MemoryMempool {
|
|
|
198
198
|
return [false, reason];
|
|
199
199
|
}
|
|
200
200
|
const oldMaxPriorityFeePerGas = oldOp.maxPriorityFeePerGas;
|
|
201
|
-
const newMaxPriorityFeePerGas =
|
|
201
|
+
const newMaxPriorityFeePerGas = userOperation.maxPriorityFeePerGas;
|
|
202
202
|
const oldMaxFeePerGas = oldOp.maxFeePerGas;
|
|
203
|
-
const newMaxFeePerGas =
|
|
203
|
+
const newMaxFeePerGas = userOperation.maxFeePerGas;
|
|
204
204
|
const incrementMaxPriorityFeePerGas = (oldMaxPriorityFeePerGas * BigInt(10)) / BigInt(100);
|
|
205
205
|
const incrementMaxFeePerGas = (oldMaxFeePerGas * BigInt(10)) / BigInt(100);
|
|
206
206
|
if (newMaxPriorityFeePerGas <
|
|
@@ -214,8 +214,8 @@ export class MemoryMempool {
|
|
|
214
214
|
const parallelUserOperationsCount = this.store
|
|
215
215
|
.dumpOutstanding()
|
|
216
216
|
.filter((userOpInfo) => {
|
|
217
|
-
const userOp =
|
|
218
|
-
return userOp.sender ===
|
|
217
|
+
const userOp = userOpInfo.userOperation;
|
|
218
|
+
return userOp.sender === userOperation.sender;
|
|
219
219
|
}).length;
|
|
220
220
|
if (parallelUserOperationsCount > this.config.mempoolMaxParallelOps) {
|
|
221
221
|
return [
|
|
@@ -224,13 +224,14 @@ export class MemoryMempool {
|
|
|
224
224
|
];
|
|
225
225
|
}
|
|
226
226
|
// Check if mempool already includes max amount of queued user operations
|
|
227
|
-
const [nonceKey] = getNonceKeyAndValue(
|
|
227
|
+
const [nonceKey] = getNonceKeyAndValue(userOperation.nonce);
|
|
228
228
|
const queuedUserOperationsCount = this.store
|
|
229
229
|
.dumpOutstanding()
|
|
230
230
|
.filter((userOpInfo) => {
|
|
231
|
-
const userOp =
|
|
231
|
+
const userOp = userOpInfo.userOperation;
|
|
232
232
|
const [opNonceKey] = getNonceKeyAndValue(userOp.nonce);
|
|
233
|
-
return userOp.sender ===
|
|
233
|
+
return (userOp.sender === userOperation.sender &&
|
|
234
|
+
opNonceKey === nonceKey);
|
|
234
235
|
}).length;
|
|
235
236
|
if (queuedUserOperationsCount > this.config.mempoolMaxQueuedOps) {
|
|
236
237
|
return [
|
|
@@ -239,8 +240,8 @@ export class MemoryMempool {
|
|
|
239
240
|
];
|
|
240
241
|
}
|
|
241
242
|
this.store.addOutstanding({
|
|
242
|
-
|
|
243
|
-
entryPoint
|
|
243
|
+
userOperation,
|
|
244
|
+
entryPoint,
|
|
244
245
|
userOperationHash: opHash,
|
|
245
246
|
firstSubmitted: oldUserOp ? oldUserOp.firstSubmitted : Date.now(),
|
|
246
247
|
lastReplaced: Date.now(),
|
|
@@ -255,7 +256,7 @@ export class MemoryMempool {
|
|
|
255
256
|
}
|
|
256
257
|
// biome-ignore lint/complexity/noExcessiveCognitiveComplexity: <explanation>
|
|
257
258
|
async shouldSkip(opInfo, paymasterDeposit, stakedEntityCount, knownEntities, senders, storageMap) {
|
|
258
|
-
const op =
|
|
259
|
+
const op = opInfo.userOperation;
|
|
259
260
|
if (!this.config.safeMode) {
|
|
260
261
|
return {
|
|
261
262
|
skip: false,
|
|
@@ -430,8 +431,8 @@ export class MemoryMempool {
|
|
|
430
431
|
// Decide the order of the userops based on the sender and nonce
|
|
431
432
|
// If sender is the same, sort by nonce key
|
|
432
433
|
outstandingUserOperations.sort((a, b) => {
|
|
433
|
-
const aUserOp =
|
|
434
|
-
const bUserOp =
|
|
434
|
+
const aUserOp = a.userOperation;
|
|
435
|
+
const bUserOp = b.userOperation;
|
|
435
436
|
if (aUserOp.sender === bUserOp.sender) {
|
|
436
437
|
const [aNonceKey, aNonceValue] = getNonceKeyAndValue(aUserOp.nonce);
|
|
437
438
|
const [bNonceKey, bNonceValue] = getNonceKeyAndValue(bUserOp.nonce);
|
|
@@ -454,7 +455,7 @@ export class MemoryMempool {
|
|
|
454
455
|
let knownEntities = this.getKnownEntities();
|
|
455
456
|
let storageMap = {};
|
|
456
457
|
for (const opInfo of outstandingUserOperations) {
|
|
457
|
-
const op =
|
|
458
|
+
const op = opInfo.userOperation;
|
|
458
459
|
gasUsed += op.callGasLimit + op.verificationGasLimit;
|
|
459
460
|
if (isVersion07(op)) {
|
|
460
461
|
gasUsed +=
|
|
@@ -486,13 +487,13 @@ export class MemoryMempool {
|
|
|
486
487
|
.dumpOutstanding()
|
|
487
488
|
.find((op) => op.userOperationHash === opHash);
|
|
488
489
|
if (outstanding) {
|
|
489
|
-
return
|
|
490
|
+
return outstanding.userOperation;
|
|
490
491
|
}
|
|
491
492
|
const submitted = this.store
|
|
492
493
|
.dumpSubmitted()
|
|
493
494
|
.find((op) => op.userOperation.userOperationHash === opHash);
|
|
494
495
|
if (submitted) {
|
|
495
|
-
return
|
|
496
|
+
return submitted.userOperation.userOperation;
|
|
496
497
|
}
|
|
497
498
|
return null;
|
|
498
499
|
}
|
|
@@ -522,10 +523,10 @@ export class MemoryMempool {
|
|
|
522
523
|
}
|
|
523
524
|
const outstanding = this.store
|
|
524
525
|
.dumpOutstanding()
|
|
525
|
-
.map((
|
|
526
|
-
.filter((
|
|
527
|
-
const [opNonceKey, opNonceValue] = getNonceKeyAndValue(
|
|
528
|
-
return (
|
|
526
|
+
.map(({ userOperation }) => userOperation)
|
|
527
|
+
.filter((mempoolUserOp) => {
|
|
528
|
+
const [opNonceKey, opNonceValue] = getNonceKeyAndValue(mempoolUserOp.nonce);
|
|
529
|
+
return (mempoolUserOp.sender === userOperation.sender &&
|
|
529
530
|
opNonceKey === nonceKey &&
|
|
530
531
|
opNonceValue >= currentNonceValue &&
|
|
531
532
|
opNonceValue < userOperationNonceValue);
|