@paraswap/dex-lib 2.42.17 → 2.42.19

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

@@ -54,6 +54,7 @@ const isPoolV1_9 = (
 
 // % START OF COPY PASTA FROM UNISWAPV3 %
 function _priceComputationCycles(
+  networkId: number,
   poolState: DeepReadonly<PoolStateV1_1 | PoolState_v1_9>,
   ticksCopy: Record<NumberAsString, TickInfo>,
   state: PriceComputationState,
@@ -112,6 +113,7 @@ function _priceComputationCycles(
     try {
       [step.tickNext, step.initialized] =
         TickTable.nextInitializedTickWithinOneWord(
+          networkId,
           poolState,
           state.tick,
           zeroForOne,
@@ -228,6 +230,7 @@ function _priceComputationCycles(
 
 class AlgebraMathClass {
   queryOutputs(
+    networkId: number,
     poolState: DeepReadonly<PoolStateV1_1 | PoolState_v1_9>,
     amounts: bigint[],
     zeroForOne: boolean,
@@ -309,6 +312,7 @@ class AlgebraMathClass {
       if (!isOutOfRange) {
         const [finalState, { latestFullCycleState, latestFullCycleCache }] =
           _priceComputationCycles(
+            networkId,
             poolState,
             ticksCopy,
             state,
@@ -414,6 +418,7 @@ class AlgebraMathClass {
   }
 
   _updatePositionTicksAndFees(
+    networkId: number,
     state: PoolStateV1_1 | PoolState_v1_9,
     bottomTick: bigint,
     topTick: bigint,
@@ -447,6 +452,7 @@ class AlgebraMathClass {
       ) {
         toggledBottom = true;
         TickTable.toggleTick(
+          networkId,
           state,
           bottomTick,
           state.areTicksCompressed ? state.tickSpacing : undefined,
@@ -467,6 +473,7 @@ class AlgebraMathClass {
       ) {
         toggledTop = true;
         TickTable.toggleTick(
+          networkId,
           state,
           topTick,
           state.areTicksCompressed ? state.tickSpacing : undefined,
@@ -507,6 +514,7 @@ class AlgebraMathClass {
   }
 
   _calculateSwapAndLock(
+    networkId: number,
     poolState: PoolStateV1_1 | PoolState_v1_9,
     zeroToOne: boolean,
     newSqrtPriceX96: bigint,
@@ -577,6 +585,7 @@ class AlgebraMathClass {
       //equivalent of tickTable.nextTickInTheSameRow(currentTick, zeroToOne);
       [step.nextTick, step.initialized] =
         TickTable.nextInitializedTickWithinOneWord(
+          networkId,
           poolState,
           currentTick,
           zeroToOne,

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

@@ -4,9 +4,15 @@ import { DeepReadonly } from 'ts-essentials';
 import { OUT_OF_RANGE_ERROR_POSTFIX } from '../../uniswap-v3/constants';
 import { TickMath } from '../../uniswap-v3/contract-math/TickMath';
 import { Yul } from './yul-helper';
-import { TICK_BITMAP_BUFFER, TICK_BITMAP_TO_USE } from '../constants';
+import {
+  TICK_BITMAP_BUFFER,
+  TICK_BITMAP_BUFFER_BY_CHAIN,
+  TICK_BITMAP_TO_USE,
+  TICK_BITMAP_TO_USE_BY_CHAIN,
+} from '../constants';
 
 function isWordPosOut(
+  networkId: number,
   wordPos: bigint,
   startTickBitmap: bigint,
   // For pricing we use wider range to check price impact. If function called from event
@@ -16,14 +22,19 @@ function isWordPosOut(
   let lowerTickBitmapLimit;
   let upperTickBitmapLimit;
 
+  const tickBitmapToUse =
+    TICK_BITMAP_TO_USE_BY_CHAIN[networkId] ?? TICK_BITMAP_TO_USE;
+  const tickBitmapBuffer =
+    TICK_BITMAP_BUFFER_BY_CHAIN[networkId] ?? TICK_BITMAP_BUFFER;
+
   if (isPriceQuery) {
     lowerTickBitmapLimit =
-      startTickBitmap - (TICK_BITMAP_BUFFER + TICK_BITMAP_TO_USE);
+      startTickBitmap - (tickBitmapBuffer + tickBitmapToUse);
     upperTickBitmapLimit =
-      startTickBitmap + (TICK_BITMAP_BUFFER + TICK_BITMAP_TO_USE);
+      startTickBitmap + (tickBitmapBuffer + tickBitmapToUse);
   } else {
-    lowerTickBitmapLimit = startTickBitmap - TICK_BITMAP_BUFFER;
-    upperTickBitmapLimit = startTickBitmap + TICK_BITMAP_BUFFER;
+    lowerTickBitmapLimit = startTickBitmap - tickBitmapBuffer;
+    upperTickBitmapLimit = startTickBitmap + tickBitmapBuffer;
   }
 
   _require(
@@ -45,6 +56,7 @@ export class TickTable {
   }
 
   static toggleTick(
+    networkId: number,
     state: Pick<IAlgebraPoolState, 'startTickBitmap' | 'tickBitmap'>,
     tick: bigint,
     tickSpacing?: bigint,
@@ -57,7 +69,7 @@ export class TickTable {
 
     // toggleTick is used only in _updatePosition which is always state changing event
     // Therefore it is never used in price query
-    isWordPosOut(rowNumber, state.startTickBitmap, false);
+    isWordPosOut(networkId, rowNumber, state.startTickBitmap, false);
 
     const stringWordPos = rowNumber.toString();
     if (state.tickBitmap[stringWordPos] === undefined) {
@@ -71,6 +83,7 @@ export class TickTable {
   }
 
   static nextInitializedTickWithinOneWord(
+    networkId: number,
     state: DeepReadonly<
       Pick<IAlgebraPoolState, 'startTickBitmap' | 'tickBitmap'>
     >,
@@ -93,7 +106,7 @@ export class TickTable {
     }
     if (lte) {
       const [rowNumber, bitNumber] = TickTable.position(tick);
-      isWordPosOut(rowNumber, state.startTickBitmap, isPriceQuery);
+      isWordPosOut(networkId, rowNumber, state.startTickBitmap, isPriceQuery);
       let tickBitmapValue = state.tickBitmap[rowNumber.toString()];
       tickBitmapValue = tickBitmapValue === undefined ? 0n : tickBitmapValue;
 
@@ -109,7 +122,7 @@ export class TickTable {
       tick += 1n;
 
       const [rowNumber, bitNumber] = TickTable.position(tick);
-      isWordPosOut(rowNumber, state.startTickBitmap, isPriceQuery);
+      isWordPosOut(networkId, rowNumber, state.startTickBitmap, isPriceQuery);
       let tickBitmapValue = state.tickBitmap[rowNumber.toString()];
       tickBitmapValue = tickBitmapValue === undefined ? 0n : tickBitmapValue;
 

package/src/dex/algebra/types.ts

@@ -58,9 +58,21 @@ export type AlgebraData = {
     tokenIn: Address;
     tokenOut: Address;
   }[];
+  feeOnTransfer: boolean;
   isApproved?: boolean;
 };
 
+export type AlgebraDataWithFee = {
+  tokenIn: Address;
+  tokenOut: Address;
+};
+
+export enum AlgebraFunctions {
+  exactInput = 'exactInput',
+  exactOutput = 'exactOutput',
+  exactInputWithFeeToken = 'exactInputSingleSupportingFeeOnTransferTokens',
+}
+
 export type DexParams = {
   router: Address;
   quoter: Address;

package/tests/constants-e2e.ts

@@ -853,6 +853,10 @@ export const Tokens: {
       address: '0x3d9907f9a368ad0a51be60f7da3b97cf940982d8',
       decimals: 18,
     },
+    RDPX: {
+      address: '0x32eb7902d4134bf98a28b963d26de779af92a212',
+      decimals: 18,
+    },
   },
   [Network.OPTIMISM]: {
     DAI: {
@@ -1145,12 +1149,13 @@ export const Holders: {
     AMPL: '0xfcaA5ea7F8eb0631BcA72C345025C0A5a6D93f0E',
   },
   [Network.ARBITRUM]: {
+    RDPX: '0x2fa6f21ecfe274f594f470c376f5bdd061e08a37',
     ARB: '0xb65edba80a3d81903ecd499c8eb9cf0e19096bd0',
     ETH: '0xF977814e90dA44bFA03b6295A0616a897441aceC',
     DAI: '0x07d7f291e731a41d3f0ea4f1ae5b6d920ffb3fe0',
     WETH: '0xc31e54c7a869b9fcbecc14363cf510d1c41fa443',
     USDCe: '0x62383739d68dd0f844103db8dfb05a7eded5bbe6',
-    USDC: '0xa843392198862f98d17e3aa1421b08f2c2020cff',
+    USDC: '0x489ee077994b6658eafa855c308275ead8097c4a',
     OHM: '0xebce5f29ff5ca9aa330ebdf7ec6b5f474bff271e',
     USDT: '0x5ff47d4ab75bcaff6807c81f1367abb53439883c',
     POPS: '0x4b78b52e7de4d8b7d367297cb8a87c1875a9d591',