thirdweb 5.105.22 → 5.105.24

package/src/wallets/create-wallet.ts

@@ -2,8 +2,10 @@ import { trackConnect } from "../analytics/track/connect.js";
 import type { Chain } from "../chains/types.js";
 import { getCachedChainIfExists } from "../chains/utils.js";
 import { webLocalStorage } from "../utils/storage/webStorage.js";
+import { formatWalletConnectUrl } from "../utils/url.js";
 import { isMobile } from "../utils/web/isMobile.js";
 import { openWindow } from "../utils/web/openWindow.js";
+import { getWalletInfo } from "./__generated__/getWalletInfo.js";
 import type {
   InjectedSupportedWalletIds,
   WCSupportedWalletIds,
@@ -313,43 +315,63 @@ export function createWallet<const ID extends WalletId>(
                   ...wcOptions,
                   walletConnect: {
                     ...wcOptions.walletConnect,
-                    onDisplayUri: wcOptions.walletConnect?.showQrModal
-                      ? async (uri) => {
-                          // Check if we're in a browser environment
-                          if (
-                            typeof window !== "undefined" &&
-                            typeof document !== "undefined"
-                          ) {
-                            try {
-                              const { createQROverlay } = await import(
-                                "./wallet-connect/qr-overlay.js"
+                    onDisplayUri:
+                      wcOptions.walletConnect?.onDisplayUri ||
+                      (async (uri) => {
+                        // Check if we're in a browser environment
+                        if (
+                          typeof window !== "undefined" &&
+                          typeof document !== "undefined"
+                        ) {
+                          // on mobile, open the wallet app via deeplink
+                          if (isMobile()) {
+                            const walletInfo = await getWalletInfo(id);
+
+                            const mobileAppLink =
+                              walletInfo.mobile.native ||
+                              walletInfo.mobile.universal;
+                            if (mobileAppLink) {
+                              openWindow(
+                                formatWalletConnectUrl(mobileAppLink, uri)
+                                  .redirect,
                               );
+                            } else {
+                              // on android, wc:// links show the app picker
+                              openWindow(uri);
+                            }
+                            return;
+                          }
 
-                              // Clean up any existing overlay
-                              if (qrOverlay) {
-                                qrOverlay.destroy();
-                              }
+                          try {
+                            // on desktop, create a QR overlay
+                            const { createQROverlay } = await import(
+                              "./wallet-connect/qr-overlay.js"
+                            );
 
-                              // Create new QR overlay
-                              qrOverlay = createQROverlay(uri, {
-                                theme:
-                                  wcOptions.walletConnect?.qrModalOptions
-                                    ?.themeMode ?? "dark",
-                                qrSize: 280,
-                                showCloseButton: true,
-                                onCancel: () => {
-                                  wcOptions.walletConnect?.onCancel?.();
-                                },
-                              });
-                            } catch (error) {
-                              console.error(
-                                "Failed to create QR overlay:",
-                                error,
-                              );
+                            // Clean up any existing overlay
+                            if (qrOverlay) {
+                              qrOverlay.destroy();
                             }
+
+                            // Create new QR overlay
+                            qrOverlay = createQROverlay(uri, {
+                              theme:
+                                wcOptions.walletConnect?.qrModalOptions
+                                  ?.themeMode ?? "dark",
+                              qrSize: 280,
+                              showCloseButton: true,
+                              onCancel: () => {
+                                wcOptions.walletConnect?.onCancel?.();
+                              },
+                            });
+                          } catch (error) {
+                            console.error(
+                              "Failed to create QR overlay:",
+                              error,
+                            );
                           }
                         }
-                      : undefined,
+                      }),
                   },
                 },
                 emitter,

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

@@ -123,30 +123,28 @@ export async function connectWC(
     optionalChains: optionalChains,
   });
 
-  if (!provider.session) {
-    // For UniversalProvider, we need to connect with namespaces
-    await provider.connect({
-      ...(wcOptions?.pairingTopic
-        ? { pairingTopic: wcOptions?.pairingTopic }
-        : {}),
-      namespaces: {
-        [NAMESPACE]: {
-          chains: chainsToRequest,
-          events: ["chainChanged", "accountsChanged"],
-          methods: [
-            "eth_sendTransaction",
-            "eth_signTransaction",
-            "eth_sign",
-            "personal_sign",
-            "eth_signTypedData",
-            "wallet_switchEthereumChain",
-            "wallet_addEthereumChain",
-          ],
-          rpcMap,
-        },
+  // For UniversalProvider, we need to connect with namespaces
+  await provider.connect({
+    ...(wcOptions?.pairingTopic
+      ? { pairingTopic: wcOptions?.pairingTopic }
+      : {}),
+    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.map((x) => Number(x.split(":")[1])),
@@ -223,9 +221,14 @@ export async function autoConnectWC(
     sessionHandler,
   );
 
+  if (!provider.session) {
+    await provider.disconnect();
+    throw new Error("No wallet connect session found on provider.");
+  }
+
   // For UniversalProvider, get accounts from enable() method
-  const addresses = await provider.enable();
-  const address = addresses[0];
+  const namespaceAccounts = provider.session?.namespaces?.[NAMESPACE]?.accounts;
+  const address = namespaceAccounts?.[0]?.split(":")[2];
 
   if (!address) {
     throw new Error("No accounts found on provider.");

package/dist/cjs/react/core/hooks/useBridgeQuote.js

@@ -1,52 +0,0 @@
-"use strict";
-"use client";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useBridgeQuote = useBridgeQuote;
-const react_query_1 = require("@tanstack/react-query");
-const Buy = require("../../../bridge/Buy.js");
-const Transfer = require("../../../bridge/Transfer.js");
-const address_js_1 = require("../../../utils/address.js");
-function useBridgeQuote({ originToken, destinationToken, destinationAmount, feePayer, client, enabled = true, }) {
-    return (0, react_query_1.useQuery)({
-        enabled: enabled && !!originToken && !!destinationToken && !!destinationAmount,
-        queryFn: async () => {
-            // if ssame token and chain, use transfer
-            if ((0, address_js_1.checksumAddress)(originToken.address) ===
-                (0, address_js_1.checksumAddress)(destinationToken.address) &&
-                originToken.chainId === destinationToken.chainId) {
-                const transfer = await Transfer.prepare({
-                    amount: destinationAmount,
-                    chainId: originToken.chainId,
-                    client,
-                    feePayer,
-                    receiver: destinationToken.address,
-                    sender: originToken.address,
-                    tokenAddress: originToken.address,
-                });
-                return transfer;
-            }
-            const quote = await Buy.quote({
-                amount: destinationAmount,
-                client,
-                destinationChainId: destinationToken.chainId,
-                destinationTokenAddress: destinationToken.address,
-                originChainId: originToken.chainId,
-                originTokenAddress: originToken.address,
-            });
-            return quote;
-        },
-        queryKey: [
-            "bridge-quote",
-            originToken.chainId,
-            originToken.address,
-            destinationToken.chainId,
-            destinationToken.address,
-            destinationAmount.toString(),
-            feePayer,
-        ],
-        refetchInterval: 60000, // 30 seconds
-        retry: 3, // 1 minute
-        staleTime: 30000,
-    });
-}
-//# sourceMappingURL=useBridgeQuote.js.map

package/dist/cjs/react/core/hooks/useBridgeQuote.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useBridgeQuote.js","sourceRoot":"","sources":["../../../../../src/react/core/hooks/useBridgeQuote.ts"],"names":[],"mappings":";AAAA,YAAY,CAAC;;AAiBb,wCAqDC;AArED,uDAAiD;AACjD,8CAA8C;AAC9C,wDAAwD;AAGxD,0DAA4D;AAW5D,SAAgB,cAAc,CAAC,EAC7B,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACjB,QAAQ,EACR,MAAM,EACN,OAAO,GAAG,IAAI,GACO;IACrB,OAAO,IAAA,sBAAQ,EAAC;QACd,OAAO,EACL,OAAO,IAAI,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,gBAAgB,IAAI,CAAC,CAAC,iBAAiB;QACvE,OAAO,EAAE,KAAK,IAAI,EAAE;YAClB,yCAAyC;YACzC,IACE,IAAA,4BAAe,EAAC,WAAW,CAAC,OAAO,CAAC;gBAClC,IAAA,4BAAe,EAAC,gBAAgB,CAAC,OAAO,CAAC;gBAC3C,WAAW,CAAC,OAAO,KAAK,gBAAgB,CAAC,OAAO,EAChD,CAAC;gBACD,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC;oBACtC,MAAM,EAAE,iBAAiB;oBACzB,OAAO,EAAE,WAAW,CAAC,OAAO;oBAC5B,MAAM;oBACN,QAAQ;oBACR,QAAQ,EAAE,gBAAgB,CAAC,OAAO;oBAClC,MAAM,EAAE,WAAW,CAAC,OAAO;oBAC3B,YAAY,EAAE,WAAW,CAAC,OAAO;iBAClC,CAAC,CAAC;gBACH,OAAO,QAAQ,CAAC;YAClB,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC;gBAC5B,MAAM,EAAE,iBAAiB;gBACzB,MAAM;gBACN,kBAAkB,EAAE,gBAAgB,CAAC,OAAO;gBAC5C,uBAAuB,EAAE,gBAAgB,CAAC,OAAO;gBACjD,aAAa,EAAE,WAAW,CAAC,OAAO;gBAClC,kBAAkB,EAAE,WAAW,CAAC,OAAO;aACxC,CAAC,CAAC;YAEH,OAAO,KAAK,CAAC;QACf,CAAC;QACD,QAAQ,EAAE;YACR,cAAc;YACd,WAAW,CAAC,OAAO;YACnB,WAAW,CAAC,OAAO;YACnB,gBAAgB,CAAC,OAAO;YACxB,gBAAgB,CAAC,OAAO;YACxB,iBAAiB,CAAC,QAAQ,EAAE;YAC5B,QAAQ;SACT;QACD,eAAe,EAAE,KAAK,EAAE,aAAa;QACrC,KAAK,EAAE,CAAC,EAAE,WAAW;QACrB,SAAS,EAAE,KAAK;KACjB,CAAC,CAAC;AACL,CAAC"}

package/dist/esm/react/core/hooks/useBridgeQuote.js

@@ -1,49 +0,0 @@
-"use client";
-import { useQuery } from "@tanstack/react-query";
-import * as Buy from "../../../bridge/Buy.js";
-import * as Transfer from "../../../bridge/Transfer.js";
-import { checksumAddress } from "../../../utils/address.js";
-export function useBridgeQuote({ originToken, destinationToken, destinationAmount, feePayer, client, enabled = true, }) {
-    return useQuery({
-        enabled: enabled && !!originToken && !!destinationToken && !!destinationAmount,
-        queryFn: async () => {
-            // if ssame token and chain, use transfer
-            if (checksumAddress(originToken.address) ===
-                checksumAddress(destinationToken.address) &&
-                originToken.chainId === destinationToken.chainId) {
-                const transfer = await Transfer.prepare({
-                    amount: destinationAmount,
-                    chainId: originToken.chainId,
-                    client,
-                    feePayer,
-                    receiver: destinationToken.address,
-                    sender: originToken.address,
-                    tokenAddress: originToken.address,
-                });
-                return transfer;
-            }
-            const quote = await Buy.quote({
-                amount: destinationAmount,
-                client,
-                destinationChainId: destinationToken.chainId,
-                destinationTokenAddress: destinationToken.address,
-                originChainId: originToken.chainId,
-                originTokenAddress: originToken.address,
-            });
-            return quote;
-        },
-        queryKey: [
-            "bridge-quote",
-            originToken.chainId,
-            originToken.address,
-            destinationToken.chainId,
-            destinationToken.address,
-            destinationAmount.toString(),
-            feePayer,
-        ],
-        refetchInterval: 60000, // 30 seconds
-        retry: 3, // 1 minute
-        staleTime: 30000,
-    });
-}
-//# sourceMappingURL=useBridgeQuote.js.map

package/dist/esm/react/core/hooks/useBridgeQuote.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useBridgeQuote.js","sourceRoot":"","sources":["../../../../../src/react/core/hooks/useBridgeQuote.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AACb,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,KAAK,GAAG,MAAM,wBAAwB,CAAC;AAC9C,OAAO,KAAK,QAAQ,MAAM,6BAA6B,CAAC;AAGxD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAW5D,MAAM,UAAU,cAAc,CAAC,EAC7B,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACjB,QAAQ,EACR,MAAM,EACN,OAAO,GAAG,IAAI,GACO;IACrB,OAAO,QAAQ,CAAC;QACd,OAAO,EACL,OAAO,IAAI,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,gBAAgB,IAAI,CAAC,CAAC,iBAAiB;QACvE,OAAO,EAAE,KAAK,IAAI,EAAE;YAClB,yCAAyC;YACzC,IACE,eAAe,CAAC,WAAW,CAAC,OAAO,CAAC;gBAClC,eAAe,CAAC,gBAAgB,CAAC,OAAO,CAAC;gBAC3C,WAAW,CAAC,OAAO,KAAK,gBAAgB,CAAC,OAAO,EAChD,CAAC;gBACD,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC;oBACtC,MAAM,EAAE,iBAAiB;oBACzB,OAAO,EAAE,WAAW,CAAC,OAAO;oBAC5B,MAAM;oBACN,QAAQ;oBACR,QAAQ,EAAE,gBAAgB,CAAC,OAAO;oBAClC,MAAM,EAAE,WAAW,CAAC,OAAO;oBAC3B,YAAY,EAAE,WAAW,CAAC,OAAO;iBAClC,CAAC,CAAC;gBACH,OAAO,QAAQ,CAAC;YAClB,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC;gBAC5B,MAAM,EAAE,iBAAiB;gBACzB,MAAM;gBACN,kBAAkB,EAAE,gBAAgB,CAAC,OAAO;gBAC5C,uBAAuB,EAAE,gBAAgB,CAAC,OAAO;gBACjD,aAAa,EAAE,WAAW,CAAC,OAAO;gBAClC,kBAAkB,EAAE,WAAW,CAAC,OAAO;aACxC,CAAC,CAAC;YAEH,OAAO,KAAK,CAAC;QACf,CAAC;QACD,QAAQ,EAAE;YACR,cAAc;YACd,WAAW,CAAC,OAAO;YACnB,WAAW,CAAC,OAAO;YACnB,gBAAgB,CAAC,OAAO;YACxB,gBAAgB,CAAC,OAAO;YACxB,iBAAiB,CAAC,QAAQ,EAAE;YAC5B,QAAQ;SACT;QACD,eAAe,EAAE,KAAK,EAAE,aAAa;QACrC,KAAK,EAAE,CAAC,EAAE,WAAW;QACrB,SAAS,EAAE,KAAK;KACjB,CAAC,CAAC;AACL,CAAC"}

package/dist/types/react/core/hooks/useBridgeQuote.d.ts

@@ -1,15 +0,0 @@
-import * as Buy from "../../../bridge/Buy.js";
-import * as Transfer from "../../../bridge/Transfer.js";
-import type { Token } from "../../../bridge/types/Token.js";
-import type { ThirdwebClient } from "../../../client/client.js";
-interface UseBridgeQuoteParams {
-    originToken: Token;
-    destinationToken: Token;
-    destinationAmount: bigint;
-    client: ThirdwebClient;
-    enabled?: boolean;
-    feePayer?: "sender" | "receiver";
-}
-export declare function useBridgeQuote({ originToken, destinationToken, destinationAmount, feePayer, client, enabled, }: UseBridgeQuoteParams): import("@tanstack/react-query").UseQueryResult<Buy.quote.Result | Transfer.prepare.Result, Error>;
-export {};
-//# sourceMappingURL=useBridgeQuote.d.ts.map

package/dist/types/react/core/hooks/useBridgeQuote.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useBridgeQuote.d.ts","sourceRoot":"","sources":["../../../../../src/react/core/hooks/useBridgeQuote.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,GAAG,MAAM,wBAAwB,CAAC;AAC9C,OAAO,KAAK,QAAQ,MAAM,6BAA6B,CAAC;AACxD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAGhE,UAAU,oBAAoB;IAC5B,WAAW,EAAE,KAAK,CAAC;IACnB,gBAAgB,EAAE,KAAK,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,MAAM,EAAE,cAAc,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;CAClC;AAED,wBAAgB,cAAc,CAAC,EAC7B,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACjB,QAAQ,EACR,MAAM,EACN,OAAc,GACf,EAAE,oBAAoB,qGA8CtB"}

package/src/react/core/hooks/useBridgeQuote.ts

@@ -1,71 +0,0 @@
-"use client";
-import { useQuery } from "@tanstack/react-query";
-import * as Buy from "../../../bridge/Buy.js";
-import * as Transfer from "../../../bridge/Transfer.js";
-import type { Token } from "../../../bridge/types/Token.js";
-import type { ThirdwebClient } from "../../../client/client.js";
-import { checksumAddress } from "../../../utils/address.js";
-
-interface UseBridgeQuoteParams {
-  originToken: Token;
-  destinationToken: Token;
-  destinationAmount: bigint;
-  client: ThirdwebClient;
-  enabled?: boolean;
-  feePayer?: "sender" | "receiver";
-}
-
-export function useBridgeQuote({
-  originToken,
-  destinationToken,
-  destinationAmount,
-  feePayer,
-  client,
-  enabled = true,
-}: UseBridgeQuoteParams) {
-  return useQuery({
-    enabled:
-      enabled && !!originToken && !!destinationToken && !!destinationAmount,
-    queryFn: async () => {
-      // if ssame token and chain, use transfer
-      if (
-        checksumAddress(originToken.address) ===
-          checksumAddress(destinationToken.address) &&
-        originToken.chainId === destinationToken.chainId
-      ) {
-        const transfer = await Transfer.prepare({
-          amount: destinationAmount,
-          chainId: originToken.chainId,
-          client,
-          feePayer,
-          receiver: destinationToken.address,
-          sender: originToken.address,
-          tokenAddress: originToken.address,
-        });
-        return transfer;
-      }
-      const quote = await Buy.quote({
-        amount: destinationAmount,
-        client,
-        destinationChainId: destinationToken.chainId,
-        destinationTokenAddress: destinationToken.address,
-        originChainId: originToken.chainId,
-        originTokenAddress: originToken.address,
-      });
-
-      return quote;
-    },
-    queryKey: [
-      "bridge-quote",
-      originToken.chainId,
-      originToken.address,
-      destinationToken.chainId,
-      destinationToken.address,
-      destinationAmount.toString(),
-      feePayer,
-    ],
-    refetchInterval: 60000, // 30 seconds
-    retry: 3, // 1 minute
-    staleTime: 30000,
-  });
-}