Merge branch 'main' into mintable-module

Author: MananTank

.changeset/early-shoes-applaud.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Respect custom bundler URL for getting gas fees + better DX for `predictSmartAccountAddress()`

.changeset/three-dancers-hear.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Consolidate custom jwt and custom auth endpoint through common endpoint

apps/dashboard/src/components/settings/ApiKeys/validations.ts

@@ -149,4 +149,4 @@ export type ApiKeyPayConfigValidationSchema = z.infer<
 >;
 
 // FIXME: Remove
-export const HIDDEN_SERVICES = ["relayer", "chainsaw", "insight"];
+export const HIDDEN_SERVICES = ["relayer", "chainsaw"];

apps/portal/src/app/typescript/v5/sidebar.tsx

@@ -139,7 +139,7 @@ export const sidebar: SideBar = {
             },
             ...[
               "smartWallet",
-              "predictAddress",
+              "predictSmartAccountAddress",
               "createAndSignUserOp",
               "createUnsignedUserOp",
               "signUserOp",

packages/thirdweb/src/exports/wallets/smart.ts

@@ -15,7 +15,10 @@ export {
   estimateUserOpGas,
 } from "../../wallets/smart/lib/bundler.js";
 
-export { predictAddress } from "../../wallets/smart/lib/calls.js";
+export {
+  predictAddress,
+  predictSmartAccountAddress,
+} from "../../wallets/smart/lib/calls.js";
 
 export { getPaymasterAndData } from "../../wallets/smart/lib/paymaster.js";
 

packages/thirdweb/src/transaction/prepare-contract-call.ts

@@ -92,6 +92,29 @@ export type PrepareContractCallOptions<
  * });
  * ```
  *
+ * ### Usage with ERC20 value:
+ *
+ * For transactions that transfer ERC20 tokens, you can specify the value as the amount of tokens to transfer.
+ *
+ * You can use this in conjuction with the [`getApprovalForTransaction`](https://portal.thirdweb.com/references/typescript/v5/getApprovalForTransaction) function to easily create approval transactions for ERC20 tokens.
+ *
+ * This value will also be read by the react hooks and UI components to present to total cost to the user.
+ *
+ * ```ts
+ * import { prepareContractCall } from "thirdweb";
+ * import { toWei } from "thirdweb/utils";
+ *
+ * const transaction = prepareContractCall({
+ *  contract,
+ *  method: "function payWithCoin()",
+ *  params: [],
+ *  erc20Value: {
+ *    tokenAddress: "0x...", // the address of the ERC20 token
+ *    amountWei: toWei("0.1"), // the amount of tokens to transfer in wei
+ *  },
+ * });
+ * ```
+ *
  * ### Usage with a JSON ABI function object:
  *
  * ```ts

packages/thirdweb/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) {

packages/thirdweb/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;
 }

packages/thirdweb/src/wallets/in-app/core/authentication/jwt.ts

@@ -1,33 +1,36 @@
 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,
       developerClientId: args.client.clientId,
     }),
   });
 
-  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(

packages/thirdweb/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);
   }