thirdweb 5.105.6 → 5.105.7-nightly-4c6a421d64336d7c18956a4128fea40866b9c9b1-20250706232018

package/dist/types/wallets/wallet-connect/controller.d.ts

@@ -1,4 +1,4 @@
-import type { EthereumProvider } from "@walletconnect/ethereum-provider";
+import type { UniversalProvider } from "@walletconnect/universal-provider";
 import type { Chain } from "../../chains/types.js";
 import type { ThirdwebClient } from "../../client/client.js";
 import type { AsyncStorage } from "../../utils/storage/AsyncStorage.js";
@@ -8,7 +8,7 @@ import type { DisconnectFn, SwitchChainFn } from "../types.js";
 import type { WalletEmitter } from "../wallet-emitter.js";
 import type { WalletId } from "../wallet-types.js";
 import type { WCAutoConnectOptions, WCConnectOptions } from "./types.js";
-type WCProvider = InstanceType<typeof EthereumProvider>;
+type WCProvider = InstanceType<typeof UniversalProvider>;
 /**
  * Checks if the provided wallet is a Wallet Connect wallet.
  *

package/dist/types/wallets/wallet-connect/controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../../src/wallets/wallet-connect/controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAYzE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAMnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAU7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAOxE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,KAAK,EACV,OAAO,EAEP,MAAM,EACP,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAI/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEzE,KAAK,UAAU,GAAG,YAAY,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAiBxD;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,GACvB,MAAM,IAAI,MAAM,CAAC,eAAe,CAAC,CAEnC;AAED;;GAEG;AACH,wBAAsB,SAAS,CAC7B,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,aAAa,CAAC,oBAAoB,CAAC,EAC5C,QAAQ,EAAE,oBAAoB,GAAG,eAAe,EAChD,OAAO,EAAE,YAAY,EACrB,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,GACrC,OAAO,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CA0FvC;AAED;;;GAGG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,aAAa,CAAC,oBAAoB,CAAC,EAC5C,QAAQ,EAAE,oBAAoB,GAAG,eAAe,EAChD,OAAO,EAAE,YAAY,EACrB,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,GACrC,OAAO,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CAsCvC;AAsLD,iBAAS,SAAS,CAChB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,UAAU,EACpB,OAAO,EAAE,aAAa,CAAC,oBAAoB,CAAC,EAC5C,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,cAAc,GACrB,CAAC,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,aAAa,CAAC,CAgD/C"}
+{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../../src/wallets/wallet-connect/controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAY3E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAU7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAOxE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,KAAK,EACV,OAAO,EAEP,MAAM,EACP,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEzE,KAAK,UAAU,GAAG,YAAY,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAezD;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,GACvB,MAAM,IAAI,MAAM,CAAC,eAAe,CAAC,CAEnC;AAED;;GAEG;AACH,wBAAsB,SAAS,CAC7B,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,aAAa,CAAC,oBAAoB,CAAC,EAC5C,QAAQ,EAAE,oBAAoB,GAAG,eAAe,EAChD,OAAO,EAAE,YAAY,EACrB,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,GACrC,OAAO,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CA6GvC;AAED;;;GAGG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,aAAa,CAAC,oBAAoB,CAAC,EAC5C,QAAQ,EAAE,oBAAoB,GAAG,eAAe,EAChD,OAAO,EAAE,YAAY,EACrB,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,GACrC,OAAO,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CAyCvC;AAwKD,iBAAS,SAAS,CAChB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,UAAU,EACpB,OAAO,EAAE,aAAa,CAAC,oBAAoB,CAAC,EAC5C,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,cAAc,GACrB,CAAC,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,aAAa,CAAC,CAkD/C"}

package/dist/types/wallets/wallet-connect/types.d.ts

@@ -1,10 +1,19 @@
-import type { EthereumProvider } from "@walletconnect/ethereum-provider";
 import type { Chain } from "../../chains/types.js";
 import type { ThirdwebClient } from "../../client/client.js";
 import type { Prettify } from "../../utils/type-utils.js";
 import type { AppMetadata } from "../types.js";
-type EthereumProviderOptions = Parameters<(typeof EthereumProvider)["init"]>[0];
-type WalletConnectQRCodeModalOptions = Pick<NonNullable<EthereumProviderOptions["qrModalOptions"]>, "themeMode" | "themeVariables" | "desktopWallets" | "enableExplorer" | "explorerRecommendedWalletIds" | "explorerExcludedWalletIds" | "mobileWallets" | "privacyPolicyUrl" | "termsOfServiceUrl" | "walletImages">;
+type WalletConnectQRCodeModalOptions = {
+    themeMode?: "light" | "dark";
+    themeVariables?: Record<string, string>;
+    desktopWallets?: Record<string, unknown>[];
+    enableExplorer?: boolean;
+    explorerRecommendedWalletIds?: string[];
+    explorerExcludedWalletIds?: string[];
+    mobileWallets?: Record<string, unknown>[];
+    privacyPolicyUrl?: string;
+    termsOfServiceUrl?: string;
+    walletImages?: Record<string, string>;
+};
 export type WalletConnectConfig = {
     /**
      * Your project’s unique identifier that can be obtained at https://cloud.walletconnect.com/

package/dist/types/wallets/wallet-connect/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/wallets/wallet-connect/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,KAAK,uBAAuB,GAAG,UAAU,CAAC,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEhF,KAAK,+BAA+B,GAAG,IAAI,CACzC,WAAW,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC,EACpD,WAAW,GACX,gBAAgB,GAChB,gBAAgB,GAChB,gBAAgB,GAChB,8BAA8B,GAC9B,2BAA2B,GAC3B,eAAe,GACf,kBAAkB,GAClB,mBAAmB,GACnB,cAAc,CACjB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;;;;;;;;;;;;OAeG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;IAEd;;;;;;;;;;;;;;OAcG;IACH,MAAM,EAAE,cAAc,CAAC;IAEvB,aAAa,CAAC,EAAE,QAAQ,CACtB,mBAAmB,GAAG;QACpB;;;;;;;;;;;;;;;;;;;;;;;;;WAyBG;QACH,cAAc,CAAC,EAAE,KAAK,EAAE,CAAC;QACzB;;;;;;;;;;;;;;;;;WAiBG;QACH,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB;;WAEG;QACH,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB;;;WAGG;QACH,cAAc,CAAC,EAAE,+BAA+B,CAAC;QACjD;;;;;;;;;;;;;WAaG;QACH,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;KACvC,CACF,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC;;;;;;;;;;;;;;OAcG;IACH,MAAM,EAAE,cAAc,CAAC;IAEvB,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IAExC,KAAK,CAAC,EAAE,KAAK,CAAC;CACf,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACxB,cAAc,CAAC,EAAE,KAAK,EAAE,CAAC;IACzB,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/wallets/wallet-connect/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,KAAK,+BAA+B,GAAG;IACrC,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IAC3C,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,4BAA4B,CAAC,EAAE,MAAM,EAAE,CAAC;IACxC,yBAAyB,CAAC,EAAE,MAAM,EAAE,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IAC1C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;;;;;;;;;;;;OAeG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;IAEd;;;;;;;;;;;;;;OAcG;IACH,MAAM,EAAE,cAAc,CAAC;IAEvB,aAAa,CAAC,EAAE,QAAQ,CACtB,mBAAmB,GAAG;QACpB;;;;;;;;;;;;;;;;;;;;;;;;;WAyBG;QACH,cAAc,CAAC,EAAE,KAAK,EAAE,CAAC;QACzB;;;;;;;;;;;;;;;;;WAiBG;QACH,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB;;WAEG;QACH,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB;;;WAGG;QACH,cAAc,CAAC,EAAE,+BAA+B,CAAC;QACjD;;;;;;;;;;;;;WAaG;QACH,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;KACvC,CACF,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC;;;;;;;;;;;;;;OAcG;IACH,MAAM,EAAE,cAAc,CAAC;IAEvB,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IAExC,KAAK,CAAC,EAAE,KAAK,CAAC;CACf,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACxB,cAAc,CAAC,EAAE,KAAK,EAAE,CAAC;IACzB,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC"}

package/package.json

@@ -23,8 +23,8 @@
     "@radix-ui/react-tooltip": "1.2.7",
     "@storybook/react": "9.0.15",
     "@tanstack/react-query": "5.81.5",
-    "@walletconnect/ethereum-provider": "2.20.1",
     "@walletconnect/sign-client": "2.20.1",
+    "@walletconnect/universal-provider": "2.21.4",
     "abitype": "1.0.8",
     "cross-spawn": "7.0.6",
     "fuse.js": "7.1.0",
@@ -375,7 +375,7 @@
     }
   },
   "typings": "./dist/types/exports/thirdweb.d.ts",
-  "version": "5.105.6",
+  "version": "5.105.7-nightly-4c6a421d64336d7c18956a4128fea40866b9c9b1-20250706232018",
   "scripts": {
     "bench": "vitest -c ./test/vitest.config.ts bench",
     "bench:compare": "bun run ./benchmarks/run.ts",

package/src/react/web/ui/Bridge/BuyWidget.tsx

@@ -282,6 +282,7 @@ export function BuyWidget(props: BuyWidgetProps) {
         toChainId: props.chain.id,
         toToken: props.tokenAddress,
       });
+      return true;
     },
     queryKey: ["buy_widget:render"],
   });

package/src/react/web/ui/Bridge/CheckoutWidget.tsx

@@ -265,6 +265,7 @@ export function CheckoutWidget(props: CheckoutWidgetProps) {
         toChainId: props.chain.id,
         toToken: props.tokenAddress,
       });
+      return true;
     },
     queryKey: ["checkout_widget:render"],
   });

package/src/react/web/ui/Bridge/TransactionWidget.tsx

@@ -292,6 +292,7 @@ export function TransactionWidget(props: TransactionWidgetProps) {
         event: "ub:ui:transaction_widget:render",
         toToken: props.tokenAddress,
       });
+      return true;
     },
     queryKey: ["transaction_widget:render"],
   });

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.105.6";
+export const version = "5.105.7-nightly-4c6a421d64336d7c18956a4128fea40866b9c9b1-20250706232018";

package/src/wallets/create-wallet.ts

@@ -399,7 +399,14 @@ export function createWallet<const ID extends WalletId>(
         getConfig: () => args[1],
         id,
         subscribe: emitter.subscribe,
-        switchChain: (c) => handleSwitchChain(c),
+        switchChain: async (c) => {
+          try {
+            await handleSwitchChain(c);
+            chain = c;
+          } catch (e) {
+            console.error("Error switching chain", e);
+          }
+        },
       };
       return wallet;
     }

package/src/wallets/native/create-wallet.ts

@@ -230,7 +230,14 @@ export function createWallet<const ID extends WalletId>(
         getConfig: () => args[1],
         id,
         subscribe: emitter.subscribe,
-        switchChain: (c) => handleSwitchChain(c),
+        switchChain: async (c) => {
+          try {
+            await handleSwitchChain(c);
+            chain = c;
+          } catch (e) {
+            console.error("Error switching chain", e);
+          }
+        },
       };
       return wallet;
     }

package/src/wallets/wallet-connect/controller.ts

@@ -1,4 +1,4 @@
-import type { EthereumProvider } from "@walletconnect/ethereum-provider";
+import type { UniversalProvider } from "@walletconnect/universal-provider";
 import type { Address } from "abitype";
 import {
   getTypesForEIP712Domain,
@@ -11,11 +11,7 @@ import {
 } from "viem";
 import { trackTransaction } from "../../analytics/track/transaction.js";
 import type { Chain } from "../../chains/types.js";
-import {
-  getCachedChain,
-  getChainMetadata,
-  getRpcUrlForChain,
-} from "../../chains/utils.js";
+import { getCachedChain, getRpcUrlForChain } from "../../chains/utils.js";
 import type { ThirdwebClient } from "../../client/client.js";
 import { getAddress } from "../../utils/address.js";
 import {
@@ -40,7 +36,6 @@ import type {
   Wallet,
 } from "../interfaces/wallet.js";
 import type { DisconnectFn, SwitchChainFn } from "../types.js";
-import { getValidPublicRPCUrl } from "../utils/chains.js";
 import { getDefaultAppMetadata } from "../utils/defaultDappMetadata.js";
 import { normalizeChainId } from "../utils/normalizeChainId.js";
 import type { WalletEmitter } from "../wallet-emitter.js";
@@ -48,7 +43,9 @@ import type { WalletId } from "../wallet-types.js";
 import { DEFAULT_PROJECT_ID, NAMESPACE } from "./constants.js";
 import type { WCAutoConnectOptions, WCConnectOptions } from "./types.js";
 
-type WCProvider = InstanceType<typeof EthereumProvider>;
+type WCProvider = InstanceType<typeof UniversalProvider>;
+
+let cachedProvider: WCProvider | null = null;
 
 type SavedConnectParams = {
   optionalChains?: Chain[];
@@ -56,10 +53,6 @@ type SavedConnectParams = {
   pairingTopic?: string;
 };
 
-const ADD_ETH_CHAIN_METHOD = "wallet_addEthereumChain";
-
-const defaultShowQrModal = true;
-
 const storageKeys = {
   lastUsedChainId: "tw.wc.lastUsedChainId",
   requestedChains: "tw.wc.requestedChains",
@@ -123,37 +116,56 @@ export async function connectWC(
     }
   }
 
-  const {
-    rpcMap,
-    requiredChain,
-    optionalChains: chainsToRequest,
-  } = getChainsToRequest({
+  // For UniversalProvider, we still need chain configuration for session management
+  const { chains: chainsToRequest, rpcMap } = getChainsToRequest({
     chain: chainToRequest,
     client: options.client,
     optionalChains: optionalChains,
   });
 
-  if (provider.session) {
+  if (!provider.session) {
+    // For UniversalProvider, we need to connect with namespaces
     await provider.connect({
       ...(wcOptions?.pairingTopic
         ? { pairingTopic: wcOptions?.pairingTopic }
         : {}),
-      chains: requiredChain ? [requiredChain.id] : undefined,
-      optionalChains: chainsToRequest,
-      rpcMap: rpcMap,
+      namespaces: {
+        [NAMESPACE]: {
+          chains: chainsToRequest,
+          events: ["chainChanged", "accountsChanged"],
+          methods: [
+            "eth_sendTransaction",
+            "eth_signTransaction",
+            "eth_sign",
+            "personal_sign",
+            "eth_signTypedData",
+            "wallet_switchEthereumChain",
+            "wallet_addEthereumChain",
+          ],
+          rpcMap,
+        },
+      },
     });
   }
 
-  setRequestedChainsIds(chainsToRequest, storage);
-  // If session exists and chains are authorized, enable provider for required chain
-  const addresses = await provider.enable();
-  const address = addresses[0];
+  setRequestedChainsIds(
+    chainsToRequest.map((x) => Number(x.split(":")[1])),
+    storage,
+  );
+  const currentChainId = chainsToRequest[0]?.split(":")[1] || 1;
+  const providerChainId = normalizeChainId(currentChainId);
+  const accounts: string[] = await provider.request(
+    {
+      method: "eth_requestAccounts",
+      params: [],
+    },
+    `eip155:${providerChainId}`,
+  );
+  const address = accounts[0];
   if (!address) {
     throw new Error("No accounts found on provider.");
   }
 
-  const providerChainId = normalizeChainId(provider.chainId);
-
   const chain =
     options.chain && options.chain.id === providerChainId
       ? options.chain
@@ -209,16 +221,19 @@ export async function autoConnectWC(
         },
     walletId,
     sessionHandler,
-    true, // is auto connect
   );
 
-  const address = provider.accounts[0];
+  // For UniversalProvider, get accounts from enable() method
+  const addresses = await provider.enable();
+  const address = addresses[0];
 
   if (!address) {
     throw new Error("No accounts found on provider.");
   }
 
-  const providerChainId = normalizeChainId(provider.chainId);
+  // For UniversalProvider, get chainId from the session namespaces or use default
+  const currentChainId = options.chain?.id || 1;
+  const providerChainId = normalizeChainId(currentChainId);
 
   const chain =
     options.chain && options.chain.id === providerChainId
@@ -234,12 +249,15 @@ async function initProvider(
   options: WCConnectOptions,
   walletId: WCSupportedWalletIds | "walletConnect",
   sessionRequestHandler?: (uri: string) => void | Promise<void>,
-  isAutoConnect = false,
 ) {
+  if (cachedProvider) {
+    return cachedProvider;
+  }
+
   const walletInfo = await getWalletInfo(walletId);
   const wcOptions = options.walletConnect;
-  const { EthereumProvider, OPTIONAL_EVENTS, OPTIONAL_METHODS } = await import(
-    "@walletconnect/ethereum-provider"
+  const { UniversalProvider } = await import(
+    "@walletconnect/universal-provider"
   );
 
   let optionalChains: Chain[] | undefined = wcOptions?.optionalChains;
@@ -253,19 +271,7 @@ async function initProvider(
     }
   }
 
-  const {
-    rpcMap,
-    requiredChain,
-    optionalChains: chainsToRequest,
-  } = getChainsToRequest({
-    chain: chainToRequest,
-    client: options.client,
-    optionalChains: optionalChains,
-  });
-
-  const provider = await EthereumProvider.init({
-    chains: requiredChain ? [requiredChain.id] : undefined,
-    disableProviderPing: true,
+  const provider = await UniversalProvider.init({
     metadata: {
       description:
         wcOptions?.appMetadata?.description ||
@@ -276,31 +282,11 @@ async function initProvider(
       name: wcOptions?.appMetadata?.name || getDefaultAppMetadata().name,
       url: wcOptions?.appMetadata?.url || getDefaultAppMetadata().url,
     },
-    optionalChains: chainsToRequest,
-    optionalEvents: OPTIONAL_EVENTS,
-    optionalMethods: OPTIONAL_METHODS,
     projectId: wcOptions?.projectId || DEFAULT_PROJECT_ID,
-    qrModalOptions: wcOptions?.qrModalOptions,
-    rpcMap: rpcMap,
-    showQrModal:
-      wcOptions?.showQrModal === undefined
-        ? sessionRequestHandler
-          ? false
-          : defaultShowQrModal
-        : wcOptions.showQrModal,
   });
 
   provider.events.setMaxListeners(Number.POSITIVE_INFINITY);
 
-  // disconnect the provider if chains are stale when (if not auto connecting)
-  if (!isAutoConnect) {
-    // const isStale = await isChainsStale(provider, chainsToRequest);
-
-    if (provider.session) {
-      await provider.disconnect();
-    }
-  }
-
   if (walletId !== "walletConnect") {
     async function handleSessionRequest() {
       const walletLinkToOpen =
@@ -314,12 +300,16 @@ async function initProvider(
       }
     }
 
-    provider.signer.client.on("session_request_sent", handleSessionRequest);
+    // For UniversalProvider, use different event handling
+    provider.on("session_request_sent", handleSessionRequest);
     provider.events.addListener("disconnect", () => {
-      provider.signer.client.off("session_request_sent", handleSessionRequest);
+      provider.off("session_request_sent", handleSessionRequest);
+      cachedProvider = null;
     });
   }
 
+  cachedProvider = provider;
+
   return provider;
 }
 
@@ -327,26 +317,31 @@ function createAccount({
   provider,
   address,
   client,
+  chain,
 }: {
   provider: WCProvider;
   address: string;
   client: ThirdwebClient;
+  chain: Chain;
 }) {
   const account: Account = {
     address: getAddress(address),
     async sendTransaction(tx: SendTransactionOption) {
-      const transactionHash = (await provider.request({
-        method: "eth_sendTransaction",
-        params: [
-          {
-            data: tx.data,
-            from: getAddress(address),
-            gas: tx.gas ? numberToHex(tx.gas) : undefined,
-            to: tx.to as Address,
-            value: tx.value ? numberToHex(tx.value) : undefined,
-          },
-        ],
-      })) as Hex;
+      const transactionHash = (await provider.request(
+        {
+          method: "eth_sendTransaction",
+          params: [
+            {
+              data: tx.data,
+              from: getAddress(address),
+              gas: tx.gas ? numberToHex(tx.gas) : undefined,
+              to: tx.to as Address,
+              value: tx.value ? numberToHex(tx.value) : undefined,
+            },
+          ],
+        },
+        `eip155:${tx.chainId}`,
+      )) as Hex;
 
       trackTransaction({
         chainId: tx.chainId,
@@ -372,10 +367,13 @@ function createAccount({
         }
         return message.raw;
       })();
-      return provider.request({
-        method: "personal_sign",
-        params: [messageToSign, this.address],
-      });
+      return provider.request(
+        {
+          method: "personal_sign",
+          params: [messageToSign, this.address],
+        },
+        `eip155:${chain.id}`,
+      );
     },
     async signTypedData(_data) {
       const data = parseTypedData(_data);
@@ -398,10 +396,13 @@ function createAccount({
         types,
       });
 
-      return await provider.request({
-        method: "eth_signTypedData_v4",
-        params: [this.address, typedData],
-      });
+      return await provider.request(
+        {
+          method: "eth_signTypedData_v4",
+          params: [this.address, typedData],
+        },
+        `eip155:${chain.id}`,
+      );
     },
   };
 
@@ -416,13 +417,14 @@ function onConnect(
   storage: AsyncStorage,
   client: ThirdwebClient,
 ): [Account, Chain, DisconnectFn, SwitchChainFn] {
-  const account = createAccount({ address, client, provider });
+  const account = createAccount({ address, chain, client, provider });
 
   async function disconnect() {
     provider.removeListener("accountsChanged", onAccountsChanged);
     provider.removeListener("chainChanged", onChainChanged);
     provider.removeListener("disconnect", onDisconnect);
     await provider.disconnect();
+    cachedProvider = null;
   }
 
   function onDisconnect() {
@@ -436,6 +438,7 @@ function onConnect(
     if (accounts[0]) {
       const newAccount = createAccount({
         address: getAddress(accounts[0]),
+        chain,
         client,
         provider,
       });
@@ -461,66 +464,14 @@ function onConnect(
     account,
     chain,
     disconnect,
-    (newChain) => switchChainWC(provider, newChain, storage),
+    (newChain) => switchChainWC(provider, newChain),
   ];
 }
 
-// Storage utils  -----------------------------------------------------------------------------------------------
-
-function getNamespaceMethods(provider: WCProvider) {
-  return provider.session?.namespaces[NAMESPACE]?.methods || [];
-}
-
-function getNamespaceChainsIds(provider: WCProvider): number[] {
-  const chainIds = provider.session?.namespaces[NAMESPACE]?.chains?.map(
-    (chain) => Number.parseInt(chain.split(":")[1] || ""),
-  );
-
-  return chainIds ?? [];
-}
-
-async function switchChainWC(
-  provider: WCProvider,
-  chain: Chain,
-  storage: AsyncStorage,
-) {
+async function switchChainWC(provider: WCProvider, chain: Chain) {
   const chainId = chain.id;
   try {
-    const namespaceChains = getNamespaceChainsIds(provider);
-    const namespaceMethods = getNamespaceMethods(provider);
-    const isChainApproved = namespaceChains.includes(chainId);
-
-    if (!isChainApproved && namespaceMethods.includes(ADD_ETH_CHAIN_METHOD)) {
-      const apiChain = await getChainMetadata(chain);
-
-      const blockExplorerUrls = [
-        ...new Set([
-          ...(chain.blockExplorers?.map((x) => x.url) || []),
-          ...(apiChain.explorers?.map((x) => x.url) || []),
-        ]),
-      ];
-
-      await provider.request({
-        method: ADD_ETH_CHAIN_METHOD,
-        params: [
-          {
-            blockExplorerUrls:
-              blockExplorerUrls.length > 0 ? blockExplorerUrls : undefined,
-            chainId: numberToHex(apiChain.chainId),
-            chainName: apiChain.name,
-            nativeCurrency: apiChain.nativeCurrency, // no clientId on purpose
-            rpcUrls: getValidPublicRPCUrl(apiChain),
-          },
-        ],
-      });
-      const requestedChains = await getRequestedChainsIds(storage);
-      requestedChains.push(chainId);
-      setRequestedChainsIds(requestedChains, storage);
-    }
-    await provider.request({
-      method: "wallet_switchEthereumChain",
-      params: [{ chainId: numberToHex(chainId) }],
-    });
+    provider.setDefaultChain(`eip155:${chainId}`);
   } catch (error) {
     const message =
       typeof error === "string" ? error : (error as ProviderRpcError)?.message;
@@ -543,35 +494,23 @@ function setRequestedChainsIds(
   storage?.setItem(storageKeys.requestedChains, stringify(chains));
 }
 
-/**
- * Get the last requested chains from the storage.
- * @internal
- */
-async function getRequestedChainsIds(storage: AsyncStorage): Promise<number[]> {
-  const data = await storage.getItem(storageKeys.requestedChains);
-  return data ? JSON.parse(data) : [];
-}
-
-type ArrayOneOrMore<T> = {
-  0: T;
-} & Array<T>;
-
 function getChainsToRequest(options: {
   chain?: Chain;
   optionalChains?: Chain[];
   client: ThirdwebClient;
 }): {
   rpcMap: Record<number, string>;
-  requiredChain: Chain | undefined;
-  optionalChains: ArrayOneOrMore<number>;
+  chains: string[];
 } {
   const rpcMap: Record<number, string> = {};
+  const chainIds: number[] = [];
 
   if (options.chain) {
     rpcMap[options.chain.id] = getRpcUrlForChain({
       chain: options.chain,
       client: options.client,
     });
+    chainIds.push(options.chain.id);
   }
 
   // limit optional chains to 10
@@ -582,18 +521,16 @@ function getChainsToRequest(options: {
       chain: chain,
       client: options.client,
     });
+    chainIds.push(chain.id);
   }
 
   if (!options.chain && optionalChains.length === 0) {
     rpcMap[1] = getCachedChain(1).rpc;
+    chainIds.push(1);
   }
 
   return {
-    optionalChains:
-      optionalChains.length > 0
-        ? (optionalChains.map((x) => x.id) as ArrayOneOrMore<number>)
-        : [1],
-    requiredChain: options.chain ? options.chain : undefined,
+    chains: chainIds.map((x) => `eip155:${x}`),
     rpcMap,
   };
 }

