thirdweb 5.100.0-nightly-713ebe0a2d6d8a409e41ce0f0317fc34b1f221bb-20250520000414 → 5.100.0

package/src/bridge/OnrampStatus.ts

@@ -0,0 +1,133 @@
+import type { Hex as ox__Hex } from "ox";
+import type { ThirdwebClient } from "../client/client.js";
+import { getThirdwebBaseUrl } from "../utils/domains.js";
+import { getClientFetch } from "../utils/fetch.js";
+
+/**
+ * Retrieves the status of an Onramp session created via {@link Bridge.Onramp.prepare}. The
+ * status will include any on-chain transactions that have occurred as a result of the onramp
+ * as well as any arbitrary `purchaseData` that was supplied when the onramp was
+ * prepared.
+ *
+ * @example
+ * ```typescript
+ * import { Bridge } from "thirdweb";
+ *
+ * const onrampStatus = await Bridge.Onramp.status({
+ *   id: "022218cc-96af-4291-b90c-dadcb47571ec",
+ *   client: thirdwebClient,
+ * });
+ *
+ * // Possible results:
+ * // {
+ * //   status: "CREATED",
+ * //   transactions: [],
+ * //   purchaseData: {
+ * //     orderId: "abc-123",
+ * //   },
+ * // }
+ * //
+ * // or
+ * // {
+ * //   status: "PENDING",
+ * //   transactions: [],
+ * //   purchaseData: {
+ * //     orderId: "abc-123",
+ * //   },
+ * // }
+ * //
+ * // or
+ * // {
+ * //   status: "COMPLETED",
+ * //   transactions: [
+ * //     {
+ * //       chainId: 1,
+ * //       transactionHash:
+ * //         "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
+ * //     },
+ * //   ],
+ * //   purchaseData: {
+ * //     orderId: "abc-123",
+ * //   },
+ * // }
+ * ```
+ *
+ * @param options - The options for fetching the onramp status.
+ * @param options.id - The UUID returned from {@link Bridge.Onramp.prepare}.
+ * @param options.client - Your thirdweb client instance.
+ *
+ * @returns A promise that resolves to the status of the onramp session.
+ *
+ * @throws Will throw an error if there is an issue fetching the status.
+ * @bridge Onramp
+ * @beta
+ */
+export async function status(options: status.Options): Promise<status.Result> {
+  const { id, client } = options;
+
+  const clientFetch = getClientFetch(client);
+  const url = new URL(`${getThirdwebBaseUrl("bridge")}/v1/onramp/status`);
+  url.searchParams.set("id", id);
+
+  const response = await clientFetch(url.toString());
+  if (!response.ok) {
+    const errorJson = await response.json();
+    throw new Error(
+      `${errorJson.code || response.status} | ${errorJson.message || response.statusText} - ${errorJson.correlationId || "N/A"}`,
+    );
+  }
+
+  const { data }: { data: status.Result } = await response.json();
+  return data;
+}
+
+export declare namespace status {
+  /**
+   * Input parameters for {@link Bridge.Onramp.status}.
+   */
+  export type Options = {
+    /**
+     * The Onramp session ID returned by {@link Bridge.Onramp.prepare}.
+     */
+    id: string;
+    /** Your {@link ThirdwebClient} instance. */
+    client: ThirdwebClient;
+  };
+
+  /**
+   * The result returned from {@link Bridge.Onramp.status}.
+   */
+  export type Result =
+    | {
+        status: "COMPLETED";
+        transactions: Array<{
+          chainId: number;
+          transactionHash: ox__Hex.Hex;
+        }>;
+        purchaseData?: unknown;
+      }
+    | {
+        status: "PENDING";
+        transactions: Array<{
+          chainId: number;
+          transactionHash: ox__Hex.Hex;
+        }>;
+        purchaseData?: unknown;
+      }
+    | {
+        status: "CREATED";
+        transactions: Array<{
+          chainId: number;
+          transactionHash: ox__Hex.Hex;
+        }>;
+        purchaseData?: unknown;
+      }
+    | {
+        status: "FAILED";
+        transactions: Array<{
+          chainId: number;
+          transactionHash: ox__Hex.Hex;
+        }>;
+        purchaseData?: unknown;
+      };
+}

