thirdweb 5.64.4-nightly-043ee925981bdc39649d30ad65d2fce922515ab0-20241030000335 → 5.64.4-nightly-c2a90542d7f870c799c297c59cd2b468816f7939-20241031000332

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

@@ -1,34 +1,37 @@
 import type { ThirdwebClient } from "../../../../client/client.js";
-import { getSessionHeaders } from "../../native/helpers/api/fetchers.js";
+import { getClientFetch } from "../../../../utils/fetch.js";
 import { ROUTE_AUTH_ENDPOINT_CALLBACK } from "../../native/helpers/constants.js";
 import { createErrorMessage } from "../../native/helpers/errors.js";
-import type { ClientScopedStorage } from "./client-scoped-storage.js";
+import type { Ecosystem } from "../wallet/types.js";
 import type { AuthStoredTokenWithCookieReturnType } from "./types.js";
 
 export async function authEndpoint(args: {
   payload: string;
   client: ThirdwebClient;
-  storage: ClientScopedStorage;
+  ecosystem?: Ecosystem;
 }): Promise<AuthStoredTokenWithCookieReturnType> {
-  const resp = await fetch(ROUTE_AUTH_ENDPOINT_CALLBACK, {
+  const clientFetch = getClientFetch(args.client, args.ecosystem);
+
+  const res = await clientFetch(ROUTE_AUTH_ENDPOINT_CALLBACK, {
     method: "POST",
     headers: {
-      ...getSessionHeaders(),
+      "Content-Type": "application/json",
     },
     body: JSON.stringify({
       payload: args.payload,
       developerClientId: args.client.clientId,
     }),
   });
-  if (!resp.ok) {
-    const error = await resp.json();
+
+  if (!res.ok) {
+    const error = await res.json();
     throw new Error(
       `Custom auth endpoint authentication error: ${error.message}`,
     );
   }
 
   try {
-    const { verifiedToken } = await resp.json();
+    const { verifiedToken } = await res.json();
 
     return { storedToken: verifiedToken };
   } catch (e) {

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

@@ -29,25 +29,22 @@ export async function guestAuthenticate(args: {
   }
 
   const clientFetch = getClientFetch(args.client, args.ecosystem);
-  const authResult = await (async () => {
-    const path = getLoginCallbackUrl({
-      authOption: "guest",
-      client: args.client,
-      ecosystem: args.ecosystem,
-    });
-    const res = await clientFetch(`${path}`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        sessionId,
-      }),
-    });
+  const path = getLoginCallbackUrl({
+    authOption: "guest",
+    client: args.client,
+    ecosystem: args.ecosystem,
+  });
+  const res = await clientFetch(`${path}`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
+      sessionId,
+    }),
+  });
 
-    if (!res.ok) throw new Error("Failed to generate guest account");
+  if (!res.ok) throw new Error("Failed to generate guest account");
 
-    return (await res.json()) satisfies AuthStoredTokenWithCookieReturnType;
-  })();
-  return authResult;
+  return (await res.json()) satisfies AuthStoredTokenWithCookieReturnType;
 }

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

@@ -1,19 +1,21 @@
 import type { ThirdwebClient } from "../../../../client/client.js";
-import { getSessionHeaders } from "../../native/helpers/api/fetchers.js";
+import { getClientFetch } from "../../../../utils/fetch.js";
 import { ROUTE_AUTH_JWT_CALLBACK } from "../../native/helpers/constants.js";
 import { createErrorMessage } from "../../native/helpers/errors.js";
