@pimlico/alto 0.0.0-main.20251008T150519 → 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/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 +3 -3
- 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/package.json +1 -1
|
@@ -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,5 +1,5 @@
|
|
|
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";
|
|
@@ -46,7 +46,7 @@ export class RpcHandler {
|
|
|
46
46
|
async handleMethod(request, apiVersion) {
|
|
47
47
|
const handler = this.methodHandlers.get(request.method);
|
|
48
48
|
if (!handler) {
|
|
49
|
-
throw new RpcError("Method not supported",
|
|
49
|
+
throw new RpcError("Method not supported", ERC7769Errors.InvalidFields);
|
|
50
50
|
}
|
|
51
51
|
return await handler.handler({
|
|
52
52
|
rpcHandler: this,
|
|
@@ -56,7 +56,7 @@ export class RpcHandler {
|
|
|
56
56
|
}
|
|
57
57
|
ensureEntryPointIsSupported(entryPoint) {
|
|
58
58
|
if (!this.config.entrypoints.includes(entryPoint)) {
|
|
59
|
-
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);
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
62
|
ensureDebugEndpointsAreEnabled(methodName) {
|
|
@@ -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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"}
|
package/esm/rpc/server.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ERC7769Errors, RpcError, altoVersions, bundlerRequestSchema, jsonRpcSchema } from "../types/index.js";
|
|
2
2
|
import websocket from "@fastify/websocket";
|
|
3
3
|
import * as sentry from "@sentry/node";
|
|
4
4
|
import Fastify from "fastify";
|
|
@@ -120,7 +120,7 @@ export class Server {
|
|
|
120
120
|
error: {
|
|
121
121
|
message: "invalid JSON-RPC request",
|
|
122
122
|
data: msgBuffer.toString(),
|
|
123
|
-
code:
|
|
123
|
+
code: ERC7769Errors.InvalidFields
|
|
124
124
|
}
|
|
125
125
|
}));
|
|
126
126
|
return;
|
|
@@ -135,24 +135,24 @@ export class Server {
|
|
|
135
135
|
const versionParsingResult = altoVersions.safeParse(request.params?.version ?? this.config.defaultApiVersion);
|
|
136
136
|
if (!versionParsingResult.success) {
|
|
137
137
|
const error = fromZodError(versionParsingResult.error);
|
|
138
|
-
throw new RpcError(`invalid version ${error.message}`,
|
|
138
|
+
throw new RpcError(`invalid version ${error.message}`, ERC7769Errors.InvalidFields);
|
|
139
139
|
}
|
|
140
140
|
const apiVersion = versionParsingResult.data;
|
|
141
141
|
if (this.config.apiVersion.indexOf(apiVersion) === -1) {
|
|
142
|
-
throw new RpcError(`unsupported version ${apiVersion}`,
|
|
142
|
+
throw new RpcError(`unsupported version ${apiVersion}`, ERC7769Errors.InvalidFields);
|
|
143
143
|
}
|
|
144
144
|
try {
|
|
145
145
|
const contentTypeHeader = request.headers["content-type"];
|
|
146
146
|
// Common browser websocket API does not allow setting custom headers
|
|
147
147
|
if (contentTypeHeader !== "application/json" &&
|
|
148
148
|
request.ws === false) {
|
|
149
|
-
throw new RpcError("invalid content-type, content-type must be application/json",
|
|
149
|
+
throw new RpcError("invalid content-type, content-type must be application/json", ERC7769Errors.InvalidFields);
|
|
150
150
|
}
|
|
151
151
|
this.fastify.log.trace({ body: JSON.stringify(request.body) }, "received request");
|
|
152
152
|
const jsonRpcParsing = jsonRpcSchema.safeParse(request.body);
|
|
153
153
|
if (!jsonRpcParsing.success) {
|
|
154
154
|
const validationError = fromZodError(jsonRpcParsing.error);
|
|
155
|
-
throw new RpcError(`invalid JSON-RPC request ${validationError.message}`,
|
|
155
|
+
throw new RpcError(`invalid JSON-RPC request ${validationError.message}`, ERC7769Errors.InvalidFields);
|
|
156
156
|
}
|
|
157
157
|
const jsonRpcRequest = jsonRpcParsing.data;
|
|
158
158
|
requestId = jsonRpcRequest.id;
|
|
@@ -160,15 +160,15 @@ export class Server {
|
|
|
160
160
|
if (!bundlerRequestParsing.success) {
|
|
161
161
|
const validationError = fromZodError(bundlerRequestParsing.error);
|
|
162
162
|
if (validationError.message.includes("Missing/invalid userOpHash")) {
|
|
163
|
-
throw new RpcError("Missing/invalid userOpHash",
|
|
163
|
+
throw new RpcError("Missing/invalid userOpHash", ERC7769Errors.InvalidFields);
|
|
164
164
|
}
|
|
165
|
-
throw new RpcError(validationError.message,
|
|
165
|
+
throw new RpcError(validationError.message, ERC7769Errors.InvalidRequest);
|
|
166
166
|
}
|
|
167
167
|
const bundlerRequest = bundlerRequestParsing.data;
|
|
168
168
|
request.rpcMethod = bundlerRequest.method;
|
|
169
169
|
if (this.config.rpcMethods !== null &&
|
|
170
170
|
!this.config.rpcMethods.includes(bundlerRequest.method)) {
|
|
171
|
-
throw new RpcError(`Method not supported: ${bundlerRequest.method}`,
|
|
171
|
+
throw new RpcError(`Method not supported: ${bundlerRequest.method}`, ERC7769Errors.InvalidRequest);
|
|
172
172
|
}
|
|
173
173
|
this.fastify.log.info({
|
|
174
174
|
data: JSON.stringify(bundlerRequest, null),
|
package/esm/rpc/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../rpc/server.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../rpc/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ export declare class SafeValidator extends UnsafeValidator implements InterfaceV
|
|
|
24
24
|
referencedContracts?: ReferencedCodeHashes;
|
|
25
25
|
}>;
|
|
26
26
|
getCodeHashes(addresses: string[]): Promise<ReferencedCodeHashes>;
|
|
27
|
-
|
|
27
|
+
getValidationResult07(args: {
|
|
28
28
|
userOp: UserOperation07;
|
|
29
29
|
queuedUserOps: UserOperation[];
|
|
30
30
|
entryPoint: Address;
|
|
@@ -33,7 +33,7 @@ export declare class SafeValidator extends UnsafeValidator implements InterfaceV
|
|
|
33
33
|
storageMap: StorageMap;
|
|
34
34
|
referencedContracts?: ReferencedCodeHashes;
|
|
35
35
|
}>;
|
|
36
|
-
|
|
36
|
+
getValidationResult06(args: {
|
|
37
37
|
userOp: UserOperation06;
|
|
38
38
|
entryPoint: Address;
|
|
39
39
|
codeHashes?: ReferencedCodeHashes;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CodeHashGetterAbi, CodeHashGetterBytecode, EntryPointV06Abi, RpcError,
|
|
1
|
+
import { CodeHashGetterAbi, CodeHashGetterBytecode, ERC7769Errors, EntryPointV06Abi, RpcError, pimlicoSimulationsAbi } from "../../types/index.js";
|
|
2
2
|
import { getAddressFromInitCodeOrPaymasterAndData, getAuthorizationStateOverrides, isVersion08, jsonStringifyWithBigint, toPackedUserOp } from "../../utils/index.js";
|
|
3
3
|
import { decodeErrorResult, encodeDeployData, encodeFunctionData, zeroAddress } from "viem";
|
|
4
4
|
import { bundlerCollectorTracer } from "./BundlerCollectorTracerV07.js";
|
|
@@ -58,12 +58,12 @@ export class SafeValidator extends UnsafeValidator {
|
|
|
58
58
|
addresses
|
|
59
59
|
};
|
|
60
60
|
}
|
|
61
|
-
async
|
|
61
|
+
async getValidationResult07(args) {
|
|
62
62
|
const { userOp, queuedUserOps, entryPoint, codeHashes } = args;
|
|
63
63
|
if (codeHashes && codeHashes.addresses.length > 0) {
|
|
64
64
|
const { hash } = await this.getCodeHashes(codeHashes.addresses);
|
|
65
65
|
if (hash !== codeHashes.hash) {
|
|
66
|
-
throw new RpcError("code hashes mismatch",
|
|
66
|
+
throw new RpcError("code hashes mismatch", ERC7769Errors.OpcodeValidation);
|
|
67
67
|
}
|
|
68
68
|
}
|
|
69
69
|
const [res, tracerResult] = await this.getValidationResultWithTracerV07(userOp, queuedUserOps, entryPoint);
|
|
@@ -74,10 +74,10 @@ export class SafeValidator extends UnsafeValidator {
|
|
|
74
74
|
throw new Error("simulateValidation reverted with no revert string!");
|
|
75
75
|
}
|
|
76
76
|
if (res.returnInfo.accountSigFailed) {
|
|
77
|
-
throw new RpcError("Invalid UserOp signature",
|
|
77
|
+
throw new RpcError("Invalid UserOp signature", ERC7769Errors.InvalidSignature);
|
|
78
78
|
}
|
|
79
79
|
if (res.returnInfo.paymasterSigFailed) {
|
|
80
|
-
throw new RpcError("Invalid UserOp paymasterData",
|
|
80
|
+
throw new RpcError("Invalid UserOp paymasterData", ERC7769Errors.InvalidSignature);
|
|
81
81
|
}
|
|
82
82
|
return {
|
|
83
83
|
...res,
|
|
@@ -85,12 +85,12 @@ export class SafeValidator extends UnsafeValidator {
|
|
|
85
85
|
storageMap
|
|
86
86
|
};
|
|
87
87
|
}
|
|
88
|
-
async
|
|
88
|
+
async getValidationResult06(args) {
|
|
89
89
|
const { userOp, entryPoint, codeHashes } = args;
|
|
90
90
|
if (codeHashes && codeHashes.addresses.length > 0) {
|
|
91
91
|
const { hash } = await this.getCodeHashes(codeHashes.addresses);
|
|
92
92
|
if (hash !== codeHashes.hash) {
|
|
93
|
-
throw new RpcError("code hashes mismatch",
|
|
93
|
+
throw new RpcError("code hashes mismatch", ERC7769Errors.OpcodeValidation);
|
|
94
94
|
}
|
|
95
95
|
}
|
|
96
96
|
const [res, tracerResult] = await this.getValidationResultWithTracerV06(userOp, entryPoint);
|
|
@@ -106,7 +106,7 @@ export class SafeValidator extends UnsafeValidator {
|
|
|
106
106
|
storageMap
|
|
107
107
|
};
|
|
108
108
|
if (validationResult.returnInfo.sigFailed) {
|
|
109
|
-
throw new RpcError("Invalid UserOp signature or paymaster signature",
|
|
109
|
+
throw new RpcError("Invalid UserOp signature or paymaster signature", ERC7769Errors.InvalidSignature);
|
|
110
110
|
}
|
|
111
111
|
const now = Date.now() / 1000;
|
|
112
112
|
this.logger.debug({
|
|
@@ -115,10 +115,10 @@ export class SafeValidator extends UnsafeValidator {
|
|
|
115
115
|
now: now
|
|
116
116
|
});
|
|
117
117
|
if (validationResult.returnInfo.validAfter > now - 5) {
|
|
118
|
-
throw new RpcError("User operation is not valid yet",
|
|
118
|
+
throw new RpcError("User operation is not valid yet", ERC7769Errors.ExpiresShortly);
|
|
119
119
|
}
|
|
120
120
|
if (validationResult.returnInfo.validUntil < now + 30) {
|
|
121
|
-
throw new RpcError("expires too soon",
|
|
121
|
+
throw new RpcError("expires too soon", ERC7769Errors.ExpiresShortly);
|
|
122
122
|
}
|
|
123
123
|
return validationResult;
|
|
124
124
|
}
|
|
@@ -186,9 +186,9 @@ export class SafeValidator extends UnsafeValidator {
|
|
|
186
186
|
// eslint-disable-next-line
|
|
187
187
|
const msg = errorResult.errorArgs[1] ?? errorResult.toString();
|
|
188
188
|
if (paymaster == null) {
|
|
189
|
-
throw new RpcError(`account validation failed: ${msg}`,
|
|
189
|
+
throw new RpcError(`account validation failed: ${msg}`, ERC7769Errors.SimulateValidation);
|
|
190
190
|
}
|
|
191
|
-
throw new RpcError(`paymaster validation failed: ${msg}`,
|
|
191
|
+
throw new RpcError(`paymaster validation failed: ${msg}`, ERC7769Errors.SimulatePaymasterValidation, {
|
|
192
192
|
paymaster
|
|
193
193
|
});
|
|
194
194
|
}
|
|
@@ -273,13 +273,13 @@ export class SafeValidator extends UnsafeValidator {
|
|
|
273
273
|
data: resultData
|
|
274
274
|
});
|
|
275
275
|
if (errorName !== "ValidationResult") {
|
|
276
|
-
let errorCode =
|
|
276
|
+
let errorCode = ERC7769Errors.SimulateValidation;
|
|
277
277
|
const errorMessage = errorName || "Unknown validation error";
|
|
278
278
|
if (errorMessage.includes("AA24")) {
|
|
279
|
-
errorCode =
|
|
279
|
+
errorCode = ERC7769Errors.InvalidSignature;
|
|
280
280
|
}
|
|
281
281
|
if (errorMessage.includes("AA31")) {
|
|
282
|
-
errorCode =
|
|
282
|
+
errorCode = ERC7769Errors.PaymasterDepositTooLow;
|
|
283
283
|
}
|
|
284
284
|
throw new RpcError(errorMessage, errorCode);
|
|
285
285
|
}
|
|
@@ -314,18 +314,18 @@ export class SafeValidator extends UnsafeValidator {
|
|
|
314
314
|
};
|
|
315
315
|
// this.validateStorageAccessList(userOp, res, accessList)
|
|
316
316
|
if (res.returnInfo.accountSigFailed) {
|
|
317
|
-
throw new RpcError("Invalid UserOp signature",
|
|
317
|
+
throw new RpcError("Invalid UserOp signature", ERC7769Errors.InvalidSignature);
|
|
318
318
|
}
|
|
319
319
|
if (res.returnInfo.paymasterSigFailed) {
|
|
320
|
-
throw new RpcError("Invalid UserOp paymasterData",
|
|
320
|
+
throw new RpcError("Invalid UserOp paymasterData", ERC7769Errors.InvalidSignature);
|
|
321
321
|
}
|
|
322
322
|
const now = Math.floor(Date.now() / 1000);
|
|
323
323
|
if (res.returnInfo.validAfter > now - 5) {
|
|
324
|
-
throw new RpcError(`User operation is not valid yet, validAfter=${res.returnInfo.validAfter}, now=${now}`,
|
|
324
|
+
throw new RpcError(`User operation is not valid yet, validAfter=${res.returnInfo.validAfter}, now=${now}`, ERC7769Errors.ExpiresShortly);
|
|
325
325
|
}
|
|
326
326
|
if (res.returnInfo.validUntil == null ||
|
|
327
327
|
res.returnInfo.validUntil < now + 30) {
|
|
328
|
-
throw new RpcError(`UserOperation expires too soon, validUntil=${res.returnInfo.validUntil}, now=${now}`,
|
|
328
|
+
throw new RpcError(`UserOperation expires too soon, validUntil=${res.returnInfo.validUntil}, now=${now}`, ERC7769Errors.ExpiresShortly);
|
|
329
329
|
}
|
|
330
330
|
return [res, tracerResult];
|
|
331
331
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SafeValidator.js","sourceRoot":"","sources":["../../../rpc/validation/SafeValidator.ts"],"names":[],"mappings":"AAUA,OAAO,EAEH,iBAAiB,EACjB,sBAAsB,EACtB,gBAAgB,EAEhB,QAAQ,EAIR,gBAAgB,EAChB,qBAAqB,EACxB,MAAM,aAAa,CAAA;AAEpB,OAAO,EACH,wCAAwC,EACxC,8BAA8B,EAC9B,WAAW,EACX,uBAAuB,EACvB,cAAc,EACjB,MAAM,aAAa,CAAA;AACpB,OAAO,EAGH,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,WAAW,EACd,MAAM,MAAM,CAAA;AAEb,OAAO,EAGH,sBAAsB,EACzB,MAAM,6BAA6B,CAAA;AACpC,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE1C,MAAM,OAAO,aACT,SAAQ,eAAe;IAGf,aAAa,CAAe;IAEpC,YAAY,EACR,MAAM,EACN,aAAa,EACb,OAAO,EACP,eAAe,EAMlB;QACG,KAAK,CAAC;YACF,MAAM;YACN,OAAO;YACP,eAAe;SAClB,CAAC,CAAA;QACF,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;IACtC,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,IAKpB;QAMG,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAA;QACvE,IAAI,CAAC;YACD,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC;gBACpD,MAAM;gBACN,aAAa;gBACb,UAAU;gBACV,UAAU,EAAE,mBAAmB;aAClC,CAAC,CAAA;YAEF,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,GAAG,EAAE,CAAA;YAE3C,OAAO,gBAAgB,CAAA;QAC3B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,GAAG,EAAE,CAAA;YAC3C,MAAM,CAAC,CAAA;QACX,CAAC;IACL,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,SAAmB;QACnC,MAAM,UAAU,GAAG,gBAAgB,CAAC;YAChC,GAAG,EAAE,iBAAiB;YACtB,QAAQ,EAAE,sBAAsB;YAChC,IAAI,EAAE,CAAC,SAAS,CAAC;SACpB,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAA;QAEnD,IAAI,IAAI,GAAG,EAAE,CAAA;QAEb,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC;gBAChC,OAAO,EAAE,MAAM;gBACf,IAAI,EAAE,UAAU;aACnB,CAAC,CAAA;QACN,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,MAAM,KAAK,GAAG,CAA2B,CAAA;YACzC,kEAAkE;YAClE,IAAI,GAAI,KAAK,CAAC,IAAI,EAAU,CAAC,IAAI,CAAA;QACrC,CAAC;QAED,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAA;QAE9C,OAAO;YACH,IAAI;YACJ,SAAS;SACZ,CAAA;IACL,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,IAK5B;QAMG,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;QAC9D,IAAI,UAAU,IAAI,UAAU,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;YAC/D,IAAI,IAAI,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;gBAC3B,MAAM,IAAI,QAAQ,CACd,sBAAsB,EACtB,gBAAgB,CAAC,gBAAgB,CACpC,CAAA;YACL,CAAC;QACL,CAAC;QAED,MAAM,CAAC,GAAG,EAAE,YAAY,CAAC,GAAG,MAAM,IAAI,CAAC,gCAAgC,CACnE,MAAM,EACN,aAAkC,EAClC,UAAU,CACb,CAAA;QAED,MAAM,CAAC,iBAAiB,EAAE,UAAU,CAAC,GAAG,qBAAqB,CACzD,MAAM,EACN,YAAY,EACZ,GAAG,EACH,UAAU,CAAC,WAAW,EAAa,CACtC,CAAA;QAED,MAAM,mBAAmB,GACrB,UAAU,IAAI,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,CAAA;QAE/D,kEAAkE;QAClE,IAAK,GAAW,KAAK,IAAI,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CACX,oDAAoD,CACvD,CAAA;QACL,CAAC;QAED,IAAI,GAAG,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC;YAClC,MAAM,IAAI,QAAQ,CACd,0BAA0B,EAC1B,gBAAgB,CAAC,gBAAgB,CACpC,CAAA;QACL,CAAC;QAED,IAAI,GAAG,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC;YACpC,MAAM,IAAI,QAAQ,CACd,8BAA8B,EAC9B,gBAAgB,CAAC,gBAAgB,CACpC,CAAA;QACL,CAAC;QAED,OAAO;YACH,GAAG,GAAG;YACN,mBAAmB;YACnB,UAAU;SACb,CAAA;IACL,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,IAI5B;QAMG,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;QAC/C,IAAI,UAAU,IAAI,UAAU,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;YAC/D,IAAI,IAAI,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;gBAC3B,MAAM,IAAI,QAAQ,CACd,sBAAsB,EACtB,gBAAgB,CAAC,gBAAgB,CACpC,CAAA;YACL,CAAC;QACL,CAAC;QAED,MAAM,CAAC,GAAG,EAAE,YAAY,CAAC,GAAG,MAAM,IAAI,CAAC,gCAAgC,CACnE,MAAM,EACN,UAAU,CACb,CAAA;QAED,MAAM,CAAC,iBAAiB,EAAE,UAAU,CAAC,GAAG,qBAAqB,CACzD,MAAM,EACN,YAAY,EACZ,GAAG,EACH,UAAU,CAAC,WAAW,EAAa,CACtC,CAAA;QAED,MAAM,mBAAmB,GACrB,UAAU,IAAI,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,CAAA;QAE/D,kEAAkE;QAClE,IAAK,GAAW,KAAK,IAAI,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CACX,oDAAoD,CACvD,CAAA;QACL,CAAC;QACD,MAAM,gBAAgB,GAAG;YACrB,GAAG,GAAG;YACN,mBAAmB;YACnB,UAAU;SACb,CAAA;QAED,IAAI,gBAAgB,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;YACxC,MAAM,IAAI,QAAQ,CACd,iDAAiD,EACjD,gBAAgB,CAAC,gBAAgB,CACpC,CAAA;QACL,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAA;QAE7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;YACd,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC,UAAU;YAClD,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC,UAAU;YAClD,GAAG,EAAE,GAAG;SACX,CAAC,CAAA;QAEF,IAAI,gBAAgB,CAAC,UAAU,CAAC,UAAU,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC;YACnD,MAAM,IAAI,QAAQ,CACd,iCAAiC,EACjC,gBAAgB,CAAC,cAAc,CAClC,CAAA;QACL,CAAC;QAED,IAAI,gBAAgB,CAAC,UAAU,CAAC,UAAU,GAAG,GAAG,GAAG,EAAE,EAAE,CAAC;YACpD,MAAM,IAAI,QAAQ,CACd,kBAAkB,EAClB,gBAAgB,CAAC,cAAc,CAClC,CAAA;QACL,CAAC;QAED,OAAO,gBAAgB,CAAA;IAC3B,CAAC;IAED,KAAK,CAAC,gCAAgC,CAClC,MAAuB,EACvB,UAAmB;QAEnB,MAAM,cAAc,GAAG,8BAA8B,CAAC;YAClD,OAAO,EAAE,CAAC,MAAM,CAAC;SACpB,CAAC,CAAA;QAEF,MAAM,YAAY,GAAG,MAAM,eAAe,CACtC,IAAI,CAAC,MAAM,CAAC,YAAY,EACxB;YACI,IAAI,EAAE,WAAW;YACjB,EAAE,EAAE,UAAU;YACd,IAAI,EAAE,kBAAkB,CAAC;gBACrB,GAAG,EAAE,gBAAgB;gBACrB,YAAY,EAAE,oBAAoB;gBAClC,IAAI,EAAE,CAAC,MAAM,CAAC;aACjB,CAAC;SACL,EACD;YACI,MAAM,EAAE,sBAAsB;YAC9B,cAAc;SACjB,CACJ,CAAA;QAED,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAClD,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAA;QACjE,CAAC;QAED,MAAM,IAAI,GAAI,UAAuB,CAAC,IAAI,CAAA;QAC1C,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAChB,kEAAkE;YAClE,OAAO,CAAC,IAAW,EAAE,YAAY,CAAC,CAAA;QACtC,CAAC;QAED,IAAI,CAAC;YACD,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,iBAAiB,CAAC;gBACrD,GAAG,EAAE,gBAAgB;gBACrB,IAAI;aACP,CAAC,CAAA;YAEF,MAAM,WAAW,GAAG,GAAG,SAAS,IAAI,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAA;YAC3D,MAAM,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE;gBACjD,SAAS;gBACT,SAAS;aACZ,CAAC,CAAA;YACF,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAChC,8BAA8B;gBAC9B,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,CAAA;YAChC,CAAC;YACD,aAAa;YACb,OAAO,CAAC,WAAW,EAAE,YAAY,CAAC,CAAA;YAClC,kEAAkE;QACtE,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YACd,iCAAiC;YACjC,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;gBACjB,MAAM,CAAC,CAAA;YACX,CAAC;YACD,MAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAA;QAC5B,CAAC;IACL,CAAC;IAED,mBAAmB,CACf,MAAuB;IACvB,kEAAkE;IAClE,WAAkD;QAElD,IAAI,CAAC,WAAW,EAAE,SAAS,EAAE,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;YAC1D,uBAAuB;YACvB,sFAAsF;YACtF,IAAI,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC,SAAS,CAAA;YAC/C,IAAI,SAAS,KAAK,WAAW,EAAE,CAAC;gBAC5B,SAAS,GAAG,SAAS,CAAA;YACzB,CAAC;YAED,2BAA2B;YAC3B,MAAM,GAAG,GACL,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,WAAW,CAAC,QAAQ,EAAE,CAAA;YAEtD,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;gBACpB,MAAM,IAAI,QAAQ,CACd,8BAA8B,GAAG,EAAE,EACnC,gBAAgB,CAAC,kBAAkB,CACtC,CAAA;YACL,CAAC;YACD,MAAM,IAAI,QAAQ,CACd,gCAAgC,GAAG,EAAE,EACrC,gBAAgB,CAAC,2BAA2B,EAC5C;gBACI,SAAS;aACZ,CACJ,CAAA;QACL,CAAC;QAED,MAAM,CACF,UAAU,EACV,UAAU,EACV,WAAW,EACX,aAAa,EACb,cAAc,CAAC,8DAA8D;SAChF,GAAG,WAAW,CAAC,SAAS,CAAA;QAEzB,+CAA+C;QAC/C,oDAAoD;QACpD,4DAA4D;QAC5D,SAAS,UAAU,CAAC,IAAS,EAAE,IAAe;YAC1C,MAAM,IAAI,GAAG,wCAAwC,CAAC,IAAI,CAAC,CAAA;YAC3D,OAAO,IAAI,IAAI,IAAI;gBACf,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC;oBACI,GAAG,IAAI;oBACP,IAAI;iBACP,CAAA;QACX,CAAC;QAED,SAAS,oBAAoB,CACzB,IAAS,EACT,IAAe;YAEf,MAAM,IAAI,GAAG,wCAAwC,CAAC,IAAI,CAAC,CAAA;YAC3D,OAAO,IAAI,IAAI,IAAI;gBACf,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC;oBACI,UAAU,EAAE,IAAI;oBAChB,SAAS,EAAE;wBACP,GAAG,IAAI;wBACP,IAAI;qBACP;iBACJ,CAAA;QACX,CAAC;QAED,OAAO;YACH,UAAU;YACV,UAAU,EAAE;gBACR,GAAG,UAAU;gBACb,IAAI,EAAE,MAAM,CAAC,MAAM;aACtB;YACD,WAAW,EAAE,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC;YACrD,aAAa,EAAE,UAAU,CAAC,MAAM,CAAC,gBAAgB,EAAE,aAAa,CAAC;YACjE,cAAc,EAAE,oBAAoB,CAChC,cAAc,EAAE,gBAAgB,EAChC,cAAc,EAAE,SAAS,CAC5B;SACJ,CAAA;IACL,CAAC;IAED,KAAK,CAAC,gCAAgC,CAClC,MAAuB,EACvB,aAAgC,EAChC,UAAmB;QAEnB,MAAM,YAAY,GAAG,cAAc,CAAC,MAAM,CAAC,CAAA;QAC3C,MAAM,mBAAmB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAClD,cAAc,CAAC,GAAG,CAAC,CACtB,CAAA;QAED,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;QAE5C,MAAM,4BAA4B,GAAG,IAAI;YACrC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,8BAA8B;YAC5C,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,8BAA8B,CAAA;QAEhD,MAAM,yBAAyB,GAAG,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAA;QAEvE,IAAI,CAAC,4BAA4B,IAAI,CAAC,yBAAyB,EAAE,CAAC;YAC9D,MAAM,IAAI,KAAK,CACX,4DAA4D,CAC/D,CAAA;QACL,CAAC;QAED,MAAM,6BAA6B,GAAG,kBAAkB,CAAC;YACrD,GAAG,EAAE,qBAAqB;YAC1B,YAAY,EAAE,oBAAoB;YAClC,IAAI,EAAE;gBACF,4BAA4B;gBAC5B,UAAU;gBACV,mBAAmB;gBACnB,YAAY;aACf;SACJ,CAAC,CAAA;QAEF,MAAM,cAAc,GAAG,8BAA8B,CAAC;YAClD,OAAO,EAAE,CAAC,MAAM,CAAC;SACpB,CAAC,CAAA;QAEF,MAAM,YAAY,GAAG,MAAM,eAAe,CACtC,IAAI,CAAC,MAAM,CAAC,YAAY,EACxB;YACI,IAAI,EAAE,WAAW;YACjB,EAAE,EAAE,yBAAyB;YAC7B,IAAI,EAAE,6BAA6B;SACtC,EACD;YACI,MAAM,EAAE,sBAAsB;YAC9B,cAAc;SACjB,CACJ,CAAA;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,iBAAiB,uBAAuB,CAAC,YAAY,CAAC,EAAE,CAC3D,CAAA;QAED,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAClD,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAA;QACjE,CAAC;QACD,MAAM,UAAU,GAAG,UAAU,CAAC,IAAW,CAAA;QAEzC,oDAAoD;QACpD,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,iBAAiB,CAAC;YAC1C,GAAG,EAAE,qBAAqB;YAC1B,IAAI,EAAE,UAAU;SACnB,CAAC,CAAA;QAEF,IAAI,SAAS,KAAK,kBAAkB,EAAE,CAAC;YACnC,IAAI,SAAS,GAAG,gBAAgB,CAAC,kBAAkB,CAAA;YACnD,MAAM,YAAY,GAAG,SAAS,IAAI,0BAA0B,CAAA;YAE5D,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBAChC,SAAS,GAAG,gBAAgB,CAAC,gBAAgB,CAAA;YACjD,CAAC;YAED,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBAChC,SAAS,GAAG,gBAAgB,CAAC,sBAAsB,CAAA;YACvD,CAAC;YAED,MAAM,IAAI,QAAQ,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;QAC/C,CAAC;QAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,CAAC,CAAuB,CAAA;QAEtD,MAAM,gBAAgB,GAAG,IAAI,CAAC,yBAAyB,CACnD,gBAAgB,CAAC,UAAU,CAAC,qBAAqB,EACjD,gBAAgB,CAAC,UAAU,CAAC,uBAAuB,CACtD,CAAA;QAED,MAAM,GAAG,GAAG;YACR,UAAU,EAAE;gBACR,GAAG,gBAAgB,CAAC,UAAU;gBAC9B,gBAAgB,EAAE,gBAAgB,CAAC,gBAAgB;gBACnD,kBAAkB,EAAE,gBAAgB,CAAC,kBAAkB;gBACvD,UAAU,EAAE,gBAAgB,CAAC,UAAU;gBACvC,UAAU,EAAE,gBAAgB,CAAC,UAAU;aAC1C;YACD,UAAU,EAAE;gBACR,GAAG,gBAAgB,CAAC,UAAU;gBAC9B,IAAI,EAAE,MAAM,CAAC,MAAM;aACtB;YACD,WAAW,EACP,MAAM,CAAC,OAAO,IAAI,gBAAgB,CAAC,WAAW;gBAC1C,CAAC,CAAC;oBACI,GAAG,gBAAgB,CAAC,WAAW;oBAC/B,IAAI,EAAE,MAAM,CAAC,OAAO;iBACvB;gBACH,CAAC,CAAC,SAAS;YACnB,aAAa,EACT,MAAM,CAAC,SAAS,IAAI,gBAAgB,CAAC,aAAa;gBAC9C,CAAC,CAAC;oBACI,GAAG,gBAAgB,CAAC,aAAa;oBACjC,IAAI,EAAE,MAAM,CAAC,SAAS;iBACzB;gBACH,CAAC,CAAC,SAAS;YACnB,cAAc,EAAE,gBAAgB,CAAC,cAAc;YAC/C,UAAU,EAAE,EAAE;SACjB,CAAA;QAED,0DAA0D;QAE1D,IAAI,GAAG,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC;YAClC,MAAM,IAAI,QAAQ,CACd,0BAA0B,EAC1B,gBAAgB,CAAC,gBAAgB,CACpC,CAAA;QACL,CAAC;QAED,IAAI,GAAG,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC;YACpC,MAAM,IAAI,QAAQ,CACd,8BAA8B,EAC9B,gBAAgB,CAAC,gBAAgB,CACpC,CAAA;QACL,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAA;QAEzC,IAAI,GAAG,CAAC,UAAU,CAAC,UAAU,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,QAAQ,CACd,+CAA+C,GAAG,CAAC,UAAU,CAAC,UAAU,SAAS,GAAG,EAAE,EACtF,gBAAgB,CAAC,cAAc,CAClC,CAAA;QACL,CAAC;QAED,IACI,GAAG,CAAC,UAAU,CAAC,UAAU,IAAI,IAAI;YACjC,GAAG,CAAC,UAAU,CAAC,UAAU,GAAG,GAAG,GAAG,EAAE,EACtC,CAAC;YACC,MAAM,IAAI,QAAQ,CACd,8CAA8C,GAAG,CAAC,UAAU,CAAC,UAAU,SAAS,GAAG,EAAE,EACrF,gBAAgB,CAAC,cAAc,CAClC,CAAA;QACL,CAAC;QAED,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC,CAAA;IAC9B,CAAC;CACJ"}
|
|
1
|
+
{"version":3,"file":"SafeValidator.js","sourceRoot":"","sources":["../../../rpc/validation/SafeValidator.ts"],"names":[],"mappings":"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"}
|