@paraswap/dex-lib 2.47.7 → 2.47.8-remove-univ3-poolconfigs.0

package/src/dex/algebra/algebra.ts

@@ -14,7 +14,12 @@ import {
   PoolLiquidity,
   Token,
 } from '../../types';
-import { SwapSide, Network, CACHE_PREFIX } from '../../constants';
+import {
+  SwapSide,
+  Network,
+  CACHE_PREFIX,
+  INIT_SERVICE_CACHE_PREFIX,
+} from '../../constants';
 import * as CALLDATA_GAS_COST from '../../calldata-gas-cost';
 import {
   _require,
@@ -55,6 +60,8 @@ 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;
@@ -269,15 +276,6 @@ 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}`);
@@ -314,7 +312,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)
@@ -372,10 +370,13 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
   }
 
   async addMasterPool(poolKey: string, blockNumber: number): Promise<boolean> {
-    const _pairs = await this.dexHelper.cache.hget(this.dexmapKey, poolKey);
+    const _pairs = await this.dexHelper.cache.hget(
+      MessagesHashKey,
+      `${this.cacheStateKey}_${poolKey}`,
+    );
     if (!_pairs) {
       this.logger.warn(
-        `did not find poolConfig in for key ${this.dexmapKey} ${poolKey}`,
+        `did not find poolConfig in for key ${MessagesHashKey} ${this.cacheStateKey}_${poolKey}`,
       );
       return false;
     }

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

@@ -124,6 +124,14 @@ 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,7 +12,12 @@ import {
   NumberAsString,
   PoolPrices,
 } from '../../types';
-import { SwapSide, Network, CACHE_PREFIX } from '../../constants';
+import {
+  SwapSide,
+  Network,
+  CACHE_PREFIX,
+  INIT_SERVICE_CACHE_PREFIX,
+} from '../../constants';
 import * as CALLDATA_GAS_COST from '../../calldata-gas-cost';
 import {
   getBigIntPow,
@@ -67,6 +72,8 @@ 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;
@@ -250,16 +257,6 @@ 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}`);
@@ -339,10 +336,13 @@ export class PancakeswapV3
   }
 
   async addMasterPool(poolKey: string, blockNumber: number): Promise<boolean> {
-    const _pairs = await this.dexHelper.cache.hget(this.dexmapKey, poolKey);
+    const _pairs = await this.dexHelper.cache.hget(
+      MessagesHashKey,
+      `${this.cacheStateKey}_${poolKey}`,
+    );
     if (!_pairs) {
       this.logger.warn(
-        `did not find poolConfig in for key ${this.dexmapKey} ${poolKey}`,
+        `did not find poolConfig in for key ${MessagesHashKey} ${this.cacheStateKey}_${poolKey}`,
       );
       return false;
     }

package/src/dex/simple-exchange.ts

@@ -39,7 +39,6 @@ export class SimpleExchange {
   private cache: ICache;
 
   protected network: number;
-  protected dexmapKey: string;
 
   readonly cacheStateKey: string;
   private readonly cacheApprovesKey: string;
@@ -58,9 +57,6 @@ 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,6 +128,14 @@ 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,7 +14,12 @@ import {
   PreprocessTransactionOptions,
   ExchangeTxInfo,
 } from '../../types';
-import { SwapSide, Network, CACHE_PREFIX } from '../../constants';
+import {
+  SwapSide,
+  Network,
+  CACHE_PREFIX,
+  INIT_SERVICE_CACHE_PREFIX,
+} from '../../constants';
 import * as CALLDATA_GAS_COST from '../../calldata-gas-cost';
 import { getBigIntPow, getDexKeysWithNetwork, isTruthy } from '../../utils';
 import { IDex } from '../../dex/idex';
@@ -56,6 +61,8 @@ 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
 
@@ -256,16 +263,6 @@ 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}`);
@@ -342,10 +339,13 @@ export class SolidlyV3
   }
 
   async addMasterPool(poolKey: string, blockNumber: number): Promise<boolean> {
-    const _pairs = await this.dexHelper.cache.hget(this.dexmapKey, poolKey);
+    const _pairs = await this.dexHelper.cache.hget(
+      MessagesHashKey,
+      `${this.cacheStateKey}_${poolKey}`,
+    );
     if (!_pairs) {
       this.logger.warn(
-        `did not find poolConfig in for key ${this.dexmapKey} ${poolKey}`,
+        `did not find poolConfig in for key ${MessagesHashKey} ${this.cacheStateKey}_${poolKey}`,
       );
       return false;
     }

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

@@ -124,6 +124,14 @@ 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,7 +15,12 @@ import {
   Token,
   TxInfo,
 } from '../../types';
-import { CACHE_PREFIX, Network, SwapSide } from '../../constants';
+import {
+  CACHE_PREFIX,
+  INIT_SERVICE_CACHE_PREFIX,
+  Network,
+  SwapSide,
+} from '../../constants';
 import * as CALLDATA_GAS_COST from '../../calldata-gas-cost';
 import {
   getBigIntPow,
@@ -72,6 +77,8 @@ 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;
@@ -281,16 +288,6 @@ 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}`);
@@ -374,10 +371,13 @@ export class UniswapV3
   }
 
   async addMasterPool(poolKey: string, blockNumber: number): Promise<boolean> {
-    const _pairs = await this.dexHelper.cache.hget(this.dexmapKey, poolKey);
+    const _pairs = await this.dexHelper.cache.hget(
+      MessagesHashKey,
+      `${this.cacheStateKey}_${poolKey}`,
+    );
     if (!_pairs) {
       this.logger.warn(
-        `did not find poolConfig in for key ${this.dexmapKey} ${poolKey}`,
+        `did not find poolConfig in for key ${MessagesHashKey} ${this.cacheStateKey}_${poolKey}`,
       );
       return false;
     }

package/src/stateful-event-subscriber.ts

@@ -145,7 +145,15 @@ export abstract class StatefulEventSubscriber<State>
           this.setState(state, blockNumber);
 
           // we should publish only if generateState succeeded
-          this.dexHelper.cache.publish('new_pools', this.cacheName);
+          const value = this.getValueToPushIntoNewPoolsChannel();
+
+          this.dexHelper.cache.publish(
+            'new_pools',
+            JSON.stringify({
+              key: this.cacheName,
+              value,
+            }),
+          );
         }
       } else {
         // if you are not a slave instance always generate new state
@@ -173,6 +181,10 @@ 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(