-import type { ClientScopedStorage } from "./client-scoped-storage.js";
+import type { Ecosystem } from "../wallet/types.js";
 import type { AuthStoredTokenWithCookieReturnType } from "./types.js";
 
 export async function customJwt(args: {
   jwt: string;
   client: ThirdwebClient;
-  storage: ClientScopedStorage;
+  ecosystem?: Ecosystem;
 }): Promise<AuthStoredTokenWithCookieReturnType> {
-  const resp = await fetch(ROUTE_AUTH_JWT_CALLBACK, {
+  const clientFetch = getClientFetch(args.client, args.ecosystem);
+
+  const res = await clientFetch(ROUTE_AUTH_JWT_CALLBACK, {
     method: "POST",
     headers: {
-      ...getSessionHeaders(),
+      "Content-Type": "application/json",
     },
     body: JSON.stringify({
       jwt: args.jwt,
@@ -21,13 +23,14 @@ export async function customJwt(args: {
     }),
   });
 
-  if (!resp.ok) {
-    const error = await resp.json();
+  if (!res.ok) {
+    const error = await res.json();
     throw new Error(`JWT authentication error: ${error.message}`);
   }
 
   try {
-    const { verifiedToken } = await resp.json();
+    const { verifiedToken } = await res.json();
+
     return { storedToken: verifiedToken };
   } catch (e) {
     throw new Error(

package/src/wallets/in-app/native/helpers/api/fetchers.ts

@@ -19,7 +19,7 @@ const ECOSYSTEM_PARTNER_ID_HEADER = "x-ecosystem-partner-id";
 
 let sessionNonce: Hex | undefined = undefined;
 
-export function getSessionHeaders() {
+function getSessionHeaders() {
   if (!sessionNonce) {
     sessionNonce = randomBytesHex(16);
   }

package/src/wallets/in-app/native/native-connector.ts

@@ -199,13 +199,13 @@ export class InAppNativeConnector implements InAppConnector {
         return customJwt({
           jwt: params.jwt,
           client: this.client,
-          storage: this.storage,
+          ecosystem: this.ecosystem,
         });
       case "auth_endpoint":
         return authEndpoint({
           payload: params.payload,
           client: this.client,
-          storage: this.storage,
+          ecosystem: this.ecosystem,
         });
       default:
         throw new Error(`Unsupported authentication type: ${strategy}`);

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

@@ -4,8 +4,10 @@ import { webLocalStorage } from "../../../../utils/storage/webStorage.js";
 import type { SocialAuthOption } from "../../../../wallets/types.js";
 import type { Account } from "../../../interfaces/wallet.js";
 import { getUserStatus } from "../../core/actions/get-enclave-user-status.js";
+import { authEndpoint } from "../../core/authentication/authEndpoint.js";
 import { ClientScopedStorage } from "../../core/authentication/client-scoped-storage.js";
 import { guestAuthenticate } from "../../core/authentication/guest.js";
+import { customJwt } from "../../core/authentication/jwt.js";
 import {
   getLinkedProfilesInternal,
   linkAccount,
@@ -268,8 +270,11 @@ export class InAppWebConnector implements InAppConnector {
     });
   }
 
-  async loginWithAuthToken(authResult: AuthStoredTokenWithCookieReturnType) {
-    return this.auth.loginWithAuthToken(authResult);
+  async loginWithAuthToken(
+    authResult: AuthStoredTokenWithCookieReturnType,
+    recoveryCode?: string,
+  ) {
+    return this.auth.loginWithAuthToken(authResult, recoveryCode);
   }
 
   /**
@@ -292,20 +297,22 @@ export class InAppWebConnector implements InAppConnector {
           client: this.client,
           ecosystem: this.ecosystem,
         });
+      case "auth_endpoint": {
+        return authEndpoint({
+          payload: args.payload,
+          client: this.client,
+          ecosystem: this.ecosystem,
+        });
+      }
       case "jwt":
-        return this.auth.authenticateWithCustomJwt({
+        return customJwt({
           jwt: args.jwt,
-          encryptionKey: args.encryptionKey,
+          client: this.client,
+          ecosystem: this.ecosystem,
         });
       case "passkey": {
         return this.passkeyAuth(args);
       }
-      case "auth_endpoint": {
-        return this.auth.authenticateWithCustomAuthEndpoint({
-          payload: args.payload,
-          encryptionKey: args.encryptionKey,
-        });
-      }
       case "iframe_email_verification": {
         return this.auth.authenticateWithIframe({
           email: args.email,
@@ -359,17 +366,10 @@ export class InAppWebConnector implements InAppConnector {
   ): Promise<AuthLoginReturnType> {
     const strategy = args.strategy;
     switch (strategy) {
+      case "auth_endpoint":
       case "jwt": {
-        return this.auth.loginWithCustomJwt({
-          jwt: args.jwt,
-          encryptionKey: args.encryptionKey,
-        });
-      }
-      case "auth_endpoint": {
-        return this.auth.loginWithCustomAuthEndpoint({
-          payload: args.payload,
-          encryptionKey: args.encryptionKey,
-        });
+        const authToken = await this.authenticate(args);
+        return await this.loginWithAuthToken(authToken, args.encryptionKey);
       }
       case "iframe_email_verification": {
         return this.auth.loginWithIframe({

package/src/wallets/smart/lib/calls.ts

@@ -1,9 +1,49 @@
-import type { ThirdwebContract } from "../../../contract/contract.js";
+import type { Chain } from "../../../chains/types.js";
+import type { ThirdwebClient } from "../../../client/client.js";
+import {
+  type ThirdwebContract,
+  getContract,
+} from "../../../contract/contract.js";
 import { prepareContractCall } from "../../../transaction/prepare-contract-call.js";
 import type { PreparedTransaction } from "../../../transaction/prepare-transaction.js";
 import { readContract } from "../../../transaction/read-contract.js";
 import { isHex, stringToHex } from "../../../utils/encoding/hex.js";
 import type { SendTransactionOption } from "../../interfaces/wallet.js";
+import { DEFAULT_ACCOUNT_FACTORY_V0_6 } from "./constants.js";
+
+/**
+ * Predict the address of a smart account.
+ * @param args - The options for predicting the address of a smart account.
+ * @returns The predicted address of the smart account.
+ * @example
+ * ```ts
+ * import { predictSmartAccountAddress } from "thirdweb/wallets/smart";
+ *
+ * const predictedAddress = await predictSmartAccountAddress({
+ *  client,
+ *  chain,
+ *  adminAddress,
+ * });
+ * ```
+ * @walletUtils
+ */
+export async function predictSmartAccountAddress(args: {
+  client: ThirdwebClient;
+  chain: Chain;
+  adminAddress: string;
+  factoryAddress?: string;
+  accountSalt?: string;
+}): Promise<string> {
+  return predictAddress({
+    adminAddress: args.adminAddress,
+    accountSalt: args.accountSalt,
+    factoryContract: getContract({
+      address: args.factoryAddress ?? DEFAULT_ACCOUNT_FACTORY_V0_6,
+      chain: args.chain,
+      client: args.client,
+    }),
+  });
+}
 
 /**
  * Predict the address of a smart account.
@@ -20,6 +60,7 @@ import type { SendTransactionOption } from "../../interfaces/wallet.js";
  * });
  * ```
  * @walletUtils
+ * @deprecated Use `predictSmartAccountAddress` instead.
  */
 export async function predictAddress(args: {
   factoryContract: ThirdwebContract;

package/src/wallets/smart/lib/userop.ts

@@ -149,6 +149,7 @@ export async function createUnsignedUserOp(args: {
   const bundlerOptions = {
     client,
     chain,
+    bundlerUrl: overrides?.bundlerUrl,
     entrypointAddress: overrides?.entrypointAddress,
   };
 

package/src/wallets/smart/smart-wallet-integration-v07.test.ts

@@ -23,6 +23,7 @@ import { isContractDeployed } from "../../utils/bytecode/is-contract-deployed.js
 import { sleep } from "../../utils/sleep.js";
 import type { Account, Wallet } from "../interfaces/wallet.js";
 import { generateAccount } from "../utils/generateAccount.js";
+import { predictSmartAccountAddress } from "./lib/calls.js";
 import { DEFAULT_ACCOUNT_FACTORY_V0_7 } from "./lib/constants.js";
 import { smartWallet } from "./smart-wallet.js";
 
@@ -70,6 +71,13 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
 
     it("can connect", async () => {
       expect(smartWalletAddress).toHaveLength(42);
+      const predictedAddress = await predictSmartAccountAddress({
+        client,
+        chain,
+        adminAddress: personalAccount.address,
+        factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_7,
+      });
+      expect(predictedAddress).toEqual(smartWalletAddress);
     });
 
     it("should revert on unsuccessful transactions", async () => {

package/src/wallets/smart/smart-wallet-integration.test.ts

@@ -23,6 +23,7 @@ import { isContractDeployed } from "../../utils/bytecode/is-contract-deployed.js
 import { sleep } from "../../utils/sleep.js";
 import type { Account, Wallet } from "../interfaces/wallet.js";
 import { generateAccount } from "../utils/generateAccount.js";
+import { predictSmartAccountAddress } from "./lib/calls.js";
 import { smartWallet } from "./smart-wallet.js";
 
 let wallet: Wallet;
@@ -69,6 +70,12 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
 
     it("can connect", async () => {
       expect(smartWalletAddress).toHaveLength(42);
+      const predictedAddress = await predictSmartAccountAddress({
+        client,
+        chain,
+        adminAddress: personalAccount.address,
+      });
+      expect(predictedAddress).toEqual(smartWalletAddress);
     });
 
     it("should revert on unsuccessful transactions", async () => {