@alcorexchange/alcor-swap-sdk 1.0.29 → 1.0.31

package/build/entities/position.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -158,7 +149,19 @@ class Position {
             ticks: this.pool.tickDataProvider
         });
         // because the router is imprecise, we need to calculate the position that will be created (assuming no slippage)
-        const positionThatWillBeCreated = Position.fromAmounts(Object.assign(Object.assign({ id: this.id, owner: this.owner, pool: this.pool, tickLower: this.tickLower, tickUpper: this.tickUpper }, this.mintAmounts), { useFullPrecision: false, feeGrowthInsideALastX64: this.feeGrowthInsideALastX64, feeGrowthInsideBLastX64: this.feeGrowthInsideBLastX64, feesA: this.feesA, feesB: this.feesB }));
+        const positionThatWillBeCreated = Position.fromAmounts({
+            id: this.id,
+            owner: this.owner,
+            pool: this.pool,
+            tickLower: this.tickLower,
+            tickUpper: this.tickUpper,
+            ...this.mintAmounts,
+            useFullPrecision: false,
+            feeGrowthInsideALastX64: this.feeGrowthInsideALastX64,
+            feeGrowthInsideBLastX64: this.feeGrowthInsideBLastX64,
+            feesA: this.feesA,
+            feesB: this.feesB,
+        });
         // we want the smaller amounts...
         // ...which occurs at the upper price for amountA...
         const { amountA } = new Position({
@@ -361,28 +364,26 @@ class Position {
      * Computes a position fees
      * @returns The position
      */
-    getFees() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { liquidity, tickLower, tickUpper, feeGrowthInsideALastX64, feeGrowthInsideBLastX64, pool } = this;
-            if (jsbi_1.default.equal(liquidity, internalConstants_2.ZERO) &&
-                jsbi_1.default.equal(this.feesA, internalConstants_2.ZERO) &&
-                jsbi_1.default.equal(this.feesB, internalConstants_2.ZERO)) {
-                return {
-                    feesA: fractions_1.CurrencyAmount.fromRawAmount(this.pool.tokenA, internalConstants_2.ZERO),
-                    feesB: fractions_1.CurrencyAmount.fromRawAmount(this.pool.tokenB, internalConstants_2.ZERO)
-                };
-            }
-            const lower = this.pool.tickDataProvider.getTick(tickLower);
-            const upper = this.pool.tickDataProvider.getTick(tickUpper);
-            const { feeGrowthGlobalAX64, feeGrowthGlobalBX64 } = pool;
-            const [feeGrowthInsideAX64, feeGrowthInsideBX64] = utils_1.TickLibrary.getFeeGrowthInside(lower, upper, tickLower, tickUpper, pool.tickCurrent, feeGrowthGlobalAX64, feeGrowthGlobalBX64);
-            const tokensOwedA = jsbi_1.default.divide(jsbi_1.default.multiply((0, utils_1.subIn128)(feeGrowthInsideAX64, feeGrowthInsideALastX64), liquidity), internalConstants_1.Q64);
-            const tokensOwedB = jsbi_1.default.divide(jsbi_1.default.multiply((0, utils_1.subIn128)(feeGrowthInsideBX64, feeGrowthInsideBLastX64), liquidity), internalConstants_1.Q64);
+    async getFees() {
+        const { liquidity, tickLower, tickUpper, feeGrowthInsideALastX64, feeGrowthInsideBLastX64, pool } = this;
+        if (jsbi_1.default.equal(liquidity, internalConstants_2.ZERO) &&
+            jsbi_1.default.equal(this.feesA, internalConstants_2.ZERO) &&
+            jsbi_1.default.equal(this.feesB, internalConstants_2.ZERO)) {
             return {
-                feesA: fractions_1.CurrencyAmount.fromRawAmount(this.pool.tokenA, jsbi_1.default.add(tokensOwedA, this.feesA)),
-                feesB: fractions_1.CurrencyAmount.fromRawAmount(this.pool.tokenB, jsbi_1.default.add(tokensOwedB, this.feesB))
+                feesA: fractions_1.CurrencyAmount.fromRawAmount(this.pool.tokenA, internalConstants_2.ZERO),
+                feesB: fractions_1.CurrencyAmount.fromRawAmount(this.pool.tokenB, internalConstants_2.ZERO)
             };
-        });
+        }
+        const lower = this.pool.tickDataProvider.getTick(tickLower);
+        const upper = this.pool.tickDataProvider.getTick(tickUpper);
+        const { feeGrowthGlobalAX64, feeGrowthGlobalBX64 } = pool;
+        const [feeGrowthInsideAX64, feeGrowthInsideBX64] = utils_1.TickLibrary.getFeeGrowthInside(lower, upper, tickLower, tickUpper, pool.tickCurrent, feeGrowthGlobalAX64, feeGrowthGlobalBX64);
+        const tokensOwedA = jsbi_1.default.divide(jsbi_1.default.multiply((0, utils_1.subIn128)(feeGrowthInsideAX64, feeGrowthInsideALastX64), liquidity), internalConstants_1.Q64);
+        const tokensOwedB = jsbi_1.default.divide(jsbi_1.default.multiply((0, utils_1.subIn128)(feeGrowthInsideBX64, feeGrowthInsideBLastX64), liquidity), internalConstants_1.Q64);
+        return {
+            feesA: fractions_1.CurrencyAmount.fromRawAmount(this.pool.tokenA, jsbi_1.default.add(tokensOwedA, this.feesA)),
+            feesB: fractions_1.CurrencyAmount.fromRawAmount(this.pool.tokenB, jsbi_1.default.add(tokensOwedB, this.feesB))
+        };
     }
 }
 exports.Position = Position;

package/build/entities/trade.js

@@ -242,13 +242,16 @@ class Trade {
      * @returns The unchecked trade
      */
     static createUncheckedTrade(constructorArguments) {
-        return new Trade(Object.assign(Object.assign({}, constructorArguments), { routes: [
+        return new Trade({
+            ...constructorArguments,
+            routes: [
                 {
                     inputAmount: constructorArguments.inputAmount,
                     outputAmount: constructorArguments.outputAmount,
                     route: constructorArguments.route
                 }
-            ] }));
+            ]
+        });
     }
     /**
      * Creates a trade without computing the result of swapping through the routes. Useful when you have simulated the trade
@@ -331,6 +334,9 @@ class Trade {
         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));

package/package.json

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

package/src/entities/trade.ts

@@ -495,6 +495,9 @@ export class Trade<TInput extends Currency, TOutput extends Currency, TTradeType
     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

package/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es2016",
+    "target": "es2019",
     "lib": [
       "es6"
     ],