thirdweb 5.63.3-nightly-50f98d7486809c541252a9cfc6979d102960366b-20241022000337 → 5.64.0-nightly-e6e994479fb8386b1740de4170f33446f038f2b1-20241024000332

package/src/wallets/__generated__/wallet-ids.ts

@@ -1,7 +1,7 @@
 // This file is auto-generated by the `scripts/wallets/generate.ts` script.
 // Do not modify this file manually.
 
-// 366 wallets
+// 369 wallets
 export type WCSupportedWalletIds =
   | "io.metamask"
   | "com.trustwallet.app"
@@ -87,7 +87,6 @@ export type WCSupportedWalletIds =
   | "network.mrhb"
   | "com.apollox"
   | "com.ennowallet"
-  | "org.nitrogen"
   | "io.loopring.wallet"
   | "com.bee"
   | "cc.localtrade.lab"
@@ -127,7 +126,6 @@ export type WCSupportedWalletIds =
   | "io.slavi"
   | "com.plasma-wallet"
   | "tech.defiantapp"
-  | "io.tradestrike"
   | "cc.avacus"
   | "org.bytebank"
   | "com.coolbitx.cwsapp"
@@ -159,7 +157,6 @@ export type WCSupportedWalletIds =
   | "finance.slingshot"
   | "com.kriptonio"
   | "xyz.timelesswallet"
-  | "com.brave.wallet"
   | "io.streakk"
   | "com.saitamatoken"
   | "group.com.flowfoundation.wallet"
@@ -368,7 +365,13 @@ export type WCSupportedWalletIds =
   | "app.nicegram"
   | "finance.openwallet"
   | "com.bitget.web3"
-  | "com.tastycrypto";
+  | "com.tastycrypto"
+  | "com.ipmb"
+  | "com.daffione"
+  | "io.owallet"
+  | "com.beexo"
+  | "com.webauth"
+  | "id.plumaa";
 
 // 52 wallets
 export type InjectedSupportedWalletIds =
@@ -393,7 +396,6 @@ export type InjectedSupportedWalletIds =
   | "com.coolbitx.cwsapp"
   | "com.bifrostwallet"
   | "so.onekey.app.wallet"
-  | "com.brave.wallet"
   | "io.xdefi"
   | "group.com.flowfoundation.wallet"
   | "app.subwallet"
@@ -421,6 +423,7 @@ export type InjectedSupportedWalletIds =
   | "com.zypto"
   | "com.walletconnect.com"
   | "io.leapwallet.CompassWallet"
+  | "app.nightly"
   | "com.lootrush"
   | "app.core.extension"
   | "xyz.dawnwallet";

package/src/wallets/__generated__/wallet-infos.ts

