@pimlico/alto 0.0.0-main.20250625T172702 → 0.0.0-main.20250627T074103
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/contracts/EIP712.sol/EIP712.json +1 -1
- package/contracts/Eip7702Support.sol/Eip7702Support.json +1 -1
- package/contracts/EntryPoint.sol/EntryPoint.json +1 -1
- package/contracts/EntryPointSimulations.sol/EntryPointSimulations07.json +1 -1
- package/contracts/EntryPointSimulations.sol/EntryPointSimulations08.json +1 -1
- package/contracts/Exec.sol/Exec.json +1 -1
- package/contracts/IAccount.sol/IAccount.json +1 -1
- package/contracts/IAccountExecute.sol/IAccountExecute.json +1 -1
- package/contracts/IAggregator.sol/IAggregator.json +1 -1
- package/contracts/IERC5267.sol/IERC5267.json +1 -1
- package/contracts/IEntryPoint.sol/IEntryPoint.json +1 -1
- package/contracts/IEntryPointSimulations.sol/IEntryPointSimulations.json +1 -1
- package/contracts/INonceManager.sol/INonceManager.json +1 -1
- package/contracts/IPaymaster.sol/IPaymaster.json +1 -1
- package/contracts/ISenderCreator.sol/ISenderCreator.json +1 -1
- package/contracts/IStakeManager.sol/IStakeManager.json +1 -1
- package/contracts/Math.sol/Math.json +1 -1
- package/contracts/MessageHashUtils.sol/MessageHashUtils.json +1 -1
- package/contracts/NonceManager.sol/NonceManager.json +1 -1
- package/contracts/Panic.sol/Panic.json +1 -1
- package/contracts/PimlicoSimulations.sol/PimlicoSimulations.json +1 -1
- package/contracts/ReentrancyGuardTransient.sol/ReentrancyGuardTransient.json +1 -1
- package/contracts/SafeCast.sol/SafeCast.json +1 -1
- package/contracts/SenderCreator.sol/SenderCreator.json +1 -1
- package/contracts/ShortStrings.sol/ShortStrings.json +1 -1
- package/contracts/SignedMath.sol/SignedMath.json +1 -1
- package/contracts/StakeManager.sol/StakeManager.json +1 -1
- package/contracts/StorageSlot.sol/StorageSlot.json +1 -1
- package/contracts/Strings.sol/Strings.json +1 -1
- package/contracts/TransientSlot.sol/TransientSlot.json +1 -1
- package/contracts/UserOperationLib.sol/UserOperationLib.json +1 -1
- package/contracts/build-info/004071c167bc55de.json +1 -0
- package/contracts/build-info/{257ff8e2b1124ead.json → 2f5dec90e180c3a0.json} +1 -1
- package/contracts/interfaces/IEntryPoint.sol/IEntryPoint.json +1 -1
- package/esm/cli/customTransport.js +3 -2
- package/esm/cli/customTransport.js.map +1 -1
- package/esm/contracts/EntryPointSimulations.sol/EntryPointSimulations07.json +1 -1
- package/esm/contracts/EntryPointSimulations.sol/EntryPointSimulations08.json +1 -1
- package/esm/contracts/PimlicoSimulations.sol/PimlicoSimulations.json +1 -1
- package/esm/executor/filterOpsAndEstimateGas.js +27 -6
- package/esm/executor/filterOpsAndEstimateGas.js.map +1 -1
- package/esm/executor/utils.js +3 -0
- package/esm/executor/utils.js.map +1 -1
- package/esm/rpc/estimation/gasEstimationHandler.d.ts +2 -2
- package/esm/rpc/estimation/gasEstimationHandler.js +6 -6
- package/esm/rpc/estimation/gasEstimationHandler.js.map +1 -1
- package/esm/rpc/estimation/{gasEstimationsV06.d.ts → gasEstimations06.d.ts} +4 -4
- package/esm/rpc/estimation/gasEstimations06.js +68 -0
- package/esm/rpc/estimation/gasEstimations06.js.map +1 -0
- package/esm/rpc/estimation/gasEstimations07.d.ts +89 -0
- package/esm/rpc/estimation/gasEstimations07.js +386 -0
- package/esm/rpc/estimation/gasEstimations07.js.map +1 -0
- package/esm/rpc/estimation/types.d.ts +23 -111
- package/esm/rpc/estimation/types.js +5 -121
- package/esm/rpc/estimation/types.js.map +1 -1
- package/esm/rpc/estimation/utils.d.ts +51 -0
- package/esm/rpc/estimation/utils.js +182 -0
- package/esm/rpc/estimation/utils.js.map +1 -0
- package/esm/rpc/methods/eth_estimateUserOperationGas.js +4 -5
- package/esm/rpc/methods/eth_estimateUserOperationGas.js.map +1 -1
- package/esm/rpc/validation/SafeValidator.d.ts +5 -5
- package/esm/rpc/validation/SafeValidator.js +28 -29
- package/esm/rpc/validation/SafeValidator.js.map +1 -1
- package/esm/rpc/validation/UnsafeValidator.d.ts +2 -2
- package/esm/rpc/validation/UnsafeValidator.js +2 -2
- package/esm/rpc/validation/UnsafeValidator.js.map +1 -1
- package/esm/types/contracts/PimlicoSimulations.d.ts +1083 -96
- package/esm/types/contracts/PimlicoSimulations.js +1357 -88
- package/esm/types/contracts/PimlicoSimulations.js.map +1 -1
- package/esm/types/contracts/index.d.ts +0 -2
- package/esm/types/contracts/index.js +0 -2
- package/esm/types/contracts/index.js.map +1 -1
- package/esm/types/interfaces.d.ts +2 -2
- package/esm/types/validation.d.ts +208 -222
- package/esm/types/validation.js +0 -8
- package/esm/types/validation.js.map +1 -1
- package/esm/utils/toViemStateOverrides.d.ts +4 -0
- package/esm/utils/toViemStateOverrides.js +44 -0
- package/esm/utils/toViemStateOverrides.js.map +1 -0
- package/package.json +1 -1
- package/contracts/build-info/10cf9b18fcc1598e.json +0 -1
- package/esm/rpc/estimation/gasEstimationsV06.js +0 -156
- package/esm/rpc/estimation/gasEstimationsV06.js.map +0 -1
- package/esm/rpc/estimation/gasEstimationsV07.d.ts +0 -101
- package/esm/rpc/estimation/gasEstimationsV07.js +0 -724
- package/esm/rpc/estimation/gasEstimationsV07.js.map +0 -1
- package/esm/types/contracts/EntryPointSimulationsV6.d.ts +0 -33
- package/esm/types/contracts/EntryPointSimulationsV6.js +0 -46
- package/esm/types/contracts/EntryPointSimulationsV6.js.map +0 -1
- package/esm/types/contracts/EntryPointSimulationsV7.d.ts +0 -2076
- package/esm/types/contracts/EntryPointSimulationsV7.js +0 -2675
- package/esm/types/contracts/EntryPointSimulationsV7.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../rpc/estimation/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../rpc/estimation/types.ts"],"names":[],"mappings":"AAGA,MAAM,CAAN,IAAY,sBAGX;AAHD,WAAY,sBAAsB;IAC9B,yEAAW,CAAA;IACX,2EAAY,CAAA;AAChB,CAAC,EAHW,sBAAsB,KAAtB,sBAAsB,QAGjC"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { type Hex, type StateOverride } from "viem";
|
|
2
|
+
import { type Logger } from "../../utils/index.js";
|
|
3
|
+
import type { StateOverrides, UserOperationV06, UserOperationV07 } from "../../types/index.js";
|
|
4
|
+
import type { AltoConfig } from "../../createConfig.js";
|
|
5
|
+
import type { SimulateHandleOpResult } from "../estimation/types.js";
|
|
6
|
+
export declare function parseFailedOpWithRevert(data: Hex): string;
|
|
7
|
+
export declare function prepareStateOverride({ userOperations, queuedUserOperations, stateOverrides, config }: {
|
|
8
|
+
userOperations: (UserOperationV06 | UserOperationV07)[];
|
|
9
|
+
queuedUserOperations: (UserOperationV06 | UserOperationV07)[];
|
|
10
|
+
stateOverrides?: StateOverrides;
|
|
11
|
+
config: Pick<AltoConfig, "balanceOverride" | "codeOverrideSupport">;
|
|
12
|
+
}): StateOverride | undefined;
|
|
13
|
+
export declare const simulationErrors: readonly [{
|
|
14
|
+
readonly name: "Error";
|
|
15
|
+
readonly type: "error";
|
|
16
|
+
readonly inputs: readonly [{
|
|
17
|
+
readonly type: "string";
|
|
18
|
+
}];
|
|
19
|
+
}, {
|
|
20
|
+
readonly name: "FailedOp";
|
|
21
|
+
readonly type: "error";
|
|
22
|
+
readonly inputs: readonly [{
|
|
23
|
+
readonly type: "uint256";
|
|
24
|
+
readonly name: "opIndex";
|
|
25
|
+
}, {
|
|
26
|
+
readonly type: "string";
|
|
27
|
+
readonly name: "reason";
|
|
28
|
+
}];
|
|
29
|
+
}, {
|
|
30
|
+
readonly name: "FailedOpWithRevert";
|
|
31
|
+
readonly type: "error";
|
|
32
|
+
readonly inputs: readonly [{
|
|
33
|
+
readonly type: "uint256";
|
|
34
|
+
readonly name: "opIndex";
|
|
35
|
+
}, {
|
|
36
|
+
readonly type: "string";
|
|
37
|
+
readonly name: "reason";
|
|
38
|
+
}, {
|
|
39
|
+
readonly type: "bytes";
|
|
40
|
+
readonly name: "inner";
|
|
41
|
+
}];
|
|
42
|
+
}, {
|
|
43
|
+
readonly name: "CallPhaseReverted";
|
|
44
|
+
readonly type: "error";
|
|
45
|
+
readonly inputs: readonly [{
|
|
46
|
+
readonly type: "bytes";
|
|
47
|
+
readonly name: "reason";
|
|
48
|
+
}];
|
|
49
|
+
}];
|
|
50
|
+
export declare function decodeSimulateHandleOpError(error: unknown, logger: Logger): SimulateHandleOpResult;
|
|
51
|
+
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -0,0 +1,182 @@
|
|
|
1
|
+
import { decodeErrorResult, parseAbi, BaseError, ContractFunctionRevertedError, ContractFunctionExecutionError, getAbiItem } from "viem";
|
|
2
|
+
import { getAuthorizationStateOverrides } from "../../utils/index.js";
|
|
3
|
+
import { toViemStateOverrides } from "../../utils/toViemStateOverrides.js";
|
|
4
|
+
import { ValidationErrors, executionResultSchema } from "../../types/index.js";
|
|
5
|
+
import { entryPoint06Abi } from "viem/account-abstraction";
|
|
6
|
+
export function parseFailedOpWithRevert(data) {
|
|
7
|
+
try {
|
|
8
|
+
const decoded = decodeErrorResult({
|
|
9
|
+
abi: parseAbi(["error Error(string)", "error Panic(uint256)"]),
|
|
10
|
+
data
|
|
11
|
+
});
|
|
12
|
+
if (decoded.errorName === "Error") {
|
|
13
|
+
return decoded.args[0];
|
|
14
|
+
}
|
|
15
|
+
if (decoded.errorName === "Panic") {
|
|
16
|
+
// from https://docs.soliditylang.org/en/v0.8.0/control-structures.html
|
|
17
|
+
const panicCodes = {
|
|
18
|
+
1: "assert(false)",
|
|
19
|
+
17: "arithmetic overflow/underflow",
|
|
20
|
+
18: "divide by zero",
|
|
21
|
+
33: "invalid enum value",
|
|
22
|
+
34: "storage byte array that is incorrectly encoded",
|
|
23
|
+
49: ".pop() on an empty array.",
|
|
24
|
+
50: "array sout-of-bounds or negative index",
|
|
25
|
+
65: "memory overflow",
|
|
26
|
+
81: "zero-initialized variable of internal function type"
|
|
27
|
+
};
|
|
28
|
+
const [code] = decoded.args;
|
|
29
|
+
return panicCodes[Number(code)] ?? `${code}`;
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
catch { }
|
|
33
|
+
return data;
|
|
34
|
+
}
|
|
35
|
+
export function prepareStateOverride({ userOperations, queuedUserOperations, stateOverrides, config }) {
|
|
36
|
+
const stateOverride = getAuthorizationStateOverrides({
|
|
37
|
+
userOperations: [...queuedUserOperations, ...userOperations],
|
|
38
|
+
stateOverrides
|
|
39
|
+
});
|
|
40
|
+
// Remove state override if not supported by network.
|
|
41
|
+
if (!config.balanceOverride && !config.codeOverrideSupport) {
|
|
42
|
+
return undefined;
|
|
43
|
+
}
|
|
44
|
+
return toViemStateOverrides(stateOverride);
|
|
45
|
+
}
|
|
46
|
+
export const simulationErrors = parseAbi([
|
|
47
|
+
"error Error(string)",
|
|
48
|
+
"error FailedOp(uint256 opIndex, string reason)",
|
|
49
|
+
"error FailedOpWithRevert(uint256 opIndex, string reason, bytes inner)",
|
|
50
|
+
"error CallPhaseReverted(bytes reason)"
|
|
51
|
+
]);
|
|
52
|
+
export function decodeSimulateHandleOpError(error, logger) {
|
|
53
|
+
// Check if it's a BaseError with ContractFunctionRevertedError
|
|
54
|
+
if (!(error instanceof BaseError)) {
|
|
55
|
+
logger.warn("Not a BaseError");
|
|
56
|
+
return {
|
|
57
|
+
result: "failed",
|
|
58
|
+
data: "Unknown error, could not parse simulate validation result.",
|
|
59
|
+
code: ValidationErrors.SimulateValidation
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
let errorName;
|
|
63
|
+
let args;
|
|
64
|
+
const contractFunctionRevertedError = error.walk((e) => e instanceof ContractFunctionRevertedError);
|
|
65
|
+
// Indicates that the RPC reverted with non standard format
|
|
66
|
+
// in this case we try to find raw revert bytes and manually decode
|
|
67
|
+
const contractFunctionExecutionError = error.walk((e) => e instanceof ContractFunctionExecutionError);
|
|
68
|
+
if (contractFunctionRevertedError) {
|
|
69
|
+
const error = contractFunctionRevertedError;
|
|
70
|
+
if (!error.data?.args && error.raw === "0x") {
|
|
71
|
+
return {
|
|
72
|
+
result: "failed",
|
|
73
|
+
data: "Sender has no code or factory not deployed",
|
|
74
|
+
code: ValidationErrors.SimulateValidation
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
if (!error.data?.args) {
|
|
78
|
+
logger.warn("Missing args");
|
|
79
|
+
return {
|
|
80
|
+
result: "failed",
|
|
81
|
+
data: "Unknown error, could not parse simulate validation result.",
|
|
82
|
+
code: ValidationErrors.SimulateValidation
|
|
83
|
+
};
|
|
84
|
+
}
|
|
85
|
+
errorName = error.data.errorName;
|
|
86
|
+
args = error.data.args;
|
|
87
|
+
}
|
|
88
|
+
else if (contractFunctionExecutionError) {
|
|
89
|
+
// Manually decode revert bytes
|
|
90
|
+
let rawRevertBytes;
|
|
91
|
+
error.walk((e) => {
|
|
92
|
+
if (typeof e?.data === "string") {
|
|
93
|
+
const hexMatch = e.data.match(/(0x[a-fA-F0-9]+)/);
|
|
94
|
+
if (hexMatch) {
|
|
95
|
+
rawRevertBytes = hexMatch[0];
|
|
96
|
+
return true; // Stop walking
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
return false;
|
|
100
|
+
});
|
|
101
|
+
if (!rawRevertBytes) {
|
|
102
|
+
logger.warn("Failed to find raw revert bytes");
|
|
103
|
+
return {
|
|
104
|
+
result: "failed",
|
|
105
|
+
data: "Unknown error, could not parse simulate validation result.",
|
|
106
|
+
code: ValidationErrors.SimulateValidation
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
try {
|
|
110
|
+
const decoded = decodeErrorResult({
|
|
111
|
+
abi: [
|
|
112
|
+
getAbiItem({
|
|
113
|
+
abi: entryPoint06Abi,
|
|
114
|
+
name: "ExecutionResult"
|
|
115
|
+
}),
|
|
116
|
+
...simulationErrors
|
|
117
|
+
],
|
|
118
|
+
data: rawRevertBytes
|
|
119
|
+
});
|
|
120
|
+
errorName = decoded.errorName;
|
|
121
|
+
args = decoded.args || [];
|
|
122
|
+
}
|
|
123
|
+
catch (decodeError) {
|
|
124
|
+
logger.warn({ rawRevertBytes }, "Failed to decode raw revert bytes");
|
|
125
|
+
return {
|
|
126
|
+
result: "failed",
|
|
127
|
+
data: "Unknown error, could not parse simulate validation result.",
|
|
128
|
+
code: ValidationErrors.SimulateValidation
|
|
129
|
+
};
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
else {
|
|
133
|
+
return {
|
|
134
|
+
result: "failed",
|
|
135
|
+
data: "Unknown error, could not parse simulate validation result.",
|
|
136
|
+
code: ValidationErrors.SimulateValidation
|
|
137
|
+
};
|
|
138
|
+
}
|
|
139
|
+
switch (errorName) {
|
|
140
|
+
case "FailedOp":
|
|
141
|
+
return {
|
|
142
|
+
result: "failed",
|
|
143
|
+
data: args[1],
|
|
144
|
+
code: ValidationErrors.SimulateValidation
|
|
145
|
+
};
|
|
146
|
+
case "FailedOpWithRevert":
|
|
147
|
+
return {
|
|
148
|
+
result: "failed",
|
|
149
|
+
data: `${args[1]} ${parseFailedOpWithRevert(args[2])}`,
|
|
150
|
+
code: ValidationErrors.SimulateValidation
|
|
151
|
+
};
|
|
152
|
+
case "CallPhaseReverted":
|
|
153
|
+
return {
|
|
154
|
+
result: "failed",
|
|
155
|
+
data: args[0],
|
|
156
|
+
code: ValidationErrors.SimulateValidation
|
|
157
|
+
};
|
|
158
|
+
case "Error":
|
|
159
|
+
return {
|
|
160
|
+
result: "failed",
|
|
161
|
+
data: args[0],
|
|
162
|
+
code: ValidationErrors.SimulateValidation
|
|
163
|
+
};
|
|
164
|
+
// 0.6 handleOp reverts with ExecutionResult if successful
|
|
165
|
+
case "ExecutionResult":
|
|
166
|
+
const parsedExecutionResult = executionResultSchema.parse(args);
|
|
167
|
+
return {
|
|
168
|
+
result: "execution",
|
|
169
|
+
data: {
|
|
170
|
+
executionResult: parsedExecutionResult
|
|
171
|
+
}
|
|
172
|
+
};
|
|
173
|
+
default:
|
|
174
|
+
logger.warn({ errorName }, "Unknown ContractFunctionRevertedError name");
|
|
175
|
+
return {
|
|
176
|
+
result: "failed",
|
|
177
|
+
data: "Unknown error, could not parse simulate validation result.",
|
|
178
|
+
code: ValidationErrors.SimulateValidation
|
|
179
|
+
};
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../rpc/estimation/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,16 +68,15 @@ const getGasEstimates = async ({ rpcHandler, userOperation, entryPoint, stateOve
|
|
|
68
68
|
}
|
|
69
69
|
const executionResult = await rpcHandler.validator.getExecutionResult({
|
|
70
70
|
userOperation: simulationUserOp,
|
|
71
|
-
entryPoint,
|
|
72
71
|
queuedUserOperations,
|
|
72
|
+
entryPoint,
|
|
73
73
|
stateOverrides: deepHexlify(mutableStateOverrides)
|
|
74
74
|
});
|
|
75
75
|
if (executionResult.result === "failed") {
|
|
76
|
-
const errorResult = executionResult;
|
|
77
76
|
return {
|
|
78
77
|
status: "failed",
|
|
79
|
-
error:
|
|
80
|
-
code:
|
|
78
|
+
error: executionResult.data,
|
|
79
|
+
code: executionResult.code
|
|
81
80
|
};
|
|
82
81
|
}
|
|
83
82
|
// type cast as typescript doesn't know the type
|
|
@@ -188,8 +187,8 @@ export const ethEstimateUserOperationGasHandler = createMethodHandler({
|
|
|
188
187
|
...gasEstimateResult.estimates, // use actual callGasLimit, verificationGasLimit, paymasterPostOpGasLimit, paymasterVerificationGasLimit
|
|
189
188
|
preVerificationGas
|
|
190
189
|
},
|
|
191
|
-
entryPoint,
|
|
192
190
|
queuedUserOperations: gasEstimateResult.queuedUserOperations,
|
|
191
|
+
entryPoint,
|
|
193
192
|
stateOverrides: deepHexlify(stateOverrides)
|
|
194
193
|
});
|
|
195
194
|
// Extrace values for returning
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eth_estimateUserOperationGas.js","sourceRoot":"","sources":["../../../rpc/methods/eth_estimateUserOperationGas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACpE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAC1E,OAAO,EACH,yBAAyB,EACzB,kBAAkB,EACrB,MAAM,yCAAyC,CAAA;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EAEH,QAAQ,EAGR,gBAAgB,EAChB,8BAA8B,EACjC,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"eth_estimateUserOperationGas.js","sourceRoot":"","sources":["../../../rpc/methods/eth_estimateUserOperationGas.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,19 +24,19 @@ export declare class SafeValidator extends UnsafeValidator implements InterfaceV
|
|
|
24
24
|
referencedContracts?: ReferencedCodeHashes;
|
|
25
25
|
}>;
|
|
26
26
|
getCodeHashes(addresses: string[]): Promise<ReferencedCodeHashes>;
|
|
27
|
-
getValidationResultV07({ userOperation, queuedUserOperations, entryPoint,
|
|
27
|
+
getValidationResultV07({ userOperation, queuedUserOperations, entryPoint, codeHashes }: {
|
|
28
28
|
userOperation: UserOperationV07;
|
|
29
|
-
queuedUserOperations:
|
|
29
|
+
queuedUserOperations: UserOperation[];
|
|
30
30
|
entryPoint: Address;
|
|
31
|
-
|
|
31
|
+
codeHashes?: ReferencedCodeHashes;
|
|
32
32
|
}): Promise<(ValidationResultV07 | ValidationResultWithAggregationV07) & {
|
|
33
33
|
storageMap: StorageMap;
|
|
34
34
|
referencedContracts?: ReferencedCodeHashes;
|
|
35
35
|
}>;
|
|
36
|
-
getValidationResultV06({ userOperation, entryPoint,
|
|
36
|
+
getValidationResultV06({ userOperation, entryPoint, codeHashes }: {
|
|
37
37
|
userOperation: UserOperationV06;
|
|
38
38
|
entryPoint: Address;
|
|
39
|
-
|
|
39
|
+
codeHashes?: ReferencedCodeHashes;
|
|
40
40
|
}): Promise<(ValidationResultV06 | ValidationResultWithAggregationV06) & {
|
|
41
41
|
referencedContracts?: ReferencedCodeHashes;
|
|
42
42
|
storageMap: StorageMap;
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import { CodeHashGetterAbi, CodeHashGetterBytecode, EntryPointV06Abi,
|
|
1
|
+
import { CodeHashGetterAbi, CodeHashGetterBytecode, EntryPointV06Abi, pimlicoSimulationsAbi, RpcError, ValidationErrors } from "../../types/index.js";
|
|
2
2
|
import { getAuthorizationStateOverrides, getAddressFromInitCodeOrPaymasterAndData, toPackedUserOperation, isVersion08, jsonStringifyWithBigint } from "../../utils/index.js";
|
|
3
3
|
import { decodeErrorResult, encodeDeployData, encodeFunctionData, zeroAddress } from "viem";
|
|
4
|
-
import { getSimulateValidationResult } from "../estimation/gasEstimationsV07.js";
|
|
5
4
|
import { bundlerCollectorTracer } from "./BundlerCollectorTracerV07.js";
|
|
6
5
|
import { tracerResultParserV06 } from "./TracerResultParserV06.js";
|
|
7
6
|
import { tracerResultParserV07 } from "./TracerResultParserV07.js";
|
|
@@ -58,16 +57,16 @@ export class SafeValidator extends UnsafeValidator {
|
|
|
58
57
|
addresses
|
|
59
58
|
};
|
|
60
59
|
}
|
|
61
|
-
async getValidationResultV07({ userOperation, queuedUserOperations, entryPoint,
|
|
62
|
-
if (
|
|
63
|
-
const { hash } = await this.getCodeHashes(
|
|
64
|
-
if (hash !==
|
|
60
|
+
async getValidationResultV07({ userOperation, queuedUserOperations, entryPoint, codeHashes }) {
|
|
61
|
+
if (codeHashes && codeHashes.addresses.length > 0) {
|
|
62
|
+
const { hash } = await this.getCodeHashes(codeHashes.addresses);
|
|
63
|
+
if (hash !== codeHashes.hash) {
|
|
65
64
|
throw new RpcError("code hashes mismatch", ValidationErrors.OpcodeValidation);
|
|
66
65
|
}
|
|
67
66
|
}
|
|
68
67
|
const [res, tracerResult] = await this.getValidationResultWithTracerV07(userOperation, queuedUserOperations, entryPoint);
|
|
69
68
|
const [contractAddresses, storageMap] = tracerResultParserV07(userOperation, tracerResult, res, entryPoint.toLowerCase());
|
|
70
|
-
const
|
|
69
|
+
const referencedContracts = codeHashes || (await this.getCodeHashes(contractAddresses));
|
|
71
70
|
// biome-ignore lint/suspicious/noExplicitAny: it's a generic type
|
|
72
71
|
if (res === "0x") {
|
|
73
72
|
throw new Error("simulateValidation reverted with no revert string!");
|
|
@@ -80,27 +79,27 @@ export class SafeValidator extends UnsafeValidator {
|
|
|
80
79
|
}
|
|
81
80
|
return {
|
|
82
81
|
...res,
|
|
83
|
-
referencedContracts
|
|
82
|
+
referencedContracts,
|
|
84
83
|
storageMap
|
|
85
84
|
};
|
|
86
85
|
}
|
|
87
|
-
async getValidationResultV06({ userOperation, entryPoint,
|
|
88
|
-
if (
|
|
89
|
-
const { hash } = await this.getCodeHashes(
|
|
90
|
-
if (hash !==
|
|
86
|
+
async getValidationResultV06({ userOperation, entryPoint, codeHashes }) {
|
|
87
|
+
if (codeHashes && codeHashes.addresses.length > 0) {
|
|
88
|
+
const { hash } = await this.getCodeHashes(codeHashes.addresses);
|
|
89
|
+
if (hash !== codeHashes.hash) {
|
|
91
90
|
throw new RpcError("code hashes mismatch", ValidationErrors.OpcodeValidation);
|
|
92
91
|
}
|
|
93
92
|
}
|
|
94
93
|
const [res, tracerResult] = await this.getValidationResultWithTracerV06(userOperation, entryPoint);
|
|
95
94
|
const [contractAddresses, storageMap] = tracerResultParserV06(userOperation, tracerResult, res, entryPoint.toLowerCase());
|
|
96
|
-
const
|
|
95
|
+
const referencedContracts = codeHashes || (await this.getCodeHashes(contractAddresses));
|
|
97
96
|
// biome-ignore lint/suspicious/noExplicitAny: it's a generic type
|
|
98
97
|
if (res === "0x") {
|
|
99
98
|
throw new Error("simulateValidation reverted with no revert string!");
|
|
100
99
|
}
|
|
101
100
|
const validationResult = {
|
|
102
101
|
...res,
|
|
103
|
-
referencedContracts
|
|
102
|
+
referencedContracts,
|
|
104
103
|
storageMap
|
|
105
104
|
};
|
|
106
105
|
if (validationResult.returnInfo.sigFailed) {
|
|
@@ -230,11 +229,6 @@ export class SafeValidator extends UnsafeValidator {
|
|
|
230
229
|
async getValidationResultWithTracerV07(userOperation, queuedUserOperations, entryPoint) {
|
|
231
230
|
const packedUserOperation = toPackedUserOperation(userOperation);
|
|
232
231
|
const packedQueuedUserOperations = queuedUserOperations.map((uop) => toPackedUserOperation(uop));
|
|
233
|
-
const entryPointSimulationsCallData = encodeFunctionData({
|
|
234
|
-
abi: EntryPointV07SimulationsAbi,
|
|
235
|
-
functionName: "simulateValidationLast",
|
|
236
|
-
args: [[...packedQueuedUserOperations, packedUserOperation]]
|
|
237
|
-
});
|
|
238
232
|
const isV8 = isVersion08(userOperation, entryPoint);
|
|
239
233
|
const entryPointSimulationsAddress = isV8
|
|
240
234
|
? this.config.entrypointSimulationContractV8
|
|
@@ -243,13 +237,14 @@ export class SafeValidator extends UnsafeValidator {
|
|
|
243
237
|
if (!entryPointSimulationsAddress || !pimlicoSimulationsAddress) {
|
|
244
238
|
throw new Error("Entrypoint simulations contract not found for this version");
|
|
245
239
|
}
|
|
246
|
-
const
|
|
247
|
-
abi:
|
|
248
|
-
functionName: "
|
|
240
|
+
const entryPointSimulationsCallData = encodeFunctionData({
|
|
241
|
+
abi: pimlicoSimulationsAbi,
|
|
242
|
+
functionName: "simulateValidation",
|
|
249
243
|
args: [
|
|
250
244
|
entryPointSimulationsAddress,
|
|
251
245
|
entryPoint,
|
|
252
|
-
|
|
246
|
+
packedQueuedUserOperations,
|
|
247
|
+
packedUserOperation
|
|
253
248
|
]
|
|
254
249
|
});
|
|
255
250
|
const stateOverrides = getAuthorizationStateOverrides({
|
|
@@ -258,7 +253,7 @@ export class SafeValidator extends UnsafeValidator {
|
|
|
258
253
|
const tracerResult = await debug_traceCall(this.config.publicClient, {
|
|
259
254
|
from: zeroAddress,
|
|
260
255
|
to: pimlicoSimulationsAddress,
|
|
261
|
-
data:
|
|
256
|
+
data: entryPointSimulationsCallData
|
|
262
257
|
}, {
|
|
263
258
|
tracer: bundlerCollectorTracer,
|
|
264
259
|
stateOverrides
|
|
@@ -269,10 +264,14 @@ export class SafeValidator extends UnsafeValidator {
|
|
|
269
264
|
throw new Error("Invalid response. simulateCall must revert");
|
|
270
265
|
}
|
|
271
266
|
const resultData = lastResult.data;
|
|
272
|
-
|
|
273
|
-
|
|
267
|
+
// Decode the validation result from the revert data
|
|
268
|
+
const { errorName, args } = decodeErrorResult({
|
|
269
|
+
abi: pimlicoSimulationsAbi,
|
|
270
|
+
data: resultData
|
|
271
|
+
});
|
|
272
|
+
if (errorName !== "ValidationResult") {
|
|
274
273
|
let errorCode = ValidationErrors.SimulateValidation;
|
|
275
|
-
const errorMessage =
|
|
274
|
+
const errorMessage = errorName || "Unknown validation error";
|
|
276
275
|
if (errorMessage.includes("AA24")) {
|
|
277
276
|
errorCode = ValidationErrors.InvalidSignature;
|
|
278
277
|
}
|
|
@@ -281,7 +280,7 @@ export class SafeValidator extends UnsafeValidator {
|
|
|
281
280
|
}
|
|
282
281
|
throw new RpcError(errorMessage, errorCode);
|
|
283
282
|
}
|
|
284
|
-
const validationResult =
|
|
283
|
+
const validationResult = args[0];
|
|
285
284
|
const mergedValidation = this.mergeValidationDataValues(validationResult.returnInfo.accountValidationData, validationResult.returnInfo.paymasterValidationData);
|
|
286
285
|
const res = {
|
|
287
286
|
returnInfo: {
|
|
@@ -310,7 +309,7 @@ export class SafeValidator extends UnsafeValidator {
|
|
|
310
309
|
aggregatorInfo: validationResult.aggregatorInfo,
|
|
311
310
|
storageMap: {}
|
|
312
311
|
};
|
|
313
|
-
// this.validateStorageAccessList(
|
|
312
|
+
// this.validateStorageAccessList(userOp, res, accessList)
|
|
314
313
|
if (res.returnInfo.accountSigFailed) {
|
|
315
314
|
throw new RpcError("Invalid UserOp signature", ValidationErrors.InvalidSignature);
|
|
316
315
|
}
|
|
@@ -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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"}
|
|
@@ -22,13 +22,13 @@ export declare class UnsafeValidator implements InterfaceValidator {
|
|
|
22
22
|
entryPoint: Address;
|
|
23
23
|
queuedUserOperations: UserOperation[];
|
|
24
24
|
stateOverrides?: StateOverrides;
|
|
25
|
-
}): Promise<SimulateHandleOpResult
|
|
25
|
+
}): Promise<SimulateHandleOpResult>;
|
|
26
26
|
getExecutionResult({ userOperation, entryPoint, queuedUserOperations, stateOverrides }: {
|
|
27
27
|
userOperation: UserOperation;
|
|
28
28
|
entryPoint: Address;
|
|
29
29
|
queuedUserOperations: UserOperation[];
|
|
30
30
|
stateOverrides?: StateOverrides;
|
|
31
|
-
}): Promise<SimulateHandleOpResult
|
|
31
|
+
}): Promise<SimulateHandleOpResult>;
|
|
32
32
|
getValidationResultV06({ userOperation, entryPoint }: {
|
|
33
33
|
userOperation: UserOperationV06;
|
|
34
34
|
entryPoint: Address;
|
|
@@ -189,12 +189,12 @@ export class UnsafeValidator {
|
|
|
189
189
|
return this.mergeValidationData(this.parseValidationData(accountValidationData), this.parseValidationData(paymasterValidationData));
|
|
190
190
|
}
|
|
191
191
|
async getValidationResultV07({ userOperation, queuedUserOperations, entryPoint }) {
|
|
192
|
-
const
|
|
192
|
+
const simulateValidationResult = await this.gasEstimationHandler.gasEstimatorV07.simulateValidation({
|
|
193
193
|
entryPoint,
|
|
194
194
|
userOperation,
|
|
195
195
|
queuedUserOperations
|
|
196
196
|
});
|
|
197
|
-
if (simulateValidationResult.
|
|
197
|
+
if (simulateValidationResult.result === "failed") {
|
|
198
198
|
throw new RpcError(`UserOperation reverted with reason: ${simulateValidationResult.data}`, ValidationErrors.SimulateValidation);
|
|
199
199
|
}
|
|
200
200
|
const validationResult = simulateValidationResult.data;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UnsafeValidator.js","sourceRoot":"","sources":["../../../rpc/validation/UnsafeValidator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"UnsafeValidator.js","sourceRoot":"","sources":["../../../rpc/validation/UnsafeValidator.ts"],"names":[],"mappings":"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"}
|