update status endpoint

Author: joaquim-verges

packages/thirdweb/src/bridge/Status.ts

@@ -124,6 +124,7 @@ export async function status(options: status.Options): Promise<status.Result> {
   if (data.status === "FAILED") {
     return {
       status: "FAILED",
+      paymentId: data.paymentId,
       transactions: data.transactions,
     };
   }
@@ -137,12 +138,19 @@ export async function status(options: status.Options): Promise<status.Result> {
       originTokenAddress: data.originTokenAddress,
       destinationTokenAddress: data.destinationTokenAddress,
       transactions: data.transactions,
+      originToken: data.originToken,
+      destinationToken: data.destinationToken,
+      sender: data.sender,
+      receiver: data.receiver,
+      paymentId: data.paymentId,
+      purchaseData: data.purchaseData,
     };
   }
 
   if (data.status === "NOT_FOUND") {
     return {
       status: "NOT_FOUND",
+      paymentId: data.paymentId,
       transactions: [],
     };
   }
@@ -156,6 +164,11 @@ export async function status(options: status.Options): Promise<status.Result> {
     originTokenAddress: data.originTokenAddress,
     destinationTokenAddress: data.destinationTokenAddress,
     transactions: data.transactions,
+    originToken: data.originToken,
+    destinationToken: data.destinationToken,
+    sender: data.sender,
+    receiver: data.receiver,
+    paymentId: data.paymentId,
     purchaseData: data.purchaseData,
   };
 }

packages/thirdweb/src/bridge/types/Route.ts

@@ -1,20 +1,6 @@
-import type { Address as ox__Address } from "ox";
+import type { Token } from "./Token.js";
 
 export type Route = {
-  originToken: {
-    chainId: number;
-    address: ox__Address.Address;
-    decimals: number;
-    symbol: string;
-    name: string;
-    iconUri?: string;
-  };
-  destinationToken: {
-    chainId: number;
-    address: string;
-    decimals: number;
-    symbol: string;
-    name: string;
-    iconUri?: string;
-  };
+  originToken: Token;
+  destinationToken: Token;
 };

packages/thirdweb/src/bridge/types/Status.ts

@@ -1,14 +1,19 @@
 import type { Address as ox__Address, Hex as ox__Hex } from "ox";
-
+import type { Token } from "./Token.js";
 export type Status =
   | {
       status: "COMPLETED";
+      paymentId: string;
       originAmount: bigint;
       destinationAmount: bigint;
       originChainId: number;
       destinationChainId: number;
       originTokenAddress: ox__Address.Address;
       destinationTokenAddress: ox__Address.Address;
+      originToken: Token;
+      destinationToken: Token;
+      sender: ox__Address.Address;
+      receiver: ox__Address.Address;
       transactions: Array<{
         chainId: number;
         transactionHash: ox__Hex.Hex;
@@ -17,24 +22,33 @@ export type Status =
     }
   | {
       status: "PENDING";
+      paymentId: string;
       originAmount: bigint;
       originChainId: number;
       destinationChainId: number;
       originTokenAddress: ox__Address.Address;
       destinationTokenAddress: ox__Address.Address;
+      originToken: Token;
+      destinationToken: Token;
+      sender: ox__Address.Address;
+      receiver: ox__Address.Address;
       transactions: Array<{
         chainId: number;
         transactionHash: ox__Hex.Hex;
       }>;
+      purchaseData?: unknown;
     }
   | {
       status: "FAILED";
+      paymentId: string;
       transactions: Array<{
         chainId: number;
         transactionHash: ox__Hex.Hex;
       }>;
+      purchaseData?: unknown;
     }
   | {
       status: "NOT_FOUND";
+      paymentId: string;
       transactions: [];
     };

packages/thirdweb/src/bridge/types/Token.ts

@@ -0,0 +1,10 @@
+import type { Address as ox__Address } from "ox";
+
+export type Token = {
+  chainId: number;
+  address: ox__Address.Address;
+  decimals: number;
+  symbol: string;
+  name: string;
+  iconUri?: string;
+};

packages/thirdweb/src/pay/buyWithCrypto/getStatus.ts

@@ -1,6 +1,8 @@
 import { type Status, status as bridgeStatus } from "../../bridge/index.js";
+import type { Token } from "../../bridge/types/Token.js";
 import type { ThirdwebClient } from "../../client/client.js";
 import type { Hex } from "../../utils/encoding/hex.js";
+import { toTokens } from "../../utils/units.js";
 import type {
   PayOnChainTransactionDetails,
   PayTokenInfo,
@@ -158,6 +160,11 @@ export async function getBuyWithCryptoStatus(
           originChainId: result.originChainId,
           destinationChainId: result.destinationChainId,
           status: result.status,
+          sender: result.sender,
+          receiver: result.receiver,
+          paymentId: result.paymentId,
+          originToken: result.originToken,
+          destinationToken: result.destinationToken,
           purchaseData: result.purchaseData as object | undefined,
         });
       }