@@ -434,11 +434,6 @@ const ALL_MINIMAL_WALLET_INFOS = (<const>[
     name: "Enno Wallet",
     hasMobileSupport: true,
   },
-  {
-    id: "org.nitrogen",
-    name: "Nitrogen Wallet",
-    hasMobileSupport: true,
-  },
   {
     id: "io.loopring.wallet",
     name: "Loopring",
@@ -634,11 +629,6 @@ const ALL_MINIMAL_WALLET_INFOS = (<const>[
     name: "Defiant",
     hasMobileSupport: true,
   },
-  {
-    id: "io.tradestrike",
-    name: "StrikeX Wallet",
-    hasMobileSupport: true,
-  },
   {
     id: "cc.avacus",
     name: "Avacus",
@@ -789,11 +779,6 @@ const ALL_MINIMAL_WALLET_INFOS = (<const>[
     name: "Kriptonio",
     hasMobileSupport: true,
   },
-  {
-    id: "com.brave.wallet",
-    name: "Bitski",
-    hasMobileSupport: true,
-  },
   {
     id: "io.streakk",
     name: "Streakk Wallet",
@@ -924,6 +909,11 @@ const ALL_MINIMAL_WALLET_INFOS = (<const>[
     name: "tomiPAY",
     hasMobileSupport: true,
   },
+  {
+    id: "io.tradestrike",
+    name: "StrikeX Wallet",
+    hasMobileSupport: true,
+  },
   {
     id: "app.subwallet",
     name: "SubWallet",
@@ -1794,6 +1784,36 @@ const ALL_MINIMAL_WALLET_INFOS = (<const>[
     name: "tastycrypto",
     hasMobileSupport: true,
   },
+  {
+    id: "com.ipmb",
+    name: "IPMB Wallet",
+    hasMobileSupport: true,
+  },
+  {
+    id: "com.daffione",
+    name: "DaffiOne",
+    hasMobileSupport: true,
+  },
+  {
+    id: "io.owallet",
+    name: "OWallet",
+    hasMobileSupport: true,
+  },
+  {
+    id: "com.beexo",
+    name: "Beexo",
+    hasMobileSupport: true,
+  },
+  {
+    id: "com.webauth",
+    name: "WebAuth",
+    hasMobileSupport: true,
+  },
+  {
+    id: "id.plumaa",
+    name: "Plumaa ID",
+    hasMobileSupport: true,
+  },
   {
     id: "com.coinbase.wallet",
     name: "Coinbase Wallet",
@@ -1809,6 +1829,11 @@ const ALL_MINIMAL_WALLET_INFOS = (<const>[
     name: "Rabby",
     hasMobileSupport: false,
   },
+  {
+    id: "com.brave.wallet",
+    name: "Brave Wallet",
+    hasMobileSupport: false,
+  },
   {
     id: "io.xdefi",
     name: "XDEFI Wallet",
@@ -1859,6 +1884,11 @@ const ALL_MINIMAL_WALLET_INFOS = (<const>[
     name: "Compass Wallet",
     hasMobileSupport: false,
   },
+  {
+    id: "app.nightly",
+    name: "Nightly",
+    hasMobileSupport: false,
+  },
   {
     id: "com.lootrush",
     name: "LootRush",

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

@@ -3,7 +3,7 @@
  */
 
 import type { ProviderInterface } from "@coinbase/wallet-sdk";
-import { trackConnect } from "../../analytics/track.js";
+import { trackConnect } from "../../analytics/track/connect.js";
 import type { Chain } from "../../chains/types.js";
 import { getCachedChainIfExists } from "../../chains/utils.js";
 import { COINBASE } from "../constants.js";

package/src/wallets/coinbase/coinbaseWebSDK.ts

@@ -14,6 +14,7 @@ import { getValidPublicRPCUrl } from "../utils/chains.js";
 import { normalizeChainId } from "../utils/normalizeChainId.js";
 
 import type { Preference } from "@coinbase/wallet-sdk/dist/core/provider/interface.js";
+import { trackTransaction } from "../../analytics/track/transaction.js";
 import type { Chain } from "../../chains/types.js";
 import { getCachedChain, getChainMetadata } from "../../chains/utils.js";
 import type { ThirdwebClient } from "../../client/client.js";
@@ -278,8 +279,15 @@ export async function coinbaseSDKWalletGetCallsStatus(args: {
   }) as Promise<GetCallsStatusResponse>;
 }
 
-function createAccount(provider: ProviderInterface, _address: string) {
-  const address = getAddress(_address);
+function createAccount({
+  provider,
+  address,
+  client,
+}: {
+  provider: ProviderInterface;
+  address: string;
+  client: ThirdwebClient;
+}) {
   const account: Account = {
     address,
     async sendTransaction(tx: SendTransactionOption) {
@@ -290,12 +298,22 @@ function createAccount(provider: ProviderInterface, _address: string) {
             accessList: tx.accessList,
             value: tx.value ? numberToHex(tx.value) : undefined,
             gas: tx.gas ? numberToHex(tx.gas) : undefined,
-            from: this.address,
+            from: getAddress(address),
             to: tx.to as Address,
             data: tx.data,
           },
         ],
       })) as Hex;
+
+      trackTransaction({
+        client: client,
+        walletAddress: getAddress(address),
+        walletType: COINBASE,
+        transactionHash,
+        contractAddress: tx.to ?? undefined,
+        gasPrice: tx.gasPrice,
+      });
+
       return {
         transactionHash,
       };
@@ -372,8 +390,9 @@ function onConnect(
   chain: Chain,
   provider: ProviderInterface,
   emitter: WalletEmitter<typeof COINBASE>,
+  client: ThirdwebClient,
 ): [Account, Chain, DisconnectFn, SwitchChainFn] {
-  const account = createAccount(provider, address);
+  const account = createAccount({ provider, address, client });
 
   async function disconnect() {
     provider.removeListener("accountsChanged", onAccountsChanged);
@@ -389,7 +408,11 @@ function onConnect(
 
   function onAccountsChanged(accounts: string[]) {
     if (accounts[0]) {
-      const newAccount = createAccount(provider, getAddress(accounts[0]));
+      const newAccount = createAccount({
+        provider,
+        address: getAddress(accounts[0]),
+        client,
+      });
       emitter.emit("accountChanged", newAccount);
       emitter.emit("accountsChanged", accounts);
     } else {
@@ -452,7 +475,7 @@ export async function connectCoinbaseWalletSDK(
     chain = options.chain;
   }
 
-  return onConnect(address, chain, provider, emitter);
+  return onConnect(address, chain, provider, emitter, options.client);
 }
 
 /**
@@ -483,7 +506,7 @@ export async function autoConnectCoinbaseWalletSDK(
       ? options.chain
       : getCachedChain(chainId);
 
-  return onConnect(address, chain, provider, emitter);
+  return onConnect(address, chain, provider, emitter, options.client);
 }
 
 async function switchChainCoinbaseWalletSDK(

package/src/wallets/create-wallet.ts

@@ -12,7 +12,7 @@ import type {
   WalletId,
 } from "./wallet-types.js";
 
-import { trackConnect } from "../analytics/track.js";
+import { trackConnect } from "../analytics/track/connect.js";
 import { getCachedChainIfExists } from "../chains/utils.js";
 import { webLocalStorage } from "../utils/storage/webStorage.js";
 import { isMobile } from "../utils/web/isMobile.js";
@@ -235,11 +235,12 @@ export function createWallet<const ID extends WalletId>(
               connectedChain,
               doDisconnect,
               doSwitchChain,
-            ] = await autoConnectInjectedWallet(
-              id as InjectedSupportedWalletIds,
+            ] = await autoConnectInjectedWallet({
+              id: id as InjectedSupportedWalletIds,
               emitter,
-              options.chain,
-            );
+              chain: options.chain,
+              client: options.client,
+            });
             // set the states
             account = connectedAccount;
             chain = connectedChain;

package/src/wallets/ecosystem/get-ecosystem-wallet-auth-options.ts

@@ -2,15 +2,26 @@ import { getThirdwebBaseUrl } from "../../utils/domains.js";
 import type { AuthOption } from "../types.js";
 import type { EcosystemWalletId } from "../wallet-types.js";
 
+export type EcosystemOptions = {
+  authOptions: AuthOption[];
+  smartAccountOptions: SmartAccountOptions;
+};
+
+type SmartAccountOptions = {
+  chainIds: number[];
+  sponsorGas: boolean;
+  accountFactoryAddress: string;
+};
+
 /**
  * Retrieves the specified auth options for a given ecosystem wallet, if any.
  * @param walletId The ecosystem wallet ID.
  * @returns {AuthOption[] | undefined} The auth options for the ecosystem wallet.
  * @internal
  */
-export async function getEcosystemWalletAuthOptions(
+export async function getEcosystemOptions(
   walletId: EcosystemWalletId,
-): Promise<AuthOption[] | undefined> {
+): Promise<EcosystemOptions | null> {
   const res = await fetch(
     `${getThirdwebBaseUrl("inAppWallet")}/api/2024-05-05/ecosystem-wallet`,
     {
@@ -29,5 +40,5 @@ export async function getEcosystemWalletAuthOptions(
     );
   }
 
-  return data.authOptions ?? undefined;
+  return data ?? null;
 }

package/src/wallets/in-app/core/authentication/types.ts

@@ -101,6 +101,7 @@ export type AuthProvider =
   | "X"
   | "Line"
   | "Twitch"
+  | "GitHub"
   | "Farcaster"
   | "Telegram";
 

package/src/wallets/in-app/core/wallet/enclave-wallet.ts

@@ -1,4 +1,5 @@
 import { bytesToHex } from "viem";
+import { trackTransaction } from "../../../../analytics/track/transaction.js";
 import { getCachedChain } from "../../../../chains/utils.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import { eth_sendRawTransaction } from "../../../../rpc/actions/eth_sendRawTransaction.js";
@@ -129,6 +130,8 @@ export class EnclaveWallet implements IWebWallet {
   async getAccount(): Promise<Account> {
     const client = this.client;
     const storage = this.localStorage;
+    const address = this.address;
+    const ecosystem = this.ecosystem;
 
     const _signTransaction = async (tx: SendTransactionOption) => {
       const rpcRequest = getRpcClient({
@@ -173,7 +176,7 @@ export class EnclaveWallet implements IWebWallet {
       });
     };
     return {
-      address: getAddress(this.address),
+      address: getAddress(address),
       async signTransaction(tx) {
         if (!tx.chainId) {
           throw new Error("chainId required in tx to sign");
@@ -190,13 +193,23 @@ export class EnclaveWallet implements IWebWallet {
           chain: getCachedChain(tx.chainId),
         });
         const signedTx = await _signTransaction(tx);
+
         const transactionHash = await eth_sendRawTransaction(
           rpcRequest,
           signedTx,
         );
-        return {
+
+        trackTransaction({
+          client,
+          ecosystem,
+          walletAddress: address,
+          walletType: "inApp",
           transactionHash,
-        };
+          contractAddress: tx.to ?? undefined,
+          gasPrice: tx.gasPrice,
+        });
+
+        return { transactionHash };
       },
       async signMessage({ message }) {
         const messagePayload = (() => {

package/src/wallets/in-app/core/wallet/in-app-core.ts

@@ -1,4 +1,4 @@
-import { trackConnect } from "../../../../analytics/track.js";
+import { trackConnect } from "../../../../analytics/track/connect.js";
 import type { Chain } from "../../../../chains/types.js";
 import { getCachedChainIfExists } from "../../../../chains/utils.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
@@ -70,6 +70,7 @@ export function createInAppWallet(args: {
         options,
         createOptions,
         connector,
+        ecosystem,
       );
 
       // set the states
@@ -78,6 +79,7 @@ export function createInAppWallet(args: {
       chain = connectedChain;
       trackConnect({
         client: options.client,
+        ecosystem,
         walletType: walletId,
         walletAddress: account.address,
       });
@@ -96,6 +98,7 @@ export function createInAppWallet(args: {
         options,
         createOptions,
         connector,
+        ecosystem,
       );
       // set the states
       client = options.client;
@@ -103,6 +106,7 @@ export function createInAppWallet(args: {
       chain = connectedChain;
       trackConnect({
         client: options.client,
+        ecosystem,
         walletType: walletId,
         walletAddress: account.address,
       });
@@ -142,6 +146,7 @@ export function createInAppWallet(args: {
           },
           createOptions,
           connector,
+          ecosystem,
         );
         account = connectedAccount;
         chain = connectedChain;

package/src/wallets/in-app/core/wallet/index.ts

@@ -1,10 +1,12 @@
 import { ethereum } from "../../../../chains/chain-definitions/ethereum.js";
 import type { Chain } from "../../../../chains/types.js";
+import { getCachedChain } from "../../../../chains/utils.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import {
   type SocialAuthOption,
   socialAuthOptions,
 } from "../../../../wallets/types.js";
+import { getEcosystemOptions } from "../../../ecosystem/get-ecosystem-wallet-auth-options.js";
 import type { Account, Wallet } from "../../../interfaces/wallet.js";
 import type { EcosystemWalletId, WalletId } from "../../../wallet-types.js";
 import type {
@@ -13,6 +15,7 @@ import type {
   WalletConnectionOption,
 } from "../../../wallet-types.js";
 import type { InAppConnector } from "../interfaces/connector.js";
+import type { Ecosystem } from "./types.js";
 
 /**
  * Checks if the provided wallet is an in-app wallet.
@@ -37,6 +40,7 @@ export async function connectInAppWallet(
     | CreateWalletArgs<"inApp">[1]
     | CreateWalletArgs<EcosystemWalletId>[1],
   connector: InAppConnector,
+  ecosystem: Ecosystem | undefined,
 ): Promise<[Account, Chain]> {
   if (
     // if auth mode is not specified, the default is popup
@@ -73,6 +77,33 @@ export async function connectInAppWallet(
     });
   }
 
+  if (ecosystem) {
+    const ecosystemOptions = await getEcosystemOptions(ecosystem.id);
+    const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
+    if (smartAccountOptions) {
+      const allowedChains = smartAccountOptions.chainIds;
+      const firstAllowedChain = allowedChains[0];
+      if (!firstAllowedChain) {
+        throw new Error(
+          "At least one chain must be allowed for ecosystem smart account",
+        );
+      }
+      const preferredChain =
+        options.chain && allowedChains.includes(options.chain.id)
+          ? options.chain
+          : getCachedChain(firstAllowedChain);
+      return convertToSmartAccount({
+        client: options.client,
+        authAccount,
+        smartAccountOptions: {
+          chain: preferredChain,
+          sponsorGas: smartAccountOptions.sponsorGas,
+          factoryAddress: smartAccountOptions.accountFactoryAddress,
+        },
+      });
+    }
+  }
+
   return [authAccount, options.chain || ethereum] as const;
 }
 
@@ -87,6 +118,7 @@ export async function autoConnectInAppWallet(
     | CreateWalletArgs<"inApp">[1]
     | CreateWalletArgs<EcosystemWalletId>[1],
   connector: InAppConnector,
+  ecosystem: Ecosystem | undefined,
 ): Promise<[Account, Chain]> {
   if (options.authResult && connector.loginWithAuthToken) {
     await connector.loginWithAuthToken(options.authResult);
@@ -112,6 +144,33 @@ export async function autoConnectInAppWallet(
     });
   }
 
+  if (ecosystem) {
+    const ecosystemOptions = await getEcosystemOptions(ecosystem.id);
+    const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
+    if (smartAccountOptions) {
+      const allowedChains = smartAccountOptions.chainIds;
+      const firstAllowedChain = allowedChains[0];
+      if (!firstAllowedChain) {
+        throw new Error(
+          "At least one chain must be allowed for ecosystem smart account",
+        );
+      }
+      const preferredChain =
+        options.chain && allowedChains.includes(options.chain.id)
+          ? options.chain
+          : getCachedChain(firstAllowedChain);
+      return convertToSmartAccount({
+        client: options.client,
+        authAccount,
+        smartAccountOptions: {
+          chain: preferredChain,
+          sponsorGas: smartAccountOptions.sponsorGas,
+          factoryAddress: smartAccountOptions.accountFactoryAddress,
+        },
+      });
+    }
+  }
+
   return [authAccount, options.chain || ethereum] as const;
 }
 

package/src/wallets/in-app/web/lib/iframe-wallet.ts

@@ -1,5 +1,6 @@
 import type * as ethers5 from "ethers5";
 import type { TypedDataDefinition } from "viem";
+import { trackTransaction } from "../../../../analytics/track/transaction.js";
 import { getCachedChain } from "../../../../chains/utils.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import { eth_sendRawTransaction } from "../../../../rpc/actions/eth_sendRawTransaction.js";
@@ -242,13 +243,22 @@ export class IFrameWallet implements IWebWallet {
           chain: getCachedChain(tx.chainId),
         });
         const signedTx = await _signTransaction(tx);
+
         const transactionHash = await eth_sendRawTransaction(
           rpcRequest,
           signedTx,
         );
-        return {
+
+        trackTransaction({
+          client,
+          walletAddress: address,
+          walletType: "inApp",
           transactionHash,
-        };
+          contractAddress: tx.to ?? undefined,
+          gasPrice: tx.gasPrice,
+        });
+
+        return { transactionHash };
       },
       async signMessage({ message }) {
         // in-app wallets use ethers to sign messages, which always expects a string (or bytes maybe but string is safest)

package/src/wallets/in-app/web/lib/web-connector.ts

@@ -318,6 +318,7 @@ export class InAppWebConnector implements InAppConnector {
       case "facebook":
       case "google":
       case "telegram":
+      case "github":
       case "twitch":
       case "farcaster":
       case "line":
@@ -390,6 +391,7 @@ export class InAppWebConnector implements InAppConnector {
       case "google":
       case "farcaster":
       case "telegram":
+      case "github":
       case "line":
       case "x":
       case "guest":