@mentaproject/core 0.5.15 → 0.6.1

package/dist/clients/createMentaAccount.d.ts

@@ -1,6 +1,6 @@
 import { MentaAccountParams } from "../types";
-import type { Client, Transport, Chain, JsonRpcAccount, LocalAccount } from "viem";
-export declare function createMentaAccount<TChain extends Chain | undefined>(client: Client<Transport, TChain, JsonRpcAccount | LocalAccount | undefined>, params: MentaAccountParams): Promise<Client<Transport, undefined, object & {
+import type { Client, Transport, Chain, Account } from "viem";
+export declare function createMentaAccount<TChain extends Chain | undefined>(client: Client<Transport, TChain, Account | undefined>, params: MentaAccountParams): Promise<Client<Transport, undefined, object & {
     client: Client<Transport, Chain | undefined, {
         address: import("abitype").Address;
         nonceManager?: import("viem").NonceManager | undefined;
@@ -18,7 +18,7 @@ export declare function createMentaAccount<TChain extends Chain | undefined>(cli
         publicKey: import("viem").Hex;
         source: string;
         type: "local";
-    } | JsonRpcAccount | undefined>;
+    } | import("viem").JsonRpcAccount | undefined>;
     entryPoint: {
         abi: readonly [{
             readonly inputs: readonly [{
@@ -1961,7 +1961,7 @@ export declare function createMentaAccount<TChain extends Chain | undefined>(cli
             publicKey: import("viem").Hex;
             source: string;
             type: "local";
-        } | JsonRpcAccount | undefined>;
+        } | import("viem").JsonRpcAccount | undefined>;
         entryPoint: {
             abi: readonly [{
                 readonly inputs: readonly [{
@@ -4311,7 +4311,7 @@ export declare function createMentaAccount<TChain extends Chain | undefined>(cli
             publicKey: import("viem").Hex;
             source: string;
             type: "local";
-        } | JsonRpcAccount | undefined>;
+        } | import("viem").JsonRpcAccount | undefined>;
         entryPoint: {
             abi: readonly [{
                 readonly inputs: readonly [{
@@ -6661,7 +6661,7 @@ export declare function createMentaAccount<TChain extends Chain | undefined>(cli
             publicKey: import("viem").Hex;
             source: string;
             type: "local";
-        } | JsonRpcAccount | undefined>;
+        } | import("viem").JsonRpcAccount | undefined>;
         entryPoint: {
             abi: readonly [{
                 readonly inputs: readonly [{
@@ -9011,7 +9011,7 @@ export declare function createMentaAccount<TChain extends Chain | undefined>(cli
             publicKey: import("viem").Hex;
             source: string;
             type: "local";
-        } | JsonRpcAccount | undefined>;
+        } | import("viem").JsonRpcAccount | undefined>;
         entryPoint: {
             abi: readonly [{
                 readonly inputs: readonly [{
@@ -11361,7 +11361,7 @@ export declare function createMentaAccount<TChain extends Chain | undefined>(cli
             publicKey: import("viem").Hex;
             source: string;
             type: "local";
-        } | JsonRpcAccount | undefined>;
+        } | import("viem").JsonRpcAccount | undefined>;
         entryPoint: {
             abi: readonly [{
                 readonly inputs: readonly [{
@@ -13711,7 +13711,7 @@ export declare function createMentaAccount<TChain extends Chain | undefined>(cli
             publicKey: import("viem").Hex;
             source: string;
             type: "local";
-        } | JsonRpcAccount | undefined>;
+        } | import("viem").JsonRpcAccount | undefined>;
         entryPoint: {
             abi: readonly [{
                 readonly inputs: readonly [{
@@ -16061,7 +16061,7 @@ export declare function createMentaAccount<TChain extends Chain | undefined>(cli
             publicKey: import("viem").Hex;
             source: string;
             type: "local";
-        } | JsonRpcAccount | undefined>;
+        } | import("viem").JsonRpcAccount | undefined>;
         entryPoint: {
             abi: readonly [{
                 readonly inputs: readonly [{
@@ -18001,7 +18001,7 @@ export declare function createMentaAccount<TChain extends Chain | undefined>(cli
         publicKey: import("viem").Hex;
         source: string;
         type: "local";
-    } | JsonRpcAccount | undefined>;
+    } | import("viem").JsonRpcAccount | undefined>;
     entryPoint: {
         abi: readonly [{
             readonly inputs: readonly [{
@@ -19530,7 +19530,7 @@ export declare function createMentaAccount<TChain extends Chain | undefined>(cli
         publicKey: import("viem").Hex;
         source: string;
         type: "local";
-    } | JsonRpcAccount | undefined>;
+    } | import("viem").JsonRpcAccount | undefined>;
     entryPoint: {
         abi: readonly [{
             readonly inputs: readonly [{

package/dist/clients/index.js

@@ -5939,6 +5939,64 @@ const getValidatorAddress = (entryPoint, kernelVersion, validatorContractVersion
     return validatorAddress ?? passKeyValidatorAddress ?? viem.zeroAddress;
 };
 
+/**
+ * RPC methods that should be routed to the bundler.
+ * All other methods will be routed to the public RPC.
+ */
+const BUNDLER_METHODS = new Set([
+    // ERC-4337 standard methods
+    "eth_sendUserOperation",
+    "eth_estimateUserOperationGas",
+    "eth_getUserOperationByHash",
+    "eth_getUserOperationReceipt",
+    "eth_supportedEntryPoints",
+    // Pimlico-specific methods
+    "pimlico_getUserOperationGasPrice",
+    "pimlico_getUserOperationStatus",
+    "pimlico_sendCompressedUserOperation",
+    // pm_ paymaster methods (used by some bundlers)
+    "pm_getPaymasterData",
+    "pm_getPaymasterStubData",
+    "pm_sponsorUserOperation",
+    "pm_validateSponsorshipPolicies",
+]);
+/**
+ * Creates a transport that routes requests between a public RPC and a bundler RPC.
+ *
+ * Bundler-specific methods (ERC-4337) are routed to the bundler transport,
+ * while all other methods (eth_getBlockByNumber, eth_call, etc.) are routed
+ * to the public transport.
+ *
+ * @param publicTransport - Transport for standard Ethereum RPC calls
+ * @param bundlerTransport - Transport for ERC-4337 bundler calls
+ * @returns A unified transport that routes requests appropriately
+ *
+ * @example
+ * import { http } from 'viem';
+ * import { createRoutedTransport } from '@mentaproject/core/utils';
+ *
+ * const transport = createRoutedTransport(
+ *   http('https://eth-mainnet.g.alchemy.com/v2/...'),
+ *   http('https://api.pimlico.io/v2/1/rpc?apikey=...')
+ * );
+ */
+function createRoutedTransport(publicTransport, bundlerTransport) {
+    return (params) => {
+        const publicClient = publicTransport(params);
+        const bundlerClient = bundlerTransport(params);
+        const request = async ({ method, params: reqParams }) => {
+            if (BUNDLER_METHODS.has(method)) {
+                return bundlerClient.request({ method, params: reqParams });
+            }
+            return publicClient.request({ method, params: reqParams });
+        };
+        return {
+            ...publicClient,
+            request,
+        };
+    };
+}
+
 async function createMentaAccount(client, params) {
     const validator = await toPasskeyValidator(client, {
         webAuthnKey: params.signer,
@@ -5953,9 +6011,12 @@ async function createMentaAccount(client, params) {
         owners: [validator],
         client: client,
     });
+    // Create a routed transport that sends bundler methods to the bundler
+    // and all other RPC calls to the public transport
+    const routedTransport = createRoutedTransport(params.publicTransport, params.bundlerTransport);
     return permissionless.createSmartAccountClient({
         account: kernel,
-        bundlerTransport: params.bundlerTransport,
+        bundlerTransport: routedTransport,
     }).extend(erc7579.erc7579Actions());
 }