thirdweb 5.58.0-nightly-3229e1f03c3cbb62ddc8dccf22ad8a8feb0a95f0-20240920000335 → 5.58.1

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

@@ -1,3 +1,5 @@
+import { isEcosystemWallet } from "../../../../wallets/ecosystem/is-ecosystem-wallet.js";
+import type { EcosystemWalletId } from "../../../../wallets/wallet-types.js";
 import type { Wallet } from "../../../interfaces/wallet.js";
 import type {
   MultiStepAuthArgsType,
@@ -25,8 +27,8 @@ import type {
  * ```
  * @wallet
  */
-export async function getProfiles(wallet: Wallet<"inApp">) {
-  if (wallet.id !== "inApp") {
+export async function getProfiles(wallet: Wallet<"inApp" | EcosystemWalletId>) {
+  if (wallet.id !== "inApp" && !isEcosystemWallet(wallet)) {
     throw new Error("Multi-auth currently only supports in-app wallets");
   }
 
@@ -59,10 +61,10 @@ export async function getProfiles(wallet: Wallet<"inApp">) {
  * @wallet
  */
 export async function linkProfile(
-  wallet: Wallet<"inApp">,
+  wallet: Wallet<"inApp" | EcosystemWalletId>,
   auth: MultiStepAuthArgsType | SingleStepAuthArgsType,
 ): Promise<Profile[]> {
-  if (wallet.id !== "inApp") {
+  if (wallet.id !== "inApp" && !isEcosystemWallet(wallet)) {
     throw new Error("Multi-auth currently only supports in-app wallets");
   }
 

package/src/wallets/in-app/web/lib/actions/get-enclave-user-status.ts

@@ -9,7 +9,7 @@ import type { Ecosystem } from "../../types.js";
  *
  * @internal
  */
-export async function getEnclaveUserStatus({
+export async function getUserStatus({
   authToken,
   client,
   ecosystem,

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

@@ -11,7 +11,7 @@ import type {
 import type { ClientIdWithQuerierType, Ecosystem } from "../../types.js";
 import type { InAppWalletIframeCommunicator } from "../../utils/iFrameCommunication/InAppWalletIframeCommunicator.js";
 import { generateWallet } from "../actions/generate-wallet.enclave.js";
-import { getEnclaveUserStatus } from "../actions/get-enclave-user-status.js";
+import { getUserStatus } from "../actions/get-enclave-user-status.js";
 import { BaseLogin } from "./base-login.js";
 
 export type AuthQuerierTypes = {
@@ -28,6 +28,9 @@ export type AuthQuerierTypes = {
     storedToken: AuthStoredTokenWithCookieReturnType["storedToken"];
     recoveryCode?: string;
   };
+  migrateFromShardToEnclave: {
+    storedToken: AuthStoredTokenWithCookieReturnType["storedToken"];
+  };
 };
 
 /**
@@ -108,7 +111,7 @@ export class Auth {
   ): Promise<AuthLoginReturnType> {
     await this.preLogin();
 
-    const user = await getEnclaveUserStatus({
+    const user = await getUserStatus({
       authToken: authToken.storedToken.cookieString,
       client: this.client,
       ecosystem: this.ecosystem,

package/src/wallets/in-app/web/lib/auth/index.ts

@@ -51,8 +51,8 @@ async function getInAppWalletConnector(
 export async function getAuthenticatedUser(
   options: GetAuthenticatedUserParams,
 ) {
-  const { client } = options;
-  const connector = await getInAppWalletConnector(client);
+  const { client, ecosystem } = options;
+  const connector = await getInAppWalletConnector(client, ecosystem);
   const user = await connector.getUser();
   switch (user.status) {
     case UserWalletStatus.LOGGED_IN_WALLET_INITIALIZED: {

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

@@ -20,7 +20,7 @@ import {
   type WalletAddressObjectType,
 } from "../../core/authentication/types.js";
 import type { Ecosystem } from "../types.js";
-import { getEnclaveUserStatus } from "./actions/get-enclave-user-status.js";
+import { getUserStatus } from "./actions/get-enclave-user-status.js";
 import { signMessage as signEnclaveMessage } from "./actions/sign-message.enclave.js";
 import { signTransaction as signEnclaveTransaction } from "./actions/sign-transaction.enclave.js";
 import { signTypedData as signEnclaveTypedData } from "./actions/sign-typed-data.enclave.js";
@@ -96,11 +96,12 @@ export class EnclaveWallet implements IWebWallet {
       return { status: UserWalletStatus.LOGGED_OUT };
     }
 
-    const userStatus = await getEnclaveUserStatus({
+    const userStatus = await getUserStatus({
       authToken: token,
       client: this.client,
       ecosystem: this.ecosystem,
     });
+
     if (!userStatus) {
       return { status: UserWalletStatus.LOGGED_OUT };
     }
@@ -108,10 +109,10 @@ export class EnclaveWallet implements IWebWallet {
 
     const authDetails = {
       email: userStatus.linkedAccounts.find(
-        (account) => account.type === "email",
+        (account) => account.details.email !== undefined,
       )?.details.email,
       phoneNumber: userStatus.linkedAccounts.find(
-        (account) => account.type === "phone",
+        (account) => account.details.phone !== undefined,
       )?.details.phone,
       userWalletId: userStatus.id || "",
       recoveryShareManagement: RecoveryShareManagement.ENCLAVE,

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

@@ -10,7 +10,6 @@ import { type Hex, hexToString } from "../../../../utils/encoding/hex.js";
 import { parseTypedData } from "../../../../utils/signatures/helpers/parseTypedData.js";
 import { webLocalStorage } from "../../../../utils/storage/webStorage.js";
 import type { Prettify } from "../../../../utils/type-utils.js";
-import { getEcosystemPartnerPermissions } from "../../../ecosystem/get-ecosystem-partner-permissions.js";
 import type {
   Account,
   SendTransactionOption,
@@ -199,14 +198,6 @@ export class IFrameWallet implements IWebWallet {
       .walletManagerQuerier as unknown as InAppWalletIframeCommunicator<SignerProcedureTypes>;
     const client = this.client;
     const partnerId = this.ecosystem?.partnerId;
-    const isEcosystem = !!this.ecosystem;
-
-    const permissions = this.ecosystem?.partnerId
-      ? await getEcosystemPartnerPermissions(
-          this.ecosystem.id,
-          this.ecosystem?.partnerId,
-        )
-      : undefined;
 
     const { address } = await querier.call<GetAddressReturnType>({
       procedureName: "getAddress",
@@ -244,10 +235,6 @@ export class IFrameWallet implements IWebWallet {
             partnerId,
             rpcEndpoint: `https://${tx.chainId}.${RPC_URL}`, // TODO (ew) shouldnt be needed
           },
-          // Can hide the iframe if the partner has full control (no user approvals)
-          showIframe: permissions?.permissions.includes("FULL_CONTROL_V1")
-            ? false
-            : isEcosystem,
         });
       return signedTransaction as Hex;
     };
