@alcorexchange/alcor-swap-sdk 1.0.11 → 1.0.13

package/.eslintignore

@@ -1,2 +1,3 @@
 node_modules
-dist
+dist
+test.ts

package/README.md

@@ -39,8 +39,7 @@ export function parseToken(token) {
   return new Token(
     token.contract,
     asset(token.quantity).symbol.precision(),
-    asset(token.quantity).symbol.code().to_string(),
-    (asset(token.quantity).symbol.code().to_string() + '-' + token.contract).toLowerCase()
+    asset(token.quantity).symbol.code().to_string()
   )
 }
 

package/build/entities/baseCurrency.d.ts

@@ -15,10 +15,6 @@ export declare abstract class BaseCurrency {
      * The symbol of the currency, i.e. a short textual non-unique identifier
      */
     readonly symbol: string;
-    /**
-     * The id of the currency(<symbol-contract>), i.e. eos-eosio.token
-     */
-    readonly id?: string;
     /**
      * Constructs an instance of the base class `BaseCurrency`.
      * @param chainId the chain ID on which this currency resides
@@ -26,7 +22,7 @@ export declare abstract class BaseCurrency {
      * @param symbol symbol of the currency
      * @param name of the currency
      */
-    protected constructor(contract: string, decimals: number, symbol: string, id?: string);
+    protected constructor(contract: string, decimals: number, symbol: string);
     /**
      * Returns whether this currency is functionally equivalent to the other currency
      * @param other the other currency

package/build/entities/baseCurrency.js

@@ -16,12 +16,11 @@ class BaseCurrency {
      * @param symbol symbol of the currency
      * @param name of the currency
      */
-    constructor(contract, decimals, symbol, id) {
+    constructor(contract, decimals, symbol) {
         (0, tiny_invariant_1.default)(decimals >= 0 && decimals < 19 && Number.isInteger(decimals), "DECIMALS");
         this.contract = contract;
         this.decimals = decimals;
         this.symbol = symbol;
-        this.id = id;
     }
 }
 exports.BaseCurrency = BaseCurrency;

package/build/entities/token.d.ts

@@ -9,8 +9,9 @@ export declare class Token extends BaseCurrency {
      * @param symbol {@link BaseCurrency#symbol}
      * @param id {@link BaseCurrency#id}
      */
-    constructor(contract: string, decimals: number, symbol: string, id?: string);
+    constructor(contract: string, decimals: number, symbol: string);
     get name(): string;
+    get id(): string;
     /**
      * Returns true if the two tokens are equivalent, i.e. have the same contract and symbol.
      * @param other other token to compare

package/build/entities/token.js

@@ -17,13 +17,16 @@ class Token extends baseCurrency_1.BaseCurrency {
      * @param symbol {@link BaseCurrency#symbol}
      * @param id {@link BaseCurrency#id}
      */
-    constructor(contract, decimals, symbol, id) {
-        super(contract, decimals, symbol, id);
+    constructor(contract, decimals, symbol) {
+        super(contract, decimals, symbol);
     }
     get name() {
         console.warn('Token.name is deprecated, use token.id');
         return this.symbol.toLowerCase() + '-' + this.contract;
     }
+    get id() {
+        return this.symbol.toLowerCase() + '-' + this.contract;
+    }
     /**
      * Returns true if the two tokens are equivalent, i.e. have the same contract and symbol.
      * @param other other token to compare

package/build/entities/trade.d.ts

@@ -219,4 +219,5 @@ export declare class Trade<TInput extends Currency, TOutput extends Currency, TT
      * @returns The exact out trade
      */
     static bestTradeExactOut<TInput extends Currency, TOutput extends Currency>(pools: Pool[], currencyIn: TInput, currencyAmountOut: CurrencyAmount<TOutput>, { maxNumResults, maxHops }?: BestTradeOptions, currentPools?: Pool[], nextAmountOut?: CurrencyAmount<Currency>, bestTrades?: Trade<TInput, TOutput, TradeType.EXACT_OUTPUT>[]): Promise<Trade<TInput, TOutput, TradeType.EXACT_OUTPUT>[]>;
+    static bestTradeExactIn2<TInput extends Currency, TOutput extends Currency>(routes: Route<TInput, TOutput>[], pools: Pool[], currencyAmountIn: CurrencyAmount<TInput>, maxNumResults?: number): Promise<Trade<TInput, TOutput, TradeType.EXACT_INPUT>[]>;
 }

package/build/entities/trade.js

@@ -383,7 +383,11 @@ class Trade {
                 }
                 // we have arrived at the output token, so this is the final trade of one of the paths
                 if (amountOut.currency && amountOut.currency.equals(tokenOut)) {
-                    (0, utils_1.sortedInsert)(bestTrades, yield Trade.fromRoute(new route_1.Route([...currentPools, pool], currencyAmountIn.currency, currencyOut), currencyAmountIn, internalConstants_1.TradeType.EXACT_INPUT), maxNumResults, tradeComparator);
+                    const trade = yield Trade.fromRoute(new route_1.Route([...currentPools, pool], currencyAmountIn.currency, currencyOut), currencyAmountIn, internalConstants_1.TradeType.EXACT_INPUT);
+                    //FIX hotfix, i do not really sure about it
+                    if (!trade.inputAmount.greaterThan(0) || !trade.priceImpact.greaterThan(0))
+                        continue;
+                    (0, utils_1.sortedInsert)(bestTrades, trade, maxNumResults, tradeComparator);
                 }
                 else if (maxHops > 1 && pools.length > 1) {
                     const poolsExcludingThisPool = pools.slice(0, i).concat(pools.slice(i + 1, pools.length));
@@ -443,7 +447,7 @@ class Trade {
                 if (amountIn.currency.equals(tokenIn)) {
                     const trade = yield Trade.fromRoute(new route_1.Route([pool, ...currentPools], currencyIn, currencyAmountOut.currency), currencyAmountOut, internalConstants_1.TradeType.EXACT_OUTPUT);
                     // FIX hotfix, i do not really sure about it
-                    if (!trade.inputAmount.greaterThan(0) || trade.priceImpact.lessThan(0))
+                    if (!trade.inputAmount.greaterThan(0) || !trade.priceImpact.greaterThan(0))
                         continue;
                     //
                     (0, utils_1.sortedInsert)(bestTrades, trade, maxNumResults, tradeComparator);
@@ -460,5 +464,18 @@ class Trade {
             return bestTrades;
         });
     }
+    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 bestTrades = [];
+            for (const route of routes) {
+                const trade = yield Trade.fromRoute(route, currencyAmountIn, internalConstants_1.TradeType.EXACT_INPUT);
+                if (!trade.inputAmount.greaterThan(0) || !trade.priceImpact.greaterThan(0))
+                    continue;
+                (0, utils_1.sortedInsert)(bestTrades, trade, maxNumResults, tradeComparator);
+            }
+            return bestTrades;
+        });
+    }
 }
 exports.Trade = Trade;

package/examples/getPoolPrices.ts

@@ -10,8 +10,7 @@ export function parseToken(token) {
   return new Token(
     token.contract,
     asset(token.quantity).symbol.precision(),
-    asset(token.quantity).symbol.code().to_string(),
-    (asset(token.quantity).symbol.code().to_string() + '-' + token.contract).toLowerCase()
+    asset(token.quantity).symbol.code().to_string()
   )
 }
 

package/examples/getPositionAmounts.ts

@@ -13,8 +13,7 @@ export function parseToken(token) {
   return new Token(
     token.contract,
     asset(token.quantity).symbol.precision(),
-    asset(token.quantity).symbol.code().to_string(),
-    (asset(token.quantity).symbol.code().to_string() + '-' + token.contract).toLowerCase()
+    asset(token.quantity).symbol.code().to_string()
   )
 }
 
@@ -54,9 +53,6 @@ async function main() {
     code: 'swap.alcor',
   })
 
