@xchainjs/xchain-thorchain-query 0.1.15 → 0.1.17

package/lib/index.esm.js

@@ -13,7 +13,7 @@ import { AssetBCH, BCHChain } from '@xchainjs/xchain-bitcoincash';
 import { DOGEChain, AssetDOGE } from '@xchainjs/xchain-doge';
 import { ETHChain, AssetETH } from '@xchainjs/xchain-ethereum';
 import { LTCChain, AssetLTC } from '@xchainjs/xchain-litecoin';
-import { TransactionsApi, Configuration as Configuration$1, QueueApi, NetworkApi, PoolsApi, LiquidityProvidersApi, SaversApi, QuoteApi } from '@xchainjs/xchain-thornode';
+import { TransactionsApi, Configuration as Configuration$1, QueueApi, NetworkApi, PoolsApi, LiquidityProvidersApi, SaversApi, QuoteApi, MimirApi } from '@xchainjs/xchain-thornode';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -216,21 +216,6 @@ class Midgard {
         axiosRetry(axios, { retries: this.config.apiRetries, retryDelay: axiosRetry.exponentialDelay });
         this.midgardApis = this.config.midgardBaseUrls.map((url) => new MidgardApi(new Configuration({ basePath: url })));
     }
-    getMimirDetails() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const path = '/v2/thorchain/mimir';
-            for (const baseUrl of this.config.midgardBaseUrls) {
-                try {
-                    const { data } = yield axios.get(`${baseUrl}${path}`);
-                    return data;
-                }
-                catch (e) {
-                    console.error(e);
-                }
-            }
-            throw new Error('Midgard not responding');
-        });
-    }
     /**
      *
      * @returns an array of Pools
@@ -248,67 +233,6 @@ class Midgard {
             throw new Error(`Midgard not responding`);
         });
     }
-    /**
-     *
-     * @returns - constants
-     */
-    getConstantsDetails() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const path = '/v2/thorchain/constants';
-            for (const baseUrl of this.config.midgardBaseUrls) {
-                try {
-                    const { data } = yield axios.get(`${baseUrl}${path}`);
-                    return data.int_64_values;
-                }
-                catch (e) {
-                    //console.error(e)
-                }
-            }
-            throw new Error('Midgard not responding');
-        });
-    }
-    /**
-     *
-     * @returns the outbound Tx Value in RUNE (Basemount)
-     */
-    getScheduledOutboundValue() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const path = '/v2/thorchain/queue';
-            for (const baseUrl of this.config.midgardBaseUrls) {
-                try {
-                    const { data } = yield axios.get(`${baseUrl}${path}`);
-                    const value = new CryptoAmount(baseAmount(data['scheduled_outbound_value']), AssetRuneNative);
-                    return value;
-                }
-                catch (e) {
-                    //console.error(e)
-                }
-            }
-            throw new Error('Midgard not responding');
-        });
-    }
-    /**
-     * Function that wraps Mimir and Constants to return the value from a given constant name. Searchs Mimir first.
-     *
-     * @param networkValueName the network value to be used to search the contsants
-     * @returns the mimir or constants value
-     */
-    getNetworkValues() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const [mimirDetails, constantDetails] = yield Promise.all([this.getMimirDetails(), this.getConstantsDetails()]);
-            const retVal = {};
-            // insert constants first
-            for (const constantKey of Object.keys(constantDetails)) {
-                retVal[constantKey.toUpperCase()] = constantDetails[constantKey];
-            }
-            // mimir will overwrite any dupe constants
-            for (const mimirKey of Object.keys(mimirDetails)) {
-                const mimirValue = mimirDetails[mimirKey];
-                retVal[mimirKey.toUpperCase()] = mimirValue;
-            }
-            return retVal;
-        });
-    }
     /**
      * Gets the latest block using the Health endpoint within Midgard
      *
@@ -542,7 +466,44 @@ const getDoubleSwap = (inputAmount, pool1, pool2, thorchainCache) => __awaiter(v
     return SwapOutput;
 });
 /**
- * Works out the required inbound or outbound fee based on the chain.
+ * Returns the native asset for a given chain
+ * @param chain
+ * @returns the gas asset type for the given chain
+ */
+const getChainAsset = (chain) => {
+    switch (chain) {
+        case BNBChain:
+            return AssetBNB;
+        case BTCChain:
+            return AssetBTC;
+        case ETHChain:
+            return AssetETH;
+        case THORChain:
+            return AssetRuneNative;
+        case GAIAChain:
+            return AssetATOM;
+        case BCHChain:
+            return AssetBCH;
+        case LTCChain:
+            return AssetLTC;
+        case DOGEChain:
+            return AssetDOGE;
+        case AVAXChain:
+            return AssetAVAX;
+        default:
+            throw Error('Unknown chain');
+    }
+};
+/**
+ *
+ * @param asset
+ * @returns a boolean based on Assets being compared are equal
+ */
+const isNativeChainAsset = (asset) => {
+    return eqAsset(asset, getChainAsset(asset.chain));
+};
+/**
+ * Works out the required inbound fee based on the chain.
  * Call getInboundDetails to get the current gasRate
  *
  * @param sourceAsset
@@ -551,8 +512,13 @@ const getDoubleSwap = (inputAmount, pool1, pool2, thorchainCache) => __awaiter(v
  * @returns
  */
 const calcNetworkFee = (asset, inbound) => {
+    // synths are always 0.02R fee
     if (asset.synth)
         return new CryptoAmount(baseAmount(2000000), AssetRuneNative);
+    // if you are swapping a non-gas asset  on a multiAsset chain (ex. ERC-20 on ETH), the
+    // gas fees will be paid in a diff asset than the one you are swapping
+    else if (!isNativeChainAsset(asset))
+        return new CryptoAmount(baseAmount(0), AssetRuneNative);
     switch (asset.chain) {
         case BTCChain:
             return new CryptoAmount(baseAmount(inbound.gasRate.multipliedBy(inbound.outboundTxSize)), AssetBTC);
@@ -626,35 +592,6 @@ const calcOutboundFee = (asset, inbound) => {
             return new CryptoAmount(baseAmount(2000000), AssetRuneNative);
     }
     throw new Error(`could not calculate outbound fee for ${asset.chain}`);
-};
-/**
- * Return the chain for a given Asset This method should live somewhere else.
- * @param chain
- * @returns the gas asset type for the given chain
- */
-const getChainAsset = (chain) => {
-    switch (chain) {
-        case BNBChain:
-            return AssetBNB;
-        case BTCChain:
-            return AssetBTC;
-        case ETHChain:
-            return AssetETH;
-        case THORChain:
-            return AssetRuneNative;
-        case GAIAChain:
-            return AssetATOM;
-        case BCHChain:
-            return AssetBCH;
-        case LTCChain:
-            return AssetLTC;
-        case DOGEChain:
-            return AssetDOGE;
-        case AVAXChain:
-            return AssetAVAX;
-        default:
-            throw Error('Unknown chain');
-    }
 };
 
 const defaultThornodeConfig = {
@@ -683,6 +620,7 @@ class Thornode {
         this.liquidityProvidersApi = this.config.thornodeBaseUrls.map((url) => new LiquidityProvidersApi(new Configuration$1({ basePath: url })));
         this.saversApi = this.config.thornodeBaseUrls.map((url) => new SaversApi(new Configuration$1({ basePath: url })));
         this.quoteApi = this.config.thornodeBaseUrls.map((url) => new QuoteApi(new Configuration$1({ basePath: url })));
+        this.mimirApi = this.config.thornodeBaseUrls.map((url) => new MimirApi(new Configuration$1({ basePath: url })));
     }
     /**
      * Returns the oubound transactions held by THORChain due to outbound delay
@@ -706,6 +644,50 @@ class Thornode {
             throw Error(`THORNode not responding`);
         });
     }
+    /**
+     * Returns queue
+     * May be empty if there are no transactions
+     *
+     * @returns {ScheduledQueueItem} Array
+     *
+     */
+    getQueue() {
+        return __awaiter(this, void 0, void 0, function* () {
+            for (const api of this.queueApi) {
+                try {
+                    const queue = yield api.queue();
+                    return queue.data;
+                }
+                catch (e) {
+                    //console.error(e)
+                    throw new Error(`THORNode not responding`);
+                }
+            }
+            throw Error(`THORNode not responding`);
+        });
+    }
+    /**
+     * Returns Mimir
+     * May be empty if there are no transactions
+     *
+     * @returns {ScheduledQueueItem} Array
+     *
+     */
+    getMimir() {
+        return __awaiter(this, void 0, void 0, function* () {
+            for (const api of this.mimirApi) {
+                try {
+                    const queue = yield api.mimir();
+                    return queue.data;
+                }
+                catch (e) {
+                    //console.error(e)
+                    throw new Error(`THORNode not responding`);
+                }
+            }
+            throw Error(`THORNode not responding`);
+        });
+    }
     /**
      *
      * @param txHash - transaction hash
@@ -785,6 +767,47 @@ class Thornode {
             throw new Error(`THORNode not responding`);
         });
     }
+    /**
+     *
+     * @returns  Thorchain constants
+     */
+    getTcConstants() {
+        return __awaiter(this, void 0, void 0, function* () {
+            for (const api of this.networkApi) {
+                try {
+                    const constants = yield api.constants();
+                    if (constants.data.int_64_values) {
+                        return constants.data.int_64_values;
+                    }
+                }
+                catch (e) {
+                    //console.error(e)
+                }
+            }
+            throw new Error(`THORNode not responding`);
+        });
+    }
+    /**
+     * Function that wraps Mimir and Constants to return the value from a given constant name. Searchs Mimir first.
+     *
+     * @param networkValueName the network value to be used to search the contsants
+     * @returns the mimir or constants value
+     */
+    getNetworkValues() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const [mimirDetails, constantDetails] = yield Promise.all([this.getMimir(), this.getTcConstants()]);
+            const retVal = {};
+            // insert constants first
+            for (const [key, value] of Object.entries(constantDetails)) {
+                retVal[key.toUpperCase()] = parseInt(value);
+            }
+            // // mimir will overwrite any dupe constants
+            for (const [key, value] of Object.entries(mimirDetails)) {
+                retVal[key] = parseInt(value);
+            }
+            return retVal;
+        });
+    }
     /**
      *
      * @param asset - asset string
@@ -1093,7 +1116,7 @@ class ThorchainCache {
     refereshInboundDetailCache() {
         return __awaiter(this, void 0, void 0, function* () {
             const [mimirDetails, allInboundAddresses] = yield Promise.all([
-                this.midgard.getMimirDetails(),
+                this.thornode.getMimir(),
                 this.thornode.getInboundAddresses(),
             ]);
             const inboundDetails = {};
@@ -1149,7 +1172,7 @@ class ThorchainCache {
      */
     refereshNetworkValuesCache() {
         return __awaiter(this, void 0, void 0, function* () {
-            const networkValues = yield this.midgard.getNetworkValues();
+            const networkValues = yield this.thornode.getNetworkValues();
             this.networkValuesCache = {
                 lastRefreshed: Date.now(),
                 networkValues,
@@ -1554,7 +1577,7 @@ class ThorchainQuery {
                 ? params.input
                 : yield this.thorchainCache.convert(params.input, params.input.asset);
             const inboundFeeInInboundGasAsset = calcNetworkFee(input.asset, sourceInboundDetails);
-            let outboundFeeInOutboundGasAsset = calcOutboundFee(params.destinationAsset, destinationInboundDetails);
+            let outboundFeeInOutboundGasAsset = calcOutboundFee(params.destinationAsset, destinationInboundDetails).times(3);
             // Check outbound fee is equal too or greater than 1 USD * need to find a more permanent solution to this. referencing just 1 stable coin pool has problems
             if (params.destinationAsset.chain !== THORChain && !params.destinationAsset.synth) {
                 const deepestUSDPOOL = yield this.thorchainCache.getDeepestUSDPool();
@@ -1564,13 +1587,12 @@ class ThorchainQuery {
                 if (!checkOutboundFee) {
                     const newFee = usdMinFee;
                     outboundFeeInOutboundGasAsset = yield this.convert(newFee, AssetRuneNative);
-                    console.log(outboundFeeInOutboundGasAsset.assetAmount.amount);
                 }
             }
             // ----------- Remove Fees from inbound before doing the swap -----------
             const inboundFeeInInboundAsset = yield this.thorchainCache.convert(inboundFeeInInboundGasAsset, params.input.asset);
-            const inputMinusInboundFeeInAsset = input.minus(inboundFeeInInboundAsset);
-            // console.log('y', inputMinusInboundFeeInAsset.formatedAssetString())
+            // if it a gas asset, take away inbound fee, else leave it as is. Still allow inboundFeeInInboundGasAsset to pass to swapEstimate.totalFees.inboundFee so user is aware if the gas requirements.
+            const inputMinusInboundFeeInAsset = isNativeChainAsset(input.asset) ? input.minus(inboundFeeInInboundAsset) : input;
             // remove any affiliateFee. netInput * affiliateFee (percentage) of the destination asset type
             const affiliateFeePercent = params.affiliateFeeBasisPoints ? params.affiliateFeeBasisPoints / 10000 : 0;
             const affiliateFeeInAsset = inputMinusInboundFeeInAsset.times(affiliateFeePercent);
@@ -1591,6 +1613,7 @@ class ThorchainQuery {
             const swapOutputInDestinationAsset = yield this.thorchainCache.getExpectedSwapOutput(inputNetInAsset, params.destinationAsset);
             // ---------------- Remove Outbound Fee ---------------------- /
             const outboundFeeInDestinationAsset = yield this.thorchainCache.convert(outboundFeeInOutboundGasAsset, params.destinationAsset);
+            //console.log(outboundFeeInDestinationAsset.formatedAssetString())
             const netOutputInAsset = swapOutputInDestinationAsset.output.minus(outboundFeeInDestinationAsset);
             const totalFees = {
                 inboundFee: inboundFeeInInboundGasAsset,
@@ -1713,10 +1736,9 @@ class ThorchainQuery {
             let result = undefined;
             const inputInRune = yield this.thorchainCache.convert(params.input, AssetRuneNative);
             const feesInRune = yield this.getFeesIn(estimate.totalFees, AssetRuneNative);
-            const totalSwapFeesInRune = feesInRune.inboundFee
-                .plus(feesInRune.outboundFee)
-                .plus(feesInRune.swapFee)
-                .plus(feesInRune.affiliateFee);
+            const totalSwapFeesInRune = !params.input.asset.synth && isNativeChainAsset(params.input.asset)
+                ? feesInRune.inboundFee.plus(feesInRune.outboundFee).plus(feesInRune.swapFee).plus(feesInRune.affiliateFee)
+                : feesInRune.outboundFee.plus(feesInRune.swapFee).plus(feesInRune.affiliateFee);
             const totalSwapFeesInAsset = yield this.thorchainCache.convert(totalSwapFeesInRune, params.input.asset);
             if (totalSwapFeesInRune.gte(inputInRune))
                 result = `Input amount ${params.input.formatedAssetString()}(${inputInRune.formatedAssetString()}) is less than or equal to total swap fees ${totalSwapFeesInAsset.formatedAssetString()}(${totalSwapFeesInRune.formatedAssetString()}) `;
@@ -1804,7 +1826,8 @@ class ThorchainQuery {
             let txOutDelayRate = new CryptoAmount(baseAmount(networkValues['TXOUTDELAYRATE']), AssetRuneNative).assetAmount
                 .amount()
                 .toNumber();
-            const getScheduledOutboundValue = yield this.thorchainCache.midgard.getScheduledOutboundValue();
+            const getQueue = yield this.thorchainCache.thornode.getQueue();
+            const outboundValue = new CryptoAmount(baseAmount(getQueue.scheduled_outbound_value), AssetRuneNative);
             const thorChainblocktime = this.chainAttributes[THORChain].avgBlockTimeInSecs; // blocks required to confirm tx
             // If asset is equal to Rune set runeValue as outbound amount else set it to the asset's value in rune
             const runeValue = yield this.thorchainCache.convert(outboundAmount, AssetRuneNative);
@@ -1813,11 +1836,11 @@ class ThorchainQuery {
                 return thorChainblocktime;
             }
             // Rune value in the outbound queue
-            if (getScheduledOutboundValue == undefined) {
+            if (outboundValue == undefined) {
                 throw new Error(`Could not return Scheduled Outbound Value`);
             }
             // Add OutboundAmount in rune to the oubound queue
-            const outboundAmountTotal = runeValue.plus(getScheduledOutboundValue);
+            const outboundAmountTotal = runeValue.plus(outboundValue);
             // calculate the if outboundAmountTotal is over the volume threshold
             const volumeThreshold = outboundAmountTotal.div(minTxOutVolumeThreshold);
             // check delay rate
@@ -1909,7 +1932,7 @@ class ThorchainQuery {
                 totalUnits: new BigNumber(poolAsset.pool.liquidityUnits),
                 liquidityUnits: new BigNumber(liquidityProvider.units),
             };
-            const networkValues = yield this.thorchainCache.midgard.getNetworkValues();
+            const networkValues = yield this.thorchainCache.thornode.getNetworkValues();
             const block = {
                 current: blockData.thorchain,
                 lastAdded: liquidityProvider.last_add_height,
@@ -2475,9 +2498,10 @@ class TransactionStage {
                 const estimatedWaitTime = outboundBlock > currentTCHeight
                     ? (outboundBlock - currentTCHeight) * this.chainAttributes[THORChain].avgBlockTimeInSecs
                     : 0;
+                const withdrawalAmount = yield this.getCryptoAmount(outAmount[0], asset);
                 const withdrawLpInfo = {
                     status,
-                    withdrawalAmount: new CryptoAmount(baseAmount(outAmount[0]), asset),
+                    withdrawalAmount,
                     expectedConfirmationDate,
                     thorchainHeight: currentTCHeight,
                     outboundHeight: outboundBlock,
@@ -2524,9 +2548,10 @@ class TransactionStage {
                     : 0;
                 // if the TC has process the block that the outbound tx was assigned to then its completed.
                 const status = txData.out_txs ? WithdrawStatus.Complete : WithdrawStatus.Incomplete;
+                const withdrawalAmount = yield this.getCryptoAmount(outAmount[0], asset);
                 const withdrawSaverInfo = {
                     status,
-                    withdrawalAmount: new CryptoAmount(baseAmount(outAmount[0]), asset),
+                    withdrawalAmount,
                     expectedConfirmationDate,
                     thorchainHeight: currentTCHeight,
                     finalisedHeight,

package/lib/index.js

@@ -225,21 +225,6 @@ class Midgard {
         axiosRetry__default['default'](axios__default['default'], { retries: this.config.apiRetries, retryDelay: axiosRetry__default['default'].exponentialDelay });
         this.midgardApis = this.config.midgardBaseUrls.map((url) => new xchainMidgard.MidgardApi(new xchainMidgard.Configuration({ basePath: url })));
     }
-    getMimirDetails() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const path = '/v2/thorchain/mimir';
-            for (const baseUrl of this.config.midgardBaseUrls) {
-                try {
-                    const { data } = yield axios__default['default'].get(`${baseUrl}${path}`);
-                    return data;
-                }
-                catch (e) {
-                    console.error(e);
-                }
-            }
-            throw new Error('Midgard not responding');
-        });
-    }
     /**
      *
      * @returns an array of Pools
@@ -257,67 +242,6 @@ class Midgard {
             throw new Error(`Midgard not responding`);
         });
     }
-    /**
-     *
-     * @returns - constants
-     */
-    getConstantsDetails() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const path = '/v2/thorchain/constants';
-            for (const baseUrl of this.config.midgardBaseUrls) {
-                try {
-                    const { data } = yield axios__default['default'].get(`${baseUrl}${path}`);
-                    return data.int_64_values;
-                }
-                catch (e) {
-                    //console.error(e)
-                }
-            }
-            throw new Error('Midgard not responding');
-        });
-    }
-    /**
-     *
-     * @returns the outbound Tx Value in RUNE (Basemount)
-     */
-    getScheduledOutboundValue() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const path = '/v2/thorchain/queue';
-            for (const baseUrl of this.config.midgardBaseUrls) {
-                try {
-                    const { data } = yield axios__default['default'].get(`${baseUrl}${path}`);
-                    const value = new CryptoAmount(xchainUtil.baseAmount(data['scheduled_outbound_value']), xchainThorchain.AssetRuneNative);
-                    return value;
-                }
-                catch (e) {
-                    //console.error(e)
-                }
-            }
-            throw new Error('Midgard not responding');
-        });
-    }
-    /**
-     * Function that wraps Mimir and Constants to return the value from a given constant name. Searchs Mimir first.
-     *
-     * @param networkValueName the network value to be used to search the contsants
-     * @returns the mimir or constants value
-     */
-    getNetworkValues() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const [mimirDetails, constantDetails] = yield Promise.all([this.getMimirDetails(), this.getConstantsDetails()]);
-            const retVal = {};
-            // insert constants first
-            for (const constantKey of Object.keys(constantDetails)) {
-                retVal[constantKey.toUpperCase()] = constantDetails[constantKey];
-            }
-            // mimir will overwrite any dupe constants
-            for (const mimirKey of Object.keys(mimirDetails)) {
-                const mimirValue = mimirDetails[mimirKey];
-                retVal[mimirKey.toUpperCase()] = mimirValue;
-            }
-            return retVal;
-        });
-    }
     /**
      * Gets the latest block using the Health endpoint within Midgard
      *
@@ -551,7 +475,44 @@ const getDoubleSwap = (inputAmount, pool1, pool2, thorchainCache) => __awaiter(v
     return SwapOutput;
 });
 /**
- * Works out the required inbound or outbound fee based on the chain.
+ * Returns the native asset for a given chain
+ * @param chain
+ * @returns the gas asset type for the given chain
+ */
+const getChainAsset = (chain) => {
+    switch (chain) {
+        case xchainBinance.BNBChain:
+            return xchainBinance.AssetBNB;
+        case xchainBitcoin.BTCChain:
+            return xchainBitcoin.AssetBTC;
+        case xchainEthereum.ETHChain:
+            return xchainEthereum.AssetETH;
+        case xchainThorchain.THORChain:
+            return xchainThorchain.AssetRuneNative;
+        case xchainCosmos.GAIAChain:
+            return xchainCosmos.AssetATOM;
+        case xchainBitcoincash.BCHChain:
+            return xchainBitcoincash.AssetBCH;
+        case xchainLitecoin.LTCChain:
+            return xchainLitecoin.AssetLTC;
+        case xchainDoge.DOGEChain:
+            return xchainDoge.AssetDOGE;
+        case xchainAvax.AVAXChain:
+            return xchainAvax.AssetAVAX;
+        default:
+            throw Error('Unknown chain');
+    }
+};
+/**
+ *
+ * @param asset
+ * @returns a boolean based on Assets being compared are equal
+ */
+const isNativeChainAsset = (asset) => {
+    return xchainUtil.eqAsset(asset, getChainAsset(asset.chain));
+};
+/**
+ * Works out the required inbound fee based on the chain.
  * Call getInboundDetails to get the current gasRate
  *
  * @param sourceAsset
@@ -560,8 +521,13 @@ const getDoubleSwap = (inputAmount, pool1, pool2, thorchainCache) => __awaiter(v
  * @returns
  */
 const calcNetworkFee = (asset, inbound) => {
+    // synths are always 0.02R fee
     if (asset.synth)
         return new CryptoAmount(xchainUtil.baseAmount(2000000), xchainThorchain.AssetRuneNative);
+    // if you are swapping a non-gas asset  on a multiAsset chain (ex. ERC-20 on ETH), the
+    // gas fees will be paid in a diff asset than the one you are swapping
+    else if (!isNativeChainAsset(asset))
+        return new CryptoAmount(xchainUtil.baseAmount(0), xchainThorchain.AssetRuneNative);
     switch (asset.chain) {
         case xchainBitcoin.BTCChain:
             return new CryptoAmount(xchainUtil.baseAmount(inbound.gasRate.multipliedBy(inbound.outboundTxSize)), xchainBitcoin.AssetBTC);
@@ -635,35 +601,6 @@ const calcOutboundFee = (asset, inbound) => {
             return new CryptoAmount(xchainUtil.baseAmount(2000000), xchainThorchain.AssetRuneNative);
     }
     throw new Error(`could not calculate outbound fee for ${asset.chain}`);
-};
-/**
- * Return the chain for a given Asset This method should live somewhere else.
- * @param chain
- * @returns the gas asset type for the given chain
- */
-const getChainAsset = (chain) => {
-    switch (chain) {
-        case xchainBinance.BNBChain:
-            return xchainBinance.AssetBNB;
-        case xchainBitcoin.BTCChain:
-            return xchainBitcoin.AssetBTC;
-        case xchainEthereum.ETHChain:
-            return xchainEthereum.AssetETH;
-        case xchainThorchain.THORChain:
-            return xchainThorchain.AssetRuneNative;
-        case xchainCosmos.GAIAChain:
-            return xchainCosmos.AssetATOM;
-        case xchainBitcoincash.BCHChain:
-            return xchainBitcoincash.AssetBCH;
-        case xchainLitecoin.LTCChain:
-            return xchainLitecoin.AssetLTC;
-        case xchainDoge.DOGEChain:
-            return xchainDoge.AssetDOGE;
-        case xchainAvax.AVAXChain:
-            return xchainAvax.AssetAVAX;
-        default:
-            throw Error('Unknown chain');
-    }
 };
 
 const defaultThornodeConfig = {
@@ -692,6 +629,7 @@ class Thornode {
         this.liquidityProvidersApi = this.config.thornodeBaseUrls.map((url) => new xchainThornode.LiquidityProvidersApi(new xchainThornode.Configuration({ basePath: url })));
         this.saversApi = this.config.thornodeBaseUrls.map((url) => new xchainThornode.SaversApi(new xchainThornode.Configuration({ basePath: url })));
         this.quoteApi = this.config.thornodeBaseUrls.map((url) => new xchainThornode.QuoteApi(new xchainThornode.Configuration({ basePath: url })));
+        this.mimirApi = this.config.thornodeBaseUrls.map((url) => new xchainThornode.MimirApi(new xchainThornode.Configuration({ basePath: url })));
     }
     /**
      * Returns the oubound transactions held by THORChain due to outbound delay
@@ -715,6 +653,50 @@ class Thornode {
             throw Error(`THORNode not responding`);
         });
     }
+    /**
+     * Returns queue
+     * May be empty if there are no transactions
+     *
+     * @returns {ScheduledQueueItem} Array
+     *
+     */
+    getQueue() {
+        return __awaiter(this, void 0, void 0, function* () {
+            for (const api of this.queueApi) {
+                try {
+                    const queue = yield api.queue();
+                    return queue.data;
+                }
+                catch (e) {
+                    //console.error(e)
+                    throw new Error(`THORNode not responding`);
+                }
+            }
+            throw Error(`THORNode not responding`);
+        });
+    }
+    /**
+     * Returns Mimir
+     * May be empty if there are no transactions
+     *
+     * @returns {ScheduledQueueItem} Array
+     *
+     */
+    getMimir() {
+        return __awaiter(this, void 0, void 0, function* () {
+            for (const api of this.mimirApi) {
+                try {
+                    const queue = yield api.mimir();
+                    return queue.data;
+                }
+                catch (e) {
+                    //console.error(e)
+                    throw new Error(`THORNode not responding`);
+                }
+            }
+            throw Error(`THORNode not responding`);
+        });
+    }
     /**
      *
      * @param txHash - transaction hash
@@ -794,6 +776,47 @@ class Thornode {
             throw new Error(`THORNode not responding`);
         });
     }
+    /**
+     *
+     * @returns  Thorchain constants
+     */
+    getTcConstants() {
+        return __awaiter(this, void 0, void 0, function* () {
+            for (const api of this.networkApi) {
+                try {
+                    const constants = yield api.constants();
+                    if (constants.data.int_64_values) {
+                        return constants.data.int_64_values;
+                    }
+                }
+                catch (e) {
+                    //console.error(e)
+                }
+            }
+            throw new Error(`THORNode not responding`);
+        });
+    }
+    /**
+     * Function that wraps Mimir and Constants to return the value from a given constant name. Searchs Mimir first.
+     *
+     * @param networkValueName the network value to be used to search the contsants
+     * @returns the mimir or constants value
+     */
+    getNetworkValues() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const [mimirDetails, constantDetails] = yield Promise.all([this.getMimir(), this.getTcConstants()]);
+            const retVal = {};
+            // insert constants first
+            for (const [key, value] of Object.entries(constantDetails)) {
+                retVal[key.toUpperCase()] = parseInt(value);
+            }
+            // // mimir will overwrite any dupe constants
+            for (const [key, value] of Object.entries(mimirDetails)) {
+                retVal[key] = parseInt(value);
+            }
+            return retVal;
+        });
+    }
     /**
      *
      * @param asset - asset string
@@ -1102,7 +1125,7 @@ class ThorchainCache {
     refereshInboundDetailCache() {
         return __awaiter(this, void 0, void 0, function* () {
             const [mimirDetails, allInboundAddresses] = yield Promise.all([
-                this.midgard.getMimirDetails(),
+                this.thornode.getMimir(),
                 this.thornode.getInboundAddresses(),
             ]);
             const inboundDetails = {};
@@ -1158,7 +1181,7 @@ class ThorchainCache {
      */
     refereshNetworkValuesCache() {
         return __awaiter(this, void 0, void 0, function* () {
-            const networkValues = yield this.midgard.getNetworkValues();
+            const networkValues = yield this.thornode.getNetworkValues();
             this.networkValuesCache = {
                 lastRefreshed: Date.now(),
                 networkValues,
@@ -1563,7 +1586,7 @@ class ThorchainQuery {
                 ? params.input
                 : yield this.thorchainCache.convert(params.input, params.input.asset);
             const inboundFeeInInboundGasAsset = calcNetworkFee(input.asset, sourceInboundDetails);
-            let outboundFeeInOutboundGasAsset = calcOutboundFee(params.destinationAsset, destinationInboundDetails);
+            let outboundFeeInOutboundGasAsset = calcOutboundFee(params.destinationAsset, destinationInboundDetails).times(3);
             // Check outbound fee is equal too or greater than 1 USD * need to find a more permanent solution to this. referencing just 1 stable coin pool has problems
             if (params.destinationAsset.chain !== xchainThorchain.THORChain && !params.destinationAsset.synth) {
                 const deepestUSDPOOL = yield this.thorchainCache.getDeepestUSDPool();
@@ -1573,13 +1596,12 @@ class ThorchainQuery {
                 if (!checkOutboundFee) {
                     const newFee = usdMinFee;
                     outboundFeeInOutboundGasAsset = yield this.convert(newFee, xchainThorchain.AssetRuneNative);
-                    console.log(outboundFeeInOutboundGasAsset.assetAmount.amount);
                 }
             }
             // ----------- Remove Fees from inbound before doing the swap -----------
             const inboundFeeInInboundAsset = yield this.thorchainCache.convert(inboundFeeInInboundGasAsset, params.input.asset);
-            const inputMinusInboundFeeInAsset = input.minus(inboundFeeInInboundAsset);
-            // console.log('y', inputMinusInboundFeeInAsset.formatedAssetString())
+            // if it a gas asset, take away inbound fee, else leave it as is. Still allow inboundFeeInInboundGasAsset to pass to swapEstimate.totalFees.inboundFee so user is aware if the gas requirements.
+            const inputMinusInboundFeeInAsset = isNativeChainAsset(input.asset) ? input.minus(inboundFeeInInboundAsset) : input;
             // remove any affiliateFee. netInput * affiliateFee (percentage) of the destination asset type
             const affiliateFeePercent = params.affiliateFeeBasisPoints ? params.affiliateFeeBasisPoints / 10000 : 0;
             const affiliateFeeInAsset = inputMinusInboundFeeInAsset.times(affiliateFeePercent);
@@ -1600,6 +1622,7 @@ class ThorchainQuery {
             const swapOutputInDestinationAsset = yield this.thorchainCache.getExpectedSwapOutput(inputNetInAsset, params.destinationAsset);
             // ---------------- Remove Outbound Fee ---------------------- /
             const outboundFeeInDestinationAsset = yield this.thorchainCache.convert(outboundFeeInOutboundGasAsset, params.destinationAsset);
+            //console.log(outboundFeeInDestinationAsset.formatedAssetString())
             const netOutputInAsset = swapOutputInDestinationAsset.output.minus(outboundFeeInDestinationAsset);
             const totalFees = {
                 inboundFee: inboundFeeInInboundGasAsset,
@@ -1722,10 +1745,9 @@ class ThorchainQuery {
             let result = undefined;
             const inputInRune = yield this.thorchainCache.convert(params.input, xchainThorchain.AssetRuneNative);
             const feesInRune = yield this.getFeesIn(estimate.totalFees, xchainThorchain.AssetRuneNative);
-            const totalSwapFeesInRune = feesInRune.inboundFee
-                .plus(feesInRune.outboundFee)
-                .plus(feesInRune.swapFee)
-                .plus(feesInRune.affiliateFee);
+            const totalSwapFeesInRune = !params.input.asset.synth && isNativeChainAsset(params.input.asset)
+                ? feesInRune.inboundFee.plus(feesInRune.outboundFee).plus(feesInRune.swapFee).plus(feesInRune.affiliateFee)
+                : feesInRune.outboundFee.plus(feesInRune.swapFee).plus(feesInRune.affiliateFee);
             const totalSwapFeesInAsset = yield this.thorchainCache.convert(totalSwapFeesInRune, params.input.asset);
             if (totalSwapFeesInRune.gte(inputInRune))
                 result = `Input amount ${params.input.formatedAssetString()}(${inputInRune.formatedAssetString()}) is less than or equal to total swap fees ${totalSwapFeesInAsset.formatedAssetString()}(${totalSwapFeesInRune.formatedAssetString()}) `;
@@ -1813,7 +1835,8 @@ class ThorchainQuery {
             let txOutDelayRate = new CryptoAmount(xchainUtil.baseAmount(networkValues['TXOUTDELAYRATE']), xchainThorchain.AssetRuneNative).assetAmount
                 .amount()
                 .toNumber();
-            const getScheduledOutboundValue = yield this.thorchainCache.midgard.getScheduledOutboundValue();
+            const getQueue = yield this.thorchainCache.thornode.getQueue();
+            const outboundValue = new CryptoAmount(xchainUtil.baseAmount(getQueue.scheduled_outbound_value), xchainThorchain.AssetRuneNative);
             const thorChainblocktime = this.chainAttributes[xchainThorchain.THORChain].avgBlockTimeInSecs; // blocks required to confirm tx
             // If asset is equal to Rune set runeValue as outbound amount else set it to the asset's value in rune
             const runeValue = yield this.thorchainCache.convert(outboundAmount, xchainThorchain.AssetRuneNative);
@@ -1822,11 +1845,11 @@ class ThorchainQuery {
                 return thorChainblocktime;
             }
             // Rune value in the outbound queue
-            if (getScheduledOutboundValue == undefined) {
+            if (outboundValue == undefined) {
                 throw new Error(`Could not return Scheduled Outbound Value`);
             }
             // Add OutboundAmount in rune to the oubound queue
-            const outboundAmountTotal = runeValue.plus(getScheduledOutboundValue);
+            const outboundAmountTotal = runeValue.plus(outboundValue);
             // calculate the if outboundAmountTotal is over the volume threshold
             const volumeThreshold = outboundAmountTotal.div(minTxOutVolumeThreshold);
             // check delay rate
@@ -1918,7 +1941,7 @@ class ThorchainQuery {
                 totalUnits: new bignumber_js.BigNumber(poolAsset.pool.liquidityUnits),
                 liquidityUnits: new bignumber_js.BigNumber(liquidityProvider.units),
             };
-            const networkValues = yield this.thorchainCache.midgard.getNetworkValues();
+            const networkValues = yield this.thorchainCache.thornode.getNetworkValues();
             const block = {
                 current: blockData.thorchain,
                 lastAdded: liquidityProvider.last_add_height,
@@ -2478,9 +2501,10 @@ class TransactionStage {
                 const estimatedWaitTime = outboundBlock > currentTCHeight
                     ? (outboundBlock - currentTCHeight) * this.chainAttributes[xchainThorchain.THORChain].avgBlockTimeInSecs
                     : 0;
+                const withdrawalAmount = yield this.getCryptoAmount(outAmount[0], asset);
                 const withdrawLpInfo = {
                     status,
-                    withdrawalAmount: new CryptoAmount(xchainUtil.baseAmount(outAmount[0]), asset),
+                    withdrawalAmount,
                     expectedConfirmationDate,
                     thorchainHeight: currentTCHeight,
                     outboundHeight: outboundBlock,
@@ -2527,9 +2551,10 @@ class TransactionStage {
                     : 0;
                 // if the TC has process the block that the outbound tx was assigned to then its completed.
                 const status = txData.out_txs ? exports.WithdrawStatus.Complete : exports.WithdrawStatus.Incomplete;
+                const withdrawalAmount = yield this.getCryptoAmount(outAmount[0], asset);
                 const withdrawSaverInfo = {
                     status,
-                    withdrawalAmount: new CryptoAmount(xchainUtil.baseAmount(outAmount[0]), asset),
+                    withdrawalAmount,
                     expectedConfirmationDate,
                     thorchainHeight: currentTCHeight,
                     finalisedHeight,

package/lib/utils/midgard.d.ts

@@ -1,35 +1,16 @@
 import { Network } from '@xchainjs/xchain-client';
 import { Action, MemberDetails, PoolDetail, PoolStatsDetail, THORNameDetails } from '@xchainjs/xchain-midgard';
-import { CryptoAmount } from '../crypto-amount';
 import { MidgardConfig } from '../types';
 export declare class Midgard {
     private config;
     readonly network: Network;
     private midgardApis;
     constructor(network?: Network, config?: MidgardConfig);
-    getMimirDetails(): Promise<Record<string, number>>;
     /**
      *
      * @returns an array of Pools
      */
     getPools(): Promise<PoolDetail[]>;
-    /**
-     *
-     * @returns - constants
-     */
-    private getConstantsDetails;
-    /**
-     *
-     * @returns the outbound Tx Value in RUNE (Basemount)
-     */
-    getScheduledOutboundValue(): Promise<CryptoAmount>;
-    /**
-     * Function that wraps Mimir and Constants to return the value from a given constant name. Searchs Mimir first.
-     *
-     * @param networkValueName the network value to be used to search the contsants
-     * @returns the mimir or constants value
-     */
-    getNetworkValues(): Promise<Record<string, number>>;
     /**
      * Gets the latest block using the Health endpoint within Midgard
      *

package/lib/utils/swap.d.ts

@@ -49,7 +49,19 @@ export declare const getDoubleSwapFee: (inputAmount: CryptoAmount, pool1: Liquid
  */
 export declare const getDoubleSwap: (inputAmount: CryptoAmount, pool1: LiquidityPool, pool2: LiquidityPool, thorchainCache: ThorchainCache) => Promise<SwapOutput>;
 /**
- * Works out the required inbound or outbound fee based on the chain.
+ * Returns the native asset for a given chain
+ * @param chain
+ * @returns the gas asset type for the given chain
+ */
+export declare const getChainAsset: (chain: Chain) => Asset;
+/**
+ *
+ * @param asset
+ * @returns a boolean based on Assets being compared are equal
+ */
+export declare const isNativeChainAsset: (asset: Asset) => boolean;
+/**
+ * Works out the required inbound fee based on the chain.
  * Call getInboundDetails to get the current gasRate
  *
  * @param sourceAsset
@@ -68,12 +80,6 @@ export declare const calcNetworkFee: (asset: Asset, inbound: InboundDetail) => C
  * @returns
  */
 export declare const calcOutboundFee: (asset: Asset, inbound: InboundDetail) => CryptoAmount;
-/**
- * Return the chain for a given Asset This method should live somewhere else.
- * @param chain
- * @returns the gas asset type for the given chain
- */
-export declare const getChainAsset: (chain: Chain) => Asset;
 /**
  *
  * @param chain - input chain string

package/lib/utils/thornode.d.ts

@@ -1,5 +1,5 @@
 import { Network } from '@xchainjs/xchain-client';
-import { InboundAddress, LastBlock, LiquidityProviderSummary, Pool, QuoteSaverDepositResponse, QuoteSaverWithdrawResponse, QuoteSwapResponse, Saver, SaversResponse, TxDetailsResponse, TxOutItem, TxResponse } from '@xchainjs/xchain-thornode';
+import { InboundAddress, LastBlock, LiquidityProviderSummary, MimirResponse, Pool, QueueResponse, QuoteSaverDepositResponse, QuoteSaverWithdrawResponse, QuoteSwapResponse, Saver, SaversResponse, TxDetailsResponse, TxOutItem, TxResponse } from '@xchainjs/xchain-thornode';
 import { SaversWithdraw } from '../types';
 export declare type ThornodeConfig = {
     apiRetries: number;
@@ -15,6 +15,7 @@ export declare class Thornode {
     private liquidityProvidersApi;
     private saversApi;
     private quoteApi;
+    private mimirApi;
     constructor(network?: Network, config?: ThornodeConfig);
     /**
      * Returns the oubound transactions held by THORChain due to outbound delay
@@ -24,6 +25,22 @@ export declare class Thornode {
      *
      */
     getscheduledQueue(): Promise<TxOutItem[]>;
+    /**
+     * Returns queue
+     * May be empty if there are no transactions
+     *
+     * @returns {ScheduledQueueItem} Array
+     *
+     */
+    getQueue(): Promise<QueueResponse>;
+    /**
+     * Returns Mimir
+     * May be empty if there are no transactions
+     *
+     * @returns {ScheduledQueueItem} Array
+     *
+     */
+    getMimir(): Promise<MimirResponse>;
     /**
      *
      * @param txHash - transaction hash
@@ -47,6 +64,18 @@ export declare class Thornode {
      * @returns - thorchain pool
      */
     getPools(): Promise<Pool[]>;
+    /**
+     *
+     * @returns  Thorchain constants
+     */
+    getTcConstants(): Promise<Record<string, string>>;
+    /**
+     * Function that wraps Mimir and Constants to return the value from a given constant name. Searchs Mimir first.
+     *
+     * @param networkValueName the network value to be used to search the contsants
+     * @returns the mimir or constants value
+     */
+    getNetworkValues(): Promise<Record<string, number>>;
     /**
      *
      * @param asset - asset string

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-thorchain-query",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "license": "MIT",
   "description": "Thorchain query module that is resposible for estimating swap calculations and add/remove liquidity for thorchain ",
   "keywords": [
@@ -42,7 +42,7 @@
     "@xchainjs/xchain-doge": "^0.5.6",
     "@xchainjs/xchain-ethereum": "^0.27.6",
     "@xchainjs/xchain-litecoin": "^0.10.8",
-    "@xchainjs/xchain-midgard": "^0.4.0",
+    "@xchainjs/xchain-midgard": "^0.4.2",
     "@xchainjs/xchain-thorchain": "^0.27.7",
     "@xchainjs/xchain-thornode": "^0.2.0",
     "@xchainjs/xchain-util": "^0.12.0",
@@ -61,7 +61,7 @@
     "@xchainjs/xchain-bitcoin": "^0.20.7",
     "@xchainjs/xchain-litecoin": "^0.10.8",
     "@xchainjs/xchain-client": "^0.13.5",
-    "@xchainjs/xchain-midgard": "^0.4.1",
+    "@xchainjs/xchain-midgard": "^0.4.2",
     "@xchainjs/xchain-thorchain": "^0.27.7",
     "@xchainjs/xchain-thornode": "^0.2.0",
     "@xchainjs/xchain-util": "^0.12.0",