From b98ef55211af81647ca96d963e2d12bed5282146 Mon Sep 17 00:00:00 2001
From: Garvit Khatri <garvitdelhi@gmail.com>
Date: Fri, 1 Nov 2024 12:55:34 +0000
Subject: [PATCH] Fix send transaction when multiple chains configured (#316)

* Fix tests

* Add changeset

* Support both single and multiple url configuration
---
 .changeset/thin-peas-remain.md             |  5 +++++
 .gitignore                                 |  2 +-
 biome.json                                 |  3 ++-
 packages/wagmi-demo/src/main.tsx           | 13 ++-----------
 packages/wagmi-demo/src/wagmi.ts           | 21 +++++++++++++++++----
 packages/wagmi/hooks/useSendTransaction.ts | 17 ++++++++++++++++-
 6 files changed, 43 insertions(+), 18 deletions(-)
 create mode 100644 .changeset/thin-peas-remain.md

diff --git a/.changeset/thin-peas-remain.md b/.changeset/thin-peas-remain.md
new file mode 100644
index 00000000..463e9919
--- /dev/null
+++ b/.changeset/thin-peas-remain.md
@@ -0,0 +1,5 @@
+---
+"@permissionless/wagmi": patch
+---
+
+Fixed sendTransaction when multiple chainIds are configured
diff --git a/.gitignore b/.gitignore
index 0ed37f27..292b1a48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,7 @@ coverage
 node_modules
 tsconfig*.tsbuildinfo
 esbuild-why-permissionless*
-
+temp.ts
 # local env files
 .env
 .env.local
diff --git a/biome.json b/biome.json
index b2665b47..4fb1dc7f 100644
--- a/biome.json
+++ b/biome.json
@@ -11,7 +11,8 @@
             "_cjs",
             "_esm",
             "_types",
-            "bun.lockb"
+            "bun.lockb",
+            "temp.ts"
         ]
     },
     "organizeImports": {
diff --git a/packages/wagmi-demo/src/main.tsx b/packages/wagmi-demo/src/main.tsx
index 246b5056..437ef88a 100644
--- a/packages/wagmi-demo/src/main.tsx
+++ b/packages/wagmi-demo/src/main.tsx
@@ -7,10 +7,9 @@ import ReactDOM from "react-dom/client"
 import { WagmiProvider } from "wagmi"
 
 import App from "./App.tsx"
-import { config } from "./wagmi.ts"
+import { capabilities, config } from "./wagmi.ts"
 
 import "./index.css"
-import { baseSepolia } from "viem/chains"
 
 globalThis.Buffer = Buffer
 
@@ -25,15 +24,7 @@ ReactDOM.createRoot(root).render(
         <WagmiProvider config={config}>
             <QueryClientProvider client={queryClient}>
                 {/* Call it generic 5792 provider */}
-                <PermissionlessProvider
-                    capabilities={{
-                        paymasterService: {
-                            [baseSepolia.id]: {
-                                url: `https://api.pimlico.io/v2/${baseSepolia.id}/rpc?apikey=`
-                            }
-                        }
-                    }}
-                >
+                <PermissionlessProvider capabilities={capabilities}>
                     <App />
                 </PermissionlessProvider>
             </QueryClientProvider>
diff --git a/packages/wagmi-demo/src/wagmi.ts b/packages/wagmi-demo/src/wagmi.ts
index 1c478f27..9b70ecdc 100644
--- a/packages/wagmi-demo/src/wagmi.ts
+++ b/packages/wagmi-demo/src/wagmi.ts
@@ -1,17 +1,30 @@
-import { baseSepolia } from "viem/chains"
+import { sepolia } from "viem/chains"
 import { http, createConfig } from "wagmi"
 import { coinbaseWallet } from "wagmi/connectors"
 
+const pimlicoApiKey = process.env.PIMLICO_API_KEY
+
 export const config = createConfig({
-    chains: [baseSepolia],
+    chains: [sepolia],
     connectors: [
-        coinbaseWallet({ appName: "Pimlico", preference: "smartWalletOnly" })
+        coinbaseWallet({
+            appName: "Pimlico Test",
+            preference: "smartWalletOnly"
+        })
     ],
     transports: {
-        [baseSepolia.id]: http("https://sepolia.base.org")
+        [sepolia.id]: http("https://sepolia.base.org")
     }
 })
 
+export const capabilities = {
+    paymasterService: {
+        [sepolia.id]: {
+            url: `https://api.pimlico.io/v2/${sepolia.id}/rpc?apikey=${pimlicoApiKey}`
+        }
+    }
+}
+
 declare module "wagmi" {
     interface Register {
         config: typeof config
diff --git a/packages/wagmi/hooks/useSendTransaction.ts b/packages/wagmi/hooks/useSendTransaction.ts
index 0dbd1f1b..f0c2238f 100644
--- a/packages/wagmi/hooks/useSendTransaction.ts
+++ b/packages/wagmi/hooks/useSendTransaction.ts
@@ -29,9 +29,24 @@ const sendTransactionMutationOptions = <config extends Config>(
     return {
         mutationFn(variables) {
             if (parameters.capabilities) {
+                const client = config.getClient({ chainId: variables.chainId })
+
+                const paymasterServiceUrl = parameters.capabilities
+                    ?.paymasterService?.url
+                    ? parameters.capabilities?.paymasterService?.url
+                    : parameters.capabilities?.paymasterService[client.chain.id]
+                          ?.url
+
                 return sendCalls(config, {
                     calls: [variables],
-                    capabilities: parameters.capabilities
+                    capabilities: {
+                        ...parameters.capabilities,
+                        paymasterService: paymasterServiceUrl
+                            ? {
+                                  url: paymasterServiceUrl
+                              }
+                            : undefined
+                    }
                 })
             }