@latticexyz/entrykit 2.2.22-8c4b624756007fd02b1c3c3494e34128a5f1c044 → 2.2.22-98707edd061dabe30900f1b1b8b52f9fd72add97

package/dist/tsup/exports/internal.js

@@ -139,8 +139,11 @@ var debug2 = debug.extend("quarry");
 
 // src/quarry/transports/userOpExecutor.ts
 import { setBalance } from "viem/actions";
-function userOpExecutor({ executor }) {
-  return () => {
+function userOpExecutor({
+  executor,
+  fallbackEth
+}) {
+  return (opts) => {
     debug2("using a local user op executor", executor.account.address);
     if (executor.chain.id === 31337) {
       debug2("setting executor balance");
@@ -175,7 +178,9 @@ function userOpExecutor({ executor }) {
       if (method === "eth_estimateUserOperationGas") {
         return await estimateUserOperationGas(params);
       }
-      throw new Error(`userOpExecutor: method "${method}" not supported`);
+      debug2(`userOpExecutor: method "${method}" not overridden, falling back to fallback transport`);
+      const { request: fallbackRequest } = fallbackEth(opts);
+      return fallbackRequest({ method, params });
     };
     return createTransport({
       key: "userOpExecutor",
@@ -187,20 +192,41 @@ function userOpExecutor({ executor }) {
 }
 
 // src/getBundlerTransport.ts
+import { wiresaw } from "@latticexyz/common/internal";
 function getBundlerTransport(chain) {
+  const ethRpcUrl = chain.rpcUrls.default.http[0];
   const bundlerHttpUrl = chain.rpcUrls.bundler?.http[0];
-  const bundlerTransport = bundlerHttpUrl ? http(bundlerHttpUrl) : chain.id === 31337 ? userOpExecutor({
-    executor: createClient({
-      chain,
-      transport: fallback([webSocket(), http()]),
-      account: privateKeyToAccount(keccak256(stringToHex("local user op executor"))),
-      pollingInterval: 10
-    }).extend(transactionQueue())
-  }) : null;
-  if (!bundlerTransport) {
-    throw new Error(`Chain ${chain.id} config did not include a bundler RPC URL.`);
+  const wiresawWebSocketUrl = chain.rpcUrls.wiresaw?.webSocket?.[0];
+  if (wiresawWebSocketUrl) {
+    return wiresaw({
+      wiresaw: webSocket(wiresawWebSocketUrl),
+      fallbackBundler: http(bundlerHttpUrl),
+      fallbackEth: http(ethRpcUrl)
+    });
+  }
+  const wiresawHttpUrl = chain.rpcUrls.wiresaw?.http[0];
+  if (wiresawHttpUrl) {
+    return wiresaw({
+      wiresaw: http(wiresawHttpUrl),
+      fallbackBundler: http(bundlerHttpUrl),
+      fallbackEth: http(ethRpcUrl)
+    });
+  }
+  if (bundlerHttpUrl) {
+    return http(bundlerHttpUrl);
+  }
+  if (chain.id === 31337) {
+    return userOpExecutor({
+      executor: createClient({
+        chain,
+        transport: fallback([webSocket(), http()]),
+        account: privateKeyToAccount(keccak256(stringToHex("local user op executor"))),
+        pollingInterval: 10
+      }).extend(transactionQueue()),
+      fallbackEth: http(ethRpcUrl)
+    });
   }
-  return bundlerTransport;
+  throw new Error(`Chain ${chain.id} config did not include a bundler RPC URL.`);
 }
 
 // src/EntryKitConfigProvider.tsx