package/src/wallets/wallet-connect/types.ts

@@ -1,24 +1,20 @@
-import type { EthereumProvider } from "@walletconnect/ethereum-provider";
 import type { Chain } from "../../chains/types.js";
 import type { ThirdwebClient } from "../../client/client.js";
 import type { Prettify } from "../../utils/type-utils.js";
 import type { AppMetadata } from "../types.js";
 
-type EthereumProviderOptions = Parameters<(typeof EthereumProvider)["init"]>[0];
-
-type WalletConnectQRCodeModalOptions = Pick<
-  NonNullable<EthereumProviderOptions["qrModalOptions"]>,
-  | "themeMode"
-  | "themeVariables"
-  | "desktopWallets"
-  | "enableExplorer"
-  | "explorerRecommendedWalletIds"
-  | "explorerExcludedWalletIds"
-  | "mobileWallets"
-  | "privacyPolicyUrl"
-  | "termsOfServiceUrl"
-  | "walletImages"
->;
+type WalletConnectQRCodeModalOptions = {
+  themeMode?: "light" | "dark";
+  themeVariables?: Record<string, string>;
+  desktopWallets?: Record<string, unknown>[];
+  enableExplorer?: boolean;
+  explorerRecommendedWalletIds?: string[];
+  explorerExcludedWalletIds?: string[];
+  mobileWallets?: Record<string, unknown>[];
+  privacyPolicyUrl?: string;
+  termsOfServiceUrl?: string;
+  walletImages?: Record<string, string>;
+};
 
 export type WalletConnectConfig = {
   /**