Unity 4.11.0, EmbeddedWallet -> InAppWallet + fix 4.10 regression (#2765)

Author: 0xFirekeeper

.changeset/ten-balloons-dream.md

@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/unity-js-bridge": patch
+---
+
+Unity 4.11.0, EmbeddedWallet -> InAppWallet + fix 4.10 regression

packages/unity-js-bridge/src/thirdweb-bridge.ts

@@ -17,13 +17,12 @@ import {
 import { ThirdwebStorage } from "@thirdweb-dev/storage";
 import {
   type DAppMetaData,
-  type EmbeddedWalletOauthStrategy,
+  InAppWallet,
+  type InAppWalletOauthStrategy,
   type SmartWalletConfig,
-  walletIds,
 } from "@thirdweb-dev/wallets";
 import type { AbstractClientWallet } from "@thirdweb-dev/wallets/evm/wallets/base";
 import { CoinbaseWallet } from "@thirdweb-dev/wallets/evm/wallets/coinbase-wallet";
-import { EmbeddedWallet } from "@thirdweb-dev/wallets/evm/wallets/embedded-wallet";
 import { EthersWallet } from "@thirdweb-dev/wallets/evm/wallets/ethers";
 import { InjectedWallet } from "@thirdweb-dev/wallets/evm/wallets/injected";
 import { LocalWallet } from "@thirdweb-dev/wallets/evm/wallets/local-wallet";
@@ -66,30 +65,28 @@ const bigNumberReplacer = (_key: string, value: any) => {
   return value;
 };
 
-const WALLETS = [
-  MetaMaskWallet,
-  InjectedWallet,
-  WalletConnect,
-  CoinbaseWallet,
-  LocalWallet,
-  SmartWallet,
-  EmbeddedWallet,
+const SUPPORTED_WALLET_IDS = [
+  "injected",
+  "metamask",
+  "walletConnect",
+  "coinbase",
+  "localWallet",
+  "smartWallet",
+  "inAppWallet",
 ] as const;
 
-type PossibleWallet = (typeof WALLETS)[number]["id"];
-
 type FundWalletInput = FundWalletOptions & {
   appId: string;
 };
 
 interface TWBridge {
   initialize: (chain: ChainIdOrName, options: string) => void;
   connect: (
-    wallet: PossibleWallet,
+    wallet: string,
     chainId: string,
     password?: string,
     email?: string,
-    personalWallet?: PossibleWallet,
+    personalWallet?: string,
     authOptions?: string,
     smartWalletAccountOverride?: string,
   ) => Promise<string>;
@@ -174,10 +171,11 @@ class ThirdwebBridge implements TWBridge {
       // biome-ignore lint/suspicious/noExplicitAny: TODO: fix use of any
       (globalThis as any).X_SDK_PLATFORM = "unity";
       // biome-ignore lint/suspicious/noExplicitAny: TODO: fix use of any
-      (globalThis as any).X_SDK_VERSION = "unity-4.10.1";
+      (globalThis as any).X_SDK_VERSION = "unity-4.11.0";
       // biome-ignore lint/suspicious/noExplicitAny: TODO: fix use of any
       (globalThis as any).X_SDK_OS = browser?.os ?? "unknown";
     }
+
     this.initializedChain = chain;
     const sdkOptions = JSON.parse(options);
     // biome-ignore lint/suspicious/noExplicitAny: TODO: fix use of any
@@ -215,7 +213,7 @@ class ThirdwebBridge implements TWBridge {
           clientId: sdkOptions.clientId,
         });
     this.activeSDK = new ThirdwebSDK(chain, sdkOptions, storage);
-    for (const possibleWallet of WALLETS) {
+    for (const walletId of SUPPORTED_WALLET_IDS) {
       let walletInstance: AbstractClientWallet;
       const dappMetadata: DAppMetaData = {
         name: sdkOptions.wallet?.appName || "thirdweb powered game",
@@ -224,22 +222,22 @@ class ThirdwebBridge implements TWBridge {
         logoUrl: sdkOptions.wallet?.appIcons?.[0] || "",
         ...sdkOptions.wallet?.extras,
       };
-      switch (possibleWallet.id) {
+      switch (walletId) {
         case "injected":
           walletInstance = new InjectedWallet({
             dappMetadata,
             chains: supportedChains,
             clientId: sdkOptions.clientId,
           });
           break;
-        case walletIds.metamask:
+        case "metamask":
           walletInstance = new MetaMaskWallet({
             dappMetadata,
             chains: supportedChains,
             clientId: sdkOptions.clientId,
           });
           break;
-        case walletIds.walletConnect:
+        case "walletConnect":
           walletInstance = new WalletConnect({
             projectId: sdkOptions.wallet?.walletConnectProjectId,
             dappMetadata,
@@ -261,21 +259,21 @@ class ThirdwebBridge implements TWBridge {
             },
           });
           break;
-        case walletIds.coinbase:
+        case "coinbase":
           walletInstance = new CoinbaseWallet({
             dappMetadata,
             chains: supportedChains,
             clientId: sdkOptions.clientId,
           });
           break;
-        case walletIds.localWallet:
+        case "localWallet":
           walletInstance = new LocalWallet({
             dappMetadata,
             chains: supportedChains,
             clientId: sdkOptions.clientId,
           });
           break;
-        case walletIds.smartWallet: {
+        case "smartWallet": {
           const config: SmartWalletConfig = {
             chain: chain,
             factoryAddress: sdkOptions.smartWalletConfig?.factoryAddress,
@@ -292,16 +290,16 @@ class ThirdwebBridge implements TWBridge {
           walletInstance = new SmartWallet(config);
           break;
         }
-        case walletIds.embeddedWallet:
-          walletInstance = new EmbeddedWallet({
+        case "inAppWallet":
+          walletInstance = new InAppWallet({
             clientId: sdkOptions.clientId,
             chain: Ethereum,
             dappMetadata,
             chains: supportedChains,
           });
           break;
         default:
-          throw new Error(`Unknown wallet type: ${possibleWallet.id}`);
+          throw new Error(`Unknown wallet type: ${walletId}`);
       }
       if (walletInstance) {
         walletInstance.on("connect", async () =>
@@ -312,19 +310,19 @@ class ThirdwebBridge implements TWBridge {
         );
         walletInstance.on("disconnect", () => this.updateSDKSigner());
 
-        this.walletMap.set(possibleWallet.id, walletInstance);
+        this.walletMap.set(walletId, walletInstance);
       }
     }
   }
 
   public async connect(
     // biome-ignore lint/style/useDefaultParameterLast: would change the order of parameters to fix this
-    wallet: PossibleWallet = "injected",
+    wallet: string,
     chainId: string,
     password?: string,
     email?: string,
     phoneNumber?: string,
-    personalWallet: PossibleWallet = "localWallet",
+    personalWallet?: string,
     authOptions?: string,
     smartWalletAccountOverride?: string,
   ) {
@@ -335,13 +333,13 @@ class ThirdwebBridge implements TWBridge {
     const chainIdNumber = Number(chainId);
     if (walletInstance) {
       // local wallet needs to be generated or loaded before connecting
-      if (walletInstance.walletId === walletIds.localWallet) {
+      if (wallet === "localWallet") {
         await this.initializeLocalWallet(password as string);
         walletInstance.connect({ chainId: chainIdNumber });
       }
 
-      if (walletInstance.walletId === walletIds.embeddedWallet) {
-        const embeddedWallet = walletInstance as EmbeddedWallet;
+      if (wallet === "inAppWallet") {
+        const embeddedWallet = walletInstance as InAppWallet;
         const authOptionsParsed = JSON.parse(authOptions || "{}");
         if (authOptionsParsed.authProvider === 0) {
           // EmailOTP
@@ -358,7 +356,7 @@ class ThirdwebBridge implements TWBridge {
           });
         } else if (authOptionsParsed.authProvider < 4) {
           // OAuth
-          let authProvider: EmbeddedWalletOauthStrategy;
+          let authProvider: InAppWalletOauthStrategy;
           switch (authOptionsParsed.authProvider) {
             // Google
             case 1:
@@ -437,17 +435,21 @@ class ThirdwebBridge implements TWBridge {
             `Invalid auth provider: ${authOptionsParsed.authProvider}`,
           );
         }
-      } else if (walletInstance.walletId === walletIds.smartWallet) {
+      } else if (wallet === "smartWallet") {
+        if (!personalWallet) {
+          throw new Error("Personal wallet is required for smart wallet");
+        }
         const smartWallet = walletInstance as SmartWallet;
-        const eoaWallet = this.walletMap.get(personalWallet);
         // Connect flow for EOA first
         await this.connect(
-          eoaWallet?.walletId,
+          personalWallet,
           chainId,
           password,
           email,
-          personalWallet,
+          phoneNumber,
+          undefined,
           authOptions,
+          undefined,
         );
         await this.switchNetwork(chainId); // workaround for polygon/mumbai
         if (this.activeWallet) {
@@ -471,7 +473,7 @@ class ThirdwebBridge implements TWBridge {
       this.updateSDKSigner(await walletInstance.getSigner());
       return await this.activeSDK.wallet.getAddress();
     }
-    throw new Error("Invalid Wallet");
+    throw new Error(`This wallet is not supported in WebGL: ${wallet}`);
   }
 
   public async disconnect() {
@@ -728,9 +730,7 @@ class ThirdwebBridge implements TWBridge {
   }
 
   public async exportWallet(password: string): Promise<string> {
-    const localWallet = this.walletMap.get(
-      walletIds.localWallet,
-    ) as LocalWallet;
+    const localWallet = this.walletMap.get("localWallet") as LocalWallet;
     return await localWallet.export({
       strategy: "encryptedJson",
       password: password,
@@ -754,9 +754,7 @@ class ThirdwebBridge implements TWBridge {
   }
 
   public async initializeLocalWallet(password: string): Promise<LocalWallet> {
-    const localWallet = this.walletMap.get(
-      walletIds.localWallet,
-    ) as LocalWallet;
+    const localWallet = this.walletMap.get("localWallet") as LocalWallet;
     try {
       await localWallet.loadOrCreate({
         strategy: "encryptedJson",
@@ -872,9 +870,7 @@ class ThirdwebBridge implements TWBridge {
     if (!this.activeWallet) {
       throw new Error("No wallet connected");
     }
-    const embeddedWallet = this.walletMap.get(
-      walletIds.embeddedWallet,
-    ) as EmbeddedWallet;
+    const embeddedWallet = this.walletMap.get("inAppWallet") as InAppWallet;
     const email = await embeddedWallet.getEmail();
     return JSON.stringify({ result: email });
   }