@xchainjs/xchain-thorchain-query 0.2.0 → 0.2.1

package/lib/index.esm.js

@@ -1549,7 +1549,7 @@ class ThorchainQuery {
     isValidSwap(params) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            if (isAssetRuneNative(params.input.asset)) {
+            if (isAssetRuneNative(params.input.asset) || params.input.asset.synth) {
                 if (params.input.baseAmount.decimal !== 8)
                     throw Error(`input asset ${assetToString(params.input.asset)}  must have decimals of 8`);
             }
@@ -1594,7 +1594,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).times(3);
+            let outboundFeeInOutboundGasAsset = calcOutboundFee(params.destinationAsset, destinationInboundDetails);
             // 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();
@@ -2215,7 +2215,7 @@ class ThorchainQuery {
             const withdrawQuote = yield this.thorchainCache.thornode.getSaversWithdrawQuote(withdrawParams);
             if (!withdrawQuote.expected_amount_out)
                 throw Error(`Could not quote withdrawal ${JSON.stringify(withdrawQuote)}`);
-            const pool = (yield this.thorchainCache.getPoolForAsset(withdrawParams.asset)).pool;
+            // const pool = (await this.thorchainCache.getPoolForAsset(withdrawParams.asset)).pool
             // Calculate transaction expiry time of the vault address
             const currentDatetime = new Date();
             const minutesToAdd = 15;
@@ -2223,18 +2223,18 @@ class ThorchainQuery {
             const estimatedWait = +withdrawQuote.outbound_delay_seconds;
             const withdrawAsset = assetFromStringEx(withdrawQuote.fees.asset);
             const estimateWithdrawSaver = {
-                expectedAssetAmount: new CryptoAmount(baseAmount(withdrawQuote.expected_amount_out, +pool.nativeDecimal), withdrawParams.asset),
+                expectedAssetAmount: new CryptoAmount(baseAmount(withdrawQuote.expected_amount_out), withdrawParams.asset),
                 fee: {
-                    affiliate: new CryptoAmount(baseAmount(withdrawQuote.fees.affiliate, +pool.nativeDecimal), withdrawAsset),
+                    affiliate: new CryptoAmount(baseAmount(withdrawQuote.fees.affiliate), withdrawAsset),
                     asset: withdrawAsset,
-                    outbound: new CryptoAmount(baseAmount(withdrawQuote.fees.outbound, +pool.nativeDecimal), withdrawAsset),
+                    outbound: new CryptoAmount(baseAmount(withdrawQuote.fees.outbound), withdrawAsset),
                 },
                 expiry: expiryDatetime,
                 toAddress: withdrawQuote.inbound_address,
                 memo: withdrawQuote.memo,
                 estimatedWaitTime: estimatedWait,
                 slipBasisPoints: withdrawQuote.slippage_bps,
-                dustAmount: new CryptoAmount(baseAmount(withdrawQuote.dust_amount, +pool.nativeDecimal), withdrawParams.asset),
+                dustAmount: new CryptoAmount(baseAmount(withdrawQuote.dust_amount), withdrawParams.asset),
             };
             return estimateWithdrawSaver;
         });
@@ -2260,8 +2260,8 @@ class ThorchainQuery {
             const saverUnits = Number(pool.saversUnits);
             const assetDepth = Number(pool.saversDepth);
             const redeemableValue = (ownerUnits / saverUnits) * assetDepth;
-            const depositAmount = new CryptoAmount(baseAmount(savers.asset_deposit_value, +pool.nativeDecimal), params.asset);
-            const redeemableAssetAmount = new CryptoAmount(baseAmount(redeemableValue, +pool.nativeDecimal), params.asset);
+            const depositAmount = new CryptoAmount(baseAmount(savers.asset_deposit_value), params.asset);
+            const redeemableAssetAmount = new CryptoAmount(baseAmount(redeemableValue), params.asset);
             const saversAge = ((blockData === null || blockData === void 0 ? void 0 : blockData.thorchain) - lastAdded) / ((365 * 86400) / 6);
             const saverGrowth = redeemableAssetAmount.minus(depositAmount).div(depositAmount).times(100);
             const saversPos = {

package/lib/index.js

@@ -1558,7 +1558,7 @@ class ThorchainQuery {
     isValidSwap(params) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            if (xchainThorchain.isAssetRuneNative(params.input.asset)) {
+            if (xchainThorchain.isAssetRuneNative(params.input.asset) || params.input.asset.synth) {
                 if (params.input.baseAmount.decimal !== 8)
                     throw Error(`input asset ${xchainUtil.assetToString(params.input.asset)}  must have decimals of 8`);
             }
@@ -1603,7 +1603,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).times(3);
+            let outboundFeeInOutboundGasAsset = calcOutboundFee(params.destinationAsset, destinationInboundDetails);
             // 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();
@@ -2224,7 +2224,7 @@ class ThorchainQuery {
             const withdrawQuote = yield this.thorchainCache.thornode.getSaversWithdrawQuote(withdrawParams);
             if (!withdrawQuote.expected_amount_out)
                 throw Error(`Could not quote withdrawal ${JSON.stringify(withdrawQuote)}`);
-            const pool = (yield this.thorchainCache.getPoolForAsset(withdrawParams.asset)).pool;
+            // const pool = (await this.thorchainCache.getPoolForAsset(withdrawParams.asset)).pool
             // Calculate transaction expiry time of the vault address
             const currentDatetime = new Date();
             const minutesToAdd = 15;
@@ -2232,18 +2232,18 @@ class ThorchainQuery {
             const estimatedWait = +withdrawQuote.outbound_delay_seconds;
             const withdrawAsset = xchainUtil.assetFromStringEx(withdrawQuote.fees.asset);
             const estimateWithdrawSaver = {
-                expectedAssetAmount: new CryptoAmount(xchainUtil.baseAmount(withdrawQuote.expected_amount_out, +pool.nativeDecimal), withdrawParams.asset),
+                expectedAssetAmount: new CryptoAmount(xchainUtil.baseAmount(withdrawQuote.expected_amount_out), withdrawParams.asset),
                 fee: {
-                    affiliate: new CryptoAmount(xchainUtil.baseAmount(withdrawQuote.fees.affiliate, +pool.nativeDecimal), withdrawAsset),
+                    affiliate: new CryptoAmount(xchainUtil.baseAmount(withdrawQuote.fees.affiliate), withdrawAsset),
                     asset: withdrawAsset,
-                    outbound: new CryptoAmount(xchainUtil.baseAmount(withdrawQuote.fees.outbound, +pool.nativeDecimal), withdrawAsset),
+                    outbound: new CryptoAmount(xchainUtil.baseAmount(withdrawQuote.fees.outbound), withdrawAsset),
                 },
                 expiry: expiryDatetime,
                 toAddress: withdrawQuote.inbound_address,
                 memo: withdrawQuote.memo,
                 estimatedWaitTime: estimatedWait,
                 slipBasisPoints: withdrawQuote.slippage_bps,
-                dustAmount: new CryptoAmount(xchainUtil.baseAmount(withdrawQuote.dust_amount, +pool.nativeDecimal), withdrawParams.asset),
+                dustAmount: new CryptoAmount(xchainUtil.baseAmount(withdrawQuote.dust_amount), withdrawParams.asset),
             };
             return estimateWithdrawSaver;
         });
@@ -2269,8 +2269,8 @@ class ThorchainQuery {
             const saverUnits = Number(pool.saversUnits);
             const assetDepth = Number(pool.saversDepth);
             const redeemableValue = (ownerUnits / saverUnits) * assetDepth;
-            const depositAmount = new CryptoAmount(xchainUtil.baseAmount(savers.asset_deposit_value, +pool.nativeDecimal), params.asset);
-            const redeemableAssetAmount = new CryptoAmount(xchainUtil.baseAmount(redeemableValue, +pool.nativeDecimal), params.asset);
+            const depositAmount = new CryptoAmount(xchainUtil.baseAmount(savers.asset_deposit_value), params.asset);
+            const redeemableAssetAmount = new CryptoAmount(xchainUtil.baseAmount(redeemableValue), params.asset);
             const saversAge = ((blockData === null || blockData === void 0 ? void 0 : blockData.thorchain) - lastAdded) / ((365 * 86400) / 6);
             const saverGrowth = redeemableAssetAmount.minus(depositAmount).div(depositAmount).times(100);
             const saversPos = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-thorchain-query",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "license": "MIT",
   "description": "Thorchain query module that is resposible for estimating swap calculations and add/remove liquidity for thorchain ",
   "keywords": [