@pimlico/alto 0.0.18 → 0.0.20

package/esm/rpc/methods/pimlico_sendUserOperationNow.js

@@ -1,50 +1,53 @@
-import { getUserOperationHash, isVersion06, parseUserOperationReceipt } from "../../utils/index.js";
+import { ERC7769Errors, RpcError, pimlicoSendUserOperationNowSchema } from "../../types/index.js";
+import { getUserOpHash, getViemEntryPointVersion, parseUserOpReceipt } from "../../utils/index.js";
 import { createMethodHandler } from "../createMethodHandler.js";
-import { RpcError, ValidationErrors, pimlicoSendUserOperationNowSchema } from "../../types/index.js";
 export const pimlicoSendUserOperationNowHandler = createMethodHandler({
     method: "pimlico_sendUserOperationNow",
     schema: pimlicoSendUserOperationNowSchema,
     handler: async ({ rpcHandler, params, apiVersion }) => {
         if (!rpcHandler.config.enableInstantBundlingEndpoint) {
-            throw new RpcError("pimlico_sendUserOperationNow endpoint is not enabled", ValidationErrors.InvalidFields);
+            throw new RpcError("pimlico_sendUserOperationNow endpoint is not enabled", ERC7769Errors.InvalidFields);
         }
-        const [userOperation, entryPoint] = params;
+        const [userOp, entryPoint] = params;
         rpcHandler.ensureEntryPointIsSupported(entryPoint);
-        const opHash = await getUserOperationHash({
-            userOperation: userOperation,
+        const userOpHash = getUserOpHash({
+            userOp,
             entryPointAddress: entryPoint,
-            chainId: rpcHandler.config.chainId,
-            publicClient: rpcHandler.config.publicClient
+            chainId: rpcHandler.config.chainId
         });
-        await rpcHandler.preMempoolChecks(opHash, userOperation, apiVersion, entryPoint);
+        const [preMempoolValid, preMempoolError] = await rpcHandler.preMempoolChecks(userOp, apiVersion);
+        if (!preMempoolValid) {
+            throw new RpcError(preMempoolError, ERC7769Errors.InvalidFields);
+        }
         // Prepare bundle
-        const userOperationInfo = {
-            userOp: userOperation,
-            userOpHash: await getUserOperationHash({
-                userOperation: userOperation,
-                entryPointAddress: entryPoint,
-                chainId: rpcHandler.config.chainId,
-                publicClient: rpcHandler.config.publicClient
-            }),
-            addedToMempool: Date.now()
+        const userOpInfo = {
+            userOp,
+            userOpHash,
+            addedToMempool: Date.now(),
+            submissionAttempts: 0
         };
+        // Derive version.
+        const version = getViemEntryPointVersion(userOp, entryPoint);
         const bundle = {
             entryPoint,
-            userOps: [userOperationInfo],
-            version: isVersion06(userOperation)
-                ? "0.6"
-                : "0.7"
+            userOps: [userOpInfo],
+            version,
+            submissionAttempts: 0
         };
+        rpcHandler.mempool.store.addProcessing({
+            entryPoint,
+            userOpInfo
+        });
         const result = await rpcHandler.executorManager.sendBundleToExecutor(bundle);
         if (!result) {
-            throw new RpcError("unhandled error during bundle submission", ValidationErrors.InvalidFields);
+            throw new RpcError("unhandled error during bundle submission", ERC7769Errors.InvalidFields);
         }
         // Wait for receipt.
         const receipt = await rpcHandler.config.publicClient.waitForTransactionReceipt({
             hash: result,
             pollingInterval: 100
         });
-        return parseUserOperationReceipt(opHash, receipt);
+        return parseUserOpReceipt(userOpHash, receipt);
     }
 });
 //# sourceMappingURL=pimlico_sendUserOperationNow.js.map

package/esm/rpc/methods/pimlico_sendUserOperationNow.js.map

@@ -1 +1 @@
-{"version":3,"file":"pimlico_sendUserOperationNow.js","sourceRoot":"","sources":["../../../rpc/methods/pimlico_sendUserOperationNow.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,oBAAoB,EACpB,WAAW,EACX,yBAAyB,EAC5B,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EACH,QAAQ,EAGR,gBAAgB,EAChB,iCAAiC,EACpC,MAAM,aAAa,CAAA;AAEpB,MAAM,CAAC,MAAM,kCAAkC,GAAG,mBAAmB,CAAC;IAClE,MAAM,EAAE,8BAA8B;IACtC,MAAM,EAAE,iCAAiC;IACzC,OAAO,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE;QAClD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,6BAA6B,EAAE,CAAC;YACnD,MAAM,IAAI,QAAQ,CACd,sDAAsD,EACtD,gBAAgB,CAAC,aAAa,CACjC,CAAA;QACL,CAAC;QAED,MAAM,CAAC,aAAa,EAAE,UAAU,CAAC,GAAG,MAAM,CAAA;QAE1C,UAAU,CAAC,2BAA2B,CAAC,UAAU,CAAC,CAAA;QAClD,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC;YACtC,aAAa,EAAE,aAAa;YAC5B,iBAAiB,EAAE,UAAU;YAC7B,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO;YAClC,YAAY,EAAE,UAAU,CAAC,MAAM,CAAC,YAAY;SAC/C,CAAC,CAAA;QAEF,MAAM,UAAU,CAAC,gBAAgB,CAC7B,MAAM,EACN,aAAa,EACb,UAAU,EACV,UAAU,CACb,CAAA;QAED,iBAAiB;QACjB,MAAM,iBAAiB,GAAe;YAClC,MAAM,EAAE,aAAa;YACrB,UAAU,EAAE,MAAM,oBAAoB,CAAC;gBACnC,aAAa,EAAE,aAAa;gBAC5B,iBAAiB,EAAE,UAAU;gBAC7B,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO;gBAClC,YAAY,EAAE,UAAU,CAAC,MAAM,CAAC,YAAY;aAC/C,CAAC;YACF,cAAc,EAAE,IAAI,CAAC,GAAG,EAAE;SAC7B,CAAA;QACD,MAAM,MAAM,GAAwB;YAChC,UAAU;YACV,OAAO,EAAE,CAAC,iBAAiB,CAAC;YAC5B,OAAO,EAAE,WAAW,CAAC,aAAa,CAAC;gBAC/B,CAAC,CAAE,KAAe;gBAClB,CAAC,CAAE,KAAe;SACzB,CAAA;QACD,MAAM,MAAM,GACR,MAAM,UAAU,CAAC,eAAe,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAA;QAEjE,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,QAAQ,CACd,0CAA0C,EAC1C,gBAAgB,CAAC,aAAa,CACjC,CAAA;QACL,CAAC;QAED,oBAAoB;QACpB,MAAM,OAAO,GACT,MAAM,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,yBAAyB,CAAC;YAC3D,IAAI,EAAE,MAAM;YACZ,eAAe,EAAE,GAAG;SACvB,CAAC,CAAA;QAEN,OAAO,yBAAyB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrD,CAAC;CACJ,CAAC,CAAA"}
+{"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,wBAAwB,EACxB,kBAAkB,EACrB,MAAM,aAAa,CAAA;AACpB,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,kBAAkB;QAClB,MAAM,OAAO,GAAG,wBAAwB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;QAE5D,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"}