thirdweb 5.29.2 → 5.29.3-nightly-476b6cc271b0891fa01fb09ca509c564b850ccfa-20240614185219

package/src/exports/react-native/wallets/in-app.ts

@@ -0,0 +1,18 @@
+// --- KEEEP IN SYNC with exports/wallets/in-app.ts ---
+
+export { inAppWallet } from "../../../wallets/in-app/native/in-app.js";
+
+export {
+  preAuthenticate,
+  authenticate,
+  getUserEmail,
+  getUserPhoneNumber,
+} from "../../../wallets/in-app/native/auth/index.js";
+
+export { type GetAuthenticatedUserParams } from "../../../wallets/in-app/core/authentication/type.js";
+
+// NOT SUPPORTED (yet)
+
+export const hasStoredPasskey = () => {
+  throw new Error("Not supported in native");
+};

package/src/exports/react-native/wallets.ts

@@ -0,0 +1,102 @@
+// --- KEEEP IN SYNC with exports/wallets.ts ---
+
+export {
+  createWallet,
+  walletConnect,
+} from "../../wallets/native/create-wallet.js";
+export { inAppWallet } from "../../wallets/in-app/native/in-app.js";
+export { smartWallet } from "../../wallets/smart/smart-wallet.js";
+
+export type { Wallet, Account } from "../../wallets/interfaces/wallet.js";
+export type { ConnectionStatus } from "../../wallets/manager/index.js";
+
+// utils
+export {
+  getWalletBalance,
+  type GetWalletBalanceOptions,
+} from "../../wallets/utils/getWalletBalance.js";
+export {
+  generateAccount,
+  type GenerateAccountOptions,
+} from "../../wallets/utils/generateAccount.js";
+
+// private-key
+export {
+  privateKeyToAccount,
+  /**
+   * @internal
+   * @deprecated - use {@link privateKeyToAccount} instead
+   */
+  privateKeyToAccount as privateKeyAccount,
+  type PrivateKeyToAccountOptions,
+  /**
+   * @internal
+   * @deprecated - use {@link PrivateKeyToAccountOptions} instead
+   */
+  type PrivateKeyToAccountOptions as PrivateKeyAccountOptions,
+} from "../../wallets/private-key.js";
+
+export type {
+  WalletId,
+  WalletAutoConnectionOption,
+  WalletCreationOptions,
+  WalletConnectionOption,
+  CreateWalletArgs,
+} from "../../wallets/wallet-types.js";
+
+export type {
+  WCSupportedWalletIds,
+  InjectedSupportedWalletIds,
+} from "../../wallets/__generated__/wallet-ids.js";
+
+export type {
+  WCConnectOptions,
+  WCAutoConnectOptions,
+} from "../../wallets/wallet-connect/types.js";
+
+export type {
+  SmartWalletConnectionOptions,
+  SmartWalletOptions,
+} from "../../wallets/smart/types.js";
+
+export type {
+  InAppWalletAuth,
+  /**
+   * @deprecated use InAppWalletAuth instead
+   */
+  InAppWalletAuth as EmbeddedWalletAuth,
+  InAppWalletAutoConnectOptions,
+  /**
+   * @deprecated use InAppWalletAutoConnectOptions instead
+   */
+  InAppWalletAutoConnectOptions as EmbeddedWalletAutoConnectOptions,
+  InAppWalletConnectionOptions,
+  /**
+   * @deprecated use InAppWalletConnectionOptions instead
+   */
+  InAppWalletConnectionOptions as EmbeddedWalletConnectionOptions,
+  InAppWalletSocialAuth,
+  /**
+   * @deprecated use InAppWalletSocialAuth instead
+   */
+  InAppWalletSocialAuth as EmbeddedWalletSocialAuth,
+} from "../../wallets/in-app/core/wallet/types.js";
+
+export type { CoinbaseSDKWalletConnectionOptions } from "../../wallets/coinbase/coinbaseSDKWallet.js";
+
+export type {
+  WalletEmitter,
+  WalletEmitterEvents,
+} from "../../wallets/wallet-emitter.js";
+
+export { getAllWalletsList } from "../../wallets/getAllWalletsList.js";
+export { getWalletInfo } from "../../wallets/__generated__/getWalletInfo.js";
+export { type WalletInfo } from "../../wallets/wallet-info.js";
+
+export { createWalletAdapter } from "../../adapters/wallet-adapter.js";
+
+// NOT SUPPORTED
+
+export const injectedProvider = () => {
+  throw new Error("Not supported in native");
+};