package/src/bridge/Sell.ts

@@ -251,7 +251,7 @@ export declare namespace quote {
  * ```
  *
  * ## Sending the transactions
- * The `transactions` array is a series of [ox](https://oxlib.sh) EIP-1559 transactions that must be executed one after the other in order to fulfill the complete route. There are a few things to keep in mind when executing these transactions:
+ * The `transactions` array is a series of transactions ready to be executed (with `sendTransaction`) must be executed one after the other in order to fulfill the complete route. There are a few things to keep in mind when executing these transactions:
  *  - Approvals will have the `approval` action specified. You can perform approvals with `sendAndConfirmTransaction`, then proceed to the next transaction.
  *  - All transactions are assumed to be executed by the `sender` address, regardless of which chain they are on. The final transaction will use the `receiver` as the recipient address.
  *  - If an `expiration` timestamp is provided, all transactions must be executed before that time to guarantee successful execution at the specified price.

package/src/bridge/index.ts

@@ -1,11 +1,19 @@
 export * as Buy from "./Buy.js";
 export * as Sell from "./Sell.js";
 export * as Transfer from "./Transfer.js";
+export * as Onramp from "./Onramp.js";
 export { status } from "./Status.js";
 export { routes } from "./Routes.js";
 export { chains } from "./Chains.js";
 
-export type { Status } from "./types/Status.js";
-export type { Route } from "./types/Route.js";
-export type { Quote, PreparedQuote } from "./types/Quote.js";
 export type { Chain } from "./types/Chain.js";
+export type { Quote, PreparedQuote } from "./types/Quote.js";
+export type {
+  Route,
+  RouteQuoteStep,
+  RouteStep,
+  RouteTransaction,
+} from "./types/Route.js";
+export type { Status } from "./types/Status.js";
+export type { Token } from "./types/Token.js";
+export type { BridgeAction } from "./types/BridgeAction.js";

package/src/bridge/types/BridgeAction.ts

@@ -0,0 +1 @@
+export type BridgeAction = "approval" | "transfer" | "buy" | "sell";

package/src/bridge/types/Quote.ts

@@ -1,6 +1,4 @@
-import type { Hex as ox__Hex } from "ox";
-import type { Chain } from "../../chains/types.js";
-import type { ThirdwebClient } from "../../client/client.js";
+import type { RouteQuoteStep, RouteStep } from "./Route.js";
 
 export type Quote = {
   /**
@@ -26,29 +24,7 @@ export type Quote = {
   /**
    * The steps required to complete the quote.
    */
-  steps: Array<{
-    originToken: {
-      chainId: number;
-      address: ox__Hex.Hex;
-      symbol: string;
-      name: string;
-      decimals: number;
-      priceUsd: number;
-      iconUri: string;
-    };
-    destinationToken: {
-      chainId: number;
-      address: ox__Hex.Hex;
-      symbol: string;
-      name: string;
-      decimals: number;
-      priceUsd: number;
-      iconUri: string;
-    };
-    originAmount: bigint;
-    destinationAmount: bigint;
-    estimatedExecutionTimeMs: number;
-  }>;
+  steps: RouteQuoteStep[];
 };
 
 export type PreparedQuote = {
@@ -79,43 +55,5 @@ export type PreparedQuote = {
   /**
    * A series of steps required to complete the quote, along with the transactions to execute in order.
    */
-  steps: Array<{
-    originToken: {
-      chainId: number;
-      address: ox__Hex.Hex;
-      symbol: string;
-      name: string;
-      decimals: number;
-      priceUsd: number;
-      iconUri: string;
-    };
-    destinationToken: {
-      chainId: number;
-      address: ox__Hex.Hex;
-      symbol: string;
-      name: string;
-      decimals: number;
-      priceUsd: number;
-      iconUri: string;
-    };
-    originAmount: bigint;
-    destinationAmount: bigint;
-    estimatedExecutionTimeMs: number;
-    transactions: Array<{
-      data: ox__Hex.Hex;
-      to: ox__Hex.Hex;
-      value?: bigint | undefined;
-      chainId: number;
-      /**
-       * The action this transaction performs. This can be "approval", "transfer", "buy", or "sell".
-       */
-      action: "approval" | "transfer" | "buy" | "sell";
-      /**
-       * The transaction ID, used for tracking purposes.
-       */
-      id: ox__Hex.Hex;
-      client: ThirdwebClient;
-      chain: Chain;
-    }>;
-  }>;
+  steps: RouteStep[];
 };

package/src/bridge/types/Route.ts

@@ -1,6 +1,45 @@
+import type { Hex as ox__Hex } from "ox";
+import type { Chain } from "../../chains/types.js";
+import type { ThirdwebClient } from "../../client/client.js";
+import type { BridgeAction } from "./BridgeAction.js";
 import type { Token } from "./Token.js";
 
 export type Route = {
   originToken: Token;
   destinationToken: Token;
 };
+
+export type RouteQuoteStep = {
+  originToken: Token;
+  destinationToken: Token;
+  originAmount: bigint;
+  destinationAmount: bigint;
+  estimatedExecutionTimeMs: number;
+};
+
+export type RouteStep = {
+  originToken: Token;
+  destinationToken: Token;
+  originAmount: bigint;
+  destinationAmount: bigint;
+  estimatedExecutionTimeMs: number;
+  transactions: RouteTransaction[];
+};
+
+export type RouteTransaction = {
+  data: ox__Hex.Hex;
+  to: ox__Hex.Hex;
+  value?: bigint | undefined;
+  chainId: number;
+
+  /**
+   * The action this transaction performs. This can be "approval", "transfer", "buy", or "sell".
+   */
+  action: BridgeAction;
+  /**
+   * The transaction ID, used for tracking purposes.
+   */
+  id: ox__Hex.Hex;
+  client: ThirdwebClient;
+  chain: Chain;
+};

package/src/bridge/types/Token.ts

@@ -7,4 +7,5 @@ export type Token = {
   symbol: string;
   name: string;
   iconUri?: string;
+  priceUsd: number;
 };

package/src/extensions/ens/resolve-l2-name.ts

@@ -4,7 +4,6 @@ import * as ox__Bytes from "ox/Bytes";
 import * as ox__Ens from "ox/Ens";
 import * as ox__Hash from "ox/Hash";
 import * as ox__Hex from "ox/Hex";
-import { keccak256 } from "viem";
 import type { Chain } from "../../chains/types.js";
 import type { ThirdwebClient } from "../../client/client.js";
 import { getContract } from "../../contract/contract.js";
@@ -47,7 +46,6 @@ const convertReverseNodeToBytes = (address: Address, chainId: number) => {
       [reverseNode, addressNode],
     ),
   );
-  keccak256;
   return addressReverseNode;
 };
 

package/src/pay/buyWithFiat/getQuote.ts

@@ -1,9 +1,12 @@
+import { prepare as prepareOnramp } from "../../bridge/Onramp.js";
+import { getCachedChain } from "../../chains/utils.js";
 import type { ThirdwebClient } from "../../client/client.js";
+import { NATIVE_TOKEN_ADDRESS } from "../../constants/addresses.js";
+import { getContract } from "../../contract/contract.js";
+import { decimals } from "../../extensions/erc20/read/decimals.js";
 import type { CurrencyMeta } from "../../react/web/ui/ConnectWallet/screens/Buy/fiat/currencies.js";
-import { getClientFetch } from "../../utils/fetch.js";
-import { stringify } from "../../utils/json.js";
+import { toTokens, toUnits } from "../../utils/units.js";
 import type { FiatProvider, PayTokenInfo } from "../utils/commonTypes.js";
-import { getPayBuyWithFiatQuoteEndpoint } from "../utils/definitions.js";
 /**
  * Parameters for [`getBuyWithFiatQuote`](https://portal.thirdweb.com/references/typescript/v5/getBuyWithFiatQuote) function
  * @deprecated
@@ -274,41 +277,189 @@ export async function getBuyWithFiatQuote(
   params: GetBuyWithFiatQuoteParams,
 ): Promise<BuyWithFiatQuote> {
   try {
-    const clientFetch = getClientFetch(params.client);
+    // map preferred provider (FiatProvider) → onramp string expected by Onramp.prepare
+    const mapProviderToOnramp = (
+      provider?: FiatProvider,
+    ): "stripe" | "coinbase" | "transak" => {
+      switch (provider) {
+        case "STRIPE":
+          return "stripe";
+        case "TRANSAK":
+          return "transak";
+        default: // default to coinbase when undefined or any other value
+          return "coinbase";
+      }
+    };
 
-    const response = await clientFetch(getPayBuyWithFiatQuoteEndpoint(), {
-      method: "POST",
-      headers: {
-        Accept: "application/json",
-        "Content-Type": "application/json",
-      },
-      body: stringify({
-        toAddress: params.toAddress,
-        fromCurrencySymbol: params.fromCurrencySymbol,
-        toChainId: params.toChainId.toString(),
-        toTokenAddress: params.toTokenAddress,
-        fromAmount: params.fromAmount,
-        toAmount: params.toAmount,
-        maxSlippageBPS: params.maxSlippageBPS,
-        isTestMode: params.isTestMode,
-        purchaseData: params.purchaseData,
-        fromAddress: params.fromAddress,
-        toGasAmountWei: params.toGasAmountWei,
-        preferredProvider: params.preferredProvider,
-        multiHopSupported: true,
-      }),
+    // Choose provider or default to STRIPE
+    const onrampProvider = mapProviderToOnramp(params.preferredProvider);
+
+    const d =
+      params.toTokenAddress !== NATIVE_TOKEN_ADDRESS
+        ? await decimals({
+            contract: getContract({
+              client: params.client,
+              address: params.toTokenAddress,
+              chain: getCachedChain(params.toChainId),
+            }),
+          })
+        : 18;
+
+    // Prepare amount in wei if provided
+    const amountWei = params.toAmount ? toUnits(params.toAmount, d) : undefined;
+
+    // Call new Onramp.prepare to get the quote & link
+    const prepared = await prepareOnramp({
+      client: params.client,
+      onramp: onrampProvider,
+      chainId: params.toChainId,
+      tokenAddress: params.toTokenAddress,
+      receiver: params.toAddress,
+      sender: params.fromAddress,
+      amount: amountWei,
+      purchaseData: params.purchaseData,
+      currency: params.fromCurrencySymbol,
+      maxSteps: 2,
+      onrampTokenAddress: NATIVE_TOKEN_ADDRESS, // force onramp to native token to avoid missing gas issues
     });
 
-    // Assuming the response directly matches the SwapResponse interface
-    if (!response.ok) {
-      const errorObj = await response.json();
-      if (errorObj && "error" in errorObj) {
-        throw errorObj;
-      }
-      throw new Error(`HTTP error! status: ${response.status}`);
+    // Determine tokens based on steps rules
+    const hasSteps = prepared.steps.length > 0;
+    const firstStep = hasSteps
+      ? (prepared.steps[0] as (typeof prepared.steps)[number])
+      : undefined;
+
+    // Estimated duration in seconds – sum of all step durations
+    const estimatedDurationSeconds = Math.max(
+      120,
+      Math.ceil(
+        prepared.steps.reduce((acc, s) => acc + s.estimatedExecutionTimeMs, 0) /
+          1000,
+      ),
+    );
+
+    const estimatedToAmountMinWeiBigInt = prepared.destinationAmount;
+
+    const maxSlippageBPS = params.maxSlippageBPS ?? 0;
+    const slippageWei =
+      (estimatedToAmountMinWeiBigInt * BigInt(maxSlippageBPS)) / 10000n;
+    const toAmountMinWeiBigInt = estimatedToAmountMinWeiBigInt - slippageWei;
+
+    const estimatedToAmountMin = toTokens(estimatedToAmountMinWeiBigInt, d);
+    const toAmountMin = toTokens(toAmountMinWeiBigInt, d);
+
+    // Helper to convert a Token → PayTokenInfo
+    const tokenToPayTokenInfo = (token: {
+      chainId: number;
+      address: string;
+      decimals: number;
+      symbol: string;
+      name: string;
+      priceUsd: number;
+    }): PayTokenInfo => ({
+      chainId: token.chainId,
+      tokenAddress: token.address,
+      decimals: token.decimals,
+      priceUSDCents: Math.round(token.priceUsd * 100),
+      name: token.name,
+      symbol: token.symbol,
+    });
+
+    // Determine the raw token objects using new simplified rules
+    // 1. toToken is always the destination token
+    const toTokenRaw = prepared.destinationToken;
+
+    // 2. onRampToken: if exactly one step -> originToken of that step, else toTokenRaw
+    const onRampTokenRaw =
+      prepared.steps.length > 0 && firstStep
+        ? firstStep.originToken
+        : toTokenRaw;
+
+    // 3. routingToken: if exactly two steps -> originToken of second step, else undefined
+    const routingTokenRaw =
+      prepared.steps.length > 1
+        ? (prepared.steps[1] as (typeof prepared.steps)[number]).originToken
+        : undefined;
+
+    // Amounts for onRampToken/raw
+    const onRampTokenAmountWei: bigint =
+      prepared.steps.length > 0 && firstStep
+        ? firstStep.originAmount
+        : prepared.destinationAmount;
+
+    const onRampTokenAmount = toTokens(
+      onRampTokenAmountWei,
+      onRampTokenRaw.decimals,
+    );
+
+    // Build info objects
+    const onRampTokenObject = {
+      amount: onRampTokenAmount,
+      amountWei: onRampTokenAmountWei.toString(),
+      amountUSDCents: Math.round(
+        Number(onRampTokenAmount) * onRampTokenRaw.priceUsd * 100,
+      ),
+      token: tokenToPayTokenInfo(onRampTokenRaw),
+    };
+
+    let routingTokenObject:
+      | {
+          amount: string;
+          amountWei: string;
+          amountUSDCents: number;
+          token: PayTokenInfo;
+        }
+      | undefined;
+
+    if (routingTokenRaw) {
+      const routingAmountWei = (
+        prepared.steps[1] as (typeof prepared.steps)[number]
+      ).originAmount;
+      const routingAmount = toTokens(
+        routingAmountWei,
+        routingTokenRaw.decimals,
+      );
+      routingTokenObject = {
+        amount: routingAmount,
+        amountWei: routingAmountWei.toString(),
+        amountUSDCents: Math.round(
+          Number(routingAmount) * routingTokenRaw.priceUsd * 100,
+        ),
+        token: tokenToPayTokenInfo(routingTokenRaw),
+      };
     }
 
-    return (await response.json()).result;
+    const buyWithFiatQuote: BuyWithFiatQuote = {
+      estimatedDurationSeconds,
+      estimatedToAmountMin: estimatedToAmountMin,
+      estimatedToAmountMinWei: estimatedToAmountMinWeiBigInt.toString(),
+      toAmountMinWei: toAmountMinWeiBigInt.toString(),
+      toAmountMin: toAmountMin,
+      fromCurrency: {
+        amount: prepared.currencyAmount.toString(),
+        amountUnits: Number(prepared.currencyAmount).toFixed(2),
+        decimals: 2,
+        currencySymbol: prepared.currency,
+      },
+      fromCurrencyWithFees: {
+        amount: prepared.currencyAmount.toString(),
+        amountUnits: Number(prepared.currencyAmount).toFixed(2),
+        decimals: 2,
+        currencySymbol: prepared.currency,
+      },
+      toToken: tokenToPayTokenInfo(toTokenRaw),
+      toAddress: params.toAddress,
+      fromAddress: params.fromAddress,
+      maxSlippageBPS: maxSlippageBPS,
+      intentId: prepared.id,
+      processingFees: [],
+      onRampToken: onRampTokenObject,
+      routingToken: routingTokenObject,
+      onRampLink: prepared.link,
+      provider: (params.preferredProvider ?? "COINBASE") as FiatProvider,
+    };
+
+    return buyWithFiatQuote;
   } catch (error) {
     console.error("Error getting buy with fiat quote", error);
     throw error;