@xchainjs/xchain-mayachain-query 2.1.2 → 2.1.4

package/lib/index.esm.js

@@ -81,13 +81,12 @@ class Mayanode {
      * @param height - block height
      * @returns quotes swap object response
      */
-    getSwapQuote(fromAsset, toAsset, amount, destinationAddress, streamingInterval, streamingQuantity, toleranceBps, affiliateBps, affiliate, height) {
+    getSwapQuote(fromAsset, toAsset, amount, destinationAddress, streamingInterval, streamingQuantity, liquidityToleranceBps, toleranceBps, affiliateBps, affiliate, height) {
         return __awaiter(this, void 0, void 0, function* () {
             for (const api of this.quoteApis) {
                 try {
-                    return (yield api.quoteswap(height, fromAsset, toAsset, amount, destinationAddress, undefined, // refundAddress
-                    streamingInterval, streamingQuantity, toleranceBps, undefined, // liquidityToleranceBps
-                    affiliateBps === null || affiliateBps === void 0 ? void 0 : affiliateBps.toString(), affiliate)).data;
+                    return (yield api.quoteswap(height, fromAsset, toAsset, amount, destinationAddress, undefined, //refund address
+                    streamingInterval, streamingQuantity, toleranceBps, liquidityToleranceBps, affiliateBps === null || affiliateBps === void 0 ? void 0 : affiliateBps.toString(), affiliate)).data;
                 }
                 catch (_e) { }
             }
@@ -543,14 +542,15 @@ class MayachainQuery {
      * @returns {QuoteSwap} A quote for the swap operation.
      */
     quoteSwap(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ fromAsset, destinationAsset, amount, destinationAddress, toleranceBps, affiliateBps, affiliateAddress, height, streamingInterval, streamingQuantity, }) {
+        return __awaiter(this, arguments, void 0, function* ({ fromAsset, destinationAsset, amount, destinationAddress, liquidityToleranceBps, toleranceBps, affiliateBps, affiliateAddress, height, streamingInterval, streamingQuantity, }) {
             const fromAssetString = assetToString(fromAsset);
             const toAssetString = assetToString(destinationAsset);
             // Endpoint allows 10 decimals for Cacao, 8 for the rest of assets
-            const inputAmount = fromAssetString === assetToString(CacaoAsset)
+            const inputAmount = eqAsset(fromAsset, CacaoAsset)
                 ? amount.baseAmount.amount()
-                : getBaseAmountWithDiffDecimals(amount, 8);
-            const swapQuote = yield this.mayachainCache.mayanode.getSwapQuote(fromAssetString, toAssetString, inputAmount.toNumber(), destinationAddress, streamingInterval, streamingQuantity, toleranceBps, affiliateBps, affiliateAddress, height);
+                : getBaseAmountWithDiffDecimals(amount, this.getQuoteAssetDecimals(fromAsset));
+            const swapQuote = yield this.mayachainCache.mayanode.getSwapQuote(fromAssetString, toAssetString, inputAmount.toNumber(), destinationAddress, streamingInterval, streamingQuantity, liquidityToleranceBps, toleranceBps, affiliateBps, affiliateAddress, height);
+            // Check if the response indicates an error by examining memo and other required field
             const response = JSON.parse(JSON.stringify(swapQuote));
             if (response.error) {
                 return {
@@ -582,23 +582,22 @@ class MayachainQuery {
             }
             const feeAsset = assetFromStringEx(swapQuote.fees.asset);
             const errors = [];
-            if (swapQuote.memo === undefined)
+            if (swapQuote.memo === undefined || swapQuote.memo === '')
                 errors.push(`Error parsing swap quote: Memo is ${swapQuote.memo}`);
-            const isFeeAssetCacao = swapQuote.fees.asset === assetToString(CacaoAsset);
             return {
                 toAddress: swapQuote.inbound_address || '',
                 memo: swapQuote.memo || '',
-                expectedAmount: new CryptoAmount(baseAmount(swapQuote.expected_amount_out, toAssetString === assetToString(CacaoAsset) ? 10 : 8), destinationAsset),
+                expectedAmount: new CryptoAmount(baseAmount(swapQuote.expected_amount_out, this.getQuoteAssetDecimals(destinationAsset)), destinationAsset),
                 dustThreshold: this.getChainDustValue(fromAsset.chain),
                 fees: {
                     asset: feeAsset,
-                    affiliateFee: new CryptoAmount(baseAmount(swapQuote.fees.affiliate, isFeeAssetCacao ? 10 : 8), feeAsset),
-                    outboundFee: new CryptoAmount(baseAmount(swapQuote.fees.outbound, isFeeAssetCacao ? 10 : 8), feeAsset),
-                    liquidityFee: new CryptoAmount(baseAmount(swapQuote.fees.liquidity, isFeeAssetCacao ? 10 : 8), feeAsset),
-                    totalFee: new CryptoAmount(baseAmount(swapQuote.fees.total, isFeeAssetCacao ? 10 : 8), feeAsset),
+                    affiliateFee: new CryptoAmount(baseAmount(swapQuote.fees.affiliate, this.getQuoteAssetDecimals(feeAsset)), feeAsset),
+                    outboundFee: new CryptoAmount(baseAmount(swapQuote.fees.outbound, this.getQuoteAssetDecimals(feeAsset)), feeAsset),
+                    liquidityFee: new CryptoAmount(baseAmount(swapQuote.fees.liquidity, this.getQuoteAssetDecimals(feeAsset)), feeAsset),
+                    totalFee: new CryptoAmount(baseAmount(swapQuote.fees.total, this.getQuoteAssetDecimals(feeAsset)), feeAsset),
                 },
                 expiry: swapQuote.expiry,
-                recommendedMinAmountIn: new CryptoAmount(baseAmount(swapQuote.recommended_min_amount_in || '0', eqAsset(fromAsset, CacaoAsset) ? 10 : 8), fromAsset),
+                recommendedMinAmountIn: new CryptoAmount(baseAmount(swapQuote.recommended_min_amount_in || '0', this.getQuoteAssetDecimals(fromAsset)), fromAsset),
                 router: swapQuote.router,
                 recommendedGasRate: swapQuote.recommended_gas_rate,
                 gasRateUnits: swapQuote.gas_rate_units,
@@ -965,6 +964,14 @@ class MayachainQuery {
             });
         });
     }
+    /**
+     * Get the hardcoded decimal precision for quote calculations
+     * @param asset The asset to get decimals for
+     * @returns 10 for Cacao, 8 for other assets (used in quote calculations)
+     */
+    getQuoteAssetDecimals(asset) {
+        return eqAsset(asset, CacaoAsset) ? 10 : 8;
+    }
 }
 
 export { ArbAsset, ArbChain, BtcAsset, BtcChain, CacaoAsset, DEFAULT_MAYACHAIN_DECIMALS, DashAsset, DashChain, EthAsset, EthChain, KujiraAsset, KujiraChain, MayaChain, MayachainCache, MayachainQuery, Mayanode, RuneAsset, ThorChain, XdrAsset, XdrChain, ZecAsset, ZecChain, getBaseAmountWithDiffDecimals, getCryptoAmountWithNotation, isCacaoAsset };

package/lib/index.js

@@ -89,13 +89,12 @@ class Mayanode {
      * @param height - block height
      * @returns quotes swap object response
      */
-    getSwapQuote(fromAsset, toAsset, amount, destinationAddress, streamingInterval, streamingQuantity, toleranceBps, affiliateBps, affiliate, height) {
+    getSwapQuote(fromAsset, toAsset, amount, destinationAddress, streamingInterval, streamingQuantity, liquidityToleranceBps, toleranceBps, affiliateBps, affiliate, height) {
         return __awaiter(this, void 0, void 0, function* () {
             for (const api of this.quoteApis) {
                 try {
-                    return (yield api.quoteswap(height, fromAsset, toAsset, amount, destinationAddress, undefined, // refundAddress
-                    streamingInterval, streamingQuantity, toleranceBps, undefined, // liquidityToleranceBps
-                    affiliateBps === null || affiliateBps === void 0 ? void 0 : affiliateBps.toString(), affiliate)).data;
+                    return (yield api.quoteswap(height, fromAsset, toAsset, amount, destinationAddress, undefined, //refund address
+                    streamingInterval, streamingQuantity, toleranceBps, liquidityToleranceBps, affiliateBps === null || affiliateBps === void 0 ? void 0 : affiliateBps.toString(), affiliate)).data;
                 }
                 catch (_e) { }
             }
@@ -551,14 +550,15 @@ class MayachainQuery {
      * @returns {QuoteSwap} A quote for the swap operation.
      */
     quoteSwap(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ fromAsset, destinationAsset, amount, destinationAddress, toleranceBps, affiliateBps, affiliateAddress, height, streamingInterval, streamingQuantity, }) {
+        return __awaiter(this, arguments, void 0, function* ({ fromAsset, destinationAsset, amount, destinationAddress, liquidityToleranceBps, toleranceBps, affiliateBps, affiliateAddress, height, streamingInterval, streamingQuantity, }) {
             const fromAssetString = xchainUtil.assetToString(fromAsset);
             const toAssetString = xchainUtil.assetToString(destinationAsset);
             // Endpoint allows 10 decimals for Cacao, 8 for the rest of assets
-            const inputAmount = fromAssetString === xchainUtil.assetToString(CacaoAsset)
+            const inputAmount = xchainUtil.eqAsset(fromAsset, CacaoAsset)
                 ? amount.baseAmount.amount()
-                : getBaseAmountWithDiffDecimals(amount, 8);
-            const swapQuote = yield this.mayachainCache.mayanode.getSwapQuote(fromAssetString, toAssetString, inputAmount.toNumber(), destinationAddress, streamingInterval, streamingQuantity, toleranceBps, affiliateBps, affiliateAddress, height);
+                : getBaseAmountWithDiffDecimals(amount, this.getQuoteAssetDecimals(fromAsset));
+            const swapQuote = yield this.mayachainCache.mayanode.getSwapQuote(fromAssetString, toAssetString, inputAmount.toNumber(), destinationAddress, streamingInterval, streamingQuantity, liquidityToleranceBps, toleranceBps, affiliateBps, affiliateAddress, height);
+            // Check if the response indicates an error by examining memo and other required field
             const response = JSON.parse(JSON.stringify(swapQuote));
             if (response.error) {
                 return {
@@ -590,23 +590,22 @@ class MayachainQuery {
             }
             const feeAsset = xchainUtil.assetFromStringEx(swapQuote.fees.asset);
             const errors = [];
-            if (swapQuote.memo === undefined)
+            if (swapQuote.memo === undefined || swapQuote.memo === '')
                 errors.push(`Error parsing swap quote: Memo is ${swapQuote.memo}`);
-            const isFeeAssetCacao = swapQuote.fees.asset === xchainUtil.assetToString(CacaoAsset);
             return {
                 toAddress: swapQuote.inbound_address || '',
                 memo: swapQuote.memo || '',
-                expectedAmount: new xchainUtil.CryptoAmount(xchainUtil.baseAmount(swapQuote.expected_amount_out, toAssetString === xchainUtil.assetToString(CacaoAsset) ? 10 : 8), destinationAsset),
+                expectedAmount: new xchainUtil.CryptoAmount(xchainUtil.baseAmount(swapQuote.expected_amount_out, this.getQuoteAssetDecimals(destinationAsset)), destinationAsset),
                 dustThreshold: this.getChainDustValue(fromAsset.chain),
                 fees: {
                     asset: feeAsset,
-                    affiliateFee: new xchainUtil.CryptoAmount(xchainUtil.baseAmount(swapQuote.fees.affiliate, isFeeAssetCacao ? 10 : 8), feeAsset),
-                    outboundFee: new xchainUtil.CryptoAmount(xchainUtil.baseAmount(swapQuote.fees.outbound, isFeeAssetCacao ? 10 : 8), feeAsset),
-                    liquidityFee: new xchainUtil.CryptoAmount(xchainUtil.baseAmount(swapQuote.fees.liquidity, isFeeAssetCacao ? 10 : 8), feeAsset),
-                    totalFee: new xchainUtil.CryptoAmount(xchainUtil.baseAmount(swapQuote.fees.total, isFeeAssetCacao ? 10 : 8), feeAsset),
+                    affiliateFee: new xchainUtil.CryptoAmount(xchainUtil.baseAmount(swapQuote.fees.affiliate, this.getQuoteAssetDecimals(feeAsset)), feeAsset),
+                    outboundFee: new xchainUtil.CryptoAmount(xchainUtil.baseAmount(swapQuote.fees.outbound, this.getQuoteAssetDecimals(feeAsset)), feeAsset),
+                    liquidityFee: new xchainUtil.CryptoAmount(xchainUtil.baseAmount(swapQuote.fees.liquidity, this.getQuoteAssetDecimals(feeAsset)), feeAsset),
+                    totalFee: new xchainUtil.CryptoAmount(xchainUtil.baseAmount(swapQuote.fees.total, this.getQuoteAssetDecimals(feeAsset)), feeAsset),
                 },
                 expiry: swapQuote.expiry,
-                recommendedMinAmountIn: new xchainUtil.CryptoAmount(xchainUtil.baseAmount(swapQuote.recommended_min_amount_in || '0', xchainUtil.eqAsset(fromAsset, CacaoAsset) ? 10 : 8), fromAsset),
+                recommendedMinAmountIn: new xchainUtil.CryptoAmount(xchainUtil.baseAmount(swapQuote.recommended_min_amount_in || '0', this.getQuoteAssetDecimals(fromAsset)), fromAsset),
                 router: swapQuote.router,
                 recommendedGasRate: swapQuote.recommended_gas_rate,
                 gasRateUnits: swapQuote.gas_rate_units,
@@ -973,6 +972,14 @@ class MayachainQuery {
             });
         });
     }
+    /**
+     * Get the hardcoded decimal precision for quote calculations
+     * @param asset The asset to get decimals for
+     * @returns 10 for Cacao, 8 for other assets (used in quote calculations)
+     */
+    getQuoteAssetDecimals(asset) {
+        return xchainUtil.eqAsset(asset, CacaoAsset) ? 10 : 8;
+    }
 }
 
 exports.ArbAsset = ArbAsset;

package/lib/mayachain-query.d.ts

@@ -32,7 +32,7 @@ export declare class MayachainQuery {
      * @param {QuoteSwapParams} quoteSwapParams - Parameters for the quote swap operation.
      * @returns {QuoteSwap} A quote for the swap operation.
      */
-    quoteSwap({ fromAsset, destinationAsset, amount, destinationAddress, toleranceBps, affiliateBps, affiliateAddress, height, streamingInterval, streamingQuantity, }: QuoteSwapParams): Promise<QuoteSwap>;
+    quoteSwap({ fromAsset, destinationAsset, amount, destinationAddress, liquidityToleranceBps, toleranceBps, affiliateBps, affiliateAddress, height, streamingInterval, streamingQuantity, }: QuoteSwapParams): Promise<QuoteSwap>;
     /**
      * Return mayachain supported chains dust amounts
      * @returns a map where chain is the key and dust amount cryptoAmount as value
@@ -122,4 +122,10 @@ export declare class MayachainQuery {
      * @returns {TradeAssetAccounts} All trade accounts for the asset
      */
     getTradeAssetAccounts({ asset, height }: TradeAssetAccountsParams): Promise<TradeAssetAccounts>;
+    /**
+     * Get the hardcoded decimal precision for quote calculations
+     * @param asset The asset to get decimals for
+     * @returns 10 for Cacao, 8 for other assets (used in quote calculations)
+     */
+    private getQuoteAssetDecimals;
 }

package/lib/types.d.ts

@@ -1,7 +1,7 @@
 import { TxHash } from '@xchainjs/xchain-client';
 import { Address, Asset, AssetCryptoAmount, Chain, CryptoAmount, SynthAsset, TokenAsset, TradeAsset, TradeCryptoAmount } from '@xchainjs/xchain-util';
 import type BigNumber from 'bignumber.js';
-export type CompatibleAsset = Asset | TokenAsset | SynthAsset;
+export type CompatibleAsset = Asset | TokenAsset | SynthAsset | TradeAsset;
 /**
  * Represents fees associated with a swap.
  */
@@ -79,6 +79,7 @@ export type QuoteSwapParams = {
     fromAddress?: string;
     destinationAddress?: string;
     height?: number;
+    liquidityToleranceBps?: number;
     toleranceBps?: number;
     affiliateBps?: number;
     affiliateAddress?: string;

package/lib/utils/mayanode.d.ts

@@ -31,7 +31,7 @@ export declare class Mayanode {
      * @param height - block height
      * @returns quotes swap object response
      */
-    getSwapQuote(fromAsset: string, toAsset: string, amount: number, destinationAddress?: string, streamingInterval?: number, streamingQuantity?: number, toleranceBps?: number, affiliateBps?: number, affiliate?: string, height?: number): Promise<QuoteSwapResponse>;
+    getSwapQuote(fromAsset: string, toAsset: string, amount: number, destinationAddress?: string, streamingInterval?: number, streamingQuantity?: number, liquidityToleranceBps?: number, toleranceBps?: number, affiliateBps?: number, affiliate?: string, height?: number): Promise<QuoteSwapResponse>;
     /**
      * Get current active mimir configuration.
      * @returns mimir configuration

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-mayachain-query",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "license": "MIT",
   "description": "Mayachain query module that is responsible for estimating swap calculations and add/remove liquidity for thorchain",
   "keywords": [