@xchainjs/xchain-thorchain-query 0.6.3 → 0.6.4

package/lib/index.esm.js

@@ -893,9 +893,7 @@ class Thornode {
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 }
                 catch (e) {
-                    if (e.response.status == 404) {
-                        return undefined;
-                    }
+                    if (e.response.status == 404) ;
                 }
             }
             throw new Error(`THORNode is not responding`);
@@ -2003,8 +2001,7 @@ class ThorchainQuery {
         return __awaiter(this, void 0, void 0, function* () {
             const errors = [];
             const thornameResp = yield this.thorchainCache.thornode.getThornameDetails(thorname, height);
-            const thornameRawData = thornameResp; // TODO: Until integrate THORNode PR
-            const response = JSON.parse(JSON.stringify(thorname));
+            const response = JSON.parse(JSON.stringify(thornameResp));
             if (response.error)
                 errors.push(`Thornode request quote failed: ${response.error}`);
             if (errors.length > 0) {
@@ -2019,19 +2016,19 @@ class ThorchainQuery {
                 };
                 return errorResp;
             }
-            const thornameAliases = thornameRawData.aliases.map((alias) => ({
+            const thornameAliases = thornameResp.aliases.map((alias) => ({
                 chain: alias.chain,
                 address: alias.address,
             }));
             const thornameDetails = {
-                name: thornameRawData.name || '',
-                expireBlockHeight: thornameRawData.expire_block_height || 0,
-                owner: thornameRawData.owner || '',
-                preferredAsset: thornameRawData.preferred_asset,
-                affiliateCollectorRune: thornameRawData.affiliate_collector_rune || '',
-                aliases: thornameAliases,
+                name: thornameResp.name || '',
+                expireBlockHeight: thornameResp.expire_block_height || 0,
+                owner: thornameResp.owner || '',
+                preferredAsset: thornameResp.preferred_asset || '',
+                affiliateCollectorRune: thornameResp.affiliate_collector_rune || '',
+                aliases: thornameAliases || [],
             };
-            return thornameDetails; // Return the array
+            return thornameDetails;
         });
     }
     /**
@@ -2050,7 +2047,7 @@ class ThorchainQuery {
             // CHECK IF ALREADY EXISTS
             const thornameDetails = (yield this.thorchainCache.thornode.getThornameDetails(params.thorname)); // TODO: Until integrate THORNode PR
             if (thornameDetails && !params.isUpdate) {
-                throw Error('Thorname already reistered');
+                throw Error('Thorname already registered');
             }
             const blockData = yield this.thorchainCache.thornode.getLastBlock();
             const currentThorchainHeight = blockData[0].thorchain;
@@ -2247,8 +2244,8 @@ class TransactionStage {
                 const assetIn = assetFromStringEx((_b = txData.tx.tx.coins) === null || _b === void 0 ? void 0 : _b[0].asset);
                 const inboundAmount = (_c = txData.tx.tx.coins) === null || _c === void 0 ? void 0 : _c[0].amount;
                 const fromAddress = (_d = txData.tx.tx.from_address) !== null && _d !== void 0 ? _d : 'unknkown';
-                const block = txData.tx.tx.chain == THORChain ? Number(txData.finalised_height) : Number(txData.tx.block_height);
-                const finalizeBlock = txData.tx.tx.chain == THORChain ? Number(txData.finalised_height) : Number(txData.tx.finalise_height);
+                const block = txData.tx.tx.chain == THORChain ? Number(txData.finalised_height) : Number(txData.consensus_height);
+                const finalizeBlock = txData.tx.tx.chain == THORChain ? Number(txData.finalised_height) : Number(txData.finalised_height);
                 const status = txData.tx.status === 'done' ? InboundStatus.Observed_Consensus : InboundStatus.Observed_Incomplete;
                 if (operation.match(/swap|s|=/gi))
                     progress.txType = TxType.Swap;
@@ -2464,7 +2461,7 @@ class TransactionStage {
             let blockDifference;
             const currentHeight = lastBlockObj.find((obj) => obj.chain == chain);
             const chainHeight = Number(`${currentHeight === null || currentHeight === void 0 ? void 0 : currentHeight.last_observed_in}`);
-            const recordedChainHeight = Number(`${txData.tx.block_height}`);
+            const recordedChainHeight = Number(`${txData.consensus_height}`);
             // If outbound time is required
             if (outboundBlock) {
                 const currentHeight = lastBlockObj.find((obj) => obj);