package/src/exports/wallets/embedded.ts

@@ -4,11 +4,12 @@ export {
    * @deprecated use inAppWallet instead
    */
   inAppWallet as embeddedWallet,
-} from "../../wallets/create-wallet.js";
+} from "../../wallets/in-app/web/in-app.js";
 
 export {
   preAuthenticate,
   authenticate,
   getUserEmail,
-  type GetAuthenticatedUserParams,
-} from "../../wallets/in-app/core/authentication/index.js";
+} from "../../wallets/in-app/web/lib/auth/index.js";
+
+export { type GetAuthenticatedUserParams } from "../../wallets/in-app/core/authentication/type.js";

package/src/exports/wallets/in-app.ts

@@ -1,12 +1,15 @@
-export { inAppWallet } from "../../wallets/create-wallet.js";
+// --- KEEEP IN SYNC with exports/react-native/wallets/in-app ---
+
+export { inAppWallet } from "../../wallets/in-app/web/in-app.js";
 
 export {
   preAuthenticate,
   authenticate,
   getUserEmail,
   getUserPhoneNumber,
-  type GetAuthenticatedUserParams,
-} from "../../wallets/in-app/core/authentication/index.js";
+} from "../../wallets/in-app/web/lib/auth/index.js";
+
+export { type GetAuthenticatedUserParams } from "../../wallets/in-app/core/authentication/type.js";
 
 export { hasStoredPasskey } from "../../wallets/in-app/web/lib/auth/passkeys.js";
 

package/src/exports/wallets/smart.ts

@@ -1,4 +1,4 @@
-export { smartWallet } from "../../wallets/create-wallet.js";
+export { smartWallet } from "../../wallets/smart/smart-wallet.js";
 
 export type {
   SmartWalletConnectionOptions,

package/src/exports/wallets.ts

@@ -1,13 +1,17 @@
+// --- KEEEP IN SYNC with exports/react-native/wallets.ts ---
+
 export {
   createWallet,
-  smartWallet,
+  walletConnect,
+} from "../wallets/create-wallet.js";
+export {
   inAppWallet,
   /**
    * @deprecated use inAppWallet instead
    */
   inAppWallet as embeddedWallet,
-  walletConnect,
-} from "../wallets/create-wallet.js";
+} from "../wallets/in-app/web/in-app.js";
+export { smartWallet } from "../wallets/smart/smart-wallet.js";
 
 export type { Wallet, Account } from "../wallets/interfaces/wallet.js";
 export type { ConnectionStatus } from "../wallets/manager/index.js";

package/src/react/web/ui/ConnectWallet/Details.tsx

