@xchainjs/xchain-aggregator 1.0.24 → 1.0.25

package/lib/aggregator.d.ts

@@ -20,7 +20,7 @@ export declare class Aggregator {
      * @param {QuoteSwapParams} params Swap parameters
      * @returns the swap with the greatest expected amount estimated in the supported protocols
      */
-    estimateSwap(params: QuoteSwapParams): Promise<QuoteSwap>;
+    estimateSwap(params: QuoteSwapParams): Promise<QuoteSwap[]>;
     /**
      * Do swap
      * @param {QuoteSwapParams & { protocol?: Protocol }} params Swap parameters. If protocol is not set,

package/lib/index.esm.js

@@ -45630,6 +45630,7 @@ class ChainflipProtocol {
             const destAssetData = yield this.getAssetData(params.destinationAsset);
             try {
                 let toAddress = '';
+                let depositChannelId = '';
                 const { quotes } = yield this.sdk.getQuoteV2({
                     srcChain: srcAssetData.chain,
                     srcAsset: srcAssetData.asset,
@@ -45651,6 +45652,7 @@ class ChainflipProtocol {
                         },
                     });
                     toAddress = resp.depositAddress;
+                    depositChannelId = resp.depositChannelId;
                 }
                 else if (params.destinationAddress && (selectedQuote === null || selectedQuote === void 0 ? void 0 : selectedQuote.type) === 'REGULAR' && params.fromAddress) {
                     const resp = yield this.sdk.requestDepositAddressV2({
@@ -45664,6 +45666,7 @@ class ChainflipProtocol {
                         },
                     });
                     toAddress = resp.depositAddress;
+                    depositChannelId = resp.depositChannelId;
                 }
                 else {
                     console.error('No suitable quote found or destination/refund address missing');
@@ -45689,6 +45692,7 @@ class ChainflipProtocol {
                         outboundFee: new CryptoAmount(baseAmount(outboundFee ? outboundFee.amount : 0, destAssetData.decimals), params.destinationAsset),
                         affiliateFee: new CryptoAmount(baseAmount(brokerFee ? brokerFee.amount : 0, destAssetData.decimals), params.destinationAsset),
                     },
+                    depositChannelId,
                 };
             }
             catch (e) {
@@ -45709,6 +45713,7 @@ class ChainflipProtocol {
                         outboundFee: new CryptoAmount(baseAmount(0, destAssetData.decimals), params.destinationAsset),
                         affiliateFee: new CryptoAmount(baseAmount(0, destAssetData.decimals), params.destinationAsset),
                     },
+                    depositChannelId: undefined,
                 };
             }
         });
@@ -46072,16 +46077,15 @@ class Aggregator {
                 return protocol.estimateSwap(params);
             });
             const results = yield Promise.allSettled(this.protocols.map((protocol) => estimateTask(protocol, params)));
-            let optimalSwap;
+            const successfulQuotes = [];
             results.forEach((result) => {
                 if (result.status === 'fulfilled') {
-                    if (!optimalSwap || result.value.expectedAmount.assetAmount.gte(optimalSwap.expectedAmount.assetAmount))
-                        optimalSwap = result.value;
+                    successfulQuotes.push(result.value);
                 }
             });
-            if (!optimalSwap)
+            if (!successfulQuotes)
                 throw Error(`Can not estimate swap from ${assetToString(params.fromAsset)} to ${assetToString(params.destinationAsset)}`);
-            return optimalSwap;
+            return successfulQuotes;
         });
     }
     /**
@@ -46093,17 +46097,38 @@ class Aggregator {
      */
     doSwap(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const protocolName = params.protocol ? params.protocol : (yield this.estimateSwap(params)).protocol;
-            const protocol = this.protocols.find((protocol) => protocol.name === protocolName);
+            let successfulQuotes = [];
+            if (params.protocol) {
+                // Use the specified protocol
+                const protocol = this.protocols.find((protocol) => protocol.name === params.protocol);
+                if (!protocol) {
+                    throw Error(`${params.protocol} protocol is not supported`);
+                }
+                successfulQuotes = [yield protocol.estimateSwap(params)];
+            }
+            else {
+                // Fetch quotes from all protocols
+                const results = yield Promise.allSettled(this.protocols.map((protocol) => protocol.estimateSwap(params)));
+                successfulQuotes = results
+                    .filter((result) => result.status === 'fulfilled')
+                    .map((result) => result.value);
+            }
+            if (successfulQuotes.length === 0) {
+                throw Error(`Cannot estimate swap from ${assetToString(params.fromAsset)} to ${assetToString(params.destinationAsset)}`);
+            }
+            // Select the quote with the highest expected amount
+            const bestQuote = successfulQuotes.reduce((best, current) => current.expectedAmount.gt(best.expectedAmount) ? current : best);
+            const protocol = this.protocols.find((protocol) => protocol.name === bestQuote.protocol);
             if (!protocol) {
-                throw Error(`${protocolName} protocol is not supported`);
+                throw Error(`${bestQuote.protocol} protocol is not supported`);
             }
             if (isTokenAsset(params.fromAsset)) {
-                if (yield protocol.shouldBeApproved({
+                const approvalNeeded = yield protocol.shouldBeApproved({
                     asset: params.fromAsset,
                     amount: params.amount,
                     address: params.fromAddress || '',
-                })) {
+                });
+                if (approvalNeeded) {
                     yield protocol.approveRouterToSpend({ asset: params.fromAsset, amount: params.amount });
                 }
             }