@mentaproject/core 0.5.13 → 0.6.0

package/dist/clients/index.mjs

@@ -5937,8 +5937,66 @@ const getValidatorAddress = (entryPoint, kernelVersion, validatorContractVersion
     return validatorAddress ?? passKeyValidatorAddress ?? zeroAddress;
 };
 
-async function createMentaAccount(coreClient, params) {
-    const validator = await toPasskeyValidator(coreClient, {
+/**
+ * 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,
         entryPoint: {
             address: entryPoint07Address,
@@ -5949,11 +6007,14 @@ async function createMentaAccount(coreClient, params) {
     });
     const kernel = await toKernelSmartAccount({
         owners: [validator],
-        client: coreClient,
+        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 createSmartAccountClient({
         account: kernel,
-        bundlerTransport: params.bundlerTransport,
+        bundlerTransport: routedTransport,
     }).extend(erc7579Actions());
 }