-  console.log(JSON.stringify(ticks))
-  return
-
   const pool = new Pool({
     ...poolRow,
     tokenA: parseToken(tokenA),

package/examples/getTrateRoute.ts

@@ -11,8 +11,7 @@ export function parseToken(token) {
   return new Token(
     token.contract,
     asset(token.quantity).symbol.precision(),
-    asset(token.quantity).symbol.code().to_string(),
-    (asset(token.quantity).symbol.code().to_string() + '-' + token.contract).toLowerCase()
+    asset(token.quantity).symbol.code().to_string()
   )
 }
 
@@ -37,6 +36,8 @@ async function main() {
       code: 'swap.alcor',
     })
 
+    if (ticks.length == 0) continue
+
     pools.push(new Pool({
       ...p,
       tokenA: parseToken(tokenA),

package/examples/utils/rpc.ts

@@ -1,39 +1,72 @@
+import fetch from 'node-fetch'
+
 const MAX_PAGINATION_FETCHES = 99
 
-export const fetchAllRows =
-  async (rpc, options, indexName = 'id'): Promise<any> => {
-    const mergedOptions = {
-      json: true,
-      lower_bound: 0,
-      upper_bound: undefined,
-      limit: 9999,
-      ...options
-    }
+export const fetchAllRows = async (
+  rpc,
+  options,
+  indexName = 'id'
+) => {
+  const mergedOptions = {
+    json: true,
+    lower_bound: 0,
+    upper_bound: undefined,
+    limit: 9999,
+    ...options,
+  }
+
+  const bigNumberFix = options.bigNumberFix ?? false
 
-    let rows = []
-    let lowerBound = mergedOptions.lower_bound
+  if (bigNumberFix) {
+    delete mergedOptions.bigNumberFix
+  }
+
+  let rows = []
+  let lowerBound = mergedOptions.lower_bound
 
-    for (let i = 0; i < MAX_PAGINATION_FETCHES; i += 1) {
-      const result = await rpc.get_table_rows({
+  for (let i = 0; i < MAX_PAGINATION_FETCHES; i += 1) {
+    let result
+
+    if (bigNumberFix) {
+      const response = await fetch((rpc.endpoint ?? rpc.currentEndpoint) + '/v1/chain/get_table_rows', {
+        method: 'POST',
+        body: JSON.stringify({
+          ...mergedOptions,
+          lower_bound: lowerBound,
+        }),
+        headers: {
+          'Content-type': 'application/json; charset=UTF-8',
+        },
+      })
+
+      result = JSON.parse(
+        (await response.text()).replace(/:(-?\d+),/g, ': "$1",')
+      )
+
+    } else {
+      result = await rpc.get_table_rows({
         ...mergedOptions,
-        lower_bound: lowerBound
+        lower_bound: lowerBound,
       })
-      rows = rows.concat(result.rows)
-
-      if (!result.more || result.rows.length === 0) break
-
-      // EOS 2.0 api
-      // TODO Add 'more' key
-      if (typeof result.next_key !== 'undefined') {
-        lowerBound = result.next_key
-      } else {
-        lowerBound =
-          Number.parseInt(
-            `${result.rows[result.rows.length - 1][indexName]}`,
-            10
-          ) + 1
-      }
     }
 
-    return rows
+    rows = rows.concat(result.rows)
+
+
+    if (!result.more || result.rows.length === 0 || rows.length >= mergedOptions.limit) break
+
+    // EOS 2.0 api
+    // TODO Add 'more' key
+    if (typeof result.next_key !== 'undefined') {
+      lowerBound = result.next_key
+    } else {
+      lowerBound =
+        Number.parseInt(
+          `${result.rows[result.rows.length - 1][indexName]}`,
+          10
+        ) + 1
+    }
   }
+
+  return rows
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alcorexchange/alcor-swap-sdk",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "",
   "main": "build/index.js",
   "scripts": {
@@ -42,7 +42,13 @@
     "rimraf": "^4.1.1",
     "ts-jest": "^28.0.4",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.4"
+    "typescript": "^4.9.4",
+    "@wharfkit/antelope": "^0.10.0",
+    "@wharfkit/contract": "^0.4.3",
+    "dotenv": "^16.3.1",
+    "enf-eosjs": "^23.0.0",
+    "mongoose": "5.13.14",
+    "redis": "^4.6.10"
   },
   "dependencies": {
     "big.js": "^5.2.2",

package/src/entities/baseCurrency.ts

@@ -17,10 +17,6 @@ export abstract class BaseCurrency {
    * The symbol of the currency, i.e. a short textual non-unique identifier
    */
   public readonly symbol: string;
-  /**
-   * The id of the currency(<symbol-contract>), i.e. eos-eosio.token
-   */
-  public readonly id?: string;
 
   /**
    * Constructs an instance of the base class `BaseCurrency`.
@@ -33,7 +29,6 @@ export abstract class BaseCurrency {
     contract: string,
     decimals: number,
     symbol: string,
-    id?: string
   ) {
     invariant(
       decimals >= 0 && decimals < 19 && Number.isInteger(decimals),
@@ -42,7 +37,6 @@ export abstract class BaseCurrency {
     this.contract = contract;
     this.decimals = decimals;
     this.symbol = symbol;
-    this.id = id;
   }
 
   /**

package/src/entities/token.ts

@@ -16,9 +16,8 @@ export class Token extends BaseCurrency {
     contract: string,
     decimals: number,
     symbol: string,
-    id?: string
   ) {
-    super(contract, decimals, symbol, id);
+    super(contract, decimals, symbol);
   }
 
   public get name(): string {
@@ -26,6 +25,10 @@ export class Token extends BaseCurrency {
     return this.symbol.toLowerCase() + '-' + this.contract
   }
 
+  public get id(): string {
+    return this.symbol.toLowerCase() + '-' + this.contract
+  }
+
   /**
    * Returns true if the two tokens are equivalent, i.e. have the same contract and symbol.
    * @param other other token to compare

package/src/entities/trade.ts

@@ -529,13 +529,18 @@ export class Trade<TInput extends Currency, TOutput extends Currency, TTradeType
       }
       // we have arrived at the output token, so this is the final trade of one of the paths
       if (amountOut.currency && amountOut.currency.equals(tokenOut)) {
+        const trade = await Trade.fromRoute(
+          new Route([...currentPools, pool], currencyAmountIn.currency, currencyOut),
+          currencyAmountIn,
+          TradeType.EXACT_INPUT
+        )
+
+        //FIX hotfix, i do not really sure about it
+        if (!trade.inputAmount.greaterThan(0) || !trade.priceImpact.greaterThan(0)) continue
+
         sortedInsert(
           bestTrades,
-          await Trade.fromRoute(
-            new Route([...currentPools, pool], currencyAmountIn.currency, currencyOut),
-            currencyAmountIn,
-            TradeType.EXACT_INPUT
-          ),
+          trade,
           maxNumResults,
           tradeComparator
         )
@@ -617,7 +622,7 @@ export class Trade<TInput extends Currency, TOutput extends Currency, TTradeType
         )
 
         // FIX hotfix, i do not really sure about it
-        if (!trade.inputAmount.greaterThan(0) || trade.priceImpact.lessThan(0)) continue
+        if (!trade.inputAmount.greaterThan(0) || !trade.priceImpact.greaterThan(0)) continue
         //
 
         sortedInsert(
@@ -647,4 +652,34 @@ export class Trade<TInput extends Currency, TOutput extends Currency, TTradeType
 
     return bestTrades
   }
+
+  public static async bestTradeExactIn2<TInput extends Currency, TOutput extends Currency>(
+    routes: Route<TInput, TOutput>[],
+    pools: Pool[],
+    currencyAmountIn: CurrencyAmount<TInput>,
+    maxNumResults = 3,
+  ): Promise<Trade<TInput, TOutput, TradeType.EXACT_INPUT>[]> {
+    invariant(pools.length > 0, 'POOLS')
+
+    const bestTrades: Trade<TInput, TOutput, TradeType.EXACT_INPUT>[] = []
+
+    for (const route of routes) {
+      const trade = await Trade.fromRoute(
+        route,
+        currencyAmountIn,
+        TradeType.EXACT_INPUT
+      )
+
+      if (!trade.inputAmount.greaterThan(0) || !trade.priceImpact.greaterThan(0)) continue
+
+      sortedInsert(
+        bestTrades,
+        trade,
+        maxNumResults,
+        tradeComparator
+      )
+    }
+
+    return bestTrades
+  }
 }

package/src/utils/index.ts

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

package/test/trade.test.ts

@@ -15,12 +15,7 @@ function parseToken(token) {
   return new Token(
     token.contract,
     asset(token.quantity).symbol.precision(),
-    asset(token.quantity).symbol.code().to_string(),
-    (
-      asset(token.quantity).symbol.code().to_string() +
-      "-" +
-      token.contract
-    ).toLowerCase()
+    asset(token.quantity).symbol.code().to_string()
   );
 }
 

package/examples/getPositionAmounts.ts_old

@@ -1,107 +0,0 @@
-import fetch from 'node-fetch'
-
-// Alcor v2 sdk: https://github.com/alcorexchange/alcor-v2-sdk
-import { Token, Position, Pool } from '../src'
-import { fetchAllRows } from './utils/rpc'
-
-import { asset } from 'eos-common'
-import { JsonRpc } from 'eosjs'
-import { Serialize } from 'eosjs'
-
-
-export function parseToken(token) {
-  return new Token(
-    token.contract,
-    asset(token.quantity).symbol.precision(),
-    asset(token.quantity).symbol.code().to_string(),
-    (asset(token.quantity).symbol.code().to_string() + '-' + token.contract).toLowerCase()
-  )
-}
-
-const rpc = new JsonRpc('https://wax-api.alcor.exchange', { fetch });
-
-const types: any = Serialize.createInitialTypes()
-
-export const nameToUint64 = (name) => {
-  const ser = new Serialize.SerialBuffer()
-  ser.pushName(name)
-  return types.get('uint64').deserialize(ser)
-}
-
-async function main() {
-  const account = 'alcordexfund'
-
-  const pools = await fetchAllRows(rpc, {
-    scope: 'swap.alcor',
-    table: 'pools',
-    code: 'swap.alcor',
-  })
-
-  // First pool for example (TLM / WAX)
-  const poolRow= pools[0]
-
-  // Or Specific pool
-  //const poolRow= pools.find(p => p.id == 205)
-
-  const { id, tokenA, tokenB, currSlot: { sqrtPriceX64, tick } } = poolRow
-
-  // Or Specific pool
-  //const { id, tokenA, tokenB, currSlot: { sqrtPriceX64, tick } } = poolRow
-
-  const ticks = await fetchAllRows(rpc, {
-    scope: id,
-    table: 'ticks',
-    code: 'swap.alcor',
-  })
-
-  const pool = new Pool({
-    ...poolRow,
-    tokenA: parseToken(tokenA),
-    tokenB: parseToken(tokenB),
-    sqrtPriceX64,
-    tickCurrent: tick,
-    ticks: ticks.sort((a, b) => a.id - b.id)
-  })
-
-  const { rows: positions } = await rpc.get_table_rows({
-    scope: pool.id,
-    table: 'positions',
-    code: 'swap.alcor',
-
-    // TO get positions by account name
-    // key_type: 'i64',
-    // index_position: 3,
-    // lower_bound: nameToUint64(account),
-    // upper_bound: nameToUint64(account)
-  })
-
-  // or Specific position by id
-  // const { rows: positions } = await rpc.get_table_rows({
-  //   scope: pool.id,
-  //   table: 'positions',
-  //   code: 'swap.alcor',
-  //   lower_bound: 14235,
-  //   upper_bound: 14235
-  // })
-
-  //console.log({ pool: pool.id, positions })
-
-  const position = new Position({
-    ...positions[0], // Only first of account position
-    pool
-  })
-
-  console.log('amountA:', position.amountA.toAsset())
-  console.log('amountB:', position.amountB.toAsset())
-
-  // fees:
-  const { feesA, feesB } = await position.getFees()
-
-  console.log('feesA', feesA.toAsset())
-  console.log('feesB', feesB.toAsset())
-}
-
-main()
-
-// amountA: 103.4332 TLM
-// amountB: 29.16056021 WAX