@alcorexchange/alcor-swap-sdk 1.0.31 → 1.0.33

package/build/entities/pool.d.ts

@@ -7,6 +7,7 @@ import { Tick, TickConstructorArgs } from "./tick";
 import { TickDataProvider } from "./tickDataProvider";
 export interface PoolConstructorArgs {
     id: number;
+    active: boolean;
     tokenA: Token;
     tokenB: Token;
     fee: FeeAmount;
@@ -22,6 +23,7 @@ export interface PoolConstructorArgs {
  */
 export declare class Pool {
     readonly id: number;
+    readonly active: boolean;
     readonly tokenA: Token;
     readonly tokenB: Token;
     readonly fee: FeeAmount;
@@ -48,7 +50,7 @@ export declare class Pool {
      * @param tickCurrent The current tick of the pool
      * @param ticks The current state of the pool ticks or a data provider that can return tick data
      */
-    constructor({ id, tokenA, tokenB, fee, sqrtPriceX64, liquidity, tickCurrent, ticks, feeGrowthGlobalAX64, feeGrowthGlobalBX64, }: PoolConstructorArgs);
+    constructor({ id, active, tokenA, tokenB, fee, sqrtPriceX64, liquidity, tickCurrent, ticks, feeGrowthGlobalAX64, feeGrowthGlobalBX64, }: PoolConstructorArgs);
     /**
      * Returns true if the token is either tokenA or tokenB
      * @param token The token to check

package/build/entities/pool.js

@@ -35,7 +35,7 @@ class Pool {
      * @param tickCurrent The current tick of the pool
      * @param ticks The current state of the pool ticks or a data provider that can return tick data
      */
-    constructor({ id, tokenA, tokenB, fee, sqrtPriceX64, liquidity, tickCurrent, ticks = NO_TICK_DATA_PROVIDER_DEFAULT, feeGrowthGlobalAX64 = 0, feeGrowthGlobalBX64 = 0, }) {
+    constructor({ id, active, tokenA, tokenB, fee, sqrtPriceX64, liquidity, tickCurrent, ticks = NO_TICK_DATA_PROVIDER_DEFAULT, feeGrowthGlobalAX64 = 0, feeGrowthGlobalBX64 = 0, }) {
         (0, tiny_invariant_1.default)(Number.isInteger(fee) && fee < 1000000, "FEE");
         const tickCurrentSqrtRatioX64 = tickMath_1.TickMath.getSqrtRatioAtTick(tickCurrent);
         const nextTickSqrtRatioX64 = tickMath_1.TickMath.getSqrtRatioAtTick(tickCurrent + 1);
@@ -44,6 +44,7 @@ class Pool {
         // always create a copy of the list since we want the pool's tick list to be immutable
         this.id = id;
         this.fee = fee;
+        this.active = active;
         this.sqrtPriceX64 = jsbi_1.default.BigInt(sqrtPriceX64);
         this.liquidity = jsbi_1.default.BigInt(liquidity);
         this.tickCurrent = tickCurrent;
@@ -211,6 +212,7 @@ class Pool {
             id: pool.id,
             tokenA: token_1.Token.toJSON(pool.tokenA),
             tokenB: token_1.Token.toJSON(pool.tokenB),
+            active: pool.active,
             fee: pool.fee,
             sqrtPriceX64: pool.sqrtPriceX64.toString(),
             liquidity: pool.liquidity.toString(),
@@ -224,6 +226,7 @@ class Pool {
     static fromJSON(json) {
         return new Pool({
             id: json.id,
+            active: json.active,
             tokenA: token_1.Token.fromJSON(json.tokenA),
             tokenB: token_1.Token.fromJSON(json.tokenB),
             fee: json.fee,

package/build/entities/position.js

@@ -126,6 +126,7 @@ class Position {
         // construct counterfactual pools
         const poolLower = new pool_1.Pool({
             id: this.pool.id,
+            active: this.pool.active,
             tokenA: this.pool.tokenA,
             tokenB: this.pool.tokenB,
             fee: this.pool.fee,
@@ -138,6 +139,7 @@ class Position {
         });
         const poolUpper = new pool_1.Pool({
             id: this.pool.id,
+            active: this.pool.active,
             tokenA: this.pool.tokenA,
             tokenB: this.pool.tokenB,
             fee: this.pool.fee,
@@ -203,6 +205,7 @@ class Position {
         // construct counterfactual pools
         const poolLower = new pool_1.Pool({
             id: this.pool.id,
+            active: this.pool.active,
             tokenA: this.pool.tokenA,
             tokenB: this.pool.tokenB,
             fee: this.pool.fee,
@@ -215,6 +218,7 @@ class Position {
         });
         const poolUpper = new pool_1.Pool({
             id: this.pool.id,
+            active: this.pool.active,
             tokenA: this.pool.tokenA,
             tokenB: this.pool.tokenB,
             fee: this.pool.fee,

package/build/entities/trade.d.ts

@@ -1,7 +1,6 @@
 import { Currency } from './currency';
 import { Percent, Price, CurrencyAmount } from './fractions';
 import { TradeType } from '../internalConstants';
-import { Pool } from './pool';
 import { Route } from './route';
 /**
  * Trades comparator, an extension of the input output comparator that also considers other dimensions of the trade in ranking them
@@ -186,6 +185,6 @@ export declare class Trade<TInput extends Currency, TOutput extends Currency, TT
      * @returns The execution price
      */
     worstExecutionPrice(slippageTolerance: Percent): Price<TInput, TOutput>;
-    static bestTradeExactIn<TInput extends Currency, TOutput extends Currency>(routes: Route<TInput, TOutput>[], pools: Pool[] | Map<number, Pool>, currencyAmountIn: CurrencyAmount<TInput>, maxNumResults?: number): Trade<TInput, TOutput, TradeType.EXACT_INPUT>[];
-    static bestTradeExactOut<TInput extends Currency, TOutput extends Currency>(routes: Route<TInput, TOutput>[], pools: Pool[] | Map<number, Pool>, currencyAmountOut: CurrencyAmount<TOutput>, maxNumResults?: number): Trade<TInput, TOutput, TradeType.EXACT_OUTPUT>[];
+    static bestTradeExactIn<TInput extends Currency, TOutput extends Currency>(routes: Route<TInput, TOutput>[], currencyAmountIn: CurrencyAmount<TInput>, maxNumResults?: number): Trade<TInput, TOutput, TradeType.EXACT_INPUT>[];
+    static bestTradeExactOut<TInput extends Currency, TOutput extends Currency>(routes: Route<TInput, TOutput>[], currencyAmountOut: CurrencyAmount<TOutput>, maxNumResults?: number): Trade<TInput, TOutput, TradeType.EXACT_OUTPUT>[];
 }

package/build/entities/trade.js

@@ -8,8 +8,6 @@ const tiny_invariant_1 = __importDefault(require("tiny-invariant"));
 const fractions_1 = require("./fractions");
 const utils_1 = require("../utils");
 const internalConstants_1 = require("../internalConstants");
-const pool_1 = require("./pool");
-const route_1 = require("./route");
 /**
  * Trades comparator, an extension of the input output comparator that also considers other dimensions of the trade in ranking them
  * @template TInput The input token, either Ether or an ERC-20
@@ -327,21 +325,11 @@ class Trade {
     worstExecutionPrice(slippageTolerance) {
         return new fractions_1.Price(this.inputAmount.currency, this.outputAmount.currency, this.maximumAmountIn(slippageTolerance).quotient, this.minimumAmountOut(slippageTolerance).quotient);
     }
-    static bestTradeExactIn(routes, pools, currencyAmountIn, maxNumResults = 1) {
-        const poolsMap = Array.isArray(pools) ? new Map(pools.map(p => [p.id, p])) : pools;
-        (0, tiny_invariant_1.default)(poolsMap.size > 0, 'POOLS');
+    static bestTradeExactIn(routes, currencyAmountIn, maxNumResults = 1) {
+        (0, tiny_invariant_1.default)(routes.length > 0, 'ROUTES');
         const bestTrades = [];
         for (const route of routes) {
-            const freshPools = route.pools.map(p => {
-                const pool = poolsMap.get(p.id);
-                if (!pool) {
-                    console.log('POOL FOR ROUTE NOT FOUND', p, route.pools);
-                }
-                (0, tiny_invariant_1.default)(pool, 'POOL_FOR_ROUTE');
-                // Creating new instance
-                return pool_1.Pool.fromBuffer(pool_1.Pool.toBuffer(pool));
-            });
-            const trade = Trade.fromRoute(new route_1.Route(freshPools, route.input, route.output), currencyAmountIn, internalConstants_1.TradeType.EXACT_INPUT);
+            const trade = Trade.fromRoute(route, currencyAmountIn, internalConstants_1.TradeType.EXACT_INPUT);
             // FIXME! Sorting bug multiple pools
             if (!trade.inputAmount.greaterThan(0) || !trade.priceImpact.greaterThan(0)) {
                 continue;
@@ -350,18 +338,11 @@ class Trade {
         }
         return bestTrades;
     }
-    static bestTradeExactOut(routes, pools, currencyAmountOut, maxNumResults = 1) {
-        const poolsMap = Array.isArray(pools) ? new Map(pools.map(p => [p.id, p])) : pools;
-        (0, tiny_invariant_1.default)(poolsMap.size > 0, 'POOLS');
+    static bestTradeExactOut(routes, currencyAmountOut, maxNumResults = 1) {
+        (0, tiny_invariant_1.default)(routes.length > 0, 'ROUTES');
         const bestTrades = [];
         for (const route of routes) {
-            const freshPools = route.pools.map(p => {
-                const pool = poolsMap.get(p.id);
-                (0, tiny_invariant_1.default)(pool, 'POOL_FOR_ROUTE');
-                // Creating new instance
-                return pool_1.Pool.fromBuffer(pool_1.Pool.toBuffer(pool));
-            });
-            const trade = Trade.fromRoute(new route_1.Route(freshPools, route.input, route.output), currencyAmountOut, internalConstants_1.TradeType.EXACT_OUTPUT);
+            const trade = Trade.fromRoute(route, currencyAmountOut, internalConstants_1.TradeType.EXACT_OUTPUT);
             if (!trade.inputAmount.greaterThan(0) || !trade.priceImpact.greaterThan(0)) {
                 continue;
             }

package/examples/getPositionAmounts.ts

@@ -54,12 +54,12 @@ async function main() {
   })
 
   const pool = new Pool({
-    ...poolRow,
+    ...poolRow as any,
     tokenA: parseToken(tokenA),
     tokenB: parseToken(tokenB),
     sqrtPriceX64,
     tickCurrent: tick,
-    ticks: ticks.sort((a, b) => a.id - b.id)
+    ticks: ticks.sort((a: any, b: any) => a.id - b.id)
   })
 
   const { rows: positions } = await rpc.get_table_rows({

package/examples/getTrateRoute.ts

@@ -28,6 +28,7 @@ async function main() {
   const pools: Pool[] = []
 
   // We have to get all pools with fetched ticks for them
+  let i = 0
   for (const p of rows) {
     const { id, tokenA, tokenB, currSlot: { sqrtPriceX64, tick } } = p
 
@@ -40,13 +41,15 @@ async function main() {
     if (ticks.length == 0) continue
 
     pools.push(new Pool({
-      ...p,
+      ...p as any,
       tokenA: parseToken(tokenA),
       tokenB: parseToken(tokenB),
       sqrtPriceX64,
       tickCurrent: tick,
-      ticks: ticks.sort((a, b) => a.id - b.id)
+      ticks: ticks.sort((a: any, b: any) => a.id - b.id)
     }))
+    i += 1
+    process.stdout.write(`fetching ticks: ${i}/${rows.length} \r`)
   }
 
   // 1.0000 EOS
@@ -56,9 +59,8 @@ async function main() {
   const receiver = 'myaccount'
 
   // First trade sorted by biggest output
-  //const [trade] = Trade.bestTradeExactIn(pools, amountIn, tokenOut, { maxHops: 3 })
-  const routes = computeAllRoutes(amountIn.currency, tokenOut, pools, 3)
-  const [trade] = Trade.bestTradeExactIn(routes, pools, amountIn, 3)
+  const routes = computeAllRoutes(amountIn.currency, tokenOut, pools, 2)
+  const [trade] = Trade.bestTradeExactIn(routes, amountIn, 1)
 
   const route = trade.route.pools.map(p => p.id)
 

package/package.json

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

package/src/entities/pool.ts

@@ -16,6 +16,7 @@ import { TickListDataProvider } from "./tickListDataProvider";
 
 export interface PoolConstructorArgs {
   id: number,
+  active: boolean,
   tokenA: Token,
   tokenB: Token,
   fee: FeeAmount,
@@ -50,6 +51,7 @@ const NO_TICK_DATA_PROVIDER_DEFAULT = new NoTickDataProvider();
 export class Pool {
   // public readonly id: number;
   public readonly id: number;
+  public readonly active: boolean;
   public readonly tokenA: Token;
   public readonly tokenB: Token;
   public readonly fee: FeeAmount;
@@ -83,6 +85,7 @@ export class Pool {
    */
   public constructor({
     id,
+    active,
     tokenA,
     tokenB,
     fee,
@@ -108,6 +111,7 @@ export class Pool {
     // always create a copy of the list since we want the pool's tick list to be immutable
     this.id = id;
     this.fee = fee;
+    this.active = active;
     this.sqrtPriceX64 = JSBI.BigInt(sqrtPriceX64);
     this.liquidity = JSBI.BigInt(liquidity);
     this.tickCurrent = tickCurrent;
@@ -380,6 +384,7 @@ export class Pool {
       id: pool.id,
       tokenA: Token.toJSON(pool.tokenA),
       tokenB: Token.toJSON(pool.tokenB),
+      active: pool.active,
       fee: pool.fee,
       sqrtPriceX64: pool.sqrtPriceX64.toString(),
       liquidity: pool.liquidity.toString(),
@@ -395,6 +400,7 @@ export class Pool {
   static fromJSON(json: any): Pool {
     return new Pool({
       id: json.id,
+      active: json.active,
       tokenA: Token.fromJSON(json.tokenA),
       tokenB: Token.fromJSON(json.tokenB),
       fee: json.fee,

package/src/entities/position.ts

@@ -234,6 +234,7 @@ export class Position {
     // construct counterfactual pools
     const poolLower = new Pool({
       id: this.pool.id,
+      active: this.pool.active,
       tokenA: this.pool.tokenA,
       tokenB: this.pool.tokenB,
       fee: this.pool.fee,
@@ -246,6 +247,7 @@ export class Position {
     });
     const poolUpper = new Pool({
       id: this.pool.id,
+      active: this.pool.active,
       tokenA: this.pool.tokenA,
       tokenB: this.pool.tokenB,
       fee: this.pool.fee,
@@ -319,6 +321,7 @@ export class Position {
     // construct counterfactual pools
     const poolLower = new Pool({
       id: this.pool.id,
+      active: this.pool.active,
       tokenA: this.pool.tokenA,
       tokenB: this.pool.tokenB,
       fee: this.pool.fee,
@@ -331,6 +334,7 @@ export class Position {
     });
     const poolUpper = new Pool({
       id: this.pool.id,
+      active: this.pool.active,
       tokenA: this.pool.tokenA,
       tokenB: this.pool.tokenB,
       fee: this.pool.fee,

package/src/entities/trade.ts

@@ -483,32 +483,14 @@ export class Trade<TInput extends Currency, TOutput extends Currency, TTradeType
 
   public static bestTradeExactIn<TInput extends Currency, TOutput extends Currency>(
     routes: Route<TInput, TOutput>[],
-    pools: Pool[] | Map<number, Pool>,
     currencyAmountIn: CurrencyAmount<TInput>,
     maxNumResults = 1,
   ): Trade<TInput, TOutput, TradeType.EXACT_INPUT>[] {
-    const poolsMap = Array.isArray(pools) ? new Map(pools.map(p => [p.id, p])) : pools
-
-    invariant(poolsMap.size > 0, 'POOLS')
+    invariant(routes.length > 0, 'ROUTES')
 
     const bestTrades: Trade<TInput, TOutput, TradeType.EXACT_INPUT>[] = []
     for (const route of routes) {
-      const freshPools = route.pools.map(p => {
-        const pool = poolsMap.get(p.id)
-        if (!pool) {
-          console.log('POOL FOR ROUTE NOT FOUND', p, route.pools)
-        }
-        invariant(pool, 'POOL_FOR_ROUTE')
-
-        // Creating new instance
-        return Pool.fromBuffer(Pool.toBuffer(pool))
-      })
-
-      const trade = Trade.fromRoute(
-        new Route(freshPools, route.input, route.output),
-        currencyAmountIn,
-        TradeType.EXACT_INPUT
-      )
+      const trade = Trade.fromRoute(route, currencyAmountIn, TradeType.EXACT_INPUT)
 
       // FIXME! Sorting bug multiple pools
       if (!trade.inputAmount.greaterThan(0) || !trade.priceImpact.greaterThan(0)) {
@@ -528,28 +510,14 @@ export class Trade<TInput extends Currency, TOutput extends Currency, TTradeType
 
   public static bestTradeExactOut<TInput extends Currency, TOutput extends Currency>(
     routes: Route<TInput, TOutput>[],
-    pools: Pool[] | Map<number, Pool>,
     currencyAmountOut: CurrencyAmount<TOutput>,
     maxNumResults = 1,
   ): Trade<TInput, TOutput, TradeType.EXACT_OUTPUT>[] {
-    const poolsMap = Array.isArray(pools) ? new Map(pools.map(p => [p.id, p])) : pools
-    invariant(poolsMap.size > 0, 'POOLS')
+    invariant(routes.length > 0, 'ROUTES')
 
     const bestTrades: Trade<TInput, TOutput, TradeType.EXACT_OUTPUT>[] = []
     for (const route of routes) {
-      const freshPools = route.pools.map(p => {
-        const pool = poolsMap.get(p.id)
-        invariant(pool, 'POOL_FOR_ROUTE')
-
-        // Creating new instance
-        return Pool.fromBuffer(Pool.toBuffer(pool))
-      })
-
-      const trade = Trade.fromRoute(
-        new Route(freshPools, route.input, route.output),
-        currencyAmountOut,
-        TradeType.EXACT_OUTPUT
-      )
+      const trade = Trade.fromRoute(route, currencyAmountOut, TradeType.EXACT_OUTPUT)
 
       if (!trade.inputAmount.greaterThan(0) || !trade.priceImpact.greaterThan(0)) {
         continue