@xchainjs/xchain-thorchain-query 0.6.4 → 0.6.6

package/lib/index.esm.js

@@ -890,11 +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) ;
                 }
+                catch (e) { }
             }
             throw new Error(`THORNode is not responding`);
         });
@@ -1164,6 +1161,11 @@ class ThorchainQuery {
     quoteSwap({ fromAsset, destinationAsset, amount, destinationAddress, streamingInterval, streamingQuantity, fromAddress, toleranceBps, affiliateBps, affiliateAddress, height, }) {
         return __awaiter(this, void 0, void 0, function* () {
             const errors = [];
+            const validAssetDecimals = yield this.isValidAssetDecimals(fromAsset, amount);
+            // validates swap, and pushes error if there is one
+            if (validAssetDecimals) {
+                errors.push(`${validAssetDecimals}`);
+            }
             const fromAssetString = assetToString(fromAsset);
             const toAssetString = assetToString(destinationAsset);
             const inputAmount = getBaseAmountWithDiffDecimals(amount, 8);
@@ -1242,6 +1244,27 @@ class ThorchainQuery {
             return txDetails;
         });
     }
+    /**
+     *
+     * @param params - quote swap params
+     * @returns boolean
+     */
+    isValidAssetDecimals(fromAsset, inputAmount) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (isAssetRuneNative(fromAsset) || fromAsset.synth) {
+                if (inputAmount.baseAmount.decimal !== 8) {
+                    return `input asset ${assetToString(fromAsset)} must have decimals of 8`;
+                }
+            }
+            else {
+                const nativeDecimals = yield this.thorchainCache.midgardQuery.getDecimalForAsset(fromAsset);
+                if (nativeDecimals && nativeDecimals !== -1 && inputAmount.baseAmount.decimal !== nativeDecimals) {
+                    return `input asset ${assetToString(fromAsset)} must have decimals of ${nativeDecimals}`;
+                }
+            }
+            return undefined; // Explicitly return undefined if no conditions are met
+        });
+    }
     /**
      * Works out how long an outbound Tx will be held by THORChain before sending.
      *
@@ -1731,6 +1754,8 @@ class ThorchainQuery {
                     expiry: new Date(0),
                     toAddress: '',
                     memo: '',
+                    inboundDelayBlocks: 0,
+                    inboundDelaySeconds: 0,
                     outBoundDelayBlocks: 0,
                     outBoundDelaySeconds: 0,
                     slipBasisPoints: -1,
@@ -1758,6 +1783,8 @@ class ThorchainQuery {
                     expiry: new Date(0),
                     toAddress: '',
                     memo: '',
+                    inboundDelayBlocks: 0,
+                    inboundDelaySeconds: 0,
                     outBoundDelayBlocks: 0,
                     outBoundDelaySeconds: 0,
                     slipBasisPoints: -1,
@@ -1779,8 +1806,10 @@ class ThorchainQuery {
                 expiry: new Date(withdrawQuote.expiry),
                 toAddress: withdrawQuote.inbound_address,
                 memo: withdrawQuote.memo,
-                outBoundDelayBlocks: withdrawQuote.inbound_confirmation_blocks || 0,
-                outBoundDelaySeconds: withdrawQuote.inbound_confirmation_seconds || 0,
+                inboundDelayBlocks: withdrawQuote.inbound_confirmation_blocks || 0,
+                inboundDelaySeconds: withdrawQuote.inbound_confirmation_seconds || 0,
+                outBoundDelayBlocks: withdrawQuote.outbound_delay_blocks || 0,
+                outBoundDelaySeconds: withdrawQuote.outbound_delay_seconds || 0,
                 slipBasisPoints: withdrawQuote.slippage_bps,
                 errors,
             };
@@ -1797,7 +1826,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}`);
@@ -2000,11 +2030,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 response = JSON.parse(JSON.stringify(thornameResp));
-            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,
@@ -2016,19 +2073,6 @@ class ThorchainQuery {
                 };
                 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;
         });
     }
     /**
@@ -2045,14 +2089,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) {
+            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
@@ -2063,8 +2107,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