@skip-go/client 1.5.0 → 1.5.1

package/dist/cjs/{chunk-W3KF3V57.cjs → chunk-5CB6SPCX.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var chunkKZOSEIWH_cjs = require('./chunk-KZOSEIWH.cjs');
-var chunk4YTACAVP_cjs = require('./chunk-4YTACAVP.cjs');
+var chunkKSJ5QYMR_cjs = require('./chunk-KSJ5QYMR.cjs');
 var chunkN4UW74AG_cjs = require('./chunk-N4UW74AG.cjs');
 
 // src/private-functions/getDefaultGasTokenForChain.ts
@@ -10,7 +10,7 @@ var getDefaultGasTokenForChain = async (chainId) => {
   if (gasDenom) {
     return gasDenom;
   }
-  const chain = chunk4YTACAVP_cjs.chains().find((chain2) => chain2.chainId === chainId);
+  const chain = chunkKSJ5QYMR_cjs.chains().find((chain2) => chain2.chainId === chainId);
   if (!chain) {
     return void 0;
   }
@@ -39,7 +39,7 @@ var getDefaultGasTokenForChain = async (chainId) => {
   return chain.fees.feeTokens[0]?.denom;
 };
 var getStakingTokensForChain = (chainId) => {
-  const chain = chunk4YTACAVP_cjs.chains().find((chain2) => chain2.chainId === chainId);
+  const chain = chunkKSJ5QYMR_cjs.chains().find((chain2) => chain2.chainId === chainId);
   if (!chain) {
     throw new Error(
       `getStakingTokensForChain error: failed to find chain id '${chainId}' in registry`
@@ -69,7 +69,7 @@ var getFeeInfoForChain = async ({ chainId, apiUrl, apiKey }) => {
   if (skipFeeInfo && skipFeeInfo.gasPrice !== null) {
     return skipFeeInfo;
   }
-  const chain = chunk4YTACAVP_cjs.chains().find((chain2) => chain2.chainId === chainId);
+  const chain = chunkKSJ5QYMR_cjs.chains().find((chain2) => chain2.chainId === chainId);
   if (!chain) {
     return void 0;
   }

package/dist/cjs/{chunk-HHZGD62Y.cjs → chunk-EZGHN6ZL.cjs}

@@ -1,13 +1,13 @@
 'use strict';
 
-var chunkUIQML2XG_cjs = require('./chunk-UIQML2XG.cjs');
-var chunkCUDPMOR6_cjs = require('./chunk-CUDPMOR6.cjs');
+var chunkKHJQE3DI_cjs = require('./chunk-KHJQE3DI.cjs');
+var chunkV3FWWJG2_cjs = require('./chunk-V3FWWJG2.cjs');
 var chunkKM2D7PJL_cjs = require('./chunk-KM2D7PJL.cjs');
 var chunkF3EB2AQG_cjs = require('./chunk-F3EB2AQG.cjs');
 var chunk4R6OCWRR_cjs = require('./chunk-4R6OCWRR.cjs');
 var chunkKZOSEIWH_cjs = require('./chunk-KZOSEIWH.cjs');
-var chunkX22PL5T7_cjs = require('./chunk-X22PL5T7.cjs');
-var chunk4YTACAVP_cjs = require('./chunk-4YTACAVP.cjs');
+var chunkRVXCF6AL_cjs = require('./chunk-RVXCF6AL.cjs');
+var chunkKSJ5QYMR_cjs = require('./chunk-KSJ5QYMR.cjs');
 var chunk5HDKZVOL_cjs = require('./chunk-5HDKZVOL.cjs');
 var chunk5AYPH3ZR_cjs = require('./chunk-5AYPH3ZR.cjs');
 var chunkN4UW74AG_cjs = require('./chunk-N4UW74AG.cjs');
@@ -36,7 +36,7 @@ var getRestEndpointForChain = async (chainId) => {
       return endpointOptions.rest;
     }
   }
-  const chain = chunk4YTACAVP_cjs.chains().find((chain2) => chain2.chainId === chainId);
+  const chain = chunkKSJ5QYMR_cjs.chains().find((chain2) => chain2.chainId === chainId);
   if (!chain) {
     throw new Error(
       `getRestEndpointForChain error: failed to find chain id '${chainId}' in registry`
@@ -48,7 +48,7 @@ var getRestEndpointForChain = async (chainId) => {
     );
   }
   const endpoints = chain.apis?.rest?.map((api) => api.address);
-  const endpoint = await chunk4YTACAVP_cjs.findFirstWorkingEndpoint(endpoints, "rest");
+  const endpoint = await chunkKSJ5QYMR_cjs.findFirstWorkingEndpoint(endpoints, "rest");
   if (!endpoint) {
     throw new Error(
       `getRestEndpointForChain error: failed to find REST endpoint for chain id '${chainId}'`
@@ -62,9 +62,9 @@ var getAccountNumberAndSequence = async (address, chainId) => {
   if (chainId.includes("dymension")) {
     return getAccountNumberAndSequenceFromDymension(address, chainId);
   }
-  const endpoint = await chunkX22PL5T7_cjs.getRpcEndpointForChain(chainId);
+  const endpoint = await chunkRVXCF6AL_cjs.getRpcEndpointForChain(chainId);
   const client = chunkN4UW74AG_cjs.ClientState.signingStargateClientByChainId[chainId] ?? await stargate.StargateClient.connect(endpoint, {
-    accountParser: chunkX22PL5T7_cjs.accountParser
+    accountParser: chunkRVXCF6AL_cjs.accountParser
   });
   const account = await client.getAccount(address);
   if (!account) {
@@ -125,7 +125,7 @@ function encodeEthSecp256k1Pubkey(pubkey) {
 
 // src/proto-signing/pubkey.ts
 function makePubkeyAnyFromAccount(account, chainId) {
-  const isEthermint = chunk4YTACAVP_cjs.getIsEthermint(chainId);
+  const isEthermint = chunkKSJ5QYMR_cjs.getIsEthermint(chainId);
   const pubkey = isEthermint ? encodeEthSecp256k1Pubkey(account.pubkey) : amino.encodeSecp256k1Pubkey(account.pubkey);
   const pubkeyAny = encodePubkeyToAny(pubkey, chainId, isEthermint);
   return pubkeyAny;
@@ -146,7 +146,7 @@ function encodePubkeyToAny(pubkey, chainId, isEthermint) {
       value: Uint8Array.from(keys_js.PubKey.encode(pubkeyProto).finish())
     });
   } else {
-    const isInitia = chunk4YTACAVP_cjs.getIsInitia(chainId);
+    const isInitia = chunkKSJ5QYMR_cjs.getIsInitia(chainId);
     const pubkeyProto = keys_js.PubKey.fromPartial({
       key: encoding.fromBase64(pubkey.value)
     });
@@ -289,7 +289,7 @@ var signCosmosTransaction = async ({
   if (messages === void 0) {
     throw new Error("no messages found for tx");
   }
-  const { signer } = await chunkX22PL5T7_cjs.getSigningStargateClient({
+  const { signer } = await chunkRVXCF6AL_cjs.getSigningStargateClient({
     chainId,
     getOfflineSigner: options?.getCosmosSigner
   });
@@ -328,7 +328,7 @@ var signCosmosTransaction = async ({
     txIndex: index,
     signerAddress: currentUserAddress
   });
-  chunkUIQML2XG_cjs.updateRouteDetails({
+  chunkKHJQE3DI_cjs.updateRouteDetails({
     status: "signing",
     routeId,
     options
@@ -344,7 +344,7 @@ var signCosmosTransaction = async ({
   options?.onTransactionSigned?.({
     chainId
   });
-  chunkUIQML2XG_cjs.updateRouteDetails({
+  chunkKHJQE3DI_cjs.updateRouteDetails({
     status: "pending",
     routeId,
     options
@@ -630,7 +630,7 @@ var executeEvmTransaction = async (message, options, index, routeId) => {
         status: "pending",
         allowance: requiredApproval
       });
-      chunkUIQML2XG_cjs.updateRouteDetails({
+      chunkKHJQE3DI_cjs.updateRouteDetails({
         status: "allowance",
         routeId,
         options
@@ -664,7 +664,7 @@ var executeEvmTransaction = async (message, options, index, routeId) => {
     signerAddress: evmSigner.account.address,
     txIndex: index
   });
-  chunkUIQML2XG_cjs.updateRouteDetails({
+  chunkKHJQE3DI_cjs.updateRouteDetails({
     status: "signing",
     routeId,
     options
@@ -676,7 +676,7 @@ var executeEvmTransaction = async (message, options, index, routeId) => {
     chain: evmSigner.chain,
     value: evmTx.value === "" ? void 0 : BigInt(evmTx.value)
   });
-  chunkUIQML2XG_cjs.updateRouteDetails({
+  chunkKHJQE3DI_cjs.updateRouteDetails({
     status: "pending",
     routeId,
     options
@@ -732,14 +732,14 @@ var signSvmTransaction = async ({
     signerAddress: signer.publicKey?.toBase58(),
     txIndex: index
   });
-  chunkUIQML2XG_cjs.updateRouteDetails({
+  chunkKHJQE3DI_cjs.updateRouteDetails({
     status: "signing",
     routeId,
     options
   });
   const signedTx = await signer.signTransaction(transaction);
   options?.onTransactionSigned?.({ chainId: svmTx.chainId });
-  chunkUIQML2XG_cjs.updateRouteDetails({
+  chunkKHJQE3DI_cjs.updateRouteDetails({
     status: "pending",
     routeId,
     options
@@ -758,7 +758,7 @@ var executeSvmTransaction = async (tx, options, index, routeId) => {
   if (!signedTx) {
     throw new Error("executeSvmTransaction error: signedTx is undefined");
   }
-  const endpoint = await chunkX22PL5T7_cjs.getRpcEndpointForChain(svmTx.chainId);
+  const endpoint = await chunkRVXCF6AL_cjs.getRpcEndpointForChain(svmTx.chainId);
   const connection = new web3_js.Connection(endpoint);
   let signature;
   const submitTxResponse = await chunk5HDKZVOL_cjs.submitTransaction({
@@ -990,7 +990,7 @@ var validateSvmGasBalance = async ({
       fee: null
     };
   }
-  const endpoint = await chunkX22PL5T7_cjs.getRpcEndpointForChain(tx.chainId ?? "");
+  const endpoint = await chunkRVXCF6AL_cjs.getRpcEndpointForChain(tx.chainId ?? "");
   const connection = new web3_js.Connection(endpoint);
   if (!connection) throw new Error(`Failed to connect to ${tx.chainId}`);
   if (!tx.tx) {
@@ -1068,7 +1068,7 @@ var validateGasBalances = async ({
         onValidateGasBalance?.({
           status: "pending"
         });
-        chunkUIQML2XG_cjs.updateRouteDetails({
+        chunkKHJQE3DI_cjs.updateRouteDetails({
           status: "validating",
           routeId,
           options
@@ -1077,7 +1077,7 @@ var validateGasBalances = async ({
           throw new Error(`invalid msgs ${tx?.cosmosTx?.msgs}`);
         }
         try {
-          const res = await chunkCUDPMOR6_cjs.validateCosmosGasBalance({
+          const res = await chunkV3FWWJG2_cjs.validateCosmosGasBalance({
             chainId: tx.cosmosTx.chainId ?? "",
             signerAddress: tx.cosmosTx.signerAddress ?? "",
             messages: tx.cosmosTx.msgs,
@@ -1102,7 +1102,7 @@ var validateGasBalances = async ({
         onValidateGasBalance?.({
           status: "pending"
         });
-        chunkUIQML2XG_cjs.updateRouteDetails({
+        chunkKHJQE3DI_cjs.updateRouteDetails({
           status: "validating",
           routeId,
           options
@@ -1135,7 +1135,7 @@ var validateGasBalances = async ({
         onValidateGasBalance?.({
           status: "pending"
         });
-        chunkUIQML2XG_cjs.updateRouteDetails({
+        chunkKHJQE3DI_cjs.updateRouteDetails({
           status: "validating",
           routeId,
           options
@@ -1231,7 +1231,7 @@ var executeTransactions = async (options) => {
       throw new Error("executeRoute error: invalid message type");
     }
   });
-  chunkUIQML2XG_cjs.updateRouteDetails({
+  chunkKHJQE3DI_cjs.updateRouteDetails({
     transactionDetails,
     routeId,
     options

package/dist/cjs/{chunk-UIQML2XG.cjs → chunk-KHJQE3DI.cjs}

@@ -198,8 +198,6 @@ var executeAndSubscribeToRouteStatus = async ({
   transactionDetails,
   executeTransaction,
   trackTxPollingOptions,
-  onTransactionTracked,
-  onTransactionCompleted,
   routeDetails,
   onRouteStatusUpdated,
   options,
@@ -228,7 +226,7 @@ var executeAndSubscribeToRouteStatus = async ({
         explorerLink = trackResponse.explorerLink;
       }
       transaction.explorerLink = explorerLink;
-      await onTransactionTracked?.({
+      await options?.onTransactionTracked?.({
         txHash: transaction.txHash,
         chainId: transaction.chainId,
         explorerLink
@@ -252,6 +250,11 @@ var executeAndSubscribeToRouteStatus = async ({
         (relatedRoute) => relatedRoute && isFinalRouteStatus(relatedRoute)
       );
       if (isFinalState(transaction) && allRelatedRoutesFinal) {
+        options?.onTransactionCompleted?.({
+          chainId: transaction.chainId,
+          txHash: transaction.txHash,
+          status: transaction.statusResponse
+        });
         break;
       }
       if (isCancelled?.()) {
@@ -275,14 +278,24 @@ var executeAndSubscribeToRouteStatus = async ({
           relatedRoutes: routeDetails?.relatedRoutes
         });
         if (isFinalState(transaction)) {
-          onTransactionCompleted?.({
-            chainId: transaction.chainId,
-            txHash: transaction.txHash,
-            status: statusResponse
-          });
-          if (routeDetails?.relatedRoutes?.every(
-            (relatedRoute) => isFinalRouteStatus(relatedRoute)
-          )) {
+          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;
           }
         }