@pimlico/alto 0.0.0-main.20250325T180358 → 0.0.0-main.20250326T205022
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 -6
- package/esm/cli/config/bundler.js +2 -1
- package/esm/cli/config/bundler.js.map +1 -1
- package/esm/cli/config/options.js +8 -2
- package/esm/cli/config/options.js.map +1 -1
- package/esm/cli/deploySimulationsContract.d.ts +7 -2
- package/esm/cli/deploySimulationsContract.js +56 -19
- package/esm/cli/deploySimulationsContract.js.map +1 -1
- package/esm/cli/handler.js +21 -5
- package/esm/cli/handler.js.map +1 -1
- package/esm/executor/executor.js +1 -1
- package/esm/executor/executor.js.map +1 -1
- package/esm/executor/executorManager.js.map +1 -1
- package/esm/executor/utils.d.ts +1 -1
- package/esm/executor/utils.js +24 -2
- package/esm/executor/utils.js.map +1 -1
- package/esm/mempool/mempool.d.ts +38 -4
- package/esm/mempool/mempool.js +29 -4
- package/esm/mempool/mempool.js.map +1 -1
- package/esm/rpc/createMethodHandler.d.ts +1 -1
- package/esm/rpc/estimation/gasEstimationsV07.d.ts +5 -4
- package/esm/rpc/estimation/gasEstimationsV07.js +78 -31
- package/esm/rpc/estimation/gasEstimationsV07.js.map +1 -1
- package/esm/rpc/methods/debug_bundler_dumpMempool.d.ts +373 -44
- package/esm/rpc/methods/debug_bundler_getStakeStatus.js +11 -3
- package/esm/rpc/methods/debug_bundler_getStakeStatus.js.map +1 -1
- package/esm/rpc/methods/eth_estimateUserOperationGas.d.ts +686 -94
- package/esm/rpc/methods/eth_getUserOperationByHash.d.ts +671 -78
- package/esm/rpc/methods/eth_sendUserOperation.d.ts +336 -40
- package/esm/rpc/methods/eth_sendUserOperation.js +6 -1
- package/esm/rpc/methods/eth_sendUserOperation.js.map +1 -1
- package/esm/rpc/methods/pimlico_sendUserOperationNow.d.ts +336 -40
- package/esm/rpc/methods/pimlico_sendUserOperationNow.js +12 -2
- package/esm/rpc/methods/pimlico_sendUserOperationNow.js.map +1 -1
- package/esm/rpc/rpcHandler.js +20 -4
- package/esm/rpc/rpcHandler.js.map +1 -1
- package/esm/rpc/validation/SafeValidator.js +5 -2
- package/esm/rpc/validation/SafeValidator.js.map +1 -1
- package/esm/rpc/validation/TracerResultParserV07.js +42 -20
- package/esm/rpc/validation/TracerResultParserV07.js.map +1 -1
- package/esm/store/createMemoryOutstandingStore.js +12 -2
- package/esm/store/createMemoryOutstandingStore.js.map +1 -1
- package/esm/store/createMempoolStore.js +10 -8
- package/esm/store/createMempoolStore.js.map +1 -1
- package/esm/types/contracts/PimlicoEntryPointSimulations.d.ts +2 -1
- package/esm/types/contracts/PimlicoEntryPointSimulations.js +2 -1
- package/esm/types/contracts/PimlicoEntryPointSimulations.js.map +1 -1
- package/esm/types/schemas.d.ts +11240 -5385
- package/esm/types/schemas.js +90 -8
- package/esm/types/schemas.js.map +1 -1
- package/esm/utils/userop.d.ts +23 -3
- package/esm/utils/userop.js +85 -7
- package/esm/utils/userop.js.map +1 -1
- package/lib/cli/config/bundler.d.ts +12 -6
- package/lib/cli/config/bundler.js +2 -1
- package/lib/cli/config/bundler.js.map +1 -1
- package/lib/cli/config/options.js +8 -2
- package/lib/cli/config/options.js.map +1 -1
- package/lib/cli/deploySimulationsContract.d.ts +7 -2
- package/lib/cli/deploySimulationsContract.js +55 -18
- package/lib/cli/deploySimulationsContract.js.map +1 -1
- package/lib/cli/handler.js +21 -5
- package/lib/cli/handler.js.map +1 -1
- package/lib/executor/executor.js +1 -1
- package/lib/executor/executor.js.map +1 -1
- package/lib/executor/executorManager.js.map +1 -1
- package/lib/executor/utils.d.ts +1 -1
- package/lib/executor/utils.js +23 -1
- package/lib/executor/utils.js.map +1 -1
- package/lib/mempool/mempool.d.ts +38 -4
- package/lib/mempool/mempool.js +29 -4
- package/lib/mempool/mempool.js.map +1 -1
- package/lib/rpc/createMethodHandler.d.ts +1 -1
- package/lib/rpc/estimation/gasEstimationsV07.d.ts +5 -4
- package/lib/rpc/estimation/gasEstimationsV07.js +77 -30
- package/lib/rpc/estimation/gasEstimationsV07.js.map +1 -1
- package/lib/rpc/methods/debug_bundler_dumpMempool.d.ts +373 -44
- package/lib/rpc/methods/debug_bundler_getStakeStatus.js +10 -2
- package/lib/rpc/methods/debug_bundler_getStakeStatus.js.map +1 -1
- package/lib/rpc/methods/eth_estimateUserOperationGas.d.ts +686 -94
- package/lib/rpc/methods/eth_getUserOperationByHash.d.ts +671 -78
- package/lib/rpc/methods/eth_sendUserOperation.d.ts +336 -40
- package/lib/rpc/methods/eth_sendUserOperation.js +6 -1
- package/lib/rpc/methods/eth_sendUserOperation.js.map +1 -1
- package/lib/rpc/methods/pimlico_sendUserOperationNow.d.ts +336 -40
- package/lib/rpc/methods/pimlico_sendUserOperationNow.js +12 -2
- package/lib/rpc/methods/pimlico_sendUserOperationNow.js.map +1 -1
- package/lib/rpc/rpcHandler.js +20 -4
- package/lib/rpc/rpcHandler.js.map +1 -1
- package/lib/rpc/validation/SafeValidator.js +4 -1
- package/lib/rpc/validation/SafeValidator.js.map +1 -1
- package/lib/rpc/validation/TracerResultParserV07.js +41 -19
- package/lib/rpc/validation/TracerResultParserV07.js.map +1 -1
- package/lib/store/createMemoryOutstandingStore.js +12 -2
- package/lib/store/createMemoryOutstandingStore.js.map +1 -1
- package/lib/store/createMempoolStore.js +10 -8
- package/lib/store/createMempoolStore.js.map +1 -1
- package/lib/types/contracts/PimlicoEntryPointSimulations.d.ts +2 -1
- package/lib/types/contracts/PimlicoEntryPointSimulations.js +3 -2
- package/lib/types/contracts/PimlicoEntryPointSimulations.js.map +1 -1
- package/lib/types/schemas.d.ts +11240 -5385
- package/lib/types/schemas.js +90 -8
- package/lib/types/schemas.js.map +1 -1
- package/lib/utils/userop.d.ts +23 -3
- package/lib/utils/userop.js +87 -7
- package/lib/utils/userop.js.map +1 -1
- package/package.json +2 -2
|
@@ -10,12 +10,22 @@ export const pimlicoSendUserOperationNowHandler = createMethodHandler({
|
|
|
10
10
|
}
|
|
11
11
|
const [userOperation, entryPoint] = params;
|
|
12
12
|
rpcHandler.ensureEntryPointIsSupported(entryPoint);
|
|
13
|
-
const opHash = getUserOperationHash(
|
|
13
|
+
const opHash = await getUserOperationHash({
|
|
14
|
+
userOperation: userOperation,
|
|
15
|
+
entryPointAddress: entryPoint,
|
|
16
|
+
chainId: rpcHandler.config.chainId,
|
|
17
|
+
publicClient: rpcHandler.config.publicClient
|
|
18
|
+
});
|
|
14
19
|
await rpcHandler.preMempoolChecks(opHash, userOperation, apiVersion, entryPoint);
|
|
15
20
|
// Prepare bundle
|
|
16
21
|
const userOperationInfo = {
|
|
17
22
|
userOp: userOperation,
|
|
18
|
-
userOpHash: getUserOperationHash(
|
|
23
|
+
userOpHash: await getUserOperationHash({
|
|
24
|
+
userOperation: userOperation,
|
|
25
|
+
entryPointAddress: entryPoint,
|
|
26
|
+
chainId: rpcHandler.config.chainId,
|
|
27
|
+
publicClient: rpcHandler.config.publicClient
|
|
28
|
+
}),
|
|
19
29
|
addedToMempool: Date.now()
|
|
20
30
|
};
|
|
21
31
|
const bundle = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pimlico_sendUserOperationNow.js","sourceRoot":"","sources":["../../../rpc/methods/pimlico_sendUserOperationNow.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,oBAAoB,EACpB,WAAW,EACX,yBAAyB,EAC5B,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EACH,QAAQ,EAGR,gBAAgB,EAChB,iCAAiC,EACpC,MAAM,aAAa,CAAA;AAEpB,MAAM,CAAC,MAAM,kCAAkC,GAAG,mBAAmB,CAAC;IAClE,MAAM,EAAE,8BAA8B;IACtC,MAAM,EAAE,iCAAiC;IACzC,OAAO,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE;QAClD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,6BAA6B,EAAE,CAAC;YACnD,MAAM,IAAI,QAAQ,CACd,sDAAsD,EACtD,gBAAgB,CAAC,aAAa,CACjC,CAAA;QACL,CAAC;QAED,MAAM,CAAC,aAAa,EAAE,UAAU,CAAC,GAAG,MAAM,CAAA;QAE1C,UAAU,CAAC,2BAA2B,CAAC,UAAU,CAAC,CAAA;QAClD,MAAM,MAAM,GAAG,oBAAoB,
|
|
1
|
+
{"version":3,"file":"pimlico_sendUserOperationNow.js","sourceRoot":"","sources":["../../../rpc/methods/pimlico_sendUserOperationNow.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,oBAAoB,EACpB,WAAW,EACX,yBAAyB,EAC5B,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EACH,QAAQ,EAGR,gBAAgB,EAChB,iCAAiC,EACpC,MAAM,aAAa,CAAA;AAEpB,MAAM,CAAC,MAAM,kCAAkC,GAAG,mBAAmB,CAAC;IAClE,MAAM,EAAE,8BAA8B;IACtC,MAAM,EAAE,iCAAiC;IACzC,OAAO,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE;QAClD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,6BAA6B,EAAE,CAAC;YACnD,MAAM,IAAI,QAAQ,CACd,sDAAsD,EACtD,gBAAgB,CAAC,aAAa,CACjC,CAAA;QACL,CAAC;QAED,MAAM,CAAC,aAAa,EAAE,UAAU,CAAC,GAAG,MAAM,CAAA;QAE1C,UAAU,CAAC,2BAA2B,CAAC,UAAU,CAAC,CAAA;QAClD,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC;YACtC,aAAa,EAAE,aAAa;YAC5B,iBAAiB,EAAE,UAAU;YAC7B,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO;YAClC,YAAY,EAAE,UAAU,CAAC,MAAM,CAAC,YAAY;SAC/C,CAAC,CAAA;QAEF,MAAM,UAAU,CAAC,gBAAgB,CAC7B,MAAM,EACN,aAAa,EACb,UAAU,EACV,UAAU,CACb,CAAA;QAED,iBAAiB;QACjB,MAAM,iBAAiB,GAAe;YAClC,MAAM,EAAE,aAAa;YACrB,UAAU,EAAE,MAAM,oBAAoB,CAAC;gBACnC,aAAa,EAAE,aAAa;gBAC5B,iBAAiB,EAAE,UAAU;gBAC7B,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO;gBAClC,YAAY,EAAE,UAAU,CAAC,MAAM,CAAC,YAAY;aAC/C,CAAC;YACF,cAAc,EAAE,IAAI,CAAC,GAAG,EAAE;SAC7B,CAAA;QACD,MAAM,MAAM,GAAwB;YAChC,UAAU;YACV,OAAO,EAAE,CAAC,iBAAiB,CAAC;YAC5B,OAAO,EAAE,WAAW,CAAC,aAAa,CAAC;gBAC/B,CAAC,CAAE,KAAe;gBAClB,CAAC,CAAE,KAAe;SACzB,CAAA;QACD,MAAM,MAAM,GACR,MAAM,UAAU,CAAC,eAAe,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAA;QAEjE,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,QAAQ,CACd,0CAA0C,EAC1C,gBAAgB,CAAC,aAAa,CACjC,CAAA;QACL,CAAC;QAED,oBAAoB;QACpB,MAAM,OAAO,GACT,MAAM,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,yBAAyB,CAAC;YAC3D,IAAI,EAAE,MAAM;YACZ,eAAe,EAAE,GAAG;SACvB,CAAC,CAAA;QAEN,OAAO,yBAAyB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrD,CAAC;CACJ,CAAC,CAAA"}
|
package/esm/rpc/rpcHandler.js
CHANGED
|
@@ -2,8 +2,8 @@ import { EntryPointV06Abi, EntryPointV07Abi, RpcError, ValidationErrors } from "
|
|
|
2
2
|
import { calcPreVerificationGas, calcVerificationGasAndCallGasLimit, deepHexlify, getAAError, getNonceKeyAndSequence, getUserOperationHash, isVersion06, isVersion07, maxBigInt, scaleBigIntByPercent } from "../utils/index.js";
|
|
3
3
|
import { getContract } from "viem";
|
|
4
4
|
import { base, baseSepolia, optimism } from "viem/chains";
|
|
5
|
-
import { recoverAuthorizationAddress } from "viem/experimental";
|
|
6
5
|
import { registerHandlers } from "./methods/index.js";
|
|
6
|
+
import { recoverAuthorizationAddress } from "viem/experimental";
|
|
7
7
|
export class RpcHandler {
|
|
8
8
|
config;
|
|
9
9
|
validator;
|
|
@@ -103,7 +103,12 @@ export class RpcHandler {
|
|
|
103
103
|
// check if we want to bundle userOperation. If yes, add to mempool
|
|
104
104
|
async addToMempoolIfValid(userOperation, entryPoint, apiVersion) {
|
|
105
105
|
this.ensureEntryPointIsSupported(entryPoint);
|
|
106
|
-
const opHash = getUserOperationHash(
|
|
106
|
+
const opHash = await getUserOperationHash({
|
|
107
|
+
userOperation: userOperation,
|
|
108
|
+
entryPointAddress: entryPoint,
|
|
109
|
+
chainId: this.config.chainId,
|
|
110
|
+
publicClient: this.config.publicClient
|
|
111
|
+
});
|
|
107
112
|
await this.preMempoolChecks(opHash, userOperation, apiVersion, entryPoint);
|
|
108
113
|
const currentNonceValue = await this.getNonceValue(userOperation, entryPoint);
|
|
109
114
|
const [, userOperationNonceValue] = getNonceKeyAndSequence(userOperation.nonce);
|
|
@@ -179,6 +184,16 @@ export class RpcHandler {
|
|
|
179
184
|
}
|
|
180
185
|
})
|
|
181
186
|
: userOperation.sender;
|
|
187
|
+
const nonceOnChain = await this.config.publicClient.getTransactionCount({
|
|
188
|
+
address: sender
|
|
189
|
+
});
|
|
190
|
+
if (userOperation.eip7702Auth.chainId !== this.config.chainId &&
|
|
191
|
+
userOperation.eip7702Auth.chainId !== 0) {
|
|
192
|
+
throw new RpcError("Invalid EIP-7702 authorization: The chainId does not match the userOperation sender address", ValidationErrors.InvalidFields);
|
|
193
|
+
}
|
|
194
|
+
if (nonceOnChain !== userOperation.eip7702Auth.nonce) {
|
|
195
|
+
throw new RpcError("Invalid EIP-7702 authorization: The nonce does not match the userOperation sender address", ValidationErrors.SimulateValidation);
|
|
196
|
+
}
|
|
182
197
|
if (sender !== userOperation.sender) {
|
|
183
198
|
throw new RpcError("Invalid EIP-7702 authorization: The recovered signer address does not match the userOperation sender address", ValidationErrors.InvalidFields);
|
|
184
199
|
}
|
|
@@ -186,8 +201,9 @@ export class RpcHandler {
|
|
|
186
201
|
throw new RpcError("Invalid EIP-7702 authorization: UserOperation cannot contain initCode.", ValidationErrors.InvalidFields);
|
|
187
202
|
}
|
|
188
203
|
if (isVersion07(userOperation) &&
|
|
189
|
-
|
|
190
|
-
|
|
204
|
+
userOperation.factory !== "0x7702" &&
|
|
205
|
+
userOperation.factory !== null) {
|
|
206
|
+
throw new RpcError("Invalid EIP-7702 authorization: UserOperation cannot contain factory that is neither null or 0x7702.", ValidationErrors.InvalidFields);
|
|
191
207
|
}
|
|
192
208
|
}
|
|
193
209
|
async getNonceValue(userOperation, entryPoint) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpcHandler.js","sourceRoot":"","sources":["../../rpc/rpcHandler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"rpcHandler.js","sourceRoot":"","sources":["../../rpc/rpcHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { CodeHashGetterAbi, CodeHashGetterBytecode, EntryPointV06Abi, EntryPointV07SimulationsAbi, PimlicoEntryPointSimulationsAbi, RpcError, ValidationErrors } from "../../types/index.js";
|
|
2
|
-
import { getAuthorizationStateOverrides, calcVerificationGasAndCallGasLimit, getAddressFromInitCodeOrPaymasterAndData, isVersion06, isVersion07, toPackedUserOperation } from "../../utils/index.js";
|
|
2
|
+
import { getAuthorizationStateOverrides, calcVerificationGasAndCallGasLimit, getAddressFromInitCodeOrPaymasterAndData, isVersion06, isVersion07, toPackedUserOperation, isVersion08 } from "../../utils/index.js";
|
|
3
3
|
import { decodeErrorResult, encodeDeployData, encodeFunctionData, zeroAddress } from "viem";
|
|
4
4
|
import { getSimulateValidationResult } from "../estimation/gasEstimationsV07.js";
|
|
5
5
|
import { bundlerCollectorTracer } from "./BundlerCollectorTracerV07.js";
|
|
@@ -264,7 +264,10 @@ export class SafeValidator extends UnsafeValidator {
|
|
|
264
264
|
functionName: "simulateEntryPoint",
|
|
265
265
|
args: [entryPoint, [entryPointSimulationsCallData]]
|
|
266
266
|
});
|
|
267
|
-
const
|
|
267
|
+
const isV8 = isVersion08(userOperation, entryPoint);
|
|
268
|
+
const entryPointSimulationsAddress = isV8
|
|
269
|
+
? this.config.entrypointSimulationContractV8
|
|
270
|
+
: this.config.entrypointSimulationContractV7;
|
|
268
271
|
const stateOverrides = await getAuthorizationStateOverrides({
|
|
269
272
|
userOperations: [userOperation],
|
|
270
273
|
publicClient: this.config.publicClient
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SafeValidator.js","sourceRoot":"","sources":["../../../rpc/validation/SafeValidator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"SafeValidator.js","sourceRoot":"","sources":["../../../rpc/validation/SafeValidator.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { EntryPointV07Abi, PaymasterAbi, RpcError, SenderCreatorAbi, ValidationE
|
|
|
3
3
|
// where xxx is OP/STO/COD/EP/SREP/EREP/UREP/ALT, and ### is a number
|
|
4
4
|
// the validation rules are defined in erc-aa-validation.md
|
|
5
5
|
import { decodeErrorResult, decodeFunctionResult, hexToBigInt, keccak256, pad, toFunctionSelector } from "viem";
|
|
6
|
-
import { areAddressesEqual } from "../../utils/index.js";
|
|
6
|
+
import { areAddressesEqual, isVersion08 } from "../../utils/index.js";
|
|
7
7
|
const abi = [...SenderCreatorAbi, ...EntryPointV07Abi, ...PaymasterAbi];
|
|
8
8
|
// biome-ignore lint/suspicious/noExplicitAny: it's a generic type
|
|
9
9
|
const functionSignatureToMethodName = (hash) => {
|
|
@@ -344,24 +344,42 @@ const callsFromEntryPointMethodSigs = {
|
|
|
344
344
|
export function tracerResultParserV07(userOperation, tracerResults, validationResult, entryPointAddress) {
|
|
345
345
|
// todo: block access to no-code addresses (might need update to tracer)
|
|
346
346
|
// opcodes from [OP-011]
|
|
347
|
-
const bannedOpCodes =
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
347
|
+
const bannedOpCodes = isVersion08(userOperation, entryPointAddress)
|
|
348
|
+
? new Set([
|
|
349
|
+
"GAS",
|
|
350
|
+
"NUMBER",
|
|
351
|
+
"TIMESTAMP",
|
|
352
|
+
"COINBASE",
|
|
353
|
+
"DIFFICULTY",
|
|
354
|
+
"BASEFEE",
|
|
355
|
+
"GASLIMIT",
|
|
356
|
+
"GASPRICE",
|
|
357
|
+
"SELFBALANCE",
|
|
358
|
+
"BALANCE",
|
|
359
|
+
"ORIGIN",
|
|
360
|
+
"BLOCKHASH",
|
|
361
|
+
"SELFDESTRUCT",
|
|
362
|
+
"BLOBHASH",
|
|
363
|
+
"BLOBBASEFEE"
|
|
364
|
+
])
|
|
365
|
+
: new Set([
|
|
366
|
+
"GASPRICE",
|
|
367
|
+
"GASLIMIT",
|
|
368
|
+
"DIFFICULTY",
|
|
369
|
+
"TIMESTAMP",
|
|
370
|
+
"BASEFEE",
|
|
371
|
+
"BLOCKHASH",
|
|
372
|
+
"NUMBER",
|
|
373
|
+
"ORIGIN",
|
|
374
|
+
"GAS",
|
|
375
|
+
"COINBASE",
|
|
376
|
+
"SELFDESTRUCT",
|
|
377
|
+
"RANDOM",
|
|
378
|
+
"PREVRANDAO",
|
|
379
|
+
"INVALID",
|
|
380
|
+
"SELFBALANCE",
|
|
381
|
+
"BALANCE"
|
|
382
|
+
]);
|
|
365
383
|
// eslint-disable-next-line @typescript-eslint/no-base-to-string
|
|
366
384
|
if (Object.values(tracerResults.callsFromEntryPoint).length < 1) {
|
|
367
385
|
throw new Error("Unexpected traceCall result: no calls from entrypoint.");
|
|
@@ -418,12 +436,16 @@ export function tracerResultParserV07(userOperation, tracerResults, validationRe
|
|
|
418
436
|
}
|
|
419
437
|
}
|
|
420
438
|
const createOpcode = (opcodes.CREATE2 ?? 0) + (opcodes.CREATE ?? 0);
|
|
439
|
+
const create2Opcode = opcodes.CREATE2 ?? 0;
|
|
421
440
|
if (isCreateOpcodeUsed && createOpcode > 1) {
|
|
422
441
|
throw new RpcError(`${entityTitle} uses banned opcode: CREATE2`, ValidationErrors.OpcodeValidation);
|
|
423
442
|
}
|
|
424
443
|
// [OP-031]
|
|
425
444
|
if (entityTitle === "factory") {
|
|
426
|
-
if ((createOpcode ?? 0) >
|
|
445
|
+
if ((createOpcode ?? 0) > 2) {
|
|
446
|
+
throw new RpcError(`${entityTitle} with too many CREATE2`, ValidationErrors.OpcodeValidation);
|
|
447
|
+
}
|
|
448
|
+
if ((create2Opcode ?? 0) >= 2) {
|
|
427
449
|
throw new RpcError(`${entityTitle} with too many CREATE2`, ValidationErrors.OpcodeValidation);
|
|
428
450
|
}
|
|
429
451
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TracerResultParserV07.js","sourceRoot":"","sources":["../../../rpc/validation/TracerResultParserV07.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"TracerResultParserV07.js","sourceRoot":"","sources":["../../../rpc/validation/TracerResultParserV07.ts"],"names":[],"mappings":"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"}
|
|
@@ -160,11 +160,21 @@ export class MemoryOutstanding {
|
|
|
160
160
|
const outstanding = outstandingOps.filter((userOpInfo) => {
|
|
161
161
|
const { userOp: mempoolUserOp } = userOpInfo;
|
|
162
162
|
const [mempoolNonceKey, mempoolNonceSequence] = getNonceKeyAndSequence(mempoolUserOp.nonce);
|
|
163
|
+
let isPaymasterSame = false;
|
|
164
|
+
if (isVersion07(userOp) && isVersion07(mempoolUserOp)) {
|
|
165
|
+
isPaymasterSame =
|
|
166
|
+
mempoolUserOp.paymaster === userOp.paymaster &&
|
|
167
|
+
!(mempoolUserOp.sender === userOp.sender &&
|
|
168
|
+
mempoolNonceKey === nonceKey &&
|
|
169
|
+
mempoolNonceSequence === nonceSequence) &&
|
|
170
|
+
userOp.paymaster !== null;
|
|
171
|
+
}
|
|
163
172
|
// Filter operations with the same sender and nonce key
|
|
164
173
|
// but with a lower nonce sequence
|
|
165
|
-
return (mempoolUserOp.sender === userOp.sender &&
|
|
174
|
+
return ((mempoolUserOp.sender === userOp.sender &&
|
|
166
175
|
mempoolNonceKey === nonceKey &&
|
|
167
|
-
mempoolNonceSequence < nonceSequence)
|
|
176
|
+
mempoolNonceSequence < nonceSequence) ||
|
|
177
|
+
isPaymasterSame);
|
|
168
178
|
});
|
|
169
179
|
return outstanding
|
|
170
180
|
.sort((a, b) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createMemoryOutstandingStore.js","sourceRoot":"","sources":["../../store/createMemoryOutstandingStore.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"createMemoryOutstandingStore.js","sourceRoot":"","sources":["../../store/createMemoryOutstandingStore.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,sBAAsB,EACtB,WAAW,EACX,WAAW,EACd,MAAM,iBAAiB,CAAA;AAMxB,MAAM,eAAe,GAAG,CAAC,MAAqB,EAAE,EAAE;IAC9C,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;IAC5B,MAAM,CAAC,QAAQ,CAAC,GAAG,sBAAsB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACvD,OAAO,GAAG,MAAM,IAAI,QAAQ,EAAE,CAAA;AAClC,CAAC,CAAA;AAED,MAAM,OAAO,iBAAiB;IAKN;IAJZ,UAAU,GAA8B,IAAI,GAAG,EAAE,CAAA;IACjD,aAAa,GAAiB,EAAE,CAAA;IAChC,MAAM,CAAQ;IAEtB,YAAoB,MAAkB;QAAlB,WAAM,GAAN,MAAM,CAAY;QAClC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAC1B,EAAE,MAAM,EAAE,0BAA0B,EAAE,EACtC;YACI,KAAK,EAAE,MAAM,CAAC,QAAQ;SACzB,CACJ,CAAA;IACL,CAAC;IAEO,IAAI;QACR,OAAO,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;IAC3D,CAAC;IAED,2DAA2D;IACnD,kBAAkB,CAAC,UAAsB;QAC7C,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACnC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YAC7B,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAA;YACxB,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAA;YACxB,OAAO,MAAM,CAAC,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;QAC9D,CAAC,CAAC,CAAA;IACN,CAAC;IAED,mBAAmB,CAAC,MAAqB;QACrC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;QAElC,MAAM,2BAA2B,GAAG,cAAc,CAAC,MAAM,CACrD,CAAC,UAAU,EAAE,EAAE;YACX,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,UAAU,CAAA;YAC5C,OAAO,aAAa,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,CAAA;QACjD,CAAC,CACJ,CAAC,MAAM,CAAA;QAER,IAAI,2BAA2B,GAAG,IAAI,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC;YAClE,OAAO,KAAK,CAAA;QAChB,CAAC;QAED,OAAO,IAAI,CAAA;IACf,CAAC;IAED,qBAAqB,CAAC,MAAqB;QACvC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;QAElC,MAAM,CAAC,QAAQ,CAAC,GAAG,sBAAsB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACvD,MAAM,yBAAyB,GAAG,cAAc,CAAC,MAAM,CACnD,CAAC,UAAU,EAAE,EAAE;YACX,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,UAAU,CAAA;YAC5C,MAAM,CAAC,UAAU,CAAC,GAAG,sBAAsB,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;YAEhE,OAAO,CACH,aAAa,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM;gBACtC,UAAU,KAAK,QAAQ,CAC1B,CAAA;QACL,CAAC,CACJ,CAAC,MAAM,CAAA;QAER,IAAI,yBAAyB,GAAG,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE,CAAC;YAC9D,OAAO,KAAK,CAAA;QAChB,CAAC;QAED,OAAO,IAAI,CAAA;IACf,CAAC;IAED,KAAK,CAAC,cAAc,CAChB,MAAqB;QAErB,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;QAElC,IAAI,iBAAiB,GAA+B,SAAS,CAAA;QAE7D,KAAK,MAAM,UAAU,IAAI,cAAc,EAAE,CAAC;YACtC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,UAAU,CAAA;YAE5C,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,CAAA;YAC3D,IAAI,YAAY,IAAI,aAAa,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,EAAE,CAAC;gBACvD,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;gBAClC,iBAAiB,GAAG;oBAChB,MAAM,EAAE,mBAAmB;oBAC3B,UAAU;iBACb,CAAA;gBACD,MAAK;YACT,CAAC;YAED,MAAM,yBAAyB,GAC3B,WAAW,CAAC,MAAM,CAAC;gBACnB,WAAW,CAAC,aAAa,CAAC;gBAC1B,MAAM,CAAC,QAAQ;gBACf,MAAM,CAAC,QAAQ,KAAK,IAAI;gBACxB,aAAa,CAAC,QAAQ;gBACtB,aAAa,CAAC,QAAQ,KAAK,IAAI;gBAC/B,YAAY,CAAA;YAEhB,MAAM,yBAAyB,GAC3B,WAAW,CAAC,MAAM,CAAC;gBACnB,WAAW,CAAC,aAAa,CAAC;gBAC1B,MAAM,CAAC,OAAO;gBACd,MAAM,CAAC,OAAO,KAAK,IAAI;gBACvB,aAAa,CAAC,OAAO;gBACrB,aAAa,CAAC,OAAO,KAAK,IAAI;gBAC9B,YAAY,CAAA;YAEhB,MAAM,uBAAuB,GACzB,yBAAyB,IAAI,yBAAyB,CAAA;YAE1D,IAAI,uBAAuB,EAAE,CAAC;gBAC1B,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;gBAClC,iBAAiB,GAAG;oBAChB,MAAM,EAAE,wBAAwB;oBAChC,UAAU;iBACb,CAAA;gBACD,MAAK;YACT,CAAC;QACL,CAAC;QAED,OAAO,iBAAiB,CAAA;IAC5B,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,UAAqB;QAChC,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC;YACjD,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,KAAK,UAAU,CAAC,EAAE,CAAC;gBAC7D,OAAO,IAAI,CAAA;YACf,CAAC;QACL,CAAC;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IAED,KAAK,CAAC,IAAI;QACN,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClC,OAAO,SAAS,CAAA;QACpB,CAAC;QAED,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;IAChC,CAAC;IAED,KAAK,CAAC,GAAG;QACL,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAA;QAE7C,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,OAAO,SAAS,CAAA;QACpB,CAAC;QAED,MAAM,cAAc,GAAG,eAAe,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QACzD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QAEtD,2BAA2B;QAC3B,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;QAC3D,CAAC;QAED,wDAAwD;QACxD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;QAC1C,CAAC;QAED,WAAW;QACX,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;QAC1C,CAAC;QAED,OAAO,UAAU,CAAA;IACrB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,UAAsB;QAC5B,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,UAAU,CAAA;QACzC,MAAM,CAAC,QAAQ,CAAC,GAAG,sBAAsB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACvD,MAAM,cAAc,GAAG,eAAe,CAAC,MAAM,CAAC,CAAA;QAE9C,MAAM,UAAU,GACZ,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,cAAc,CAAC;YACnC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,cAAc,CAAE,CAAA;QAEhE,4FAA4F;QAC5F,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAE3B,UAAU;aACL,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC;aACxB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACX,MAAM,CAAC,EAAE,SAAS,CAAC,GAAG,sBAAsB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;YACrD,MAAM,CAAC,EAAE,SAAS,CAAC,GAAG,sBAAsB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;YACrD,OAAO,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,CAAA;QAChD,CAAC,CAAC,CAAA;QAEN,MAAM,gBAAgB,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;QAEjD,+GAA+G;QAC/G,IAAI,gBAAgB,KAAK,UAAU,EAAE,CAAC;YAClC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE;gBAC1D,MAAM,aAAa,GAAG,UAAU,CAAC,MAAM,CAAA;gBACvC,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,CAAA;gBAC3D,MAAM,cAAc,GAChB,sBAAsB,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAA;gBAE/D,OAAO,CAAC,CAAC,YAAY,IAAI,cAAc,CAAC,CAAA;YAC5C,CAAC,CAAC,CAAA;YAEF,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAA;QACvC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,MAAqB;QACxC,MAAM,CAAC,QAAQ,EAAE,aAAa,CAAC,GAAG,sBAAsB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAEtE,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;QAClC,MAAM,WAAW,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE;YACrD,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,UAAU,CAAA;YAE5C,MAAM,CAAC,eAAe,EAAE,oBAAoB,CAAC,GACzC,sBAAsB,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;YAE/C,IAAI,eAAe,GAAG,KAAK,CAAA;YAE3B,IAAI,WAAW,CAAC,MAAM,CAAC,IAAI,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC;gBACpD,eAAe;oBACX,aAAa,CAAC,SAAS,KAAK,MAAM,CAAC,SAAS;wBAC5C,CAAC,CACG,aAAa,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM;4BACtC,eAAe,KAAK,QAAQ;4BAC5B,oBAAoB,KAAK,aAAa,CACzC;wBACD,MAAM,CAAC,SAAS,KAAK,IAAI,CAAA;YACjC,CAAC;YAED,uDAAuD;YACvD,kCAAkC;YAClC,OAAO,CACH,CAAC,aAAa,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM;gBACnC,eAAe,KAAK,QAAQ;gBAC5B,oBAAoB,GAAG,aAAa,CAAC;gBACzC,eAAe,CAClB,CAAA;QACL,CAAC,CAAC,CAAA;QAEF,OAAO,WAAW;aACb,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACX,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAA;YACxB,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAA;YAExB,MAAM,CAAC,EAAE,WAAW,CAAC,GAAG,sBAAsB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;YAC7D,MAAM,CAAC,EAAE,WAAW,CAAC,GAAG,sBAAsB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;YAE7D,OAAO,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC,CAAA;QAC5C,CAAC,CAAC;aACD,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;IAC/C,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,UAAqB;QAC9B,MAAM,kBAAkB,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CACnD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,KAAK,UAAU,CAC3C,CAAA;QAED,IAAI,kBAAkB,KAAK,CAAC,CAAC,EAAE,CAAC;YAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,mDAAmD,CACtD,CAAA;YACD,OAAO,KAAK,CAAA;QAChB,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAA;QACzD,MAAM,cAAc,GAAG,eAAe,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QAEzD,6BAA6B;QAC7B,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAA;QAEhD,mCAAmC;QACnC,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QACtD,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CACX,qDAAqD,UAAU,EAAE,CACpE,CAAA;QACL,CAAC;QAED,MAAM,YAAY,GAAG,UAAU,CAAC,SAAS,CACrC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,KAAK,UAAU,CAC3C,CAAA;QAED,IAAI,YAAY,KAAK,CAAC,CAAC,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CACX,2BAA2B,UAAU,uBAAuB,CAC/D,CAAA;QACL,CAAC;QAED,UAAU,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,CAAA;QAElC,qEAAqE;QACrE,oDAAoD;QACpD,IAAI,YAAY,KAAK,CAAC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9C,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;QAC1C,CAAC;QAED,OAAO,IAAI,CAAA;IACf,CAAC;IAED,KAAK,CAAC,SAAS;QACX,OAAO,IAAI,CAAC,IAAI,EAAE,CAAA;IACtB,CAAC;IAED,KAAK,CAAC,KAAK;QACP,IAAI,CAAC,aAAa,GAAG,EAAE,CAAA;QACvB,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAA;IAC3B,CAAC;IAED,+EAA+E;IAC/E,KAAK,CAAC,eAAe,CACjB,MAAqB;QAErB,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;IACtC,CAAC;CACJ;AAED,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,EACzC,MAAM,EACe,EAAoB,EAAE;IAC3C,OAAO,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAA;AACxC,CAAC,CAAA"}
|
|
@@ -87,15 +87,17 @@ export const createMempoolStore = ({ config, metrics }) => {
|
|
|
87
87
|
logAddOperation(userOpInfo.userOpHash, "outstanding");
|
|
88
88
|
await outstanding.add(userOpInfo);
|
|
89
89
|
},
|
|
90
|
-
addProcessing:
|
|
90
|
+
addProcessing: ({ entryPoint, userOpInfo }) => {
|
|
91
91
|
const { processing } = getStoreHandlers(entryPoint);
|
|
92
92
|
logAddOperation(userOpInfo.userOpHash, "processing");
|
|
93
93
|
processing.add(userOpInfo);
|
|
94
|
+
return Promise.resolve();
|
|
94
95
|
},
|
|
95
|
-
addSubmitted:
|
|
96
|
+
addSubmitted: ({ entryPoint, submittedUserOp }) => {
|
|
96
97
|
const { submitted } = getStoreHandlers(entryPoint);
|
|
97
98
|
logAddOperation(submittedUserOp.userOpHash, "submitted");
|
|
98
99
|
submitted.add(submittedUserOp);
|
|
100
|
+
return Promise.resolve();
|
|
99
101
|
},
|
|
100
102
|
removeOutstanding: async ({ entryPoint, userOpHash }) => {
|
|
101
103
|
const { outstanding } = getStoreHandlers(entryPoint);
|
|
@@ -162,21 +164,21 @@ export const createMempoolStore = ({ config, metrics }) => {
|
|
|
162
164
|
const { outstanding } = getStoreHandlers(entryPoint);
|
|
163
165
|
return await outstanding.popConflicting(userOp);
|
|
164
166
|
},
|
|
165
|
-
validateSenderLimits:
|
|
167
|
+
validateSenderLimits: ({ entryPoint, userOp }) => {
|
|
166
168
|
const { outstanding } = getStoreHandlers(entryPoint);
|
|
167
169
|
if (!outstanding.validateParallelLimit(userOp)) {
|
|
168
|
-
return {
|
|
170
|
+
return Promise.resolve({
|
|
169
171
|
valid: false,
|
|
170
172
|
reason: "AA25 invalid account nonce: Maximum number of parallel user operations for that is allowed for this sender reached"
|
|
171
|
-
};
|
|
173
|
+
});
|
|
172
174
|
}
|
|
173
175
|
if (!outstanding.validateQueuedLimit(userOp)) {
|
|
174
|
-
return {
|
|
176
|
+
return Promise.resolve({
|
|
175
177
|
valid: false,
|
|
176
178
|
reason: "AA25 invalid account nonce: Maximum number of queued user operations reached for this sender and nonce key"
|
|
177
|
-
};
|
|
179
|
+
});
|
|
178
180
|
}
|
|
179
|
-
return { valid: true };
|
|
181
|
+
return Promise.resolve({ valid: true });
|
|
180
182
|
},
|
|
181
183
|
// misc
|
|
182
184
|
getQueuedOutstandingUserOps: async ({ userOp, entryPoint }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createMempoolStore.js","sourceRoot":"","sources":["../../store/createMempoolStore.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"createMempoolStore.js","sourceRoot":"","sources":["../../store/createMempoolStore.ts"],"names":[],"mappings":"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"}
|