@xchainjs/xchain-thorchain-query 0.6.3 → 0.6.5

package/lib/index.esm.js

@@ -890,13 +890,8 @@ class Thornode {
                 try {
                     const resp = (yield api.thorname(thorname, height)).data;
                     return resp;
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                }
-                catch (e) {
-                    if (e.response.status == 404) {
-                        return undefined;
-                    }
                 }
+                catch (e) { }
             }
             throw new Error(`THORNode is not responding`);
         });
@@ -1799,7 +1794,8 @@ class ThorchainQuery {
             const errors = [];
             const inboundDetails = yield this.thorchainCache.getInboundDetails();
             const blockData = (yield this.thorchainCache.thornode.getLastBlock()).find((item) => item.chain === params.asset.chain);
-            const savers = (yield this.thorchainCache.thornode.getSavers(`${params.asset.chain}.${params.asset.symbol}`)).find((item) => item.asset_address === params.address);
+            // address comparison is done after conversion to lower case
+            const savers = (yield this.thorchainCache.thornode.getSavers(`${params.asset.chain}.${params.asset.symbol}`)).find((item) => item.asset_address.toLowerCase() === params.address.toLowerCase());
             const pool = (yield this.thorchainCache.getPoolForAsset(params.asset)).thornodeDetails;
             if (!savers)
                 errors.push(`Could not find position for ${params.address}`);
@@ -2002,12 +1998,38 @@ class ThorchainQuery {
     getThornameDetails(thorname, height) {
         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));
-            if (response.error)
-                errors.push(`Thornode request quote failed: ${response.error}`);
-            if (errors.length > 0) {
+            try {
+                const thornameResp = yield this.thorchainCache.thornode.getThornameDetails(thorname, height);
+                const response = JSON.parse(JSON.stringify(thornameResp));
+                if (response.error)
+                    errors.push(`Thornode request quote failed: ${response.error}`);
+                if (errors.length > 0) {
+                    const errorResp = {
+                        name: '',
+                        expireBlockHeight: 0,
+                        owner: '',
+                        preferredAsset: '',
+                        affiliateCollectorRune: '',
+                        aliases: [],
+                        error: errors,
+                    };
+                    return errorResp;
+                }
+                const thornameAliases = thornameResp.aliases.map((alias) => ({
+                    chain: alias.chain,
+                    address: alias.address,
+                }));
+                const thornameDetails = {
+                    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;
+            }
+            catch (e) {
                 const errorResp = {
                     name: '',
                     expireBlockHeight: 0,
@@ -2019,19 +2041,6 @@ class ThorchainQuery {
                 };
                 return errorResp;
             }
-            const thornameAliases = thornameRawData.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,
-            };
-            return thornameDetails; // Return the array
         });
     }
     /**
@@ -2048,14 +2057,14 @@ class ThorchainQuery {
     estimateThorname(params) {
         return __awaiter(this, void 0, void 0, function* () {
             // 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');
+            const thornameDetails = yield this.getThornameDetails(params.thorname);
+            if (thornameDetails.owner !== '' && !params.isUpdate) {
+                throw Error('Thorname already registered');
             }
             const blockData = yield this.thorchainCache.thornode.getLastBlock();
             const currentThorchainHeight = blockData[0].thorchain;
             const currentHeightForExpirity = params.isUpdate
-                ? thornameDetails === null || thornameDetails === void 0 ? void 0 : thornameDetails.expire_block_height
+                ? thornameDetails === null || thornameDetails === void 0 ? void 0 : thornameDetails.expireBlockHeight
                 : currentThorchainHeight;
             // DEFAULT EXPIRITY
             let numberOfBlocksToAddToExpirity = params.isUpdate ? 0 : 5259600; // One year by default
@@ -2066,8 +2075,8 @@ class ThorchainQuery {
                 const numberOfSecondsToExpire = expirityTimestamp - currentTimestamp;
                 const numberOfBlocks = Math.round(numberOfSecondsToExpire / 6);
                 const newHeightExpirity = currentThorchainHeight + numberOfBlocks;
-                numberOfBlocksToAddToExpirity = (thornameDetails === null || thornameDetails === void 0 ? void 0 : thornameDetails.expire_block_height)
-                    ? newHeightExpirity - (thornameDetails === null || thornameDetails === void 0 ? void 0 : thornameDetails.expire_block_height)
+                numberOfBlocksToAddToExpirity = (thornameDetails === null || thornameDetails === void 0 ? void 0 : thornameDetails.expireBlockHeight)
+                    ? newHeightExpirity - (thornameDetails === null || thornameDetails === void 0 ? void 0 : thornameDetails.expireBlockHeight)
                     : numberOfBlocks;
             }
             // COMPUTE VALUE
@@ -2247,8 +2256,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 +2473,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);