@xchainjs/xchain-mayachain-query 2.1.11 → 2.2.0

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) { }
             }
@@ -547,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) {

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) { }
             }
@@ -555,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) {

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/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.11",
+  "version": "2.2.0",
   "license": "MIT",
   "description": "Mayachain query module that is responsible for estimating swap calculations and add/remove liquidity for thorchain",
   "keywords": [