@alcorexchange/alcor-swap-sdk 1.0.25 → 1.0.26

package/build/entities/position.js

@@ -364,8 +364,16 @@ class Position {
     getFees() {
         return __awaiter(this, void 0, void 0, function* () {
             const { liquidity, tickLower, tickUpper, feeGrowthInsideALastX64, feeGrowthInsideBLastX64, pool } = this;
-            const lower = yield this.pool.tickDataProvider.getTick(tickLower);
-            const upper = yield this.pool.tickDataProvider.getTick(tickUpper);
+            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);

package/package.json

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

package/src/entities/position.ts

@@ -586,9 +586,20 @@ export class Position {
    */
   public async getFees(): Promise<Fees> {
     const { liquidity, tickLower, tickUpper, feeGrowthInsideALastX64, feeGrowthInsideBLastX64, pool } = this
+
+    if (
+      JSBI.equal(liquidity, ZERO) &&
+      JSBI.equal(this.feesA, ZERO) &&
+      JSBI.equal(this.feesB, ZERO)
+    ) {
+      return {
+        feesA: CurrencyAmount.fromRawAmount(this.pool.tokenA, ZERO),
+        feesB: CurrencyAmount.fromRawAmount(this.pool.tokenB, ZERO)
+      }
+    }
     
-    const lower = await this.pool.tickDataProvider.getTick(tickLower)
-    const upper = await this.pool.tickDataProvider.getTick(tickUpper)
+    const lower = this.pool.tickDataProvider.getTick(tickLower)
+    const upper = this.pool.tickDataProvider.getTick(tickUpper)
 
     const { feeGrowthGlobalAX64, feeGrowthGlobalBX64 } = pool