@alcorexchange/alcor-swap-sdk 1.1.1 → 1.1.2

package/build/entities/pool.js

@@ -195,7 +195,7 @@ let Pool = exports.Pool = /*#__PURE__*/function () {
       } = this.swap(zeroForOne, outputAmount.quotient * _internalConstants.NEGATIVE_ONE, sqrtPriceLimitX64);
       const inputToken = zeroForOne ? this.tokenA : this.tokenB;
       const inputAmount = zeroForOne ? amountA : amountB;
-      const amountOutReceived = zeroForOne ? amountB : amountA * _internalConstants.NEGATIVE_ONE;
+      const amountOutReceived = zeroForOne ? amountB * _internalConstants.NEGATIVE_ONE : amountA * _internalConstants.NEGATIVE_ONE;
       if (!(amountOutReceived === outputAmount.quotient)) {
         throw new _errors.InsufficientReservesError();
       }

package/build/entities/trade.js

@@ -492,8 +492,38 @@ let Trade = exports.Trade = /*#__PURE__*/function () {
     key: "bestTradeExactOut",
     value: function bestTradeExactOut(routes, currencyAmountOut, maxNumResults = 1) {
       (0, _tinyInvariant.default)(routes.length > 0, 'ROUTES');
+
+      // Pre-filter: remove routes with zero-liquidity pools
+      const validRoutes = routes.filter(route => route.pools.every(pool => pool.active && pool.liquidity > _internalConstants.ZERO));
+
+      // Helper: compute min liquidity (no overflow)
+      const getMinLiquidity = route => {
+        let min = route.pools[0].liquidity;
+        for (let i = 1; i < route.pools.length; i++) {
+          if (route.pools[i].liquidity < min) {
+            min = route.pools[i].liquidity;
+          }
+        }
+        return min;
+      };
+
+      // Precompute min liquidity for sorting
+      const routeMinLiq = new Map();
+      for (const route of validRoutes) {
+        routeMinLiq.set(route, getMinLiquidity(route));
+      }
+
+      // Sort routes: fewer hops first, then by min liquidity desc
+      validRoutes.sort((a, b) => {
+        if (a.pools.length !== b.pools.length) return a.pools.length - b.pools.length;
+        const minLiqA = routeMinLiq.get(a);
+        const minLiqB = routeMinLiq.get(b);
+        if (minLiqA > minLiqB) return -1;
+        if (minLiqA < minLiqB) return 1;
+        return 0;
+      });
       const bestTrades = [];
-      for (const route of routes) {
+      for (const route of validRoutes) {
         let trade;
         try {
           trade = Trade.fromRoute(route, currencyAmountOut, _internalConstants.TradeType.EXACT_OUTPUT);
@@ -504,7 +534,7 @@ let Trade = exports.Trade = /*#__PURE__*/function () {
           }
           throw error;
         }
-        if (!trade.inputAmount.greaterThan(0) || !trade.priceImpact.greaterThan(0)) continue;
+        if (!trade.inputAmount.greaterThan(0)) continue;
         (0, _sortedInsert.sortedInsert)(bestTrades, trade, maxNumResults, tradeComparator);
       }
       return bestTrades;

package/build/esm/entities/pool.js

@@ -189,7 +189,7 @@ export let Pool = /*#__PURE__*/function () {
       } = this.swap(zeroForOne, outputAmount.quotient * NEGATIVE_ONE, sqrtPriceLimitX64);
       const inputToken = zeroForOne ? this.tokenA : this.tokenB;
       const inputAmount = zeroForOne ? amountA : amountB;
-      const amountOutReceived = zeroForOne ? amountB : amountA * NEGATIVE_ONE;
+      const amountOutReceived = zeroForOne ? amountB * NEGATIVE_ONE : amountA * NEGATIVE_ONE;
       if (!(amountOutReceived === outputAmount.quotient)) {
         throw new InsufficientReservesError();
       }

package/build/esm/entities/trade.js

@@ -483,8 +483,38 @@ export let Trade = /*#__PURE__*/function () {
     key: "bestTradeExactOut",
     value: function bestTradeExactOut(routes, currencyAmountOut, maxNumResults = 1) {
       invariant(routes.length > 0, 'ROUTES');
+
+      // Pre-filter: remove routes with zero-liquidity pools
+      const validRoutes = routes.filter(route => route.pools.every(pool => pool.active && pool.liquidity > ZERO));
+
+      // Helper: compute min liquidity (no overflow)
+      const getMinLiquidity = route => {
+        let min = route.pools[0].liquidity;
+        for (let i = 1; i < route.pools.length; i++) {
+          if (route.pools[i].liquidity < min) {
+            min = route.pools[i].liquidity;
+          }
+        }
+        return min;
+      };
+
+      // Precompute min liquidity for sorting
+      const routeMinLiq = new Map();
+      for (const route of validRoutes) {
+        routeMinLiq.set(route, getMinLiquidity(route));
+      }
+
+      // Sort routes: fewer hops first, then by min liquidity desc
+      validRoutes.sort((a, b) => {
+        if (a.pools.length !== b.pools.length) return a.pools.length - b.pools.length;
+        const minLiqA = routeMinLiq.get(a);
+        const minLiqB = routeMinLiq.get(b);
+        if (minLiqA > minLiqB) return -1;
+        if (minLiqA < minLiqB) return 1;
+        return 0;
+      });
       const bestTrades = [];
-      for (const route of routes) {
+      for (const route of validRoutes) {
         let trade;
         try {
           trade = Trade.fromRoute(route, currencyAmountOut, TradeType.EXACT_OUTPUT);
@@ -495,7 +525,7 @@ export let Trade = /*#__PURE__*/function () {
           }
           throw error;
         }
-        if (!trade.inputAmount.greaterThan(0) || !trade.priceImpact.greaterThan(0)) continue;
+        if (!trade.inputAmount.greaterThan(0)) continue;
         sortedInsert(bestTrades, trade, maxNumResults, tradeComparator);
       }
       return bestTrades;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alcorexchange/alcor-swap-sdk",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "",
   "main": "build/index.js",
   "module": "build/esm/index.js",