@skip-go/client 1.4.0 → 1.5.1

package/dist/cjs/{chunk-7MC3BVQN.cjs → chunk-KHJQE3DI.cjs}

@@ -142,12 +142,12 @@ var isFinalRouteStatus = (routeDetails) => {
   return false;
 };
 var isFinalState = (transaction) => {
-  const transactionState = transaction?.statusResponse?.state;
+  const transactionState = transaction?.statusResponse?.transfers?.[0]?.state;
   const transactionStatus2 = transaction?.status;
   return transactionState === "STATE_COMPLETED_SUCCESS" || transactionState === "STATE_COMPLETED_ERROR" || transactionState === "STATE_ABANDONED" || transactionStatus2 === "failed" || transactionStatus2 === "success";
 };
 var isSuccessState = (transaction) => {
-  const transactionState = transaction?.statusResponse?.state;
+  const transactionState = transaction?.statusResponse?.transfers?.[0]?.state;
   const transactionStatus2 = transaction?.status;
   return transactionState === "STATE_COMPLETED_SUCCESS" || transactionStatus2 === "success";
 };
@@ -163,29 +163,41 @@ var initializeNewRouteDetails = (options) => {
     txsSigned: 0,
     transactionDetails: [],
     transferEvents: [],
-    senderAddress: options?.userAddresses?.[0]?.address ?? "",
-    receiverAddress: options?.userAddresses?.at(-1)?.address ?? ""
+    relatedRoutes: [],
+    userAddresses: options?.userAddresses ?? []
   };
   routeDetailsMap.set(newRouteId, newRouteDetails);
   return newRouteDetails;
 };
 var subscribeToRouteStatus = (props) => {
-  let cancelled = false;
-  const unsubscribe = () => {
-    cancelled = true;
+  const { routeDetails, onRouteStatusUpdated } = props;
+  const routeList = Array.isArray(routeDetails) ? routeDetails : [routeDetails];
+  const cancelFlags = /* @__PURE__ */ new Map();
+  const unsubscribers = [];
+  for (const route of routeList) {
+    const cancelFlag = { cancelled: false };
+    cancelFlags.set(route?.id ?? uuid.v4(), cancelFlag);
+    const unsubscribe = () => {
+      cancelFlag.cancelled = true;
+    };
+    unsubscribers.push(unsubscribe);
+    void executeAndSubscribeToRouteStatus({
+      routeDetails: route,
+      onRouteStatusUpdated,
+      isCancelled: () => cancelFlag.cancelled
+    });
+  }
+  const unsubscribeAll = () => {
+    for (const unsubscribe of unsubscribers) {
+      unsubscribe();
+    }
   };
-  executeAndSubscribeToRouteStatus({
-    ...props,
-    isCancelled: () => cancelled
-  });
-  return unsubscribe;
+  return unsubscribeAll;
 };
 var executeAndSubscribeToRouteStatus = async ({
   transactionDetails,
   executeTransaction,
   trackTxPollingOptions,
-  onTransactionTracked,
-  onTransactionCompleted,
   routeDetails,
   onRouteStatusUpdated,
   options,
@@ -196,7 +208,9 @@ var executeAndSubscribeToRouteStatus = async ({
   routeId ??= routeDetails?.id;
   const currentRouteDetails = routeDetailsMap.get(routeId ?? "");
   transactionDetails ??= routeDetails?.transactionDetails ?? currentRouteDetails?.transactionDetails ?? [];
-  if (routeDetails && isFinalRouteStatus(routeDetails)) {
+  if (routeDetails && isFinalRouteStatus(routeDetails) && routeDetails?.relatedRoutes?.every(
+    (relatedRoute) => isFinalRouteStatus(relatedRoute)
+  )) {
     return;
   }
   for (const [transactionIndex, transaction] of transactionDetails.entries()) {
@@ -212,7 +226,11 @@ var executeAndSubscribeToRouteStatus = async ({
         explorerLink = trackResponse.explorerLink;
       }
       transaction.explorerLink = explorerLink;
-      await onTransactionTracked?.({ txHash: transaction.txHash, chainId: transaction.chainId, explorerLink });
+      await options?.onTransactionTracked?.({
+        txHash: transaction.txHash,
+        chainId: transaction.chainId,
+        explorerLink
+      });
     }
     if (transaction.txHash === void 0) {
       updateRouteDetails({
@@ -226,10 +244,22 @@ var executeAndSubscribeToRouteStatus = async ({
       });
       return;
     }
-    while (!isFinalState(transaction)) {
+    while (true) {
+      const updatedRouteDetails = routeDetailsMap.get(routeId ?? "");
+      const allRelatedRoutesFinal = updatedRouteDetails?.relatedRoutes?.every(
+        (relatedRoute) => relatedRoute && isFinalRouteStatus(relatedRoute)
+      );
+      if (isFinalState(transaction) && allRelatedRoutesFinal) {
+        options?.onTransactionCompleted?.({
+          chainId: transaction.chainId,
+          txHash: transaction.txHash,
+          status: transaction.statusResponse
+        });
+        break;
+      }
       if (isCancelled?.()) {
         console.info(`Polling cancelled for route ${routeId}`);
-        return;
+        break;
       }
       try {
         const statusResponse = await chunkQPM7H2YL_cjs.transactionStatus({
@@ -244,15 +274,30 @@ var executeAndSubscribeToRouteStatus = async ({
           options: {
             onRouteStatusUpdated,
             ...options
-          }
+          },
+          relatedRoutes: routeDetails?.relatedRoutes
         });
         if (isFinalState(transaction)) {
-          onTransactionCompleted?.({
-            chainId: transaction.chainId,
-            txHash: transaction.txHash,
-            status: statusResponse
-          });
-          break;
+          const relatedRoutes = updatedRouteDetails?.relatedRoutes && updatedRouteDetails?.relatedRoutes.length > 0 ? updatedRouteDetails.relatedRoutes : routeDetails?.relatedRoutes;
+          if (relatedRoutes && relatedRoutes.length > 0) {
+            if (relatedRoutes.every(
+              (relatedRoute) => isFinalRouteStatus(relatedRoute)
+            )) {
+              options?.onTransactionCompleted?.({
+                chainId: transaction.chainId,
+                txHash: transaction.txHash,
+                status: statusResponse
+              });
+              break;
+            }
+          } else {
+            options?.onTransactionCompleted?.({
+              chainId: transaction.chainId,
+              txHash: transaction.txHash,
+              status: statusResponse
+            });
+            break;
+          }
         }
       } catch (error) {
         console.error(error);
@@ -267,7 +312,10 @@ var updateRouteDetails = ({
   routeDetails,
   options,
   status,
-  routeId
+  routeId,
+  mainRouteId,
+  transferIndexToRouteKey,
+  relatedRoutes
 }) => {
   routeId ??= routeDetails?.id ?? "";
   let currentRouteDetails = routeDetails ?? routeDetailsMap.get(routeId);
@@ -275,6 +323,7 @@ var updateRouteDetails = ({
     currentRouteDetails = initializeNewRouteDetails(options);
     routeId = currentRouteDetails?.id;
   }
+  transferIndexToRouteKey ??= currentRouteDetails?.transferIndexToRouteKey;
   if (currentRouteDetails === void 0) {
     throw new Error("No route details found");
   }
@@ -283,7 +332,9 @@ var updateRouteDetails = ({
   if (currentRouteDetails?.status === "signing" && status === "pending") {
     currentRouteDetails.txsSigned += 1;
   }
-  const transferEvents = routeDetails?.transferEvents ?? getTransferEventsFromTxStatusResponse(transactionDetails.map((tx) => tx.statusResponse).filter((status2) => status2 !== void 0));
+  const transferEvents = routeDetails?.transferEvents ?? getTransferEventsFromTxStatusResponse(
+    transactionDetails.map((tx) => tx.statusResponse).filter((status2) => status2 !== void 0)
+  );
   const allExpectedTxsStarted = transactionDetails.every(
     (tx) => tx.txHash || tx.status === void 0
   );
@@ -307,9 +358,14 @@ var updateRouteDetails = ({
     }
     return currentRouteDetails?.status;
   };
-  const transferAssetRelease = transactionDetails?.findLast((i) => i.statusResponse?.transferAssetRelease)?.statusResponse?.transferAssetRelease;
-  const senderAddress = options?.userAddresses?.at(0);
-  const receiverAddress = options?.userAddresses?.at(-1);
+  const transferAssetRelease = transactionDetails?.findLast(
+    (i) => i.statusResponse?.transferAssetRelease
+  )?.statusResponse?.transferAssetRelease;
+  const updatedRelatedRoutes = updateRelatedRoutes({
+    relatedRoutes: relatedRoutes ?? currentRouteDetails?.relatedRoutes ?? [],
+    transferIndexToRouteKey,
+    transactionDetails
+  });
   const newRouteDetails = {
     id: routeId,
     timestamp: currentRouteDetails.timestamp,
@@ -319,9 +375,11 @@ var updateRouteDetails = ({
     transactionDetails,
     transferEvents,
     transferAssetRelease,
-    senderAddress: currentRouteDetails?.senderAddress ?? senderAddress?.address ?? "",
-    receiverAddress: currentRouteDetails?.receiverAddress ?? receiverAddress?.address ?? "",
-    txsSigned: currentRouteDetails?.txsSigned
+    userAddresses: (currentRouteDetails?.userAddresses.length > 0 ? currentRouteDetails?.userAddresses : options?.userAddresses) ?? [],
+    txsSigned: currentRouteDetails?.txsSigned,
+    transferIndexToRouteKey,
+    mainRouteId: mainRouteId ?? currentRouteDetails?.mainRouteId,
+    relatedRoutes: updatedRelatedRoutes
   };
   const newRouteStatus = getRouteDetailsWithSimpleTransactionDetailsStatus(newRouteDetails);
   const previousRouteStatus = getRouteDetailsWithSimpleTransactionDetailsStatus(currentRouteDetails);
@@ -335,6 +393,8 @@ var updateRouteDetails = ({
 };
 var getSimpleRoute = (route) => {
   return {
+    usdAmountOut: route?.usdAmountOut,
+    usdAmountIn: route?.usdAmountIn,
     amountIn: route?.amountIn,
     amountOut: route?.amountOut,
     sourceAssetDenom: route?.sourceAssetDenom,
@@ -349,10 +409,11 @@ var getRouteDetailsWithSimpleTransactionDetailsStatus = (routeDetails) => {
     ...routeDetails,
     transactionDetails: routeDetails.transactionDetails.map((txDetails) => {
       const { statusResponse, ...rest } = txDetails;
-      return {
+      const newTxDetails = {
         ...rest,
-        status: txDetails?.status ?? getTransactionStatus(txDetails.statusResponse?.state)
+        status: txDetails?.status ?? getTransactionStatus(statusResponse?.transfers?.[0]?.state)
       };
+      return newTxDetails;
     })
   };
 };
@@ -363,6 +424,43 @@ var removeRoutesWithFinalStatus = () => {
     }
   });
 };
+var convertTransactionStatusToRouteStatus = (transactionStatus2) => {
+  if (!transactionStatus2) return;
+  if (transactionStatus2 === "success") {
+    return "completed";
+  }
+  return transactionStatus2;
+};
+var updateRelatedRoutes = ({
+  relatedRoutes,
+  transferIndexToRouteKey,
+  transactionDetails
+}) => {
+  let updatedRelatedRoutes = [
+    ...relatedRoutes.map((relatedRoute) => ({ ...relatedRoute }))
+  ];
+  if (!transferIndexToRouteKey) return updatedRelatedRoutes;
+  transactionDetails?.forEach((transaction) => {
+    Object.entries(transferIndexToRouteKey).forEach(([indexStr, routeKey]) => {
+      const index = Number(indexStr);
+      const state = transaction?.statusResponse?.transfers?.[index]?.state;
+      const status = convertTransactionStatusToRouteStatus(
+        getTransactionStatus(state)
+      );
+      const transferAssetRelease = transaction?.statusResponse?.transfers?.[index]?.transferAssetRelease;
+      const targetRoute = updatedRelatedRoutes.find(
+        (r) => r.routeKey === routeKey
+      );
+      if (targetRoute && state) {
+        targetRoute.status = status ?? "failed";
+      }
+      if (targetRoute && transferAssetRelease) {
+        targetRoute.transferAssetRelease = transferAssetRelease;
+      }
+    });
+  });
+  return updatedRelatedRoutes;
+};
 
 exports.executeAndSubscribeToRouteStatus = executeAndSubscribeToRouteStatus;
 exports.getTransactionStatus = getTransactionStatus;