@@ -296,10 +283,6 @@ export class IFrameWallet implements IWebWallet {
             partnerId,
             chainId: 1, // TODO check if we need this
           },
-          // Can hide the iframe if the partner has full control (no user approvals)
-          showIframe: permissions?.permissions.includes("FULL_CONTROL_V1")
-            ? false
-            : isEcosystem,
         });
         return signedMessage as Hex;
       },
@@ -339,10 +322,6 @@ export class IFrameWallet implements IWebWallet {
               partnerId,
               rpcEndpoint: `https://${chainId}.${RPC_URL}`, // TODO (ew) shouldnt be needed
             },
-            // Can hide the iframe if the partner has full control (no user approvals)
-            showIframe: permissions?.permissions.includes("FULL_CONTROL_V1")
-              ? false
-              : isEcosystem,
           });
         return signedTypedData as Hex;
       },

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

@@ -20,7 +20,7 @@ import {
   UserWalletStatus,
 } from "../../core/authentication/types.js";
 import type { InAppConnector } from "../../core/interfaces/connector.js";
-import { getEnclaveUserStatus } from "../lib/actions/get-enclave-user-status.js";
+import { getUserStatus } from "../lib/actions/get-enclave-user-status.js";
 import type { Ecosystem, InAppWalletConstructorType } from "../types.js";
 import { InAppWalletIframeCommunicator } from "../utils/iFrameCommunication/InAppWalletIframeCommunicator.js";
 import { Auth, type AuthQuerierTypes } from "./auth/iframe-auth.js";
