@paraswap/dex-lib 3.11.8-stader.3 → 3.11.8

package/src/dex/balancer-v3/balancer-v3-sepolia-pools.ts

@@ -0,0 +1,404 @@
+const pools = [
+  {
+    id: '0x0d7291d8bdc6b376aadacbf05b1ef8a8292ef58a',
+    type: 'STABLE',
+    poolTokens: [
+      {
+        address: '0x8a88124522dbbf1e56352ba3de1d9f78c143751e',
+        weight: null,
+        isErc4626: true,
+        underlyingToken: {
+          address: '0x94a9d9ac8a22534e3faca9f4e7f2e2cf85d5e4c8',
+        },
+      },
+      {
+        address: '0x978206fae13faf5a8d293fb614326b237684b750',
+        weight: null,
+        isErc4626: true,
+        underlyingToken: {
+          address: '0xaa8e23fb1079ea71e0a56f48a2aa51851d8433d0',
+        },
+      },
+    ],
+  },
+  {
+    id: '0x1017d7b181ab63ceeb36d96c52a8056e02b7edd0',
+    type: 'STABLE',
+    poolTokens: [
+      {
+        address: '0x8a88124522dbbf1e56352ba3de1d9f78c143751e',
+        weight: null,
+        isErc4626: true,
+        underlyingToken: {
+          address: '0x94a9d9ac8a22534e3faca9f4e7f2e2cf85d5e4c8',
+        },
+      },
+      {
+        address: '0x978206fae13faf5a8d293fb614326b237684b750',
+        weight: null,
+        isErc4626: true,
+        underlyingToken: {
+          address: '0xaa8e23fb1079ea71e0a56f48a2aa51851d8433d0',
+        },
+      },
+    ],
+  },
+  {
+    id: '0x1ada5f54c7aafe20dfcd493de4dbcf4a3061c79c',
+    type: 'WEIGHTED',
+    poolTokens: [
+      {
+        address: '0x0f409e839a6a790aecb737e4436293be11717f95',
+        weight: '0.33',
+        isErc4626: false,
+        underlyingToken: null,
+      },
+      {
+        address: '0xb19382073c7a0addbb56ac6af1808fa49e377b75',
+        weight: '0.67',
+        isErc4626: false,
+        underlyingToken: null,
+      },
+    ],
+  },
+  {
+    id: '0x2ff3b96e0057a1f25f1d62ab800554ccdb268ab8',
+    type: 'WEIGHTED',
+    poolTokens: [
+      {
+        address: '0x7b79995e5f793a07bc00c21412e50ecae098e7f9',
+        weight: '0.5',
+        isErc4626: false,
+        underlyingToken: null,
+      },
+      {
+        address: '0xb19382073c7a0addbb56ac6af1808fa49e377b75',
+        weight: '0.5',
+        isErc4626: false,
+        underlyingToken: null,
+      },
+    ],
+  },
+  {
+    id: '0x3bc893eeb97ecdbb1b17dcc9e88d51e4a0d3fe35',
+    type: 'STABLE',
+    poolTokens: [
+      {
+        address: '0x7b79995e5f793a07bc00c21412e50ecae098e7f9',
+        weight: null,
+        isErc4626: false,
+        underlyingToken: null,
+      },
+      {
+        address: '0x94a9d9ac8a22534e3faca9f4e7f2e2cf85d5e4c8',
+        weight: null,
+        isErc4626: false,
+        underlyingToken: null,
+      },
+      {
+        address: '0x978206fae13faf5a8d293fb614326b237684b750',
+        weight: null,
+        isErc4626: true,
+        underlyingToken: {
+          address: '0xaa8e23fb1079ea71e0a56f48a2aa51851d8433d0',
+        },
+      },
+      {
+        address: '0xde46e43f46ff74a23a65ebb0580cbe3dfe684a17',
+        weight: null,
+        isErc4626: true,
+        underlyingToken: {
+          address: '0xff34b3d4aee8ddcd6f9afffb6fe49bd371b8a357',
+        },
+      },
+    ],
+  },
+  {
+    id: '0x42de4fa875126fdbaf590b2fc3802adbca58acee',
+    type: 'STABLE',
+    poolTokens: [
+      {
+        address: '0xd63db0b88dca565633fb8d70a70b9b8093d34a7e',
+        weight: null,
+        isErc4626: false,
+        underlyingToken: null,
+      },
+      {
+        address: '0xde46e43f46ff74a23a65ebb0580cbe3dfe684a17',
+        weight: null,
+        isErc4626: true,
+        underlyingToken: {
+          address: '0xff34b3d4aee8ddcd6f9afffb6fe49bd371b8a357',
+        },
+      },
+    ],
+  },
+  {
+    id: '0x946e59e9637f44eb122fe64b372aaf6ed0441da1',
+    type: 'WEIGHTED',
+    poolTokens: [
+      {
+        address: '0x94a9d9ac8a22534e3faca9f4e7f2e2cf85d5e4c8',
+        weight: '0.5',
+        isErc4626: false,
+        underlyingToken: null,
+      },
+      {
+        address: '0xff34b3d4aee8ddcd6f9afffb6fe49bd371b8a357',
+        weight: '0.5',
+        isErc4626: false,
+        underlyingToken: null,
+      },
+    ],
+  },
+  {
+    id: '0x965f7d7387d81056ebf0edaf4a869dc46471a676',
+    type: 'WEIGHTED',
+    poolTokens: [
+      {
+        address: '0x7b79995e5f793a07bc00c21412e50ecae098e7f9',
+        weight: '0.5',
+        isErc4626: false,
+        underlyingToken: null,
+      },
+      {
+        address: '0xd63db0b88dca565633fb8d70a70b9b8093d34a7e',
+        weight: '0.5',
+        isErc4626: false,
+        underlyingToken: null,
+      },
+    ],
+  },
+  {
+    id: '0x9dd65a7c9e3973edbf9c5a6f857252b0a67627aa',
+    type: 'STABLE',
+    poolTokens: [
+      {
+        address: '0x6bf294b80c7d8dc72dee762af5d01260b756a051',
+        weight: null,
+        isErc4626: false,
+        underlyingToken: null,
+      },
+      {
+        address: '0x80d6d3946ed8a1da4e226aa21ccddc32bd127d1a',
+        weight: null,
+        isErc4626: false,
+        underlyingToken: null,
+      },
+      {
+        address: '0xb77eb1a70a96fdaaeb31db1b42f2b8b5846b2613',
+        weight: null,
+        isErc4626: false,
+        underlyingToken: null,
+      },
+      {
+        address: '0xff34b3d4aee8ddcd6f9afffb6fe49bd371b8a357',
+        weight: null,
+        isErc4626: false,
+        underlyingToken: null,
+      },
+    ],
+  },
+  {
+    id: '0xadb63f54b5ca608144513f03ff57ea415843b083',
+    type: 'WEIGHTED',
+    poolTokens: [
+      {
+        address: '0x6bf294b80c7d8dc72dee762af5d01260b756a051',
+        weight: '0.33',
+        isErc4626: false,
+        underlyingToken: null,
+      },
+      {
+        address: '0x80d6d3946ed8a1da4e226aa21ccddc32bd127d1a',
+        weight: '0.33',
+        isErc4626: false,
+        underlyingToken: null,
+      },
+      {
+        address: '0xaa8e23fb1079ea71e0a56f48a2aa51851d8433d0',
+        weight: '0.34',
+        isErc4626: false,
+        underlyingToken: null,
+      },
+    ],
+  },
+  {
+    id: '0xbb83ba331c3254c8c44645430126797dceda89c0',
+    type: 'WEIGHTED',
+    poolTokens: [
+      {
+        address: '0x7b79995e5f793a07bc00c21412e50ecae098e7f9',
+        weight: '0.5',
+        isErc4626: false,
+        underlyingToken: null,
+      },
+      {
+        address: '0x8a88124522dbbf1e56352ba3de1d9f78c143751e',
+        weight: '0.5',
+        isErc4626: true,
+        underlyingToken: {
+          address: '0x94a9d9ac8a22534e3faca9f4e7f2e2cf85d5e4c8',
+        },
+      },
+    ],
+  },
+  {
+    id: '0xbfa3d29909e92ab04b631d114c78b5257aba53db',
+    type: 'WEIGHTED',
+    poolTokens: [
+      {
+        address: '0x6bf294b80c7d8dc72dee762af5d01260b756a051',
+        weight: '0.99',
+        isErc4626: false,
+        underlyingToken: null,
+      },
+      {
+        address: '0x80d6d3946ed8a1da4e226aa21ccddc32bd127d1a',
+        weight: '0.01',
+        isErc4626: false,
+        underlyingToken: null,
+      },
+    ],
+  },
+  {
+    id: '0xc9233cc69435591b193b50f702ac31e404a08b10',
+    type: 'WEIGHTED',
+    poolTokens: [
+      {
+        address: '0x7b79995e5f793a07bc00c21412e50ecae098e7f9',
+        weight: '0.5',
+        isErc4626: false,
+        underlyingToken: null,
+      },
+      {
+        address: '0x946e59e9637f44eb122fe64b372aaf6ed0441da1',
+        weight: '0.5',
+        isErc4626: false,
+        underlyingToken: null,
+      },
+    ],
+  },
+  {
+    id: '0xce7601b157e0871332d2295f274a0f4314a1585d',
+    type: 'STABLE',
+    poolTokens: [
+      {
+        address: '0xaa8e23fb1079ea71e0a56f48a2aa51851d8433d0',
+        weight: null,
+        isErc4626: false,
+        underlyingToken: null,
+      },
+      {
+        address: '0xde46e43f46ff74a23a65ebb0580cbe3dfe684a17',
+        weight: null,
+        isErc4626: true,
+        underlyingToken: {
+          address: '0xff34b3d4aee8ddcd6f9afffb6fe49bd371b8a357',
+        },
+      },
+    ],
+  },
+  {
+    id: '0xd320b050444aa50f24e6666e22a503f765e74263',
+    type: 'STABLE',
+    poolTokens: [
+      {
+        address: '0x6bf294b80c7d8dc72dee762af5d01260b756a051',
+        weight: null,
+        isErc4626: false,
+        underlyingToken: null,
+      },
+      {
+        address: '0xb77eb1a70a96fdaaeb31db1b42f2b8b5846b2613',
+        weight: null,
+        isErc4626: false,
+        underlyingToken: null,
+      },
+    ],
+  },
+  {
+    id: '0xd63db0b88dca565633fb8d70a70b9b8093d34a7e',
+    type: 'STABLE',
+    poolTokens: [
+      {
+        address: '0x8a88124522dbbf1e56352ba3de1d9f78c143751e',
+        weight: null,
+        isErc4626: true,
+        underlyingToken: {
+          address: '0x94a9d9ac8a22534e3faca9f4e7f2e2cf85d5e4c8',
+        },
+      },
+      {
+        address: '0x978206fae13faf5a8d293fb614326b237684b750',
+        weight: null,
+        isErc4626: true,
+        underlyingToken: {
+          address: '0xaa8e23fb1079ea71e0a56f48a2aa51851d8433d0',
+        },
+      },
+    ],
+  },
+  {
+    id: '0xdfc3ab57a32828da8074f34e702635fc58d64d06',
+    type: 'WEIGHTED',
+    poolTokens: [
+      {
+        address: '0x978206fae13faf5a8d293fb614326b237684b750',
+        weight: '0.5',
+        isErc4626: true,
+        underlyingToken: {
+          address: '0xaa8e23fb1079ea71e0a56f48a2aa51851d8433d0',
+        },
+      },
+      {
+        address: '0xde46e43f46ff74a23a65ebb0580cbe3dfe684a17',
+        weight: '0.5',
+        isErc4626: true,
+        underlyingToken: {
+          address: '0xff34b3d4aee8ddcd6f9afffb6fe49bd371b8a357',
+        },
+      },
+    ],
+  },
+  {
+    id: '0xe69b70a86a4e1fd33da95693a1ae12be1c26c8ea',
+    type: 'WEIGHTED',
+    poolTokens: [
+      {
+        address: '0xb19382073c7a0addbb56ac6af1808fa49e377b75',
+        weight: '0.5',
+        isErc4626: false,
+        underlyingToken: null,
+      },
+      {
+        address: '0xff34b3d4aee8ddcd6f9afffb6fe49bd371b8a357',
+        weight: '0.5',
+        isErc4626: false,
+        underlyingToken: null,
+      },
+    ],
+  },
+  {
+    id: '0xf5a25990da505a9d4c3e0d876f3951e9edf9abc3',
+    type: 'WEIGHTED',
+    poolTokens: [
+      {
+        address: '0x7b79995e5f793a07bc00c21412e50ecae098e7f9',
+        weight: '0.5',
+        isErc4626: false,
+        underlyingToken: null,
+      },
+      {
+        address: '0x978206fae13faf5a8d293fb614326b237684b750',
+        weight: '0.5',
+        isErc4626: true,
+        underlyingToken: {
+          address: '0xaa8e23fb1079ea71e0a56f48a2aa51851d8433d0',
+        },
+      },
+    ],
+  },
+];
+
+export default pools;

