@alcorexchange/alcor-swap-sdk 1.0.16 → 1.0.17

package/build/entities/trade.js

@@ -33,7 +33,7 @@ function tradeComparator(a, b) {
     (0, tiny_invariant_1.default)(a.outputAmount.currency.equals(b.outputAmount.currency), 'OUTPUT_CURRENCY');
     if (a.outputAmount.equalTo(b.outputAmount)) {
         if (a.inputAmount.equalTo(b.inputAmount)) {
-            // consider the number of hops since each hop costs gas
+            // consider the number of hops since each hop costs cpu
             const aHops = a.swaps.reduce((total, cur) => total + cur.route.tokenPath.length, 0);
             const bHops = b.swaps.reduce((total, cur) => total + cur.route.tokenPath.length, 0);
             return aHops - bHops;
@@ -467,9 +467,11 @@ class Trade {
     static bestTradeExactIn2(routes, pools, currencyAmountIn, maxNumResults = 3) {
         return __awaiter(this, void 0, void 0, function* () {
             (0, tiny_invariant_1.default)(pools.length > 0, 'POOLS');
+            const poolsMap = new Map(pools.map(p => [p.id, p]));
             const bestTrades = [];
             for (const route of routes) {
-                const trade = yield Trade.fromRoute(route, currencyAmountIn, internalConstants_1.TradeType.EXACT_INPUT);
+                const freshPools = route.pools.map(p => poolsMap.get(p.id));
+                const trade = yield Trade.fromRoute(new route_1.Route([...freshPools], route.input, route.output), currencyAmountIn, internalConstants_1.TradeType.EXACT_INPUT);
                 if (!trade.inputAmount.greaterThan(0) || !trade.priceImpact.greaterThan(0))
                     continue;
                 (0, utils_1.sortedInsert)(bestTrades, trade, maxNumResults, tradeComparator);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alcorexchange/alcor-swap-sdk",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "",
   "main": "build/index.js",
   "scripts": {

package/src/entities/trade.ts

@@ -26,7 +26,7 @@ export function tradeComparator<TInput extends Currency, TOutput extends Currenc
   invariant(a.outputAmount.currency.equals(b.outputAmount.currency), 'OUTPUT_CURRENCY')
   if (a.outputAmount.equalTo(b.outputAmount)) {
     if (a.inputAmount.equalTo(b.inputAmount)) {
-      // consider the number of hops since each hop costs gas
+      // consider the number of hops since each hop costs cpu
       const aHops = a.swaps.reduce((total, cur) => total + cur.route.tokenPath.length, 0)
       const bHops = b.swaps.reduce((total, cur) => total + cur.route.tokenPath.length, 0)
       return aHops - bHops
@@ -660,12 +660,14 @@ export class Trade<TInput extends Currency, TOutput extends Currency, TTradeType
     maxNumResults = 3,
   ): Promise<Trade<TInput, TOutput, TradeType.EXACT_INPUT>[]> {
     invariant(pools.length > 0, 'POOLS')
+    const poolsMap = new Map(pools.map(p => [p.id, p]))
 
     const bestTrades: Trade<TInput, TOutput, TradeType.EXACT_INPUT>[] = []
-
     for (const route of routes) {
+      const freshPools = route.pools.map(p => poolsMap.get(p.id)!)
+
       const trade = await Trade.fromRoute(
-        route,
+        new Route([...freshPools], route.input, route.output),
         currencyAmountIn,
         TradeType.EXACT_INPUT
       )