@paraswap/dex-lib 2.46.2-remove-univ3-poolconfigs.3 → 2.47.0

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

@@ -106,13 +106,6 @@ export class AlgebraEventPoolV1_9 extends StatefulEventSubscriber<PoolState_v1_9
     await super.initialize(blockNumber, options);
   }
 
-  protected getValueToPushIntoNewPoolsChannel() {
-    return {
-      token0: this.token0,
-      token1: this.token1,
-    };
-  }
-
   protected async processBlockLogs(
     state: DeepReadonly<PoolState_v1_9>,
     logs: Readonly<Log>[],

package/src/dex/algebra/algebra.ts

@@ -14,12 +14,7 @@ import {
   PoolLiquidity,
   Token,
 } from '../../types';
-import {
-  SwapSide,
-  Network,
-  CACHE_PREFIX,
-  INIT_SERVICE_CACHE_PREFIX,
-} from '../../constants';
+import { SwapSide, Network, CACHE_PREFIX } from '../../constants';
 import * as CALLDATA_GAS_COST from '../../calldata-gas-cost';
 import {
   _require,
@@ -60,8 +55,6 @@ type PoolPairsInfo = {
   token1: Address;
 };
 
-const MessagesHashKey = `${INIT_SERVICE_CACHE_PREFIX}_messages`;
-
 // const ALGEBRA_CLEAN_NOT_EXISTING_POOL_TTL_MS = 3 * 24 * 60 * 60 * 1000; // 3 days
 // const ALGEBRA_CLEAN_NOT_EXISTING_POOL_INTERVAL_MS = 24 * 60 * 60 * 1000; // Once in a day
 const ALGEBRA_EFFICIENCY_FACTOR = 3;
@@ -276,6 +269,15 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
         this.eventPools[this.getPoolIdentifier(srcAddress, destAddress)] = null;
         return null;
       }
+
+      await this.dexHelper.cache.hset(
+        this.dexmapKey,
+        key,
+        JSON.stringify({
+          token0,
+          token1,
+        }),
+      );
     }
 
     this.logger.trace(`starting to listen to new pool: ${key}`);