package/src/dex/bebop/constants.ts

@@ -6,7 +6,7 @@ export const BEBOP_API_URL = 'https://api.bebop.xyz';
 export const BEBOP_WS_API_URL = 'wss://api.bebop.xyz';
 export const BEBOP_GAS_COST = 120_000;
 export const BEBOP_AUTH_NAME = 'paraswap';
-export const BEBOP_QUOTE_TIMEOUT_MS = 2000;
+export const BEBOP_QUOTE_TIMEOUT_MS = 3000;
 export const BEBOP_ERRORS_CACHE_KEY = 'errors';
 export const BEBOP_RESTRICTED_CACHE_KEY = 'restricted';
 // Restrict for BEBOP_RESTRICT_TTL_S if an error occured >= BEBOP_RESTRICT_COUNT_THRESHOLD times within BEBOP_RESTRICT_CHECK_INTERVAL_S interval

package/src/dex/index.ts

@@ -94,7 +94,6 @@ import { LitePsm } from './lite-psm/lite-psm';
 import { UsualBond } from './usual-bond/usual-bond';
 import { StkGHO } from './stkgho/stkgho';
 import { SkyConverter } from './sky-converter/sky-converter';
-import { Stader } from './stader/stader';
 
 const LegacyDexes = [
   CurveV2,
@@ -114,7 +113,6 @@ const LegacyDexes = [
 ];
 
 const Dexes = [
-  Stader,
   Bebop,
   Dexalot,
   CurveV1,

package/src/dex/pancakeswap-v3/pancakeswap-v3-pool.ts

@@ -250,6 +250,36 @@ export class PancakeSwapV3EventPool extends StatefulEventSubscriber<PoolState> {
     return TICK_BITMAP_TO_USE + TICK_BITMAP_BUFFER;
   }
 
+  async getOrGenerateState(
+    blockNumber: number,
+  ): Promise<DeepReadonly<PoolState> | null> {
+    const state = this.getState(blockNumber);
+    if (state) {
+      return state;
+    }
+
+    this.logger.error(
+      `PancakeV3: No state found for ${this.name} ${this.addressesSubscribed[0]}, generating new one`,
+    );
+    try {
+      const newState = await this.generateState(blockNumber);
+
+      if (!newState) {
+        this.logger.error(
+          `PancakeV3: Could not generate state for ${this.name} ${this.addressesSubscribed[0]}`,
+        );
+        return null;
+      }
+      this.setState(newState, blockNumber);
+      return newState;
+    } catch (error) {
+      this.logger.error(
+        `PancakeV3: Failed to generate state for ${this.name} ${this.addressesSubscribed[0]}`,
+      );
+      return null;
+    }
+  }
+
   async generateState(blockNumber: number): Promise<Readonly<PoolState>> {
     const callData = this._getStateRequestCallData();
 

package/src/dex/pancakeswap-v3/pancakeswap-v3.ts

@@ -613,6 +613,10 @@ export class PancakeswapV3
 
       if (selectedPools.length === 0) return null;
 
+      await Promise.all(
+        selectedPools.map(pool => pool.getOrGenerateState(blockNumber)),
+      );
+
       const poolsToUse = selectedPools.reduce(
         (acc, pool) => {
           let state = pool.getState(blockNumber);
@@ -632,6 +636,12 @@ export class PancakeswapV3
         },
       );
 
+      poolsToUse.poolWithoutState.forEach(pool => {
+        this.logger.warn(
+          `PancakeV3: Pool ${pool.name} on ${this.dexKey} has no state. Fallback to rpc`,
+        );
+      });
+
       const rpcResultsPromise = this.getPricingFromRpc(
         _srcToken,
         _destToken,

package/src/dex/uniswap-v3/uniswap-v3-pool.ts

@@ -254,6 +254,36 @@ export class UniswapV3EventPool extends StatefulEventSubscriber<PoolState> {
     return TICK_BITMAP_TO_USE + TICK_BITMAP_BUFFER;
   }
 
+  async getOrGenerateState(
+    blockNumber: number,
+  ): Promise<DeepReadonly<PoolState> | null> {
+    const state = this.getState(blockNumber);
+    if (state) {
+      return state;
+    }
+
+    this.logger.error(
+      `UniV3: No state found for ${this.name} ${this.addressesSubscribed[0]}, generating new one`,
+    );
+    try {
+      const newState = await this.generateState(blockNumber);
+
+      if (!newState) {
+        this.logger.error(
+          `UniV3: Could not generate state for ${this.name} ${this.addressesSubscribed[0]}`,
+        );
+        return null;
+      }
+      this.setState(newState, blockNumber);
+      return newState;
+    } catch (error) {
+      this.logger.error(
+        `UniV3: Failed to generate state for ${this.name} ${this.addressesSubscribed[0]}`,
+      );
+      return null;
+    }
+  }
+
   async generateState(blockNumber: number): Promise<Readonly<PoolState>> {
     const callData = this._getStateRequestCallData();
 

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

@@ -715,6 +715,10 @@ export class UniswapV3
 
       if (selectedPools.length === 0) return null;
 
+      await Promise.all(
+        selectedPools.map(pool => pool.getOrGenerateState(blockNumber)),
+      );
+
       const poolsToUse = selectedPools.reduce(
         (acc, pool) => {
           let state = pool.getState(blockNumber);
@@ -722,6 +726,7 @@ export class UniswapV3
             this.logger.trace(
               `${this.dexKey}: State === null. Fallback to rpc ${pool.name}`,
             );
+            // as we generate state (if nullified) in previous Promise.all, here should only be pools with failed initialization
             acc.poolWithoutState.push(pool);
           } else {
             acc.poolWithState.push(pool);
@@ -734,6 +739,12 @@ export class UniswapV3
         },
       );
 
+      poolsToUse.poolWithoutState.forEach(pool => {
+        this.logger.warn(
+          `UniV3: Pool ${pool.name} on ${this.dexKey} has no state. Fallback to rpc`,
+        );
+      });
+
       const states = poolsToUse.poolWithState.map(
         p => p.getState(blockNumber)!,
       );

package/tests/constants-e2e.ts

@@ -92,10 +92,6 @@ export const Tokens: {
       address: ETHER_ADDRESS,
       decimals: 18,
     },
-    ETHx: {
-      address: '0xA35b1B31Ce002FBF2058D22F30f95D405200A15b',
-      decimals: 18,
-    },
     SWETH: {
       address: '0xf951e335afb289353dc249e82926178eac7ded78',
       decimals: 18,
@@ -1629,7 +1625,6 @@ export const Holders: {
     sUSDS: '0xd564B3aE673CAa49D054Bf185bD72a6853763eE7',
     SKY: '0x0ddda327A6614130CCb20bc0097313A282176A01',
     MKR: '0xe9aAA7A9DDc0877626C1779AbC29993aD89A6c1f',
-    ETHx: '0xFCC1A2c71F01B7f58Ed538a6B4AAa5A0724eB5A6',
     // Idle tokens
     AA_wstETH: '0xd7C1b48877A7dFA7D51cf1144c89C0A3F134F935',
     'AA_idle_cpPOR-USDC': '0x085c8eaccA6911fE60aE3f8FbAe5F3012E3A05Ec',

package/.idea/aws.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="accountSettings">
-    <option name="activeProfile" value="profile:default" />
-    <option name="activeRegion" value="us-east-1" />
-    <option name="recentlyUsedProfiles">
-      <list>
-        <option value="profile:default" />
-      </list>
-    </option>
-    <option name="recentlyUsedRegions">
-      <list>
-        <option value="us-east-1" />
-      </list>
-    </option>
-  </component>
-</project>

package/.idea/codeStyles/Project.xml

@@ -1,19 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <ScalaCodeStyleSettings>
-      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
-    </ScalaCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACKETS" value="true" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>

package/.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/paraswap-dex-lib.iml" filepath="$PROJECT_DIR$/.idea/paraswap-dex-lib.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/paraswap-dex-lib.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/prettier.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myRunOnSave" value="true" />
-    <option name="myRunOnReformat" value="true" />
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>