@skip-go/client 1.4.0 → 1.5.1

package/dist/esm/{chunk-RQ7DXNSS.js → chunk-XYYXRVFN.js}

@@ -140,12 +140,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";
 };
@@ -161,29 +161,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 ?? 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,
@@ -194,7 +206,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()) {
@@ -210,7 +224,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({
@@ -224,10 +242,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 transactionStatus({
@@ -242,15 +272,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);
@@ -265,7 +310,10 @@ var updateRouteDetails = ({
   routeDetails,
   options,
   status,
-  routeId
+  routeId,
+  mainRouteId,
+  transferIndexToRouteKey,
+  relatedRoutes
 }) => {
   routeId ??= routeDetails?.id ?? "";
   let currentRouteDetails = routeDetails ?? routeDetailsMap.get(routeId);
@@ -273,6 +321,7 @@ var updateRouteDetails = ({
     currentRouteDetails = initializeNewRouteDetails(options);
     routeId = currentRouteDetails?.id;
   }
+  transferIndexToRouteKey ??= currentRouteDetails?.transferIndexToRouteKey;
   if (currentRouteDetails === void 0) {
     throw new Error("No route details found");
   }
@@ -281,7 +330,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
   );
@@ -305,9 +356,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,
@@ -317,9 +373,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);
@@ -333,6 +391,8 @@ var updateRouteDetails = ({
 };
 var getSimpleRoute = (route) => {
   return {
+    usdAmountOut: route?.usdAmountOut,
+    usdAmountIn: route?.usdAmountIn,
     amountIn: route?.amountIn,
     amountOut: route?.amountOut,
     sourceAssetDenom: route?.sourceAssetDenom,
@@ -347,10 +407,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;
     })
   };
 };
@@ -361,5 +422,42 @@ 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;
+};
 
 export { executeAndSubscribeToRouteStatus, getTransactionStatus, subscribeToRouteStatus, updateRouteDetails };

package/dist/esm/client-types-BSZasIDd.d.ts

@@ -0,0 +1,114 @@
+import { OfflineAminoSigner } from '@cosmjs/amino';
+import { OfflineDirectSigner } from '@cosmjs/proto-signing';
+import { StdFee, GasPrice, SignerData } from '@cosmjs/stargate';
+import { WalletClient } from 'viem';
+import { Adapter } from '@solana/wallet-adapter-base';
+import { a3 as FeeAsset, L as ChainType, W as CosmosMsg } from './swaggerTypes-Bh6hu5Q-.js';
+import { TrackTxPollingProps } from './api/postTrackTransaction.js';
+
+/** Common Types */
+type UserAddress = {
+    chainId: string;
+    address: string;
+};
+type EndpointOptions = {
+    rpc?: string;
+    rest?: string;
+};
+type ValidateGasResult = {
+    error: null | string;
+    asset: FeeAsset | null;
+    fee: StdFee | null;
+};
+/** Signer Getters */
+type SignerGetters = {
+    getEvmSigner?: (chainId: string) => Promise<WalletClient>;
+    getCosmosSigner?: (chainId: string) => Promise<(OfflineAminoSigner & OfflineDirectSigner) | OfflineAminoSigner | OfflineDirectSigner>;
+    getSvmSigner?: () => Promise<Adapter>;
+};
+/** Gas Options */
+type GetFallbackGasAmount = (chainId: string, chainType: ChainType) => Promise<number | undefined>;
+type GetGasPrice = (chainId: string, chainType: ChainType) => Promise<GasPrice | undefined>;
+type GasOptions = {
+    /**
+     * If `getGasPrice` is undefined, or returns undefined, the router will attempt to set the recommended gas price
+     **/
+    getGasPrice?: GetGasPrice;
+    /**
+     * If `getFallbackGasAmount` is set, when router fails to simulate the gas amount, it will use the fallback gas amount
+     */
+    getFallbackGasAmount?: GetFallbackGasAmount;
+    gasAmountMultiplier?: number;
+};
+type SignCosmosMessageOptionsBase = {
+    signerAddress: string;
+    chainId: string;
+    cosmosMsgs: CosmosMsg[];
+    fee: StdFee;
+    signerData: SignerData;
+};
+type SignCosmosMessageDirectOptions = SignCosmosMessageOptionsBase & {
+    signer: OfflineDirectSigner;
+};
+type SignCosmosMessageAminoOptions = SignCosmosMessageOptionsBase & {
+    signer: OfflineAminoSigner;
+};
+type TxResult = {
+    txHash: string;
+    chainId: string;
+    explorerLink?: string;
+};
+interface BaseSettings {
+    slippageTolerancePercent?: string;
+    simulate?: boolean;
+    /**
+     * Set allowance amount to max if EVM transaction requires allowance approval.
+     */
+    useUnlimitedApproval?: boolean;
+    /**
+      /**
+       * If `skipApproval` is set to `true`, the router will bypass checking whether
+       * the signer has granted approval for the specified token contract on an EVM chain.
+       * This can be useful if approval has already been handled externally or there are race conditions.
+       */
+    bypassApprovalCheck?: boolean;
+    /**
+     * defaults to true
+     * If `batchSimulate` is set to `true`, it will simulate all messages in a batch before the first tx run.
+     * If `batchSimulate` is set to `false`, it will simulate each message one by one.
+     */
+    batchSimulate?: boolean;
+    /**
+     * Optional configuration for transaction polling behavior.
+     * - `maxRetries`: Maximum number of polling attempts (default: 5)
+     * - `retryInterval`: Retry interval in milliseconds (default: 1000)
+     * - `backoffMultiplier`: Exponential backoff multiplier for increasing delay between retries (default: 2.5)
+     * Example backoff with retryInterval = 1000 and backoffMultiplier = 2:
+     * 1st retry: 1000ms → 2nd: 2000ms → 3rd: 4000ms → 4th: 8000ms ...
+     */
+    trackTxPollingOptions?: TrackTxPollingProps;
+    /**
+     * If `batchSignTxs` is set to `true`, it will sign all transactions in a batch up front.
+     * If `batchSignTxs` is set to `false`, it will sign each transaction one by one.
+     */
+    batchSignTxs?: boolean;
+    /**
+     * If `cosmosPriorityFeeDenom` is provided, it will be used to set the priority fee for Cosmos transactions.
+     * It should be a function that takes a chainId and returns the denom for the priority fee.
+     */
+    getCosmosPriorityFeeDenom?: (chainId: string) => Promise<string | undefined>;
+    /**
+     * SVM Fee Payer
+     *
+     * This is used to pay for the transaction fees on SVM chains.
+     * It should be an object with the following properties:
+     * `address`: The address of the fee payer.
+     * `signTransaction`: A function that takes the data to sign and returns a Promise that resolves to the signed transaction.
+     */
+    svmFeePayer?: {
+        address: string;
+        signTransaction: (dataToSign: Buffer) => Promise<Uint8Array>;
+    };
+}
+
+export type { BaseSettings as B, EndpointOptions as E, GetFallbackGasAmount as G, SignerGetters as S, TxResult as T, UserAddress as U, ValidateGasResult as V, GetGasPrice as a, GasOptions as b, SignCosmosMessageOptionsBase as c, SignCosmosMessageDirectOptions as d, SignCosmosMessageAminoOptions as e };

package/dist/esm/{generateApi-C_xgtxrO.d.ts → generateApi-CwM4Ca30.d.ts}

@@ -1,4 +1,4 @@
-import { bx as Api } from './swaggerTypes-DDwqIjap.js';
+import { bG as Api } from './swaggerTypes-Bh6hu5Q-.js';
 
 type CamelKey<S extends string> = S extends `${infer T}_${infer U}` ? `${T}${Capitalize<CamelKey<U>>}` : S;
 type Camel<T> = T extends (infer U)[] ? Camel<U>[] : T extends object ? {