@@ -169,6 +176,12 @@ export async function getBuyWithCryptoStatus(
           originChainId: result.originChainId,
           destinationChainId: result.destinationChainId,
           status: result.status,
+          sender: result.sender,
+          receiver: result.receiver,
+          paymentId: result.paymentId,
+          originToken: result.originToken,
+          destinationToken: result.destinationToken,
+          purchaseData: result.purchaseData as object | undefined,
         });
       }
       case "FAILED": {
@@ -182,12 +195,17 @@ export async function getBuyWithCryptoStatus(
           originTransaction,
           destinationTransaction,
           originAmount: BigInt(0), // TODO: get from API
-          destinationAmount: BigInt(0), // TODO: get from API
           originTokenAddress: "", // TODO: get from API
           destinationTokenAddress: "", // TODO: get from API
           originChainId: 0, // TODO: get from API
           destinationChainId: 0, // TODO: get from API
           status: result.status,
+          sender: "",
+          receiver: "",
+          paymentId: "",
+          originToken: undefined,
+          destinationToken: undefined,
+          purchaseData: result.purchaseData as object | undefined,
         });
       }
       default: {
@@ -213,6 +231,11 @@ function toBuyWithCryptoStatus(args: {
   destinationChainId: number;
   status: Status["status"];
   purchaseData?: object;
+  sender: string;
+  receiver: string;
+  paymentId: string;
+  originToken?: Token;
+  destinationToken?: Token;
 }): BuyWithCryptoStatus {
   const {
     originTransaction,
@@ -225,10 +248,14 @@ function toBuyWithCryptoStatus(args: {
     destinationTokenAddress,
     originChainId,
     destinationChainId,
+    sender,
+    receiver,
+    originToken,
+    destinationToken,
   } = args;
   return {
-    fromAddress: "", // TODO: get from API
-    toAddress: "",
+    fromAddress: sender,
+    toAddress: receiver,
     quote: {
       createdAt: new Date().toISOString(),
       estimated: {
@@ -240,26 +267,36 @@ function toBuyWithCryptoStatus(args: {
         gasCostUSDCents: 0,
         durationSeconds: 0,
       },
-      fromAmount: originAmount.toString(), // TODO: get from API
+      fromAmount: originToken
+        ? toTokens(originAmount, originToken.decimals).toString()
+        : "",
       fromAmountWei: originAmount.toString(),
-      toAmount: destinationAmount?.toString() ?? "", // TODO: get from API
-      toAmountWei: destinationAmount?.toString() ?? "",
-      toAmountMin: destinationAmount?.toString() ?? "", // TODO: get from API
-      toAmountMinWei: destinationAmount?.toString() ?? "",
+      toAmount:
+        destinationToken && destinationAmount
+          ? toTokens(destinationAmount, destinationToken.decimals).toString()
+          : "", // TODO: get from API
+      toAmountWei: destinationAmount ? destinationAmount.toString() : "",
+      toAmountMin: destinationToken
+        ? toTokens(
+            destinationAmount ?? BigInt(0),
+            destinationToken.decimals,
+          ).toString()
+        : "", // TODO: get from API
+      toAmountMinWei: destinationAmount ? destinationAmount.toString() : "",
       fromToken: {
         tokenAddress: originTokenAddress,
         chainId: originChainId,
-        decimals: 18,
-        name: "",
-        symbol: "",
+        decimals: originToken?.decimals ?? 18,
+        name: originToken?.name ?? "",
+        symbol: originToken?.symbol ?? "",
         priceUSDCents: 0,
       },
       toToken: {
         tokenAddress: destinationTokenAddress,
         chainId: destinationChainId,
-        decimals: 18,
-        name: "",
-        symbol: "",
+        decimals: destinationToken?.decimals ?? 18,
+        name: destinationToken?.name ?? "",
+        symbol: destinationToken?.symbol ?? "",
         priceUSDCents: 0,
       },
     },