@@ -312,7 +314,7 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
       }
     } catch (e) {
       if (e instanceof Error && e.message.endsWith('Pool does not exist')) {
-        /*
+        /* 
          protection against 2 race conditions
           1/ if pool.initialize() promise rejects after the Pool creation event got treated
           2/ if the rpc node we hit on the http request is lagging behind the one we got event from (websocket)
@@ -370,13 +372,10 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
   }
 
   async addMasterPool(poolKey: string, blockNumber: number): Promise<boolean> {
-    const _pairs = await this.dexHelper.cache.hget(
-      MessagesHashKey,
-      `${this.cacheStateKey}_${poolKey}`,
-    );
+    const _pairs = await this.dexHelper.cache.hget(this.dexmapKey, poolKey);
     if (!_pairs) {
       this.logger.warn(
-        `did not find poolConfig in for key ${MessagesHashKey} ${this.cacheStateKey}_${poolKey}`,
+        `did not find poolConfig in for key ${this.dexmapKey} ${poolKey}`,
       );
       return false;
     }

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

@@ -124,14 +124,6 @@ export class PancakeSwapV3EventPool extends StatefulEventSubscriber<PoolState> {
     await super.initialize(blockNumber, options);
   }
 
-  protected getValueToPushIntoNewPoolsChannel() {
-    return {
-      token0: this.token0,
-      token1: this.token1,
-      fee: this.feeCode,
-    };
-  }
-
   protected async processBlockLogs(
     state: DeepReadonly<PoolState>,
     logs: Readonly<Log>[],

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

@@ -12,12 +12,7 @@ import {
   NumberAsString,
   PoolPrices,
 } from '../../types';
-import {
-  SwapSide,
-  Network,
-  CACHE_PREFIX,
-  INIT_SERVICE_CACHE_PREFIX,
-} from '../../constants';
+import { SwapSide, Network, CACHE_PREFIX } from '../../constants';
 import * as CALLDATA_GAS_COST from '../../calldata-gas-cost';
 import {
   getBigIntPow,
@@ -72,8 +67,6 @@ type PoolPairsInfo = {
   fee: string;
 };
 
-const MessagesHashKey = `${INIT_SERVICE_CACHE_PREFIX}_messages`;
-
 const PANCAKESWAPV3_CLEAN_NOT_EXISTING_POOL_TTL_MS = 3 * 24 * 60 * 60 * 1000; // 3 days
 const PANCAKESWAPV3_CLEAN_NOT_EXISTING_POOL_INTERVAL_MS = 24 * 60 * 60 * 1000; // Once in a day
 const PANCAKESWAPV3_QUOTE_GASLIMIT = 200_000;
@@ -257,6 +250,16 @@ export class PancakeswapV3
           null;
         return null;
       }
+
+      await this.dexHelper.cache.hset(
+        this.dexmapKey,
+        key,
+        JSON.stringify({
+          token0,
+          token1,
+          fee: fee.toString(),
+        }),
+      );
     }
 
     this.logger.trace(`starting to listen to new pool: ${key}`);
@@ -336,13 +339,10 @@ export class PancakeswapV3
   }
 
   async addMasterPool(poolKey: string, blockNumber: number): Promise<boolean> {
-    const _pairs = await this.dexHelper.cache.hget(
-      MessagesHashKey,
-      `${this.cacheStateKey}_${poolKey}`,
-    );
+    const _pairs = await this.dexHelper.cache.hget(this.dexmapKey, poolKey);
     if (!_pairs) {
       this.logger.warn(
-        `did not find poolConfig in for key ${MessagesHashKey} ${this.cacheStateKey}_${poolKey}`,
+        `did not find poolConfig in for key ${this.dexmapKey} ${poolKey}`,
       );
       return false;
     }

package/src/dex/simple-exchange.ts

@@ -39,6 +39,7 @@ export class SimpleExchange {
   private cache: ICache;
 
   protected network: number;
+  protected dexmapKey: string;
 
   readonly cacheStateKey: string;
   private readonly cacheApprovesKey: string;
@@ -57,6 +58,9 @@ export class SimpleExchange {
     this.provider = dexHelper.web3Provider;
     this.cache = dexHelper.cache;
 
+    this.dexmapKey =
+      `${CACHE_PREFIX}_${this.network}_${this.dexKey}_poolconfigs`.toLowerCase();
+
     this.cacheStateKey =
       `${CACHE_PREFIX}_${this.network}_${this.dexKey}_states`.toLowerCase();
 

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

@@ -128,14 +128,6 @@ export class SolidlyV3EventPool extends StatefulEventSubscriber<PoolState> {
     await super.initialize(blockNumber, options);
   }
 
-  protected getValueToPushIntoNewPoolsChannel() {
-    return {
-      token0: this.token0,
-      token1: this.token1,
-      fee: this.tickSpacing.toString(),
-    };
-  }
-
   protected async processBlockLogs(
     state: DeepReadonly<PoolState>,
     logs: Readonly<Log>[],

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

@@ -14,12 +14,7 @@ import {
   PreprocessTransactionOptions,
   ExchangeTxInfo,
 } from '../../types';
-import {
-  SwapSide,
-  Network,
-  CACHE_PREFIX,
-  INIT_SERVICE_CACHE_PREFIX,
-} from '../../constants';
+import { SwapSide, Network, CACHE_PREFIX } from '../../constants';
 import * as CALLDATA_GAS_COST from '../../calldata-gas-cost';
 import { getBigIntPow, getDexKeysWithNetwork, isTruthy } from '../../utils';
 import { IDex } from '../../dex/idex';
@@ -62,8 +57,6 @@ type PoolPairsInfo = {
   fee: string;
 };
 
-const MessagesHashKey = `${INIT_SERVICE_CACHE_PREFIX}_messages`;
-
 const UNISWAPV3_CLEAN_NOT_EXISTING_POOL_TTL_MS = 60 * 60 * 24 * 1000; // 24 hours
 const UNISWAPV3_CLEAN_NOT_EXISTING_POOL_INTERVAL_MS = 30 * 60 * 1000; // Once in 30 minutes
 
@@ -265,6 +258,16 @@ export class SolidlyV3
         ] = null;
         return null;
       }
+
+      await this.dexHelper.cache.hset(
+        this.dexmapKey,
+        key,
+        JSON.stringify({
+          token0,
+          token1,
+          fee: tickSpacing.toString(),
+        }),
+      );
     }
 
     this.logger.trace(`starting to listen to new pool: ${key}`);
@@ -341,13 +344,10 @@ export class SolidlyV3
   }
 
   async addMasterPool(poolKey: string, blockNumber: number): Promise<boolean> {
-    const _pairs = await this.dexHelper.cache.hget(
-      MessagesHashKey,
-      `${this.cacheStateKey}_${poolKey}`,
-    );
+    const _pairs = await this.dexHelper.cache.hget(this.dexmapKey, poolKey);
     if (!_pairs) {
       this.logger.warn(
-        `did not find poolConfig in for key ${MessagesHashKey} ${this.cacheStateKey}_${poolKey}`,
+        `did not find poolConfig in for key ${this.dexmapKey} ${poolKey}`,
       );
       return false;
     }

package/src/dex/uniswap-v2/config.ts

@@ -150,6 +150,48 @@ export const UniswapV2Config: DexConfigMap<DexParams> = {
       poolGasCost: 80 * 1000,
       feeCode: 30,
     },
+    [Network.ARBITRUM]: {
+      factoryAddress: '0xf1D7CC64Fb4452F05c498126312eBE29f30Fbcf9',
+      initCode:
+        '0x96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f',
+      poolGasCost: 80 * 1000,
+      feeCode: 30,
+    },
+    [Network.AVALANCHE]: {
+      factoryAddress: '0x9e5A52f57b3038F1B8EeE45F28b3C1967e22799C',
+      initCode:
+        '0x96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f',
+      poolGasCost: 80 * 1000,
+      feeCode: 30,
+    },
+    [Network.BSC]: {
+      factoryAddress: '0x8909Dc15e40173Ff4699343b6eB8132c65e18eC6',
+      initCode:
+        '0x96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f',
+      poolGasCost: 80 * 1000,
+      feeCode: 30,
+    },
+    [Network.BASE]: {
+      factoryAddress: '0x8909Dc15e40173Ff4699343b6eB8132c65e18eC6',
+      initCode:
+        '0x96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f',
+      poolGasCost: 80 * 1000,
+      feeCode: 30,
+    },
+    [Network.OPTIMISM]: {
+      factoryAddress: '0x0c3c1c532F1e39EdF36BE9Fe0bE1410313E074Bf',
+      initCode:
+        '0x96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f',
+      poolGasCost: 80 * 1000,
+      feeCode: 30,
+    },
+    [Network.POLYGON]: {
+      factoryAddress: '0x9e5A52f57b3038F1B8EeE45F28b3C1967e22799C',
+      initCode:
+        '0x96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f',
+      poolGasCost: 80 * 1000,
+      feeCode: 30,
+    },
   },
   ApeSwap: {
     [Network.BSC]: {

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

@@ -124,14 +124,6 @@ export class UniswapV3EventPool extends StatefulEventSubscriber<PoolState> {
     await super.initialize(blockNumber, options);
   }
 
-  protected getValueToPushIntoNewPoolsChannel() {
-    return {
-      token0: this.token0,
-      token1: this.token1,
-      fee: this.feeCode,
-    };
-  }
-
   protected async processBlockLogs(
     state: DeepReadonly<PoolState>,
     logs: Readonly<Log>[],

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

@@ -15,12 +15,7 @@ import {
   Token,
   TxInfo,
 } from '../../types';
-import {
-  CACHE_PREFIX,
-  INIT_SERVICE_CACHE_PREFIX,
-  Network,
-  SwapSide,
-} from '../../constants';
+import { CACHE_PREFIX, Network, SwapSide } from '../../constants';
 import * as CALLDATA_GAS_COST from '../../calldata-gas-cost';
 import {
   getBigIntPow,
@@ -77,8 +72,6 @@ type PoolPairsInfo = {
   fee: string;
 };
 
-const MessagesHashKey = `${INIT_SERVICE_CACHE_PREFIX}_messages`;
-
 const UNISWAPV3_CLEAN_NOT_EXISTING_POOL_TTL_MS = 3 * 24 * 60 * 60 * 1000; // 3 days
 const UNISWAPV3_CLEAN_NOT_EXISTING_POOL_INTERVAL_MS = 24 * 60 * 60 * 1000; // Once in a day
 const UNISWAPV3_QUOTE_GASLIMIT = 200_000;
@@ -288,6 +281,16 @@ export class UniswapV3
           null;
         return null;
       }
+
+      await this.dexHelper.cache.hset(
+        this.dexmapKey,
+        key,
+        JSON.stringify({
+          token0,
+          token1,
+          fee: fee.toString(),
+        }),
+      );
     }
 
     this.logger.trace(`starting to listen to new pool: ${key}`);
@@ -371,13 +374,10 @@ export class UniswapV3
   }
 
   async addMasterPool(poolKey: string, blockNumber: number): Promise<boolean> {
-    const _pairs = await this.dexHelper.cache.hget(
-      MessagesHashKey,
-      `${this.cacheStateKey}_${poolKey}`,
-    );
+    const _pairs = await this.dexHelper.cache.hget(this.dexmapKey, poolKey);
     if (!_pairs) {
       this.logger.warn(
-        `did not find poolConfig in for key ${MessagesHashKey} ${this.cacheStateKey}_${poolKey}`,
+        `did not find poolConfig in for key ${this.dexmapKey} ${poolKey}`,
       );
       return false;
     }

package/src/stateful-event-subscriber.ts

@@ -145,18 +145,7 @@ export abstract class StatefulEventSubscriber<State>
           this.setState(state, blockNumber);
 
           // we should publish only if generateState succeeded
-          const value = this.getValueToPushIntoNewPoolsChannel();
-          // console.log('PUBLISH IN NEW POOLS');
-          // console.log('KEY: ', this.cacheName);
-          // console.log('VALUE: ', value);
-
-          this.dexHelper.cache.publish(
-            'new_pools',
-            JSON.stringify({
-              key: this.cacheName,
-              value,
-            }),
-          );
+          this.dexHelper.cache.publish('new_pools', this.cacheName);
         }
       } else {
         // if you are not a slave instance always generate new state
@@ -184,10 +173,6 @@ export abstract class StatefulEventSubscriber<State>
     this.isInitialized = true;
   }
 
-  protected getValueToPushIntoNewPoolsChannel() {
-    return {};
-  }
-
   //Function which transforms the given state for the given log event.
   //If the provided log does not affect the state, return null.
   protected abstract processLog(

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>