@@ -85,6 +85,23 @@ export class InAppWebConnector implements InAppConnector {
       ecosystem,
       onAuthSuccess: async (authResult) => {
         onAuthSuccess?.(authResult);
+
+        if (
+          this.ecosystem &&
+          authResult.storedToken.authDetails.walletType === "sharded"
+        ) {
+          // If this is an existing sharded ecosystem wallet, we'll need to migrate
+          const result = await this.querier.call<boolean>({
+            procedureName: "migrateFromShardToEnclave",
+            params: {
+              storedToken: authResult.storedToken,
+            },
+          });
+          if (!result) {
+            throw new Error("Failed to migrate from sharded to enclave wallet");
+          }
+        }
+
         await this.initializeWallet(authResult.storedToken.cookieString);
 
         if (!this.wallet) {
@@ -135,7 +152,7 @@ export class InAppWebConnector implements InAppConnector {
       );
     }
 
-    const user = await getEnclaveUserStatus({
+    const user = await getUserStatus({
       authToken: authToken || (storedAuthToken as string),
       client: this.client,
       ecosystem: this.ecosystem,
@@ -148,6 +165,7 @@ export class InAppWebConnector implements InAppConnector {
         "Cannot initialize wallet, this user does not have a wallet generated yet",
       );
     }
+
     if (user.wallets[0].type === "enclave") {
       this.wallet = new EnclaveWallet({
         client: this.client,

package/dist/cjs/react/web/wallets/in-app/LinkButton.js

@@ -1,23 +0,0 @@
-"use strict";
-"use client";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LinkButton = void 0;
-const CustomThemeProvider_js_1 = require("../../../core/design-system/CustomThemeProvider.js");
-const index_js_1 = require("../../../core/design-system/index.js");
-const elements_js_1 = require("../../ui/design-system/elements.js");
-exports.LinkButton = (0, elements_js_1.StyledButton)((_) => {
-    const theme = (0, CustomThemeProvider_js_1.useCustomTheme)();
-    return {
-        all: "unset",
-        color: theme.colors.accentText,
-        fontSize: index_js_1.fontSize.sm,
-        cursor: "pointer",
-        textAlign: "center",
-        fontWeight: 500,
-        width: "100%",
-        "&:hover": {
-            color: theme.colors.primaryText,
-        },
-    };
-});
-//# sourceMappingURL=LinkButton.js.map

package/dist/cjs/react/web/wallets/in-app/LinkButton.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"LinkButton.js","sourceRoot":"","sources":["../../../../../../src/react/web/wallets/in-app/LinkButton.tsx"],"names":[],"mappings":";AAAA,YAAY,CAAC;;;AACb,+FAAoF;AACpF,mEAAgE;AAChE,oEAAkE;AAErD,QAAA,UAAU,GAAmB,IAAA,0BAAY,EAAC,CAAC,CAAC,EAAE,EAAE;IAC3D,MAAM,KAAK,GAAG,IAAA,uCAAc,GAAE,CAAC;IAC/B,OAAO;QACL,GAAG,EAAE,OAAO;QACZ,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,UAAU;QAC9B,QAAQ,EAAE,mBAAQ,CAAC,EAAE;QACrB,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,QAAQ;QACnB,UAAU,EAAE,GAAG;QACf,KAAK,EAAE,MAAM;QACb,SAAS,EAAE;YACT,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,WAAW;SAChC;KACF,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/dist/esm/react/web/wallets/in-app/LinkButton.js

@@ -1,20 +0,0 @@
-"use client";
-import { useCustomTheme } from "../../../core/design-system/CustomThemeProvider.js";
-import { fontSize } from "../../../core/design-system/index.js";
-import { StyledButton } from "../../ui/design-system/elements.js";
-export const LinkButton = /* @__PURE__ */ StyledButton((_) => {
-    const theme = useCustomTheme();
-    return {
-        all: "unset",
-        color: theme.colors.accentText,
-        fontSize: fontSize.sm,
-        cursor: "pointer",
-        textAlign: "center",
-        fontWeight: 500,
-        width: "100%",
-        "&:hover": {
-            color: theme.colors.primaryText,
-        },
-    };
-});
-//# sourceMappingURL=LinkButton.js.map

package/dist/esm/react/web/wallets/in-app/LinkButton.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"LinkButton.js","sourceRoot":"","sources":["../../../../../../src/react/web/wallets/in-app/LinkButton.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;AACb,OAAO,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAC;AACpF,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAElE,MAAM,CAAC,MAAM,UAAU,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE;IAC3D,MAAM,KAAK,GAAG,cAAc,EAAE,CAAC;IAC/B,OAAO;QACL,GAAG,EAAE,OAAO;QACZ,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,UAAU;QAC9B,QAAQ,EAAE,QAAQ,CAAC,EAAE;QACrB,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,QAAQ;QACnB,UAAU,EAAE,GAAG;QACf,KAAK,EAAE,MAAM;QACb,SAAS,EAAE;YACT,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,WAAW;SAChC;KACF,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/dist/types/react/web/wallets/in-app/LinkButton.d.ts

@@ -1,5 +0,0 @@
-export declare const LinkButton: import("@emotion/styled").StyledComponent<{
-    theme?: import("@emotion/react").Theme;
-    as?: React.ElementType;
-}, import("react").DetailedHTMLProps<import("react").ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement>, {}>;
-//# sourceMappingURL=LinkButton.d.ts.map

package/dist/types/react/web/wallets/in-app/LinkButton.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"LinkButton.d.ts","sourceRoot":"","sources":["../../../../../../src/react/web/wallets/in-app/LinkButton.tsx"],"names":[],"mappings":"AAKA,eAAO,MAAM,UAAU;;SAeW,MAAO,WAAW;qHADlD,CAAC"}

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

@@ -1,20 +0,0 @@
-"use client";
-import { useCustomTheme } from "../../../core/design-system/CustomThemeProvider.js";
-import { fontSize } from "../../../core/design-system/index.js";
-import { StyledButton } from "../../ui/design-system/elements.js";
-
-export const LinkButton = /* @__PURE__ */ StyledButton((_) => {
-  const theme = useCustomTheme();
-  return {
-    all: "unset",
-    color: theme.colors.accentText,
-    fontSize: fontSize.sm,
-    cursor: "pointer",
-    textAlign: "center",
-    fontWeight: 500,
-    width: "100%",
-    "&:hover": {
-      color: theme.colors.primaryText,
-    },
-  };
-});