@paraswap/dex-lib 2.42.26 → 2.42.27-solidly-v3.2

package/src/dex/solidly-v3/types.ts

@@ -0,0 +1,158 @@
+import { BigNumber, BytesLike } from 'ethers';
+import { NumberAsString } from '../../types';
+import { Address } from '../../types';
+import { AbiItem } from 'web3-utils';
+import { MultiResult } from '../../lib/multi-wrapper';
+
+export type FactoryState = Record<string, never>;
+
+export type TickInfo = {
+  liquidityGross: bigint;
+  liquidityNet: bigint;
+  initialized: boolean;
+};
+
+export type Slot0 = {
+  sqrtPriceX96: bigint;
+  tick: bigint;
+  fee: bigint;
+};
+
+export type PoolState = {
+  pool: string;
+  blockTimestamp: bigint;
+  tickSpacing: bigint;
+  slot0: Slot0;
+  liquidity: bigint;
+  maxLiquidityPerTick: bigint;
+  tickBitmap: Record<NumberAsString, bigint>;
+  ticks: Record<NumberAsString, TickInfo>;
+  isValid: boolean;
+  startTickBitmap: bigint;
+  lowestKnownTick: bigint;
+  highestKnownTick: bigint;
+  balance0: bigint;
+  balance1: bigint;
+};
+
+export type SolidlyV3Data = {
+  zeroForOne: boolean;
+  poolAddress: string;
+  isApproved?: boolean;
+};
+
+export type DecodeStateMultiCallFunc = (
+  result: MultiResult<BytesLike> | BytesLike,
+) => DecodedStateMultiCallResultWithRelativeBitmaps;
+
+export type DexParams = {
+  quoter: Address;
+  factory: Address;
+  stateMulticall: Address;
+  supportedTickSpacings: bigint[];
+  chunksCount: number;
+  initRetryFrequency: number;
+  deployer?: Address;
+  subgraphURL: string;
+  initHash: string;
+  stateMultiCallAbi?: AbiItem[];
+  decodeStateMultiCallResultWithRelativeBitmaps?: DecodeStateMultiCallFunc;
+};
+
+export type UniswapV3SimpleSwapSellParam = {
+  path: string;
+  recipient: Address;
+  deadline: string;
+  amountIn: NumberAsString;
+  amountOutMinimum: NumberAsString;
+};
+
+export type UniswapV3SimpleSwapBuyParam = {
+  path: string;
+  recipient: Address;
+  deadline: string;
+  amountOut: NumberAsString;
+  amountInMaximum: NumberAsString;
+};
+
+export type UniswapV3SimpleSwapParams =
+  | UniswapV3SimpleSwapSellParam
+  | UniswapV3SimpleSwapBuyParam;
+
+export type SolidlyV3SimpleSwapParams = {
+  recipient: string;
+  zeroForOne: boolean;
+  amountSpecified: NumberAsString;
+  sqrtPriceLimitX96: NumberAsString;
+};
+
+export type UniswapV3Param = [
+  fromToken: Address,
+  toToken: Address,
+  exchange: Address,
+  fromAmount: NumberAsString,
+  toAmount: NumberAsString,
+  expectedAmount: NumberAsString,
+  feePercent: NumberAsString,
+  deadline: NumberAsString,
+  partner: Address,
+  isApproved: boolean,
+  beneficiary: Address,
+  path: string,
+  permit: string,
+  uuid: string,
+];
+
+export enum UniswapV3Functions {
+  exactInput = 'exactInput',
+  exactOutput = 'exactOutput',
+}
+
+export type TickInfoMappings = {
+  index: number;
+  value: TickInfo;
+};
+
+export type TickBitMapMappings = {
+  index: number;
+  value: bigint;
+};
+
+export type OutputResult = {
+  outputs: bigint[];
+  tickCounts: number[];
+};
+
+// Just rewrote every type with BigNumber basically
+
+export type TickBitMapMappingsWithBigNumber = {
+  index: number;
+  value: BigNumber;
+};
+
+export type TickInfoWithBigNumber = {
+  initialized: boolean;
+  liquidityGross: BigNumber;
+  liquidityNet: BigNumber;
+};
+
+export type TickInfoMappingsWithBigNumber = {
+  index: number;
+  value: TickInfoWithBigNumber;
+};
+
+export type DecodedStateMultiCallResultWithRelativeBitmaps = {
+  pool: Address;
+  blockTimestamp: BigNumber;
+  slot0: {
+    sqrtPriceX96: BigNumber;
+    tick: number;
+    fee: number;
+    unlocked: boolean;
+  };
+  liquidity: BigNumber;
+  tickSpacing: number;
+  maxLiquidityPerTick: BigNumber;
+  tickBitmap: TickBitMapMappingsWithBigNumber[];
+  ticks: TickInfoMappingsWithBigNumber[];
+};

