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

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

@@ -118,64 +118,53 @@ describe('UniswapV3 E2E', () => {
 
     describe('UniswapV3 MAINNET', () => {
       const network = Network.MAINNET;
-
-      const tokenASymbol: string = 'USDC';
-      const tokenBSymbol: string = 'USDT';
-
-      const tokenAAmount: string = '1111100000';
-      const tokenBAmount: string = '11000000000';
-      const nativeTokenAmount = '110000000000000000';
-
-      testForNetwork(
+      const tokens = Tokens[network];
+      const holders = Holders[network];
+      const provider = new StaticJsonRpcProvider(
+        generateConfig(network).privateHttpProvider,
         network,
-        dexKey,
-        tokenASymbol,
-        tokenBSymbol,
-        tokenAAmount,
-        tokenBAmount,
-        nativeTokenAmount,
       );
 
-      // it('BUY DAI -> USDC', async () => {
-      //   await testE2E(
-      //     tokens['DAI'],
-      //     tokens['USDC'],
-      //     holders['DAI'],
-      //     '100000000000',
-      //     SwapSide.BUY,
-      //     dexKey,
-      //     ContractMethod.simpleBuy,
-      //     network,
-      //     provider,
-      //   );
-      // });
-      // it('SELL WETH -> SHIBA', async () => {
-      //   await testE2E(
-      //     tokens['WETH'],
-      //     tokens['SHIBA'],
-      //     holders['WETH'],
-      //     '1000000000000000000',
-      //     SwapSide.SELL,
-      //     dexKey,
-      //     ContractMethod.simpleSwap,
-      //     network,
-      //     provider,
-      //   );
-      // });
-
-      // it('directSwap SELL WETH -> USDC', async () => {
-      //   await testE2E(
-      //     tokens['WETH'],
-      //     tokens['USDC'],
-      //     holders['WETH'],
-      //     '1000000000000000000',
-      //     SwapSide.SELL,
-      //     dexKey,
-      //     ContractMethod.directUniV3Swap,
-      //     network,
-      //     provider,
-      //   );
-      // });
+      it('BUY DAI -> USDC', async () => {
+        await testE2E(
+          tokens['DAI'],
+          tokens['USDC'],
+          holders['DAI'],
+          '100000000000',
+          SwapSide.BUY,
+          dexKey,
+          ContractMethod.simpleBuy,
+          network,
+          provider,
+        );
+      });
+      it('SELL WETH -> SHIBA', async () => {
+        await testE2E(
+          tokens['WETH'],
+          tokens['SHIBA'],
+          holders['WETH'],
+          '1000000000000000000',
+          SwapSide.SELL,
+          dexKey,
+          ContractMethod.simpleSwap,
+          network,
+          provider,
+        );
+      });
+
+      it('directSwap SELL WETH -> USDC', async () => {
+        await testE2E(
+          tokens['WETH'],
+          tokens['USDC'],
+          holders['WETH'],
+          '1000000000000000000',
+          SwapSide.SELL,
+          dexKey,
+          ContractMethod.directUniV3Swap,
+          network,
+          provider,
+        );
+      });
     });
 
     describe('UniswapV3 POLYGON', () => {

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,7 +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,
@@ -72,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;
@@ -284,15 +282,15 @@ export class UniswapV3
         return null;
       }
 
-      // await this.dexHelper.cache.hset(
-      //   this.dexmapKey,
-      //   key,
-      //   JSON.stringify({
-      //     token0,
-      //     token1,
-      //     fee: fee.toString(),
-      //   }),
-      // );
+      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}`);
@@ -376,8 +374,7 @@ export class UniswapV3
   }
 
   async addMasterPool(poolKey: string, blockNumber: number): Promise<boolean> {
-    const _pairs = await this.dexHelper.cache.hget(MessagesHashKey, `${this.cacheStateKey}_${poolKey}`);
-    // console.log('PAIRS: ', _pairs);
+    const _pairs = await this.dexHelper.cache.hget(this.dexmapKey, poolKey);
     if (!_pairs) {
       this.logger.warn(
         `did not find poolConfig in for key ${this.dexmapKey} ${poolKey}`,
@@ -394,14 +391,10 @@ export class UniswapV3
       blockNumber,
     );
 
-    // console.log('POOL: ', pool);
-
     if (!pool) {
       return false;
     }
 
-    // console.log('RETURN TRUE');
-
     return true;
   }
 

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>