[SDK] Better eip5792 handling

.changeset/few-hats-slide.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Better handling of erc5792 getCapabilities

.changeset/sixty-views-relate.md

@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/wagmi-adapter": patch
+---
+
+Better handling of autoconnect to last connected chain

apps/wagmi-demo/package.json

@@ -17,8 +17,8 @@
     "react": "19.1.0",
     "react-dom": "19.1.0",
     "thirdweb": "workspace:*",
-    "viem": "2.37.9",
-    "wagmi": "2.17.5"
+    "viem": "2.39.0",
+    "wagmi": "2.19.4"
   },
   "devDependencies": {
     "@biomejs/biome": "2.0.6",

apps/wagmi-demo/src/App.tsx

@@ -1,5 +1,6 @@
 import type { ConnectionOptions } from "@thirdweb-dev/wagmi-adapter";
 import { ConnectButton } from "thirdweb/react";
+import { createWallet } from "thirdweb/wallets";
 import {
   useAccount,
   useCallsStatus,
@@ -58,7 +59,12 @@ function App() {
         <ConnectButton
           client={client}
           chain={thirdwebChainForWallet}
-          wallets={[wallet]}
+          wallets={[
+            wallet,
+            createWallet("io.metamask"),
+            createWallet("com.coinbase.wallet"),
+            createWallet("me.rainbow"),
+          ]}
           onConnect={(wallet) => {
             // auto connect to wagmi on tw connect
             const twConnector = connectors.find(

packages/thirdweb/package.json

@@ -38,7 +38,7 @@
     "qrcode": "1.5.3",
     "toml": "3.0.0",
     "uqr": "0.1.2",
-    "viem": "2.37.9",
+    "viem": "2.39.0",
     "x402": "0.7.0",
     "zod": "3.25.75"
   },

packages/thirdweb/src/adapters/eip1193/to-eip1193.ts

@@ -164,7 +164,17 @@
           if (!account.getCapabilities) {
             throw new Error("Wallet does not support EIP-5792");
           }
-          return account.getCapabilities({ chainId: chain.id });
+          const chains = request.params[1];
+          if (chains && Array.isArray(chains)) {
+            const firstChainStr = chains[0];
+            const firstChainId = isHex(firstChainStr)
+              ? hexToNumber(firstChainStr)
+              : Number(firstChainStr);
+            return account.getCapabilities(
+              firstChainId ? { chainId: firstChainId } : {},
+            );
+          }
+          return account.getCapabilities({});
         }
         case "wallet_sendCalls": {
           const account = wallet.getAccount();

packages/thirdweb/src/wallets/eip5792/get-capabilities.ts

@@ -54,7 +54,7 @@
 
 export function toGetCapabilitiesResult(
   result: Record<string, WalletCapabilities>,
-  chainId?: number,
+  chainIdFilter?: number,
 ): GetCapabilitiesResult {
   const capabilities = {} as WalletCapabilitiesRecord<
     WalletCapabilities,
@@ -69,6 +69,8 @@
     capabilities[Number(chainId)] = capabilitiesCopy;
   }
   return (
-    typeof chainId === "number" ? capabilities[chainId] : capabilities
+    typeof chainIdFilter === "number"
+      ? { [chainIdFilter]: capabilities[chainIdFilter] }
+      : capabilities
   ) as never;
 }

packages/thirdweb/src/wallets/injected/index.ts

@@ -374,13 +374,13 @@
       }
     },
     async getCapabilities(options) {
-      const chainId = options.chainId;
+      const chainIdFilter = options.chainId;
       try {
         const result = await provider.request({
           method: "wallet_getCapabilities",
           params: [getAddress(account.address)],
         });
-        return toGetCapabilitiesResult(result, chainId);
+        return toGetCapabilitiesResult(result, chainIdFilter);
       } catch (error: unknown) {
         if (
           /unsupport|not support|not available/i.test((error as Error).message)

packages/wagmi-adapter/src/connector.ts

@@ -1,6 +1,11 @@
 import { type CreateConnectorFn, createConnector } from "@wagmi/core";
 import type { Prettify } from "@wagmi/core/chains";
-import { defineChain, getAddress, type ThirdwebClient } from "thirdweb";
+import {
+  type Chain,
+  defineChain,
+  getAddress,
+  type ThirdwebClient,
+} from "thirdweb";
 import {
   EIP1193,
   ecosystemWallet,
@@ -53,6 +58,7 @@ type StorageItem = {
 
 const activeWalletIdKey = "thirdweb:active-wallet-id";
 const connectedWalletIdsKey = "thirdweb:connected-wallet-ids";
+const activeChainIdKey = "thirdweb:active-chain";
 
 /**
  * Connect to an in-app wallet using the auth strategy of your choice.
@@ -112,13 +118,14 @@ export function inAppWalletConnector(
       ? window.localStorage
       : undefined;
   return createConnector((config) => ({
-    connect: async (params?: ConnectionOptions<false>) => {
+    connect: async (params) => {
       wallet =
         params && "wallet" in params ? (params.wallet as Wallet) : wallet;
-      const lastChainIdStr = await config.storage?.getItem(
-        "thirdweb:lastChainId",
-      );
-      const lastChainId = lastChainIdStr ? Number(lastChainIdStr) : undefined;
+      const lastChainIdStr = rawStorage?.getItem(activeChainIdKey);
+      const lastChain = lastChainIdStr
+        ? (JSON.parse(lastChainIdStr) as Chain)
+        : undefined;
+      const lastChainId = lastChain ? lastChain.id : undefined;
       if (params?.isReconnecting) {
         const { autoConnect } = await import("thirdweb/wallets");
         const chainId = lastChainId || args.smartAccount?.chain?.id || 1;
@@ -133,7 +140,6 @@ export function inAppWalletConnector(
         if (!account) {
           throw new Error("Wallet failed to reconnect");
         }
-
         return {
           accounts: [getAddress(account.address)] as any,
           chainId: chainId,
@@ -144,7 +150,7 @@ export function inAppWalletConnector(
       const alreadyConnectedAccount = wallet.getAccount();
       if (alreadyConnectedAccount) {
         return {
-          accounts: [getAddress(alreadyConnectedAccount.address)],
+          accounts: [getAddress(alreadyConnectedAccount.address)] as any,
           chainId: wallet.getChain()?.id || 1,
         };
       }
@@ -191,9 +197,11 @@ export function inAppWalletConnector(
         }
         rawStorage.setItem(activeWalletIdKey, wallet.id);
       }
-      await config.storage?.setItem("thirdweb:lastChainId", chain.id);
       args.onConnect?.(wallet);
-      return { accounts: [getAddress(account.address)], chainId: chain.id };
+      return {
+        accounts: [getAddress(account.address)] as any,
+        chainId: chain.id,
+      };
     },
     disconnect: async () => {
       await wallet.disconnect();
@@ -209,9 +217,7 @@ export function inAppWalletConnector(
       return wallet.getChain()?.id || 1;
     },
     getProvider: async (params) => {
-      const lastChainIdStr = await config.storage?.getItem(
-        "thirdweb:lastChainId",
-      );
+      const lastChainIdStr = await rawStorage?.getItem(activeChainIdKey);
       const lastChainId = lastChainIdStr ? Number(lastChainIdStr) : undefined;
       const chain = defineChain(
         params?.chainId || args.smartAccount?.chain?.id || lastChainId || 1,
@@ -262,7 +268,10 @@ export function inAppWalletConnector(
       config.emitter.emit("change", {
         chainId: chain.id,
       });
-      await config.storage?.setItem("thirdweb:lastChainId", chain.id);
+      rawStorage?.setItem(
+        activeChainIdKey,
+        JSON.stringify(defineChain(chain.id)),
+      );
       return chain;
     },
     type: "in-app",