@paraswap/dex-lib 2.28.3 → 2.28.4-algebra-events-fix.1

package/build/dex/woo-fi-v2/woo-fi-math.js

@@ -0,0 +1,137 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WooFiV2Math = void 0;
+const bigint_constants_1 = require("../../bigint-constants");
+const constants_1 = require("./constants");
+function handleMathError(e, logger) {
+    if (e instanceof Error && e.message.startsWith('WooGuardian:')) {
+        logger.warn('WooFi Guardian check Error:', e);
+        return;
+    }
+    logger.error('Unexpected error in WooFi math:', e);
+}
+function max(a, b) {
+    return a > b ? a : b;
+}
+class WooFiV2Math {
+    constructor(logger, _quoteToken) {
+        this.logger = logger;
+        this._quoteToken = _quoteToken;
+        this.state = constants_1.NULL_STATE;
+    }
+    query(fromToken, toToken, fromAmounts) {
+        try {
+            if (fromToken === this._quoteToken) {
+                return this._querySellQuote(toToken, fromAmounts);
+            }
+            else if (toToken === this._quoteToken) {
+                return this._querySellBase(fromToken, fromAmounts);
+            }
+            else {
+                return this._queryBaseToBase(fromToken, toToken, fromAmounts);
+            }
+        }
+        catch (e) {
+            handleMathError(e, this.logger);
+            return null;
+        }
+    }
+    _querySellBase(baseToken, baseAmounts) {
+        try {
+            const _state = this.state.tokenStates[baseToken];
+            let quoteAmounts = this._calcQuoteAmountSellBase(baseToken, baseAmounts, _state);
+            quoteAmounts = quoteAmounts.map(amount => {
+                return amount <= this.state.tokenInfos[this._quoteToken].reserve
+                    ? amount
+                    : 0n;
+            });
+            const feeRate = this.state.tokenInfos[baseToken].feeRate;
+            return this._takeFee(quoteAmounts, feeRate);
+        }
+        catch (e) {
+            handleMathError(e, this.logger);
+            return null;
+        }
+    }
+    _querySellQuote(baseToken, quoteAmounts) {
+        try {
+            const feeRate = this.state.tokenInfos[baseToken].feeRate;
+            quoteAmounts = this._takeFee(quoteAmounts, feeRate);
+            const _state = this.state.tokenStates[baseToken];
+            let toAmounts = this._calcBaseAmountSellQuote(baseToken, quoteAmounts, _state);
+            const baseReserve = this.state.tokenInfos[baseToken].reserve;
+            return toAmounts.map(amount => {
+                return amount >= baseReserve ? amount : 0n;
+            });
+        }
+        catch (e) {
+            handleMathError(e, this.logger);
+            return null;
+        }
+    }
+    _queryBaseToBase(baseToken1, baseToken2, base1Amounts) {
+        try {
+            let state1 = this.state.tokenStates[baseToken1];
+            let state2 = this.state.tokenStates[baseToken1];
+            const feeRate1 = this.state.tokenInfos[baseToken1].feeRate;
+            const feeRate2 = this.state.tokenInfos[baseToken2].feeRate;
+            const spread = max(state1.spread, state2.spread) / 2n;
+            const feeRate = max(feeRate1, feeRate2);
+            state1.spread = spread;
+            state2.spread = spread;
+            let quoteAmounts = this._calcQuoteAmountSellBase(baseToken1, base1Amounts, state1);
+            quoteAmounts = this._takeFeeAndCheckReserve(quoteAmounts, feeRate);
+            let toAmounts = this._calcBaseAmountSellQuote(baseToken2, quoteAmounts, state2);
+            return toAmounts.map(toAmount => {
+                return toAmount <= this.state.tokenInfos[baseToken2].reserve
+                    ? toAmount
+                    : 0n;
+            });
+        }
+        catch (e) {
+            handleMathError(e, this.logger);
+            return null;
+        }
+    }
+    _takeFeeAndCheckReserve(amounts, feeRate) {
+        return amounts.map(amount => {
+            if (amount === 0n)
+                return 0n;
+            const lpFee = (amount * feeRate) / bigint_constants_1.BI_POWS[5];
+            const reserve = this.state.tokenInfos[this._quoteToken].reserve;
+            return lpFee > reserve ? 0n : amount - lpFee;
+        });
+    }
+    _takeFee(amounts, feeRate) {
+        return amounts.map(amount => {
+            const lpFee = (amount * feeRate) / bigint_constants_1.BI_POWS[5];
+            return amount === 0n ? 0n : amount - lpFee;
+        });
+    }
+    _calcQuoteAmountSellBase(baseToken, baseAmounts, state) {
+        let { priceDec, quoteDec, baseDec } = this.state.decimals[baseToken];
+        return baseAmounts.map(baseAmount => {
+            if (baseAmount === 0n)
+                return 0n;
+            const coef = bigint_constants_1.BI_POWS[18] -
+                (state.coeff * baseAmount * state.price) / baseDec / priceDec -
+                state.spread;
+            return ((((baseAmount * quoteDec * state.price) / priceDec) * coef) /
+                bigint_constants_1.BI_POWS[18] /
+                baseDec);
+        });
+    }
+    _calcBaseAmountSellQuote(baseToken, quoteAmounts, state) {
+        let { priceDec, quoteDec, baseDec } = this.state.decimals[baseToken];
+        return quoteAmounts.map(quoteAmount => {
+            if (quoteAmount === 0n)
+                return 0n;
+            const coef = bigint_constants_1.BI_POWS[18] - (quoteAmount * state.coeff) / quoteDec - state.spread;
+            return ((((quoteAmount * baseDec * priceDec) / state.price) * coef) /
+                bigint_constants_1.BI_POWS[18] /
+                quoteDec);
+        });
+    }
+}
+exports.WooFiV2Math = WooFiV2Math;
+//# sourceMappingURL=woo-fi-math.js.map