package/src/dex/solidly-v3/utils.ts

@@ -0,0 +1,71 @@
+import { BytesLike, ethers } from 'ethers';
+import { assert } from 'ts-essentials';
+import { extractSuccessAndValue } from '../../lib/decoders';
+import { MultiResult } from '../../lib/multi-wrapper';
+import { DexConfigMap } from '../../types';
+import {
+  DexParams,
+  DecodedStateMultiCallResultWithRelativeBitmaps,
+} from './types';
+
+export function getUniswapV3DexKey(UniswapV3Config: DexConfigMap<DexParams>) {
+  const UniswapV3Keys = Object.keys(UniswapV3Config);
+  if (UniswapV3Keys.length !== 1) {
+    throw new Error(
+      `UniswapV3 key in UniswapV3Config is not unique. Update relevant places (optimizer) or fix config issue. Received: ${JSON.stringify(
+        UniswapV3Config,
+        (_0, value) => (typeof value === 'bigint' ? value.toString() : value),
+      )}`,
+    );
+  }
+
+  return UniswapV3Keys[0].toLowerCase();
+}
+
+export function decodeStateMultiCallResultWithRelativeBitmaps(
+  result: MultiResult<BytesLike> | BytesLike,
+): DecodedStateMultiCallResultWithRelativeBitmaps {
+  const [isSuccess, toDecode] = extractSuccessAndValue(result);
+
+  assert(
+    isSuccess && toDecode !== '0x',
+    `decodeStateMultiCallResultWithRelativeBitmaps failed to get decodable result: ${result}`,
+  );
+
+  const decoded = ethers.utils.defaultAbiCoder.decode(
+    [
+      // I don't want to pass here any interface, so I just use it in ethers format
+      `
+      tuple(
+        address pool,
+        uint256 blockTimestamp,
+        tuple(
+          uint160 sqrtPriceX96,
+          int24 tick,
+          uint24 fee,
+          bool unlocked,
+        ) slot0,
+        uint128 liquidity,
+        int24 tickSpacing,
+        uint128 maxLiquidityPerTick,
+        tuple(
+          int16 index,
+          uint256 value,
+        )[] tickBitmap,
+        tuple(
+          int24 index,
+          tuple(
+            uint128 liquidityGross,
+            int128 liquidityNet,
+            bool initialized,
+          ) value,
+        )[] ticks
+      )
+    `,
+    ],
+    toDecode,
+  )[0];
+  // This conversion is not precise, because when we decode, we have more values
+  // But I typed only the ones that are used later
+  return decoded as DecodedStateMultiCallResultWithRelativeBitmaps;
+}

package/src/dex/uniswap-v3/uniswap-v3-events.test.ts

@@ -13,6 +13,7 @@ import { Interface } from '@ethersproject/abi';
 import ERC20ABI from '../../abi/erc20.json';
 import StateMulticallABI from '../../abi/uniswap-v3/UniswapV3StateMulticall.abi.json';
 import { AbiItem } from 'web3-utils';
+import { decodeStateMultiCallResultWithRelativeBitmaps } from './utils';
 
 jest.setTimeout(300 * 1000);
 const dexKey = 'UniswapV3';
