@alcorexchange/alcor-swap-sdk 1.0.20 → 1.0.22

package/build/entities/trade.js

@@ -495,8 +495,11 @@ class Trade {
             for (const route of routes) {
                 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))
+                // FIXME! Sorting bug multiple pools
+                if (!trade.inputAmount.greaterThan(0) || !trade.priceImpact.greaterThan(0)) {
+                    console.log('continue trade', (0, utils_1.parseTrade)(trade));
                     continue;
+                }
                 (0, utils_1.sortedInsert)(bestTrades, trade, maxNumResults, tradeComparator);
             }
             return bestTrades;
@@ -510,8 +513,10 @@ class Trade {
             for (const route of routes) {
                 const freshPools = route.pools.map(p => poolsMap.get(p.id));
                 const trade = yield Trade.fromRoute(new route_1.Route([...freshPools], route.input, route.output), currencyAmountOut, internalConstants_1.TradeType.EXACT_OUTPUT);
-                if (!trade.inputAmount.greaterThan(0) || !trade.priceImpact.greaterThan(0))
+                if (!trade.inputAmount.greaterThan(0) || !trade.priceImpact.greaterThan(0)) {
+                    console.log('continue trade', (0, utils_1.parseTrade)(trade));
                     continue;
+                }
                 (0, utils_1.sortedInsert)(bestTrades, trade, maxNumResults, tradeComparator);
             }
             return bestTrades;

package/build/utils/common.d.ts

@@ -0,0 +1,13 @@
+export declare function parseTrade(trade: any): {
+    input: any;
+    output: any;
+    minReceived: any;
+    maxSent: any;
+    priceImpact: any;
+    memo: string;
+    route: any;
+    executionPrice: {
+        numerator: any;
+        denominator: any;
+    };
+};

package/build/utils/common.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseTrade = void 0;
+const entities_1 = require("../entities");
+const internalConstants_1 = require("../internalConstants");
+function parseTrade(trade) {
+    // Parse Trade into api format object
+    const slippage = new entities_1.Percent(3, 100); // 0.3%
+    const receiver = '<receiver>';
+    const tradeType = trade.tradeType == internalConstants_1.TradeType.EXACT_INPUT ? 'swapexactin' : 'swapexactout';
+    const route = trade.route.pools.map(p => p.id);
+    const maxSent = trade.inputAmount;
+    const minReceived = trade.minimumAmountOut(slippage);
+    const memo = `${tradeType}#${route.join(',')}#${receiver}#${minReceived.toExtendedAsset()}#0`;
+    const result = {
+        input: trade.inputAmount.toFixed(),
+        output: trade.outputAmount.toFixed(),
+        minReceived: minReceived.toFixed(),
+        maxSent: maxSent.toFixed(),
+        priceImpact: trade.priceImpact.toSignificant(2),
+        memo,
+        route,
+        executionPrice: {
+            numerator: trade.executionPrice.numerator.toString(),
+            denominator: trade.executionPrice.denominator.toString()
+        }
+    };
+    return result;
+}
+exports.parseTrade = parseTrade;

package/build/utils/index.d.ts

@@ -13,3 +13,4 @@ export * from "./priceTickConversions";
 export * from "./sqrtPriceMath";
 export * from "./sortedInsert";
 export * from "./computeAllRoutes";
+export * from "./common";

package/build/utils/index.js

@@ -29,3 +29,4 @@ __exportStar(require("./priceTickConversions"), exports);
 __exportStar(require("./sqrtPriceMath"), exports);
 __exportStar(require("./sortedInsert"), exports);
 __exportStar(require("./computeAllRoutes"), exports);
+__exportStar(require("./common"), exports);

package/package.json

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

package/src/entities/trade.ts

@@ -2,7 +2,7 @@ import invariant from 'tiny-invariant'
 
 import { Currency } from './currency'
 import { Fraction, Percent, Price, CurrencyAmount } from './fractions'
-import { sortedInsert } from '../utils'
+import { sortedInsert, parseTrade } from '../utils'
 import { Token } from './token'
 import { ONE, ZERO, TradeType } from '../internalConstants'
 import { Pool } from './pool'
@@ -718,7 +718,11 @@ export class Trade<TInput extends Currency, TOutput extends Currency, TTradeType
         TradeType.EXACT_INPUT
       )
 
-      if (!trade.inputAmount.greaterThan(0) || !trade.priceImpact.greaterThan(0)) continue
+      // FIXME! Sorting bug multiple pools
+      if (!trade.inputAmount.greaterThan(0) || !trade.priceImpact.greaterThan(0)) {
+        console.log('continue trade', parseTrade(trade))
+        continue
+      }
 
       sortedInsert(
         bestTrades,
@@ -750,7 +754,10 @@ export class Trade<TInput extends Currency, TOutput extends Currency, TTradeType
         TradeType.EXACT_OUTPUT
       )
 
-      if (!trade.inputAmount.greaterThan(0) || !trade.priceImpact.greaterThan(0)) continue
+      if (!trade.inputAmount.greaterThan(0) || !trade.priceImpact.greaterThan(0)) {
+        console.log('continue trade', parseTrade(trade))
+        continue
+      }
 
       sortedInsert(
         bestTrades,

package/src/utils/common.ts

@@ -0,0 +1,32 @@
+import { Percent } from "../entities"
+import { TradeType } from "../internalConstants"
+
+export function parseTrade(trade) {
+  // Parse Trade into api format object
+  const slippage = new Percent(3, 100) // 0.3%
+  const receiver = '<receiver>'
+
+  const tradeType = trade.tradeType == TradeType.EXACT_INPUT ? 'swapexactin' : 'swapexactout'
+
+  const route = trade.route.pools.map(p => p.id)
+  const maxSent = trade.inputAmount
+  const minReceived = trade.minimumAmountOut(slippage)
+  const memo = `${tradeType}#${route.join(',')}#${receiver}#${minReceived.toExtendedAsset()}#0`
+
+  const result = {
+    input: trade.inputAmount.toFixed(),
+    output: trade.outputAmount.toFixed(),
+    minReceived: minReceived.toFixed(),
+    maxSent: maxSent.toFixed(),
+    priceImpact: trade.priceImpact.toSignificant(2),
+    memo,
+    route,
+    executionPrice: {
+      numerator: trade.executionPrice.numerator.toString(),
+      denominator: trade.executionPrice.denominator.toString()
+    }
+  }
+
+  return result
+}
+

package/src/utils/index.ts

@@ -13,3 +13,4 @@ export * from "./priceTickConversions";
 export * from "./sqrtPriceMath";
 export * from "./sortedInsert";
 export * from "./computeAllRoutes";
+export * from "./common";