@@ -916,7 +916,7 @@ function InAppWalletUserInfo(props: {
     queryKey: ["in-app-wallet-user", client, account?.address],
     queryFn: async () => {
       const { getUserEmail, getUserPhoneNumber } = await import(
-        "../../../../wallets/in-app/core/authentication/index.js"
+        "../../../../wallets/in-app/web/lib/auth/index.js"
       );
 
       const [email, phone] = await Promise.all([

package/src/react/web/wallets/in-app/InAppWalletOTPLoginUI.tsx

@@ -1,7 +1,7 @@
 "use client";
 import { useCallback, useEffect, useRef, useState } from "react";
-import { preAuthenticate } from "../../../../wallets/in-app/core/authentication/index.js";
 import type { SendEmailOtpReturnType } from "../../../../wallets/in-app/core/authentication/type.js";
+import { preAuthenticate } from "../../../../wallets/in-app/web/lib/auth/index.js";
 import type { Wallet } from "../../../../wallets/interfaces/wallet.js";
 import { useCustomTheme } from "../../../core/design-system/CustomThemeProvider.js";
 import { fontSize } from "../../../core/design-system/index.js";

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.29.2";
+export const version = "5.29.3-nightly-476b6cc271b0891fa01fb09ca509c564b850ccfa-20240614185219";

package/src/wallets/coinbase/coinbase-wallet.ts

@@ -0,0 +1,108 @@
+/**
+ * internal helper functions
+ */
+
+import type { ProviderInterface } from "@coinbase/wallet-sdk";
+import { trackConnect } from "../../analytics/track.js";
+import type { Chain } from "../../chains/types.js";
+import { COINBASE } from "../constants.js";
+import type { Account, Wallet } from "../interfaces/wallet.js";
+import { createWalletEmitter } from "../wallet-emitter.js";
+import type { CreateWalletArgs } from "../wallet-types.js";
+
+/**
+ * @internal
+ */
+export function coinbaseWalletSDK(args: {
+  createOptions?: CreateWalletArgs<typeof COINBASE>[1];
+  providerFactory: () => Promise<ProviderInterface>;
+}): Wallet<typeof COINBASE> {
+  const { createOptions } = args;
+  const emitter = createWalletEmitter<typeof COINBASE>();
+  let account: Account | undefined = undefined;
+  let chain: Chain | undefined = undefined;
+
+  function reset() {
+    account = undefined;
+    chain = undefined;
+  }
+
+  let handleDisconnect = async () => {};
+
+  let handleSwitchChain = async (newChain: Chain) => {
+    chain = newChain;
+  };
+
+  const unsubscribeChainChanged = emitter.subscribe(
+    "chainChanged",
+    (newChain) => {
+      chain = newChain;
+    },
+  );
+
+  const unsubscribeDisconnect = emitter.subscribe("disconnect", () => {
+    reset();
+    unsubscribeChainChanged();
+    unsubscribeDisconnect();
+  });
+
+  emitter.subscribe("accountChanged", (_account) => {
+    account = _account;
+  });
+
+  return {
+    id: COINBASE,
+    subscribe: emitter.subscribe,
+    getChain: () => chain,
+    getConfig: () => createOptions,
+    getAccount: () => account,
+    autoConnect: async (options) => {
+      const { autoConnectCoinbaseWalletSDK } = await import(
+        "./coinbaseSDKWallet.js"
+      );
+      const provider = await args.providerFactory();
+      const [connectedAccount, connectedChain, doDisconnect, doSwitchChain] =
+        await autoConnectCoinbaseWalletSDK(options, emitter, provider);
+      // set the states
+      account = connectedAccount;
+      chain = connectedChain;
+      handleDisconnect = doDisconnect;
+      handleSwitchChain = doSwitchChain;
+      trackConnect({
+        client: options.client,
+        walletType: COINBASE,
+        walletAddress: account.address,
+      });
+      // return account
+      return account;
+    },
+    connect: async (options) => {
+      const { connectCoinbaseWalletSDK } = await import(
+        "./coinbaseSDKWallet.js"
+      );
+      const provider = await args.providerFactory();
+      const [connectedAccount, connectedChain, doDisconnect, doSwitchChain] =
+        await connectCoinbaseWalletSDK(options, emitter, provider);
+
+      // set the states
+      account = connectedAccount;
+      chain = connectedChain;
+      handleDisconnect = doDisconnect;
+      handleSwitchChain = doSwitchChain;
+      trackConnect({
+        client: options.client,
+        walletType: COINBASE,
+        walletAddress: account.address,
+      });
+      // return account
+      return account;
+    },
+    disconnect: async () => {
+      reset();
+      await handleDisconnect();
+    },
+    switchChain: async (newChain) => {
+      await handleSwitchChain(newChain);
+    },
+  };
+}

package/src/wallets/coinbase/coinbaseMobileSDK.ts

@@ -1,7 +1,29 @@
 import { configure } from "@coinbase/wallet-mobile-sdk";
+import type { ProviderInterface } from "@coinbase/wallet-sdk";
 import type { Chain } from "../../chains/types.js";
+import type { COINBASE } from "../constants.js";
+import type { CreateWalletArgs } from "../wallet-types.js";
 
-export async function initMobileProvider(args: {
+let _provider: ProviderInterface | undefined;
+
+/**
+ * @internal
+ */
+export async function getCoinbaseMobileProvider(
+  options?: CreateWalletArgs<typeof COINBASE>[1],
+): Promise<ProviderInterface> {
+  if (!_provider) {
+    const mobileProvider: ProviderInterface = (await initMobileProvider({
+      chain: options?.chains ? options.chains[0] : undefined,
+      ...options?.mobileConfig,
+    })) as unknown as ProviderInterface;
+    _provider = mobileProvider;
+    return mobileProvider;
+  }
+  return _provider;
+}
+
+async function initMobileProvider(args: {
   chain?: Chain;
   callbackURL?: string;
   hostURL?: string;

package/src/wallets/coinbase/coinbaseSDKWallet.ts

@@ -26,7 +26,6 @@ import {
   stringToHex,
   uint8ArrayToHex,
 } from "../../utils/encoding/hex.js";
-import { isReactNative } from "../../utils/platform.js";
 import { parseTypedData } from "../../utils/signatures/helpers/parseTypedData.js";
 import { COINBASE } from "../constants.js";
 import type {
@@ -128,20 +127,13 @@ export type CoinbaseSDKWalletConnectionOptions = {
 // this should be ok since all the creation options are provided at build time
 let _provider: ProviderInterface | undefined;
 
-async function getCoinbaseProvider(
+/**
+ * @internal
+ */
+export async function getCoinbaseWebProvider(
   options?: CreateWalletArgs<typeof COINBASE>[1],
 ): Promise<ProviderInterface> {
   if (!_provider) {
-    if (isReactNative()) {
-      const { initMobileProvider } = require("./coinbaseMobileSDK.js");
-      const mobileProvider = initMobileProvider({
-        chain: options?.chains ? options.chains[0] : undefined,
-        ...options?.mobileConfig,
-      });
-      _provider = mobileProvider;
-      return mobileProvider;
-    }
-
     const client = new CoinbaseWalletSDK({
       appName: options?.appMetadata?.name || getDefaultAppMetadata().name,
       appChainIds: options?.chains
@@ -186,7 +178,7 @@ export async function coinbaseSDKWalletGetCapabilities(args: {
   }
 
   const config = wallet.getConfig();
-  const provider = await getCoinbaseProvider(config);
+  const provider = await getCoinbaseWebProvider(config);
   try {
     return (await provider.request({
       method: "wallet_getCapabilities",
@@ -212,7 +204,7 @@ export async function coinbaseSDKWalletSendCalls(args: {
   const { wallet, params } = args;
 
   const config = wallet.getConfig();
-  const provider = await getCoinbaseProvider(config);
+  const provider = await getCoinbaseWebProvider(config);
 
   try {
     return (await provider.request({
@@ -238,7 +230,7 @@ export async function coinbaseSDKWalletShowCallsStatus(args: {
 }) {
   const { wallet, bundleId } = args;
 
-  const provider = await getCoinbaseProvider(wallet.getConfig());
+  const provider = await getCoinbaseWebProvider(wallet.getConfig());
 
   try {
     return await provider.request({
@@ -265,7 +257,7 @@ export async function coinbaseSDKWalletGetCallsStatus(args: {
   const { wallet, bundleId } = args;
 
   const config = wallet.getConfig();
-  const provider = await getCoinbaseProvider(config);
+  const provider = await getCoinbaseWebProvider(config);
 
   return provider.request({
     method: "wallet_getCallsStatus",
@@ -402,10 +394,9 @@ function onConnect(
  */
 export async function connectCoinbaseWalletSDK(
   options: WalletConnectionOption<typeof COINBASE>,
-  createOptions: CreateWalletArgs<typeof COINBASE>[1],
   emitter: WalletEmitter<typeof COINBASE>,
+  provider: ProviderInterface,
 ): Promise<ReturnType<typeof onConnect>> {
-  const provider = await getCoinbaseProvider(createOptions);
   const accounts = (await provider.request({
     method: "eth_requestAccounts",
   })) as string[];
@@ -443,11 +434,9 @@ export async function connectCoinbaseWalletSDK(
  */
 export async function autoConnectCoinbaseWalletSDK(
   options: WalletConnectionOption<typeof COINBASE>,
-  createOptions: CreateWalletArgs<typeof COINBASE>[1],
   emitter: WalletEmitter<typeof COINBASE>,
+  provider: ProviderInterface,
 ): Promise<ReturnType<typeof onConnect>> {
-  const provider = await getCoinbaseProvider(createOptions);
-
   // connected accounts
   const addresses = (await provider.request({
     method: "eth_accounts",