@@ -100,6 +101,7 @@ describe('UniswapV3 Event', function () {
               StateMulticallABI as AbiItem[],
               config.stateMulticall,
             ),
+            decodeStateMultiCallResultWithRelativeBitmaps,
             new Interface(ERC20ABI),
             config.factory,
             poolFeeCode,
@@ -155,6 +157,7 @@ describe('UniswapV3 Event', function () {
         StateMulticallABI as AbiItem[],
         config.stateMulticall,
       ),
+      decodeStateMultiCallResultWithRelativeBitmaps,
       new Interface(ERC20ABI),
       _config.factory,
       _feeCode,

package/src/types.ts

@@ -277,6 +277,7 @@ export type Config = {
   uniswapV3EventLoggingSampleRate?: number;
   swaapV2AuthToken?: string;
   dexalotAuthToken?: string;
+  smardexSubgraphAuthToken?: string;
   forceRpcFallbackDexs: string[];
 };
 

package/tests/constants-e2e.ts

@@ -65,6 +65,10 @@ export const Tokens: {
       address: '0xae7ab96520de3a18e5e111b5eaab095312d7fe84',
       decimals: 18,
     },
+    SDEX: {
+      address: '0x5DE8ab7E27f6E7A1fFf3E5B337584Aa43961BEeF',
+      decimals: 18,
+    },
     wstETH: {
       address: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
       decimals: 18,
@@ -453,6 +457,10 @@ export const Tokens: {
       address: '0xa3fa99a148fa48d14ed51d610c367c61876997f1',
       decimals: 18,
     },
+    SDEX: {
+      address: '0x6899fAcE15c14348E1759371049ab64A3a06bFA6',
+      decimals: 18,
+    },
   },
   [Network.FANTOM]: {
     FTM: { address: ETHER_ADDRESS, decimals: 18 },
@@ -615,6 +623,10 @@ export const Tokens: {
       address: '0x1d2f0da169ceb9fc7b3144628db156f3f6c60dbe',
       decimals: 18,
     },
+    SDEX: {
+      address: '0xFdc66A08B0d0Dc44c17bbd471B88f49F50CdD20F',
+      decimals: 18,
+    },
   },
   [Network.AVALANCHE]: {
     USDCe: {
@@ -869,6 +881,10 @@ export const Tokens: {
       address: '0x32eb7902d4134bf98a28b963d26de779af92a212',
       decimals: 18,
     },
+    SDEX: {
+      address: '0xabD587f2607542723b17f14d00d99b987C29b074',
+      decimals: 18,
+    },
   },
   [Network.OPTIMISM]: {
     DAI: {
@@ -976,6 +992,10 @@ export const Tokens: {
       address: '0xbeFD5C25A59ef2C1316c5A4944931171F30Cd3E4',
       decimals: 18,
     },
+    SDEX: {
+      address: '0xFd4330b0312fdEEC6d4225075b82E00493FF2e3f',
+      decimals: 18,
+    },
     ETH: { address: ETHER_ADDRESS, decimals: 18 },
   },
 };
@@ -1047,6 +1067,7 @@ export const Holders: {
     wibBTC: '0xFbdCA68601f835b27790D98bbb8eC7f05FDEaA9B',
     MATIC: '0x7073783eee7e9b3e6e4ddac4d7f49dc46044dd9a',
     POL: '0x57B6Ad484ccdd902C4419424bA648ba6Ed45dc68',
+    SDEX: '0xB0470cF15B22a6A32c49a7C20E3821B944A76058',
   },
   [Network.ROPSTEN]: {
     ETH: '0x43262A12d8610AA70C15DbaeAC321d51613c9071',
@@ -1082,6 +1103,7 @@ export const Holders: {
     amUSDT: '0x832b11846a27b3ba25d68ae80c39fab155d18c49',
     amUSDC: '0x6e7f19cd23049c7118e14470e2bf85d2e26ee0ae',
     MAI: '0x9a8cf02f3e56c664ce75e395d0e4f3dc3dafe138',
+    SDEX: '0xB0470cF15B22a6A32c49a7C20E3821B944A76058',
   },
   [Network.FANTOM]: {
     DAI: '0x370f4b2dcf75c94d8d4450b493661a9c6170d0b5',
@@ -1125,6 +1147,7 @@ export const Holders: {
     FRAX: '0xEB4576fE753DAB07635c0Bb6c8f0A355e1Db5d31',
     frxETH: '0xf324adC872005197A6f7DAE214d3b63aa0C3625F',
     USDFI: '0x2E00D722e091836B39Db3e4dcE6eE51c90c5B221',
+    SDEX: '0xB0470cF15B22a6A32c49a7C20E3821B944A76058',
     BNBx: '0xFF4606bd3884554CDbDabd9B6e25E2faD4f6fc54',
   },
   [Network.AVALANCHE]: {
@@ -1186,6 +1209,7 @@ export const Holders: {
     ZYB: '0x3ec0eddcd1e25025077327886a78133589082fb2',
     WBTC: '0xd9d611c6943585bc0e18e51034af8fa28778f7da',
     RDNT: '0x62383739d68dd0f844103db8dfb05a7eded5bbe6',
+    SDEX: '0xb0470cf15b22a6a32c49a7c20e3821b944a76058',
     wstETH: '0x916792f7734089470de27297903bed8a4630b26d',
   },
   [Network.OPTIMISM]: {
@@ -1218,10 +1242,11 @@ export const Holders: {
     ETH: '0xdd9176ea3e7559d6b68b537ef555d3e89403f742',
     MAV: '0x7499785aa5d1bdf0a0ac862c1ef3698d3cba6568',
     USDC: '0xaac391f166f33cdaefaa4afa6616a3bea66b694d',
-    USDbC: '0xc9d05a1c3c8e01dcb701d6185cdc21a5bb94becb',
+    USDbC: '0xc68a33de9ceac7bdaed242ae1dc40d673ed4f643',
     DAI: '0x20f03e26968b179025f65c1f4afadfd3959c8d03',
     BAL: '0x854b004700885a61107b458f11ecc169a019b764',
     GOLD: '0x1374c25b3710758c326ee0c70ec48b595d5ccf8c',
+    SDEX: '0xa5d378c05192e3f1f365d6298921879c4d51c5a3',
   },
 };
 

package/.vscode/launch.json

@@ -1,54 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Current",
-      "program": "${file}",
-      "preLaunchTask": "npm: build",
-      "sourceMaps": true,
-      "smartStep": true,
-      "internalConsoleOptions": "openOnSessionStart",
-      "outFiles": ["${workspaceFolder}/build/**/*.js"]
-    },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Debug dex integration",
-      "program": "${workspaceFolder}/node_modules/ts-node/dist/bin.js",
-      "args": [
-        "--project",
-        "tsconfig.json",
-        // "${workspaceFolder}/src/dex/algebra/scripts/validate-state.ts",
-        "${workspaceFolder}/scripts/dex-integration.ts",
-        "test",
-        "wombat"
-      ],
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen",
-      "runtimeArgs": ["--nolazy"],
-      "sourceMaps": true,
-      "smartStep": true,
-      "skipFiles": ["<node_internals>/**"],
-      "cwd": "${workspaceFolder}"
-    },
-    {
-      "type": "node",
-      "name": "Jest file",
-      "request": "launch",
-      "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/jest",
-      "args": [
-        "${fileBasenameNoExtension}",
-        "--runInBand",
-        "--watch",
-        "--coverage=false",
-        "--no-cache"
-      ],
-      "cwd": "${workspaceRoot}",
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen",
-      "sourceMaps": true
-    }
-  ]
-}

package/.vscode/settings.json

@@ -1,2 +0,0 @@
-{
-}

package/.vscode/tasks.json

@@ -1,15 +0,0 @@
-{
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "tsc: build - tsconfig.json",
-      "type": "typescript",
-      "tsconfig": "tsconfig.json",
-      "problemMatcher": ["$tsc"],
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      }
-    }
-  ]
-}