@xchainjs/xchain-mayachain-query 2.1.10 → 2.2.0

package/README.md

@@ -167,15 +167,4 @@ If you plan on using the publicly accessible endpoints provided by MAYAChain (li
 - https://midgard.mayachain.info
 - https://mayanode.mayachain.info
 
-## Example
-
-```typescript
-import cosmosclient from '@cosmos-client/core'
-import axios from 'axios'
-import { register9Rheader } from '@xchainjs/xchain-util'
-
-register9Rheader(axios)
-register9Rheader(cosmosclient.config.globalAxios)
-```
-
 For a complete example please see this [test](https://github.com/xchainjs/xchainjs-lib/blob/master/packages/xchain-mayachain-amm/__e2e__/wallet.e2e.ts)

package/lib/index.esm.js

@@ -81,12 +81,15 @@ class Mayanode {
      * @param height - block height
      * @returns quotes swap object response
      */
-    getSwapQuote(fromAsset, toAsset, amount, destinationAddress, streamingInterval, streamingQuantity, liquidityToleranceBps, toleranceBps, affiliateBps, affiliate, height) {
+    getSwapQuote(fromAsset, toAsset, amount, destinationAddress, streamingInterval, streamingQuantity, liquidityToleranceBps, toleranceBps, 
+    // `string` is accepted to carry the slash-delimited per-affiliate form (e.g. "10/20/30")
+    // used when multiple affiliates are passed. Single-affiliate callers pass a number as before.
+    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, //refund address
-                    streamingInterval, streamingQuantity, toleranceBps, liquidityToleranceBps, affiliateBps === null || affiliateBps === void 0 ? void 0 : affiliateBps.toString(), affiliate)).data;
+                    streamingInterval, streamingQuantity, toleranceBps, liquidityToleranceBps, typeof affiliateBps === 'number' ? affiliateBps.toString() : affiliateBps, affiliate)).data;
                 }
                 catch (_e) { }
             }
@@ -239,6 +242,7 @@ const KujiraAsset = assetFromStringEx('KUJI.KUJI');
 const ArbAsset = assetFromStringEx('ARB.ETH');
 const XdrAsset = assetFromStringEx('XRD.XRD');
 const ZecAsset = assetFromStringEx('ZEC.ZEC');
+const AdaAsset = assetFromStringEx('ADA.ADA');
 const BtcChain = 'BTC';
 const EthChain = 'ETH';
 const MayaChain = 'MAYA';
@@ -248,6 +252,7 @@ const KujiraChain = 'KUJI';
 const ArbChain = 'ARB';
 const XdrChain = 'XRD';
 const ZecChain = 'ZEC';
+const AdaChain = 'ADA';
 const DEFAULT_MAYACHAIN_DECIMALS = 8;
 const MAYA_DECIMAL = 4;
 const CACAO_DECIMAL = 10;
