@alcorexchange/alcor-swap-sdk 1.1.0 → 1.1.2

package/build/entities/fractions/currencyAmount.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CurrencyAmount = void 0;
-var _msgpackLite = _interopRequireDefault(require("msgpack-lite"));
+var _msgpack = require("@msgpack/msgpack");
 var _tinyInvariant = _interopRequireDefault(require("tiny-invariant"));
 var _token = require("../token");
 var _fraction = require("./fraction");
@@ -153,12 +153,12 @@ let CurrencyAmount = exports.CurrencyAmount = /*#__PURE__*/function (_Fraction)
         numerator: amount.numerator.toString(),
         denominator: amount.denominator.toString()
       };
-      return _msgpackLite.default.encode(json);
+      return (0, _msgpack.encode)(json);
     }
   }, {
     key: "fromBuffer",
     value: function fromBuffer(buffer) {
-      const json = _msgpackLite.default.decode(buffer);
+      const json = (0, _msgpack.decode)(buffer);
       return this.fromJSON(json);
     }
   }]);

package/build/entities/pool.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Pool = void 0;
-var _msgpackLite = _interopRequireDefault(require("msgpack-lite"));
+var _msgpack = require("@msgpack/msgpack");
 var _fractions = require("./fractions");
 var _token = require("./token");
 var _internalConstants = require("../internalConstants");
@@ -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();
       }
@@ -355,7 +355,7 @@ let Pool = exports.Pool = /*#__PURE__*/function () {
     value: function toBuffer(pool) {
       if (pool.buffer) return pool.buffer;
       const json = Pool.toJSON(pool);
-      pool.buffer = _msgpackLite.default.encode(json);
+      pool.buffer = (0, _msgpack.encode)(json);
       const hash = Pool.createHash(pool.buffer, pool);
       if (hash) pool.bufferHash = hash;
       return pool.buffer;
@@ -374,7 +374,7 @@ let Pool = exports.Pool = /*#__PURE__*/function () {
       if (bufferHash && this.hashToPoolMap.has(bufferHash)) {
         return this.hashToPoolMap.get(bufferHash);
       }
-      const json = _msgpackLite.default.decode(bytes);
+      const json = (0, _msgpack.decode)(bytes);
       const pool = Pool.fromJSON(json);
       if (bufferHash) this.hashToPoolMap.set(bufferHash, pool);
       this.idToPoolMap.set(pool.id, pool);

package/build/entities/route.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Route = void 0;
-var _msgpackLite = _interopRequireDefault(require("msgpack-lite"));
+var _msgpack = require("@msgpack/msgpack");
 var _tinyInvariant = _interopRequireDefault(require("tiny-invariant"));
 var _fractions = require("./fractions");
 var _token = require("./token");
@@ -127,12 +127,12 @@ let Route = exports.Route = /*#__PURE__*/function () {
     key: "toBuffer",
     value: function toBuffer(route, lightWeightVersion = false) {
       const json = this.toJSON(route, lightWeightVersion);
-      return _msgpackLite.default.encode(json);
+      return (0, _msgpack.encode)(json);
     }
   }, {
     key: "fromBuffer",
     value: function fromBuffer(buffer) {
-      const json = _msgpackLite.default.decode(buffer);
+      const json = (0, _msgpack.decode)(buffer);
       return this.fromJSON(json);
     }
   }, {
@@ -151,7 +151,7 @@ let Route = exports.Route = /*#__PURE__*/function () {
         output: _token.Token.toJSON(route.output),
         _midPrice: route._midPrice
       };
-      return _msgpackLite.default.encode(json);
+      return (0, _msgpack.encode)(json);
     }
   }]);
 }();

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/fractions/currencyAmount.js

@@ -14,7 +14,7 @@ function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import msgpack from "msgpack-lite";
+import { decode, encode } from "@msgpack/msgpack";
 import invariant from "tiny-invariant";
 import { Token } from "../token";
 import { Fraction } from "./fraction";
@@ -146,12 +146,12 @@ export let CurrencyAmount = /*#__PURE__*/function (_Fraction) {
         numerator: amount.numerator.toString(),
         denominator: amount.denominator.toString()
       };
-      return msgpack.encode(json);
+      return encode(json);
     }
   }, {
     key: "fromBuffer",
     value: function fromBuffer(buffer) {
-      const json = msgpack.decode(buffer);
+      const json = decode(buffer);
       return this.fromJSON(json);
     }
   }]);

package/build/esm/entities/pool.js

@@ -5,7 +5,7 @@ function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r),
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import msgpack from "msgpack-lite";
+import { decode, encode } from "@msgpack/msgpack";
 // Avoid importing node crypto at module load so browser bundles can tree-shake/ignore it.
 const getNodeCrypto = () => {
   try {
@@ -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();
       }
@@ -349,7 +349,7 @@ export let Pool = /*#__PURE__*/function () {
     value: function toBuffer(pool) {
       if (pool.buffer) return pool.buffer;
       const json = Pool.toJSON(pool);
-      pool.buffer = msgpack.encode(json);
+      pool.buffer = encode(json);
       const hash = Pool.createHash(pool.buffer, pool);
       if (hash) pool.bufferHash = hash;
       return pool.buffer;
@@ -368,7 +368,7 @@ export let Pool = /*#__PURE__*/function () {
       if (bufferHash && this.hashToPoolMap.has(bufferHash)) {
         return this.hashToPoolMap.get(bufferHash);
       }
-      const json = msgpack.decode(bytes);
+      const json = decode(bytes);
       const pool = Pool.fromJSON(json);
       if (bufferHash) this.hashToPoolMap.set(bufferHash, pool);
       this.idToPoolMap.set(pool.id, pool);

package/build/esm/entities/route.js

@@ -4,7 +4,7 @@ function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r),
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import msgpack from "msgpack-lite";
+import { decode, encode } from "@msgpack/msgpack";
 import invariant from 'tiny-invariant';
 import { Price } from './fractions';
 import { Token } from './token';
@@ -121,12 +121,12 @@ export let Route = /*#__PURE__*/function () {
     key: "toBuffer",
     value: function toBuffer(route, lightWeightVersion = false) {
       const json = this.toJSON(route, lightWeightVersion);
-      return msgpack.encode(json);
+      return encode(json);
     }
   }, {
     key: "fromBuffer",
     value: function fromBuffer(buffer) {
-      const json = msgpack.decode(buffer);
+      const json = decode(buffer);
       return this.fromJSON(json);
     }
   }, {
@@ -145,7 +145,7 @@ export let Route = /*#__PURE__*/function () {
         output: Token.toJSON(route.output),
         _midPrice: route._midPrice
       };
-      return msgpack.encode(json);
+      return encode(json);
     }
   }]);
 }();

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.0",
+  "version": "1.1.2",
   "description": "",
   "main": "build/index.js",
   "module": "build/esm/index.js",
@@ -72,6 +72,7 @@
     "workerpool": "^9.2.0"
   },
   "dependencies": {
+    "@msgpack/msgpack": "^3.1.2",
     "big.js": "^5.2.2",
     "decimal.js-light": "^2.5.0",
     "eos-common": "^0.12.0",
@@ -79,7 +80,6 @@
     "eosjs-account-name": "2.3.0",
     "lodash": "^4.17.21",
     "mnemonist": "^0.39.8",
-    "msgpack-lite": "^0.1.26",
     "node-fetch": "2",
     "tiny-invariant": "^1.1.0",
     "tiny-warning": "^1.0.3",