@pimlico/alto 0.0.0-main.20251007T193309 → 0.0.0-main.20251009T131712
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/executor/bundleManager.d.ts +1 -1
- package/esm/executor/bundleManager.js +3 -0
- package/esm/executor/bundleManager.js.map +1 -1
- package/esm/executor/executor.js +1 -0
- package/esm/executor/executor.js.map +1 -1
- package/esm/executor/filterOpsAndEstimateGas.d.ts +2 -1
- package/esm/executor/filterOpsAndEstimateGas.js +56 -9
- package/esm/executor/filterOpsAndEstimateGas.js.map +1 -1
- package/esm/executor/utils.js +2 -3
- package/esm/executor/utils.js.map +1 -1
- package/esm/mempool/mempool.js +4 -4
- package/esm/mempool/mempool.js.map +1 -1
- package/esm/mempool/reputationManager.js +6 -6
- package/esm/mempool/reputationManager.js.map +1 -1
- package/esm/rpc/estimation/gasEstimations07.d.ts +1 -29
- package/esm/rpc/estimation/gasEstimations07.js +6 -6
- package/esm/rpc/estimation/gasEstimations07.js.map +1 -1
- package/esm/rpc/estimation/types.d.ts +4 -2
- package/esm/rpc/estimation/utils.d.ts +2 -0
- package/esm/rpc/estimation/utils.js +41 -14
- package/esm/rpc/estimation/utils.js.map +1 -1
- package/esm/rpc/methods/eth_estimateUserOperationGas.js +2 -2
- package/esm/rpc/methods/eth_estimateUserOperationGas.js.map +1 -1
- package/esm/rpc/methods/eth_sendUserOperation.js +8 -8
- package/esm/rpc/methods/eth_sendUserOperation.js.map +1 -1
- package/esm/rpc/methods/pimlico_sendUserOperationNow.js +4 -4
- package/esm/rpc/methods/pimlico_sendUserOperationNow.js.map +1 -1
- package/esm/rpc/methods/pimlico_simulateAssetChange.js +6 -6
- package/esm/rpc/methods/pimlico_simulateAssetChange.js.map +1 -1
- package/esm/rpc/rpcHandler.js +5 -6
- package/esm/rpc/rpcHandler.js.map +1 -1
- package/esm/rpc/server.js +9 -9
- package/esm/rpc/server.js.map +1 -1
- package/esm/rpc/validation/SafeValidator.d.ts +2 -2
- package/esm/rpc/validation/SafeValidator.js +19 -19
- package/esm/rpc/validation/SafeValidator.js.map +1 -1
- package/esm/rpc/validation/TracerResultParserV06.js +11 -11
- package/esm/rpc/validation/TracerResultParserV06.js.map +1 -1
- package/esm/rpc/validation/TracerResultParserV07.js +13 -13
- package/esm/rpc/validation/TracerResultParserV07.js.map +1 -1
- package/esm/rpc/validation/UnsafeValidator.d.ts +3 -3
- package/esm/rpc/validation/UnsafeValidator.js +27 -36
- package/esm/rpc/validation/UnsafeValidator.js.map +1 -1
- package/esm/types/interfaces.d.ts +2 -2
- package/esm/types/utils.d.ts +2 -4
- package/esm/types/utils.js +15 -18
- package/esm/types/utils.js.map +1 -1
- package/esm/utils/eip7702.d.ts +2 -1
- package/esm/utils/eip7702.js +6 -3
- package/esm/utils/eip7702.js.map +1 -1
- package/esm/utils/helpers.js +2 -3
- package/esm/utils/helpers.js.map +1 -1
- package/esm/utils/userop.js +2 -3
- package/esm/utils/userop.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ERC7769Errors, RpcError, pimlicoSimulationsAbi } from "../../types/index.js";
|
|
2
2
|
import { isVersion08, toPackedUserOp } from "../../utils/index.js";
|
|
3
3
|
import { getContract } from "viem";
|
|
4
4
|
import { packUserOps } from "../../executor/utils.js";
|
|
@@ -29,7 +29,7 @@ export class GasEstimator07 {
|
|
|
29
29
|
}
|
|
30
30
|
if (!this.config.pimlicoSimulationContract) {
|
|
31
31
|
this.logger.warn("pimlicoSimulation must be provided");
|
|
32
|
-
throw new RpcError("pimlicoSimulation must be provided",
|
|
32
|
+
throw new RpcError("pimlicoSimulation must be provided", ERC7769Errors.InvalidFields);
|
|
33
33
|
}
|
|
34
34
|
return {
|
|
35
35
|
epSimulationsAddress,
|
|
@@ -48,7 +48,7 @@ export class GasEstimator07 {
|
|
|
48
48
|
return {
|
|
49
49
|
result: "failed",
|
|
50
50
|
data: `Max retries reached when calling ${methodName}`,
|
|
51
|
-
code:
|
|
51
|
+
code: ERC7769Errors.SimulateValidation
|
|
52
52
|
};
|
|
53
53
|
}
|
|
54
54
|
const packedQueuedOps = packUserOps(queuedUserOps);
|
|
@@ -96,7 +96,7 @@ export class GasEstimator07 {
|
|
|
96
96
|
return {
|
|
97
97
|
result: "failed",
|
|
98
98
|
data: result.successData.returnData,
|
|
99
|
-
code:
|
|
99
|
+
code: ERC7769Errors.UserOperationReverted
|
|
100
100
|
};
|
|
101
101
|
}
|
|
102
102
|
catch (error) {
|
|
@@ -185,7 +185,7 @@ export class GasEstimator07 {
|
|
|
185
185
|
return {
|
|
186
186
|
result: "failed",
|
|
187
187
|
data: verificationGasLimit.successData.returnData,
|
|
188
|
-
code:
|
|
188
|
+
code: ERC7769Errors.UserOperationReverted
|
|
189
189
|
};
|
|
190
190
|
}
|
|
191
191
|
// Check if paymaster verification gas limit needs retry
|
|
@@ -217,7 +217,7 @@ export class GasEstimator07 {
|
|
|
217
217
|
return {
|
|
218
218
|
result: "failed",
|
|
219
219
|
data: paymasterVerificationGasLimit.successData.returnData,
|
|
220
|
-
code:
|
|
220
|
+
code: ERC7769Errors.UserOperationReverted
|
|
221
221
|
};
|
|
222
222
|
}
|
|
223
223
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gasEstimations07.js","sourceRoot":"","sources":["../../../rpc/estimation/gasEstimations07.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"gasEstimations07.js","sourceRoot":"","sources":["../../../rpc/estimation/gasEstimations07.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,11 +4,12 @@ export declare enum BinarySearchResultType {
|
|
|
4
4
|
Success = 0,
|
|
5
5
|
OutOfGas = 1
|
|
6
6
|
}
|
|
7
|
-
export type
|
|
7
|
+
export type SimulateHandleOpFailResult = {
|
|
8
8
|
result: "failed";
|
|
9
9
|
data: string;
|
|
10
10
|
code: number;
|
|
11
|
-
}
|
|
11
|
+
};
|
|
12
|
+
export type SimulateHandleOpSuccessResult = {
|
|
12
13
|
result: "execution";
|
|
13
14
|
data: {
|
|
14
15
|
callGasLimit?: bigint;
|
|
@@ -17,6 +18,7 @@ export type SimulateHandleOpResult = {
|
|
|
17
18
|
executionResult: ExecutionResult;
|
|
18
19
|
};
|
|
19
20
|
};
|
|
21
|
+
export type SimulateHandleOpResult = SimulateHandleOpFailResult | SimulateHandleOpSuccessResult;
|
|
20
22
|
export type SimulateBinarySearchResult = {
|
|
21
23
|
result: "success";
|
|
22
24
|
data: {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { StateOverrides, UserOperation06, UserOperation07 } from "../../types/index.js";
|
|
2
|
+
import { ERC7769Errors } from "../../types/index.js";
|
|
2
3
|
import { type Logger } from "../../utils/index.js";
|
|
3
4
|
import { type Address, type Hex, type StateOverride } from "viem";
|
|
4
5
|
import type { AltoConfig } from "../../createConfig.js";
|
|
@@ -48,6 +49,7 @@ export declare const simulationErrors: readonly [{
|
|
|
48
49
|
readonly name: "reason";
|
|
49
50
|
}];
|
|
50
51
|
}];
|
|
52
|
+
export declare const toErc7769Code: (entryPointError: string) => ERC7769Errors.SimulateValidation | ERC7769Errors.SimulatePaymasterValidation | ERC7769Errors.ExpiresShortly | ERC7769Errors.InvalidSignature | ERC7769Errors.PaymasterDepositTooLow;
|
|
51
53
|
export declare function decodeSimulateHandleOpError(error: unknown, logger: Logger): SimulateHandleOpResult;
|
|
52
54
|
export declare function prepareSimulationOverrides06({ userOp, entryPoint, userStateOverrides, useCodeOverride, config }: {
|
|
53
55
|
userOp: UserOperation06;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ERC7769Errors, executionResultSchema } from "../../types/index.js";
|
|
2
2
|
import { deepHexlify, getAuthorizationStateOverrides } from "../../utils/index.js";
|
|
3
3
|
import { BaseError, ContractFunctionExecutionError, ContractFunctionRevertedError, decodeErrorResult, getAbiItem, keccak256, parseAbi, toHex } from "viem";
|
|
4
4
|
import { entryPoint06Abi } from "viem/account-abstraction";
|
|
@@ -54,6 +54,24 @@ export const simulationErrors = parseAbi([
|
|
|
54
54
|
"error FailedOpWithRevert(uint256 opIndex, string reason, bytes inner)",
|
|
55
55
|
"error CallPhaseReverted(bytes reason)"
|
|
56
56
|
]);
|
|
57
|
+
// Returns error code based on EntryPoint's AA error message.
|
|
58
|
+
export const toErc7769Code = (entryPointError) => {
|
|
59
|
+
if (entryPointError.includes("AA24") || entryPointError.includes("AA34")) {
|
|
60
|
+
return ERC7769Errors.InvalidSignature;
|
|
61
|
+
}
|
|
62
|
+
if (entryPointError.includes("AA31")) {
|
|
63
|
+
return ERC7769Errors.PaymasterDepositTooLow;
|
|
64
|
+
}
|
|
65
|
+
if (entryPointError.includes("AA32")) {
|
|
66
|
+
return ERC7769Errors.ExpiresShortly;
|
|
67
|
+
}
|
|
68
|
+
if (entryPointError.includes("AA30") ||
|
|
69
|
+
entryPointError.includes("AA33") ||
|
|
70
|
+
entryPointError.includes("AA36")) {
|
|
71
|
+
return ERC7769Errors.SimulatePaymasterValidation;
|
|
72
|
+
}
|
|
73
|
+
return ERC7769Errors.SimulateValidation;
|
|
74
|
+
};
|
|
57
75
|
export function decodeSimulateHandleOpError(error, logger) {
|
|
58
76
|
// Check if it's a BaseError with ContractFunctionRevertedError
|
|
59
77
|
if (!(error instanceof BaseError)) {
|
|
@@ -72,7 +90,7 @@ export function decodeSimulateHandleOpError(error, logger) {
|
|
|
72
90
|
return {
|
|
73
91
|
result: "failed",
|
|
74
92
|
data: "Sender has no code or factory not deployed",
|
|
75
|
-
code:
|
|
93
|
+
code: ERC7769Errors.SimulateValidation
|
|
76
94
|
};
|
|
77
95
|
}
|
|
78
96
|
if (!error.data?.args) {
|
|
@@ -122,30 +140,39 @@ export function decodeSimulateHandleOpError(error, logger) {
|
|
|
122
140
|
throw new Error("Unknown error, could not parse simulate validation result.");
|
|
123
141
|
}
|
|
124
142
|
switch (errorName) {
|
|
125
|
-
case "FailedOp":
|
|
143
|
+
case "FailedOp": {
|
|
144
|
+
const errorMessage = args[1];
|
|
126
145
|
return {
|
|
127
146
|
result: "failed",
|
|
128
|
-
data:
|
|
129
|
-
code:
|
|
147
|
+
data: errorMessage,
|
|
148
|
+
code: toErc7769Code(errorMessage)
|
|
130
149
|
};
|
|
131
|
-
|
|
150
|
+
}
|
|
151
|
+
case "FailedOpWithRevert": {
|
|
152
|
+
const errorMessage = args[1];
|
|
153
|
+
const revertReason = parseFailedOpWithRevert(args[2]);
|
|
132
154
|
return {
|
|
133
155
|
result: "failed",
|
|
134
|
-
data: `${
|
|
135
|
-
code:
|
|
156
|
+
data: `${errorMessage} ${revertReason}`,
|
|
157
|
+
code: toErc7769Code(errorMessage)
|
|
136
158
|
};
|
|
137
|
-
|
|
159
|
+
}
|
|
160
|
+
case "CallPhaseReverted": {
|
|
161
|
+
const errorMessage = args[0];
|
|
138
162
|
return {
|
|
139
163
|
result: "failed",
|
|
140
|
-
data:
|
|
141
|
-
code:
|
|
164
|
+
data: errorMessage,
|
|
165
|
+
code: ERC7769Errors.UserOperationReverted
|
|
142
166
|
};
|
|
143
|
-
|
|
167
|
+
}
|
|
168
|
+
case "Error": {
|
|
169
|
+
const errorMessage = args[0];
|
|
144
170
|
return {
|
|
145
171
|
result: "failed",
|
|
146
|
-
data:
|
|
147
|
-
code:
|
|
172
|
+
data: errorMessage,
|
|
173
|
+
code: toErc7769Code(errorMessage)
|
|
148
174
|
};
|
|
175
|
+
}
|
|
149
176
|
// 0.6 handleOp reverts with ExecutionResult if successful
|
|
150
177
|
case "ExecutionResult": {
|
|
151
178
|
const parsedExecutionResult = executionResultSchema.parse(args);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../rpc/estimation/utils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../rpc/estimation/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ERC7769Errors, RpcError, estimateUserOperationGasSchema } from "../../types/index.js";
|
|
2
2
|
import { parseEther, toHex } from "viem";
|
|
3
3
|
import { maxBigInt, scaleBigIntByPercent } from "../../utils/bigInt.js";
|
|
4
4
|
import { calcExecutionPvgComponent, calcL2PvgComponent } from "../../utils/preVerificationGasCalulator.js";
|
|
@@ -170,7 +170,7 @@ export const ethEstimateUserOperationGasHandler = createMethodHandler({
|
|
|
170
170
|
]);
|
|
171
171
|
// Validate eip7702Auth
|
|
172
172
|
if (!validEip7702Auth) {
|
|
173
|
-
throw new RpcError(validEip7702AuthError,
|
|
173
|
+
throw new RpcError(validEip7702AuthError, ERC7769Errors.InvalidFields);
|
|
174
174
|
}
|
|
175
175
|
// Validate gas estimation result first
|
|
176
176
|
if (gasEstimateResult.status === "failed") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eth_estimateUserOperationGas.js","sourceRoot":"","sources":["../../../rpc/methods/eth_estimateUserOperationGas.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,QAAQ,EAGR,
|
|
1
|
+
{"version":3,"file":"eth_estimateUserOperationGas.js","sourceRoot":"","sources":["../../../rpc/methods/eth_estimateUserOperationGas.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ERC7769Errors, RpcError, sendUserOperationSchema } from "../../types/index.js";
|
|
2
2
|
import { calcExecutionPvgComponent, calcL2PvgComponent, getAAError } from "../../utils/index.js";
|
|
3
3
|
import { getNonceKeyAndSequence, getUserOpHash } from "../../utils/userop.js";
|
|
4
4
|
import { createMethodHandler } from "../createMethodHandler.js";
|
|
@@ -73,29 +73,29 @@ export async function addToMempoolIfValid({ rpcHandler, userOp, entryPoint, apiV
|
|
|
73
73
|
// Validate eip7702Auth
|
|
74
74
|
if (!validEip7702Auth) {
|
|
75
75
|
rpcHandler.eventManager.emitFailedValidation(userOpHash, validEip7702AuthError);
|
|
76
|
-
throw new RpcError(validEip7702AuthError,
|
|
76
|
+
throw new RpcError(validEip7702AuthError, ERC7769Errors.InvalidFields);
|
|
77
77
|
}
|
|
78
78
|
// Pre mempool validation
|
|
79
79
|
if (!preMempoolSuccess) {
|
|
80
80
|
rpcHandler.eventManager.emitFailedValidation(userOpHash, preMempoolError);
|
|
81
|
-
throw new RpcError(preMempoolError,
|
|
81
|
+
throw new RpcError(preMempoolError, ERC7769Errors.InvalidFields);
|
|
82
82
|
}
|
|
83
83
|
// PreVerificationGas validation
|
|
84
84
|
if (!pvgSuccess) {
|
|
85
85
|
rpcHandler.eventManager.emitFailedValidation(userOpHash, pvgErrorReason);
|
|
86
|
-
throw new RpcError(pvgErrorReason,
|
|
86
|
+
throw new RpcError(pvgErrorReason, ERC7769Errors.SimulateValidation);
|
|
87
87
|
}
|
|
88
88
|
// Nonce validation
|
|
89
89
|
const [, userOpNonceSeq] = getNonceKeyAndSequence(userOp.nonce);
|
|
90
90
|
if (userOpNonceSeq < currentNonceSeq) {
|
|
91
91
|
const reason = "UserOperation failed validation with reason: AA25 invalid account nonce";
|
|
92
92
|
rpcHandler.eventManager.emitFailedValidation(userOpHash, reason, "AA25");
|
|
93
|
-
throw new RpcError(reason,
|
|
93
|
+
throw new RpcError(reason, ERC7769Errors.SimulateValidation);
|
|
94
94
|
}
|
|
95
95
|
if (userOpNonceSeq > currentNonceSeq + 10n) {
|
|
96
96
|
const reason = "UserOperation failed validaiton with reason: AA25 invalid account nonce";
|
|
97
97
|
rpcHandler.eventManager.emitFailedValidation(userOpHash, reason, "AA25");
|
|
98
|
-
throw new RpcError(reason,
|
|
98
|
+
throw new RpcError(reason, ERC7769Errors.SimulateValidation);
|
|
99
99
|
}
|
|
100
100
|
if (userOpNonceSeq > currentNonceSeq + BigInt(queuedUserOps.length)) {
|
|
101
101
|
rpcHandler.mempool.add(userOp, entryPoint);
|
|
@@ -107,7 +107,7 @@ export async function addToMempoolIfValid({ rpcHandler, userOp, entryPoint, apiV
|
|
|
107
107
|
const [isMempoolAddSuccess, mempoolAddError] = await rpcHandler.mempool.add(userOp, entryPoint);
|
|
108
108
|
if (!isMempoolAddSuccess) {
|
|
109
109
|
rpcHandler.eventManager.emitFailedValidation(userOpHash, mempoolAddError, getAAError(mempoolAddError));
|
|
110
|
-
throw new RpcError(mempoolAddError,
|
|
110
|
+
throw new RpcError(mempoolAddError, ERC7769Errors.InvalidFields);
|
|
111
111
|
}
|
|
112
112
|
return { result: "added", userOpHash };
|
|
113
113
|
}
|
|
@@ -118,7 +118,7 @@ export async function addToMempoolIfValid({ rpcHandler, userOp, entryPoint, apiV
|
|
|
118
118
|
const [isMempoolAddSuccess, mempoolAddError] = await rpcHandler.mempool.add(userOp, entryPoint, validationResult.referencedContracts);
|
|
119
119
|
if (!isMempoolAddSuccess) {
|
|
120
120
|
rpcHandler.eventManager.emitFailedValidation(userOpHash, mempoolAddError, getAAError(mempoolAddError));
|
|
121
|
-
throw new RpcError(mempoolAddError,
|
|
121
|
+
throw new RpcError(mempoolAddError, ERC7769Errors.InvalidFields);
|
|
122
122
|
}
|
|
123
123
|
return { result: "added", userOpHash };
|
|
124
124
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eth_sendUserOperation.js","sourceRoot":"","sources":["../../../rpc/methods/eth_sendUserOperation.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"eth_sendUserOperation.js","sourceRoot":"","sources":["../../../rpc/methods/eth_sendUserOperation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ERC7769Errors, RpcError, pimlicoSendUserOperationNowSchema } from "../../types/index.js";
|
|
2
2
|
import { getUserOpHash, isVersion07, isVersion08, parseUserOpReceipt } from "../../utils/index.js";
|
|
3
3
|
import { createMethodHandler } from "../createMethodHandler.js";
|
|
4
4
|
export const pimlicoSendUserOperationNowHandler = createMethodHandler({
|
|
@@ -6,7 +6,7 @@ export const pimlicoSendUserOperationNowHandler = createMethodHandler({
|
|
|
6
6
|
schema: pimlicoSendUserOperationNowSchema,
|
|
7
7
|
handler: async ({ rpcHandler, params, apiVersion }) => {
|
|
8
8
|
if (!rpcHandler.config.enableInstantBundlingEndpoint) {
|
|
9
|
-
throw new RpcError("pimlico_sendUserOperationNow endpoint is not enabled",
|
|
9
|
+
throw new RpcError("pimlico_sendUserOperationNow endpoint is not enabled", ERC7769Errors.InvalidFields);
|
|
10
10
|
}
|
|
11
11
|
const [userOp, entryPoint] = params;
|
|
12
12
|
rpcHandler.ensureEntryPointIsSupported(entryPoint);
|
|
@@ -17,7 +17,7 @@ export const pimlicoSendUserOperationNowHandler = createMethodHandler({
|
|
|
17
17
|
});
|
|
18
18
|
const [preMempoolValid, preMempoolError] = await rpcHandler.preMempoolChecks(userOp, apiVersion);
|
|
19
19
|
if (!preMempoolValid) {
|
|
20
|
-
throw new RpcError(preMempoolError,
|
|
20
|
+
throw new RpcError(preMempoolError, ERC7769Errors.InvalidFields);
|
|
21
21
|
}
|
|
22
22
|
// Prepare bundle
|
|
23
23
|
const userOpInfo = {
|
|
@@ -49,7 +49,7 @@ export const pimlicoSendUserOperationNowHandler = createMethodHandler({
|
|
|
49
49
|
});
|
|
50
50
|
const result = await rpcHandler.executorManager.sendBundleToExecutor(bundle);
|
|
51
51
|
if (!result) {
|
|
52
|
-
throw new RpcError("unhandled error during bundle submission",
|
|
52
|
+
throw new RpcError("unhandled error during bundle submission", ERC7769Errors.InvalidFields);
|
|
53
53
|
}
|
|
54
54
|
// Wait for receipt.
|
|
55
55
|
const receipt = await rpcHandler.config.publicClient.waitForTransactionReceipt({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pimlico_sendUserOperationNow.js","sourceRoot":"","sources":["../../../rpc/methods/pimlico_sendUserOperationNow.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,QAAQ,EAGR,
|
|
1
|
+
{"version":3,"file":"pimlico_sendUserOperationNow.js","sourceRoot":"","sources":["../../../rpc/methods/pimlico_sendUserOperationNow.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,aAAa,EACb,QAAQ,EAGR,iCAAiC,EACpC,MAAM,aAAa,CAAA;AACpB,OAAO,EACH,aAAa,EACb,WAAW,EACX,WAAW,EACX,kBAAkB,EACrB,MAAM,aAAa,CAAA;AAEpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAE5D,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,aAAa,CAAC,aAAa,CAC9B,CAAA;QACL,CAAC;QAED,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,MAAM,CAAA;QACnC,UAAU,CAAC,2BAA2B,CAAC,UAAU,CAAC,CAAA;QAElD,MAAM,UAAU,GAAG,aAAa,CAAC;YAC7B,MAAM;YACN,iBAAiB,EAAE,UAAU;YAC7B,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO;SACrC,CAAC,CAAA;QAEF,MAAM,CAAC,eAAe,EAAE,eAAe,CAAC,GACpC,MAAM,UAAU,CAAC,gBAAgB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;QAEzD,IAAI,CAAC,eAAe,EAAE,CAAC;YACnB,MAAM,IAAI,QAAQ,CAAC,eAAe,EAAE,aAAa,CAAC,aAAa,CAAC,CAAA;QACpE,CAAC;QAED,iBAAiB;QACjB,MAAM,UAAU,GAAe;YAC3B,MAAM;YACN,UAAU;YACV,cAAc,EAAE,IAAI,CAAC,GAAG,EAAE;YAC1B,kBAAkB,EAAE,CAAC;SACxB,CAAA;QAED,iBAAiB;QACjB,IAAI,OAA0B,CAAA;QAC9B,IAAI,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC;YAClC,OAAO,GAAG,KAAK,CAAA;QACnB,CAAC;aAAM,IAAI,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,OAAO,GAAG,KAAK,CAAA;QACnB,CAAC;aAAM,CAAC;YACJ,OAAO,GAAG,KAAK,CAAA;QACnB,CAAC;QAED,MAAM,MAAM,GAAwB;YAChC,UAAU;YACV,OAAO,EAAE,CAAC,UAAU,CAAC;YACrB,OAAO;YACP,kBAAkB,EAAE,CAAC;SACxB,CAAA;QACD,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC;YACnC,UAAU;YACV,UAAU;SACb,CAAC,CAAA;QACF,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,aAAa,CAAC,aAAa,CAC9B,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,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;IAClD,CAAC;CACJ,CAAC,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ERC7769Errors, RpcError, pimlicoSimulateAssetChangeSchema, pimlicoSimulationsAbi } from "../../types/index.js";
|
|
2
2
|
import { isVersion06, isVersion07, isVersion08, toPackedUserOp } from "../../utils/index.js";
|
|
3
3
|
import { getContract } from "viem";
|
|
4
4
|
import { getFilterOpsStateOverride } from "../../utils/entryPointOverrides.js";
|
|
@@ -18,7 +18,7 @@ export const pimlicoSimulateAssetChangeHandler = createMethodHandler({
|
|
|
18
18
|
// Check if pimlico simulation contract is configured
|
|
19
19
|
if (!rpcHandler.config.pimlicoSimulationContract) {
|
|
20
20
|
logger.warn("pimlicoSimulation must be provided");
|
|
21
|
-
throw new RpcError("pimlicoSimulation must be provided",
|
|
21
|
+
throw new RpcError("pimlicoSimulation must be provided", ERC7769Errors.InvalidFields);
|
|
22
22
|
}
|
|
23
23
|
const is07 = isVersion07(userOp);
|
|
24
24
|
const is08 = isVersion08(userOp, entryPoint);
|
|
@@ -50,7 +50,7 @@ export const pimlicoSimulateAssetChangeHandler = createMethodHandler({
|
|
|
50
50
|
let result;
|
|
51
51
|
if (is08) {
|
|
52
52
|
if (!rpcHandler.config.entrypointSimulationContractV8) {
|
|
53
|
-
throw new RpcError("missing entrypointSimulationContractV8",
|
|
53
|
+
throw new RpcError("missing entrypointSimulationContractV8", ERC7769Errors.InvalidFields);
|
|
54
54
|
}
|
|
55
55
|
// For EntryPoint v0.8
|
|
56
56
|
const { result: simResult } = await pimlicoSimulation.simulate.simulateAssetChange08([
|
|
@@ -66,7 +66,7 @@ export const pimlicoSimulateAssetChangeHandler = createMethodHandler({
|
|
|
66
66
|
}
|
|
67
67
|
else if (is07) {
|
|
68
68
|
if (!rpcHandler.config.entrypointSimulationContractV7) {
|
|
69
|
-
throw new RpcError("missing entrypointSimulationContractV7",
|
|
69
|
+
throw new RpcError("missing entrypointSimulationContractV7", ERC7769Errors.InvalidFields);
|
|
70
70
|
}
|
|
71
71
|
// For EntryPoint v0.7
|
|
72
72
|
const { result: simResult } = await pimlicoSimulation.simulate.simulateAssetChange07([
|
|
@@ -103,10 +103,10 @@ export const pimlicoSimulateAssetChangeHandler = createMethodHandler({
|
|
|
103
103
|
catch (error) {
|
|
104
104
|
const decodedError = decodeSimulateHandleOpError(error, logger);
|
|
105
105
|
if (decodedError.result === "failed") {
|
|
106
|
-
throw new RpcError(`UserOperation reverted during simulation with reason: ${decodedError.data}`,
|
|
106
|
+
throw new RpcError(`UserOperation reverted during simulation with reason: ${decodedError.data}`, ERC7769Errors.UserOperationReverted);
|
|
107
107
|
}
|
|
108
108
|
logger.warn("Failed to decode simulation error");
|
|
109
|
-
throw new RpcError("Failed to decode simulation error",
|
|
109
|
+
throw new RpcError("Failed to decode simulation error", ERC7769Errors.InvalidFields);
|
|
110
110
|
}
|
|
111
111
|
}
|
|
112
112
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pimlico_simulateAssetChange.js","sourceRoot":"","sources":["../../../rpc/methods/pimlico_simulateAssetChange.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,
|
|
1
|
+
{"version":3,"file":"pimlico_simulateAssetChange.js","sourceRoot":"","sources":["../../../rpc/methods/pimlico_simulateAssetChange.ts"],"names":[],"mappings":"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"}
|
package/esm/rpc/rpcHandler.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { calculateAA95GasFloor } from "../executor/index.js";
|
|
2
|
-
import { EntryPointV06Abi, EntryPointV07Abi, RpcError
|
|
2
|
+
import { ERC7769Errors, EntryPointV06Abi, EntryPointV07Abi, RpcError } from "../types/index.js";
|
|
3
3
|
import { getNonceKeyAndSequence, isVersion06, isVersion07 } from "../utils/index.js";
|
|
4
4
|
import { getContract, zeroAddress } from "viem";
|
|
5
5
|
import { generatePrivateKey, privateKeyToAddress } from "viem/accounts";
|
|
6
6
|
import { recoverAuthorizationAddress } from "viem/utils";
|
|
7
|
+
import { getEip7702AuthAddress } from "../utils/eip7702.js";
|
|
7
8
|
import { registerHandlers } from "./methods/index.js";
|
|
8
9
|
export class RpcHandler {
|
|
9
10
|
config;
|
|
@@ -45,7 +46,7 @@ export class RpcHandler {
|
|
|
45
46
|
async handleMethod(request, apiVersion) {
|
|
46
47
|
const handler = this.methodHandlers.get(request.method);
|
|
47
48
|
if (!handler) {
|
|
48
|
-
throw new RpcError("Method not supported",
|
|
49
|
+
throw new RpcError("Method not supported", ERC7769Errors.InvalidFields);
|
|
49
50
|
}
|
|
50
51
|
return await handler.handler({
|
|
51
52
|
rpcHandler: this,
|
|
@@ -55,7 +56,7 @@ export class RpcHandler {
|
|
|
55
56
|
}
|
|
56
57
|
ensureEntryPointIsSupported(entryPoint) {
|
|
57
58
|
if (!this.config.entrypoints.includes(entryPoint)) {
|
|
58
|
-
throw new RpcError(`EntryPoint ${entryPoint} not supported, supported EntryPoints: ${this.config.entrypoints.join(", ")}`,
|
|
59
|
+
throw new RpcError(`EntryPoint ${entryPoint} not supported, supported EntryPoints: ${this.config.entrypoints.join(", ")}`, ERC7769Errors.InvalidFields);
|
|
59
60
|
}
|
|
60
61
|
}
|
|
61
62
|
ensureDebugEndpointsAreEnabled(methodName) {
|
|
@@ -123,9 +124,7 @@ export class RpcHandler {
|
|
|
123
124
|
return [false, "eip7702Auth is not supported on this chain"];
|
|
124
125
|
}
|
|
125
126
|
// Check that auth is valid.
|
|
126
|
-
const delegationDesignator =
|
|
127
|
-
? userOp.eip7702Auth.address
|
|
128
|
-
: userOp.eip7702Auth.contractAddress;
|
|
127
|
+
const delegationDesignator = getEip7702AuthAddress(userOp.eip7702Auth);
|
|
129
128
|
// Fetch onchain data in parallel
|
|
130
129
|
const [sender, nonceOnChain, delegateCode] = await Promise.all([
|
|
131
130
|
validateSender
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpcHandler.js","sourceRoot":"","sources":["../../rpc/rpcHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,qBAAqB,EACxB,MAAM,gBAAgB,CAAA;AAQvB,OAAO,EAEH,gBAAgB,EAChB,gBAAgB,EAEhB,QAAQ,
|
|
1
|
+
{"version":3,"file":"rpcHandler.js","sourceRoot":"","sources":["../../rpc/rpcHandler.ts"],"names":[],"mappings":"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"}
|