@@ -545,14 +550,19 @@ class MayachainQuery {
      * @returns {QuoteSwap} A quote for the swap operation.
      */
     quoteSwap(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ fromAsset, destinationAsset, amount, destinationAddress, liquidityToleranceBps, toleranceBps, affiliateBps, affiliateAddress, height, streamingInterval, streamingQuantity, }) {
+        return __awaiter(this, arguments, void 0, function* ({ fromAsset, destinationAsset, amount, destinationAddress, liquidityToleranceBps, toleranceBps, affiliateBps, affiliateAddress, affiliates, 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 = eqAsset(fromAsset, CacaoAsset)
                 ? amount.baseAmount.amount()
                 : getBaseAmountWithDiffDecimals(amount, this.getQuoteAssetDecimals(fromAsset));
-            const swapQuote = yield this.mayachainCache.mayanode.getSwapQuote(fromAssetString, toAssetString, inputAmount.toNumber(), destinationAddress, streamingInterval, streamingQuantity, liquidityToleranceBps, toleranceBps, affiliateBps, affiliateAddress, height);
+            // If the caller passed a multi-affiliate array, collapse it into the slash-delimited
+            // form the protocol's /quote/swap endpoint accepts. The endpoint requires per-affiliate bps
+            // (it does not auto-expand a single shared bps), so both fields are joined in parallel.
+            const quoteAffiliateAddress = affiliates ? affiliates.map((a) => a.address).join('/') : affiliateAddress;
+            const quoteAffiliateBps = affiliates ? affiliates.map((a) => a.bps).join('/') : affiliateBps;
+            const swapQuote = yield this.mayachainCache.mayanode.getSwapQuote(fromAssetString, toAssetString, inputAmount.toNumber(), destinationAddress, streamingInterval, streamingQuantity, liquidityToleranceBps, toleranceBps, quoteAffiliateBps, quoteAffiliateAddress, 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) {
@@ -635,6 +645,8 @@ class MayachainQuery {
             [ArbChain]: new AssetCryptoAmount(baseAmount(0, 18), ArbAsset),
             [XdrChain]: new AssetCryptoAmount(baseAmount(0, 18), XdrAsset),
             [ZecChain]: new AssetCryptoAmount(baseAmount(1000, 8), ZecAsset),
+            // 1 ADA in lovelace (6 decimals); matches MAYAChain's 1 ADA inbound minimum.
+            [AdaChain]: new AssetCryptoAmount(baseAmount(1000000, 6), AdaAsset),
         };
     }
     /**
@@ -983,4 +995,4 @@ class MayachainQuery {
     }
 }
 
-export { ArbAsset, ArbChain, BtcAsset, BtcChain, CACAO_DECIMAL, CacaoAsset, DEFAULT_MAYACHAIN_DECIMALS, DashAsset, DashChain, EthAsset, EthChain, KujiraAsset, KujiraChain, MAYA_DECIMAL, MayaAsset, MayaChain, MayachainCache, MayachainQuery, Mayanode, RuneAsset, ThorChain, XdrAsset, XdrChain, ZecAsset, ZecChain, getBaseAmountWithDiffDecimals, getCryptoAmountWithNotation, isCacaoAsset };
+export { AdaAsset, AdaChain, ArbAsset, ArbChain, BtcAsset, BtcChain, CACAO_DECIMAL, CacaoAsset, DEFAULT_MAYACHAIN_DECIMALS, DashAsset, DashChain, EthAsset, EthChain, KujiraAsset, KujiraChain, MAYA_DECIMAL, MayaAsset, MayaChain, MayachainCache, MayachainQuery, Mayanode, RuneAsset, ThorChain, XdrAsset, XdrChain, ZecAsset, ZecChain, getBaseAmountWithDiffDecimals, getCryptoAmountWithNotation, isCacaoAsset };

package/lib/index.js

@@ -89,12 +89,15 @@ class Mayanode {
      * @param height - block height
      * @returns quotes swap object response
      */
-    getSwapQuote(fromAsset, toAsset, amount, destinationAddress, streamingInterval, streamingQuantity, liquidityToleranceBps, toleranceBps, affiliateBps, affiliate, height) {
+    getSwapQuote(fromAsset, toAsset, amount, destinationAddress, streamingInterval, streamingQuantity, liquidityToleranceBps, toleranceBps, 
+    // `string` is accepted to carry the slash-delimited per-affiliate form (e.g. "10/20/30")
+    // used when multiple affiliates are passed. Single-affiliate callers pass a number as before.
+    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, //refund address
-                    streamingInterval, streamingQuantity, toleranceBps, liquidityToleranceBps, affiliateBps === null || affiliateBps === void 0 ? void 0 : affiliateBps.toString(), affiliate)).data;
+                    streamingInterval, streamingQuantity, toleranceBps, liquidityToleranceBps, typeof affiliateBps === 'number' ? affiliateBps.toString() : affiliateBps, affiliate)).data;
                 }
                 catch (_e) { }
             }
@@ -247,6 +250,7 @@ const KujiraAsset = xchainUtil.assetFromStringEx('KUJI.KUJI');
 const ArbAsset = xchainUtil.assetFromStringEx('ARB.ETH');
 const XdrAsset = xchainUtil.assetFromStringEx('XRD.XRD');
 const ZecAsset = xchainUtil.assetFromStringEx('ZEC.ZEC');
+const AdaAsset = xchainUtil.assetFromStringEx('ADA.ADA');
 const BtcChain = 'BTC';
 const EthChain = 'ETH';
 const MayaChain = 'MAYA';
@@ -256,6 +260,7 @@ const KujiraChain = 'KUJI';
 const ArbChain = 'ARB';
 const XdrChain = 'XRD';
 const ZecChain = 'ZEC';
+const AdaChain = 'ADA';
 const DEFAULT_MAYACHAIN_DECIMALS = 8;
 const MAYA_DECIMAL = 4;
 const CACAO_DECIMAL = 10;