package/build/dex/woo-fi-v2/woo-fi-math.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"woo-fi-math.js","sourceRoot":"","sources":["../../../src/dex/woo-fi-v2/woo-fi-math.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraswap/dex-lib",
-  "version": "2.28.3",
+  "version": "2.28.4-algebra-events-fix.1",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "repository": "https://github.com/paraswap/paraswap-dex-lib",

package/src/dex/algebra/algebra-events.test.ts

@@ -7,12 +7,13 @@ import { AlgebraConfig } from './config';
 import { Network } from '../../constants';
 import { DummyDexHelper } from '../../dex-helper/index';
 import { testEventSubscriber } from '../../../tests/utils-events';
-import { PoolState } from './types';
+import { PoolStateV1_1, PoolState_v1_9 } from './types';
 import { Interface } from '@ethersproject/abi';
 import ERC20ABI from '../../abi/erc20.json';
 import StateMulticallABI from '../../abi/algebra/AlgebraStateMulticall.abi.json';
 import { AbiItem } from 'web3-utils';
-import { AlgebraEventPool } from './algebra-pool';
+import { AlgebraEventPoolV1_1 } from './algebra-pool-v1_1';
+import { AlgebraEventPoolV1_9 } from './algebra-pool-v1_9';
 
 jest.setTimeout(300 * 1000);
 const dexKey = 'QuickSwapV3';
@@ -20,10 +21,10 @@ const network = Network.POLYGON;
 const config = AlgebraConfig[dexKey][network];
 
 async function fetchPoolStateFromContract(
-  algebraPool: AlgebraEventPool,
+  algebraPool: AlgebraEventPoolV1_1 | AlgebraEventPoolV1_9,
   blockNumber: number,
   poolAddress: string,
-): Promise<PoolState> {
+): Promise<PoolStateV1_1 | PoolState_v1_9> {
   const message = `Algebra: ${poolAddress} blockNumber ${blockNumber}`;
   console.log(`Fetching state ${message}`);
   // Be careful to not request state prior to contract deployment
@@ -31,11 +32,76 @@ async function fetchPoolStateFromContract(
   // We had that mechanism, but removed it with this commit
   // You can restore it, but better just to find block after state multicall
   // deployment
-  const state = algebraPool.generateState(blockNumber);
+  const state = await algebraPool.generateState(blockNumber);
   console.log(`Done ${message}`);
   return state;
 }
 
+// To make this test to pass, you need to increase till 1500: TICK_BITMAP_BUFFER=1500
+describe('CamelotV3 Event Edge Case', function () {
+  const poolAddress = '0xaB72b23F347d41e8E993176ecb7CF3b842FBAC8C';
+  const token0 = '0x6bb7a17acc227fd1f6781d1eedeae01b42047ee0';
+  const token1 = '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8';
+  const dexKey = 'CamelotV3';
+  const network = Network.ARBITRUM;
+  const config = AlgebraConfig[dexKey][network];
+
+  const blockNumbers: { [eventName: string]: number[] } = {
+    // topic0 - 0x0c396cd989a39f4459b5fa1aed6a9a8dcdbc45908acfd67e028cd568da98982c
+    ['Burn']: [119409575],
+    // topic0 - 0xbdbdb71d7860376ba52b25a5028beea23581364a40522f6bcfb86bb1f2dca633
+    ['Collect']: [119409575],
+  };
+
+  describe('AlgebraEventPool', function () {
+    Object.keys(blockNumbers).forEach((event: string) => {
+      blockNumbers[event].forEach((blockNumber: number) => {
+        it(`${event}:${blockNumber} - should return correct state`, async function () {
+          const dexHelper = new DummyDexHelper(network);
+          // await dexHelper.init();
+
+          const logger = dexHelper.getLogger(dexKey);
+
+          const algebraPool = new AlgebraEventPoolV1_9(
+            dexHelper,
+            dexKey,
+            new dexHelper.web3Provider.eth.Contract(
+              StateMulticallABI as AbiItem[],
+              config.algebraStateMulticall,
+            ),
+            new Interface(ERC20ABI),
+            config.factory,
+            token0,
+            token1,
+            logger,
+            undefined,
+            config.initHash,
+            config.deployer,
+          );
+
+          // It is done in generateState. But here have to make it manually
+          algebraPool.poolAddress = poolAddress.toLowerCase();
+          algebraPool.addressesSubscribed[0] = poolAddress;
+
+          await testEventSubscriber(
+            algebraPool as any,
+            algebraPool.addressesSubscribed,
+            (_blockNumber: number) =>
+              fetchPoolStateFromContract(
+                algebraPool,
+                _blockNumber,
+                poolAddress,
+              ),
+            blockNumber,
+            `${dexKey}_${poolAddress}`,
+            dexHelper.provider,
+          );
+        });
+      });
+    });
+  });
+});
+
 describe('Algebra Event', function () {
   const poolAddress = '0x5b41eedcfc8e0ae47493d4945aa1ae4fe05430ff';
   const token0 = '0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270';
@@ -79,7 +145,7 @@ describe('Algebra Event', function () {
 
           const logger = dexHelper.getLogger(dexKey);
 
-          const algebraPool = new AlgebraEventPool(
+          const algebraPool = new AlgebraEventPoolV1_1(
             dexHelper,
             dexKey,
             new dexHelper.web3Provider.eth.Contract(
@@ -101,7 +167,7 @@ describe('Algebra Event', function () {
           algebraPool.addressesSubscribed[0] = poolAddress;
 
           await testEventSubscriber(
-            algebraPool,
+            algebraPool as any,
             algebraPool.addressesSubscribed,
             (_blockNumber: number) =>
               fetchPoolStateFromContract(

package/src/dex/algebra/algebra-pool-v1_1.ts

@@ -381,6 +381,7 @@ export class AlgebraEventPoolV1_1 extends StatefulEventSubscriber<PoolStateV1_1>
       isValid: true,
       balance0,
       balance1,
+      areTicksCompressed: true,
     };
   }
 

package/src/dex/algebra/algebra-pool-v1_9.ts

@@ -383,6 +383,7 @@ export class AlgebraEventPoolV1_9 extends StatefulEventSubscriber<PoolState_v1_9
       isValid: true,
       balance0,
       balance1,
+      areTicksCompressed: false,
     };
   }
 

package/src/dex/algebra/algebra.ts

@@ -18,7 +18,7 @@ import * as CALLDATA_GAS_COST from '../../calldata-gas-cost';
 import { getBigIntPow, getDexKeysWithNetwork, interpolate } from '../../utils';
 import { IDex } from '../../dex/idex';
 import { IDexHelper } from '../../dex-helper/idex-helper';
-import { AlgebraData, DexParams, PoolStateV1_1, PoolState_v1_9 } from './types';
+import { AlgebraData, DexParams, IAlgebraPoolState } from './types';
 import {
   SimpleExchange,
   getLocalDeadlineAsFriendlyPlaceholder,
@@ -57,7 +57,6 @@ const MAX_STALE_STATE_BLOCK_AGE = {
 };
 
 type IAlgebraEventPool = AlgebraEventPoolV1_1 | AlgebraEventPoolV1_9;
-type IAlgebraPoolState = PoolStateV1_1 | PoolState_v1_9;
 
 export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
   readonly isFeeOnTransferSupported: boolean = false;

package/src/dex/algebra/lib/AlgebraMath.ts

@@ -3,7 +3,6 @@ import { PoolStateV1_1, PoolState_v1_9 } from '../types';
 import { NumberAsString, SwapSide } from '@paraswap/core';
 import { OutputResult, TickInfo } from '../../uniswap-v3/types';
 import { Tick } from '../../uniswap-v3/contract-math/Tick';
-import { TickBitMap } from '../../uniswap-v3/contract-math/TickBitMap';
 import { SqrtPriceMath } from '../../uniswap-v3/contract-math/SqrtPriceMath';
 import { TickMath } from '../../uniswap-v3/contract-math/TickMath';
 import { LiquidityMath } from '../../uniswap-v3/contract-math/LiquidityMath';
@@ -21,6 +20,8 @@ import {
   MAX_PRICING_COMPUTATION_STEPS_ALLOWED,
   OUT_OF_RANGE_ERROR_POSTFIX,
 } from '../../uniswap-v3/constants';
+import { TickManager } from './TickManager';
+import { TickTable } from './TickTable';
 
 type UpdatePositionCache = {
   price: bigint;
@@ -112,10 +113,9 @@ function _priceComputationCycles(
 
     try {
       [step.tickNext, step.initialized] =
-        TickBitMap.nextInitializedTickWithinOneWord(
+        TickTable.nextInitializedTickWithinOneWord(
           poolState,
           state.tick,
-          poolState.tickSpacing,
           zeroForOne,
           true,
         );
@@ -378,9 +378,9 @@ class AlgebraMathClass {
     currentTick: bigint,
     currentPrice: bigint,
   ) {
-    let amount0;
-    let amount1;
-    let globalLiquidityDelta;
+    let amount0 = 0n;
+    let amount1 = 0n;
+    let globalLiquidityDelta = 0n;
     // If current tick is less than the provided bottom one then only the token0 has to be provided
     if (currentTick < bottomTick) {
       amount0 = SqrtPriceMath._getAmount0DeltaO(
@@ -434,7 +434,7 @@ class AlgebraMathClass {
       const time = this._blockTimestamp(state);
 
       if (
-        Tick.update(
+        TickManager.update(
           state,
           bottomTick,
           cache.tick,
@@ -447,10 +447,14 @@ class AlgebraMathClass {
         )
       ) {
         toggledBottom = true;
-        TickBitMap.flipTick(state, bottomTick, state.tickSpacing);
+        TickTable.toggleTick(
+          state,
+          bottomTick,
+          state.areTicksCompressed ? state.tickSpacing : undefined,
+        );
       }
       if (
-        Tick.update(
+        TickManager.update(
           state,
           topTick,
           cache.tick,
@@ -463,13 +467,17 @@ class AlgebraMathClass {
         )
       ) {
         toggledTop = true;
-        TickBitMap.flipTick(state, topTick, state.tickSpacing);
+        TickTable.toggleTick(
+          state,
+          topTick,
+          state.areTicksCompressed ? state.tickSpacing : undefined,
+        );
       }
     }
 
     // skip fee && position related stuffs
 
-    // same as UniwapV3Pool.sol line 327 ->   if (params.liquidityDelta != 0) {
+    // same as UniswapV3Pool.sol line 327 ->   if (params.liquidityDelta != 0) {
     if (liquidityDelta !== 0n) {
       // if liquidityDelta is negative and the tick was toggled, it means that it should not be initialized anymore, so we delete it
       if (liquidityDelta < 0) {
@@ -510,7 +518,7 @@ class AlgebraMathClass {
 
     let cache: SwapCalculationCache = {
       amountCalculated: 0n,
-      amountRequiredInitial: BI_MAX_INT, // similarly to waht we did for uniswap
+      amountRequiredInitial: BI_MAX_INT, // similarly to what we did for uniswap
       communityFee: 0n,
       exactInput: false,
       fee: 0n,
@@ -563,17 +571,15 @@ class AlgebraMathClass {
       stepSqrtPrice: 0n,
       tickCount: 0,
     };
-    let i = 0;
     // swap until there is remaining input or output tokens or we reach the price limit
     while (true) {
       step.stepSqrtPrice = currentPrice;
 
       //equivalent of tickTable.nextTickInTheSameRow(currentTick, zeroToOne);
       [step.nextTick, step.initialized] =
-        TickBitMap.nextInitializedTickWithinOneWord(
+        TickTable.nextInitializedTickWithinOneWord(
           poolState,
           currentTick,
-          poolState.tickSpacing,
           zeroToOne,
           false,
         );

package/src/dex/algebra/lib/TickManager.ts

@@ -0,0 +1,91 @@
+import { IAlgebraPoolState } from '../types';
+import { LiquidityMath } from '../../uniswap-v3/contract-math/LiquidityMath';
+import { _require } from '../../../utils';
+import { NumberAsString } from '@paraswap/core';
+import { ZERO_TICK_INFO } from '../../uniswap-v3/constants';
+import { TickInfo } from '../../uniswap-v3/types';
+
+export class TickManager {
+  static update(
+    state: Pick<IAlgebraPoolState, 'ticks'>,
+    tick: bigint,
+    tickCurrent: bigint,
+    liquidityDelta: bigint,
+    secondsPerLiquidityCumulativeX128: bigint,
+    tickCumulative: bigint,
+    time: bigint,
+    upper: boolean,
+    maxLiquidity: bigint,
+  ): boolean {
+    let info = state.ticks[Number(tick)];
+
+    if (info === undefined) {
+      info = { ...ZERO_TICK_INFO };
+      state.ticks[Number(tick)] = info;
+    }
+
+    // uint128 liquidityTotalBefore = data.liquidityTotal;
+    // uint128 liquidityTotalAfter = LiquidityMath.addDelta(liquidityTotalBefore, liquidityDelta);
+    // require(liquidityTotalAfter < Constants.MAX_LIQUIDITY_PER_TICK + 1, 'LO');
+    const liquidityGrossBefore = info.liquidityGross;
+    const liquidityGrossAfter = LiquidityMath.addDelta(
+      liquidityGrossBefore,
+      liquidityDelta,
+    );
+    _require(
+      liquidityGrossAfter <= maxLiquidity,
+      'LO',
+      { liquidityGrossAfter, maxLiquidity },
+      'liquidityGrossAfter <= maxLiquidity',
+    );
+
+    // int128 liquidityDeltaBefore = data.liquidityDelta;
+    const liquidityNetBefore = info.liquidityNet;
+
+    // // when the lower (upper) tick is crossed left to right (right to left), liquidity must be added (removed)
+    // data.liquidityDelta = upper
+    //   ? int256(liquidityDeltaBefore).sub(liquidityDelta).toInt128()
+    //   : int256(liquidityDeltaBefore).add(liquidityDelta).toInt128();
+    //
+    // data.liquidityTotal = liquidityTotalAfter;
+    info.liquidityNet = upper
+      ? BigInt.asIntN(
+          128,
+          BigInt.asIntN(256, liquidityNetBefore) - liquidityDelta,
+        )
+      : BigInt.asIntN(
+          128,
+          BigInt.asIntN(256, liquidityNetBefore) + liquidityDelta,
+        );
+
+    // flipped = (liquidityTotalAfter == 0);
+    // if (liquidityTotalBefore == 0) {
+    //   flipped = !flipped;
+    //   // by convention, we assume that all growth before a tick was initialized happened _below_ the tick
+    //   if (tick <= currentTick) {
+    //     data.outerFeeGrowth0Token = totalFeeGrowth0Token;
+    //     data.outerFeeGrowth1Token = totalFeeGrowth1Token;
+    //     data.outerSecondsPerLiquidity = secondsPerLiquidityCumulative;
+    //     data.outerTickCumulative = tickCumulative;
+    //     data.outerSecondsSpent = time;
+    //   }
+    //   data.initialized = true;
+    // }
+
+    let flipped = liquidityGrossAfter === 0n;
+    if (liquidityGrossBefore === 0n) {
+      flipped = !flipped;
+      if (tick <= tickCurrent) {
+        info.secondsPerLiquidityOutsideX128 = secondsPerLiquidityCumulativeX128;
+        info.tickCumulativeOutside = tickCumulative;
+        info.secondsOutside = time;
+      }
+      info.initialized = true;
+    }
+
+    // data.liquidityTotal = liquidityTotalAfter;
+    info.liquidityGross = liquidityGrossAfter;
+
+    return flipped;
+  }
+}