@xchainjs/xchain-thorchain-query 0.4.8 → 0.4.9

package/lib/index.esm.js

@@ -1888,6 +1888,7 @@ class ThorchainQuery {
             errors = yield this.getAddSaversEstimateErrors(addAmount);
             // request param amount should always be in 1e8 which is why we pass in adjusted decimals if chain decimals != 8
             const newAddAmount = addAmount.baseAmount.decimal != 8 ? getBaseAmountWithDiffDecimals(addAmount, 8) : addAmount.baseAmount.amount();
+            console.log(assetToString(addAmount.asset));
             // Fetch quote
             const depositQuote = yield this.thorchainCache.thornode.getSaversDepositQuote(assetToString(addAmount.asset), newAddAmount.toNumber());
             // error handling
@@ -2137,7 +2138,8 @@ class ThorchainQuery {
             if (pool.status.toLowerCase() !== 'available')
                 errors.push(`Pool is not available for this asset ${assetToString(addAmount.asset)}`);
             const inboundFee = calcNetworkFee(addAmount.asset, inboundDetails[addAmount.asset.chain]);
-            if (addAmount.lte(inboundFee))
+            const inboundFeeInAddAmountAsset = yield this.convert(inboundFee, addAmount.asset); // to make sure maths is being done on same assets
+            if (addAmount.lte(inboundFeeInAddAmountAsset))
                 errors.push(`Add amount does not cover fees`);
             return errors;
         });
@@ -2180,8 +2182,8 @@ class ThorchainQuery {
                     memo: undefined,
                     expectedAmountOut: '',
                     expectedCollateralizationRatio: '',
-                    expectedCollateralUp: '',
-                    expectedDebtUp: '',
+                    expectedCollateralDeposited: '',
+                    expectedDebtIssued: '',
                     errors: errors,
                 };
             }
@@ -2207,8 +2209,8 @@ class ThorchainQuery {
                 memo: loanOpenResp.memo,
                 expectedAmountOut: loanOpenResp.expected_amount_out,
                 expectedCollateralizationRatio: loanOpenResp.expected_collateralization_ratio,
-                expectedCollateralUp: loanOpenResp.expected_collateral_up,
-                expectedDebtUp: loanOpenResp.expected_collateral_up,
+                expectedCollateralDeposited: loanOpenResp.expected_collateral_deposited,
+                expectedDebtIssued: loanOpenResp.expected_debt_issued,
                 errors: errors,
             };
             return loanOpenQuote;
@@ -2248,8 +2250,8 @@ class ThorchainQuery {
                     recommendedMinAmountIn: loanCloseResp.recommended_min_amount_in,
                     memo: undefined,
                     expectedAmountOut: '',
-                    expectedCollateralDown: '',
-                    expectedDebtDown: '',
+                    expectedCollateralWithdrawn: '',
+                    expectedDebtRepaid: '',
                     errors: errors,
                 };
             }
@@ -2274,8 +2276,8 @@ class ThorchainQuery {
                 recommendedMinAmountIn: loanCloseResp.recommended_min_amount_in,
                 memo: loanCloseResp.memo,
                 expectedAmountOut: loanCloseResp.expected_amount_out,
-                expectedCollateralDown: loanCloseResp.expected_collateral_down,
-                expectedDebtDown: loanCloseResp.expected_debt_down,
+                expectedCollateralWithdrawn: loanCloseResp.expected_collateral_withdrawn,
+                expectedDebtRepaid: loanCloseResp.expected_debt_repaid,
                 errors: errors,
             };
             return loanCloseQuote;