@@ -553,14 +558,19 @@ class MayachainQuery {
      * @returns {QuoteSwap} A quote for the swap operation.
      */
     quoteSwap(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ fromAsset, destinationAsset, amount, destinationAddress, liquidityToleranceBps, toleranceBps, affiliateBps, affiliateAddress, height, streamingInterval, streamingQuantity, }) {
+        return __awaiter(this, arguments, void 0, function* ({ fromAsset, destinationAsset, amount, destinationAddress, liquidityToleranceBps, toleranceBps, affiliateBps, affiliateAddress, affiliates, 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 = xchainUtil.eqAsset(fromAsset, CacaoAsset)
                 ? amount.baseAmount.amount()
                 : getBaseAmountWithDiffDecimals(amount, this.getQuoteAssetDecimals(fromAsset));
-            const swapQuote = yield this.mayachainCache.mayanode.getSwapQuote(fromAssetString, toAssetString, inputAmount.toNumber(), destinationAddress, streamingInterval, streamingQuantity, liquidityToleranceBps, toleranceBps, affiliateBps, affiliateAddress, height);
+            // If the caller passed a multi-affiliate array, collapse it into the slash-delimited
+            // form the protocol's /quote/swap endpoint accepts. The endpoint requires per-affiliate bps
+            // (it does not auto-expand a single shared bps), so both fields are joined in parallel.
+            const quoteAffiliateAddress = affiliates ? affiliates.map((a) => a.address).join('/') : affiliateAddress;
+            const quoteAffiliateBps = affiliates ? affiliates.map((a) => a.bps).join('/') : affiliateBps;
+            const swapQuote = yield this.mayachainCache.mayanode.getSwapQuote(fromAssetString, toAssetString, inputAmount.toNumber(), destinationAddress, streamingInterval, streamingQuantity, liquidityToleranceBps, toleranceBps, quoteAffiliateBps, quoteAffiliateAddress, 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) {
@@ -643,6 +653,8 @@ class MayachainQuery {
             [ArbChain]: new xchainUtil.AssetCryptoAmount(xchainUtil.baseAmount(0, 18), ArbAsset),
             [XdrChain]: new xchainUtil.AssetCryptoAmount(xchainUtil.baseAmount(0, 18), XdrAsset),
             [ZecChain]: new xchainUtil.AssetCryptoAmount(xchainUtil.baseAmount(1000, 8), ZecAsset),
+            // 1 ADA in lovelace (6 decimals); matches MAYAChain's 1 ADA inbound minimum.
+            [AdaChain]: new xchainUtil.AssetCryptoAmount(xchainUtil.baseAmount(1000000, 6), AdaAsset),
         };
     }
     /**
@@ -991,6 +1003,8 @@ class MayachainQuery {
     }
 }
 
+exports.AdaAsset = AdaAsset;
+exports.AdaChain = AdaChain;
 exports.ArbAsset = ArbAsset;
 exports.ArbChain = ArbChain;
 exports.BtcAsset = BtcAsset;

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, liquidityToleranceBps, toleranceBps, affiliateBps, affiliateAddress, height, streamingInterval, streamingQuantity, }: QuoteSwapParams): Promise<QuoteSwap>;
+    quoteSwap({ fromAsset, destinationAsset, amount, destinationAddress, liquidityToleranceBps, toleranceBps, affiliateBps, affiliateAddress, affiliates, 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

package/lib/types.d.ts

@@ -69,6 +69,13 @@ export type QuoteSwap = {
     errors: string[];
     warning: string;
 };
+/**
+ * A single affiliate entry. Used by the multi-affiliate `affiliates` field on QuoteSwapParams.
+ */
+export type Affiliate = {
+    address: string;
+    bps: number;
+};
 /**
  * Represents parameters for quoting a swap operation.
  */
@@ -83,6 +90,7 @@ export type QuoteSwapParams = {
     toleranceBps?: number;
     affiliateBps?: number;
     affiliateAddress?: string;
+    affiliates?: Affiliate[];
     streamingInterval?: number;
     streamingQuantity?: number;
 };

package/lib/utils/const.d.ts

@@ -9,6 +9,7 @@ export declare const KujiraAsset: Asset;
 export declare const ArbAsset: Asset;
 export declare const XdrAsset: Asset;
 export declare const ZecAsset: Asset;
+export declare const AdaAsset: Asset;
 export declare const BtcChain = "BTC";
 export declare const EthChain = "ETH";
 export declare const MayaChain = "MAYA";
@@ -18,6 +19,7 @@ export declare const KujiraChain = "KUJI";
 export declare const ArbChain = "ARB";
 export declare const XdrChain = "XRD";
 export declare const ZecChain = "ZEC";
+export declare const AdaChain = "ADA";
 export declare const DEFAULT_MAYACHAIN_DECIMALS = 8;
 export declare const MAYA_DECIMAL = 4;
 export declare const CACAO_DECIMAL = 10;

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, liquidityToleranceBps?: 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 | string, 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.10",
+  "version": "2.2.0",
   "license": "MIT",
   "description": "Mayachain query module that is responsible for estimating swap calculations and add/remove liquidity for thorchain",
   "keywords": [
@@ -33,12 +33,12 @@
     "postversion": "git push --follow-tags"
   },
   "dependencies": {
-    "@xchainjs/xchain-client": "2.0.13",
-    "@xchainjs/xchain-mayamidgard": "1.1.2",
-    "@xchainjs/xchain-mayamidgard-query": "1.0.15",
-    "@xchainjs/xchain-mayanode": "1.2.2",
+    "@xchainjs/xchain-client": "2.0.14",
+    "@xchainjs/xchain-mayamidgard": "1.1.3",
+    "@xchainjs/xchain-mayamidgard-query": "1.0.16",
+    "@xchainjs/xchain-mayanode": "1.2.3",
     "@xchainjs/xchain-util": "2.0.7",
-    "axios": "1.15.2",
+    "axios": "1.16.1",
     "axios-retry": "3.2.5",
     "bignumber.js": "^11.0.0"
   },