@paraswap/dex-lib 2.35.7-multiple-dex-base-chain.2 → 2.35.7-worker-pool.1

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

@@ -959,146 +959,4 @@ describe('SushiSwapV3', () => {
       expect(falseChecksCounter).toBeLessThan(poolPrices!.length);
     });
   });
-
-  describe('Base', () => {
-    let blockNumber: number;
-    let sushiSwapV3: UniswapV3;
-    let sushiSwapV3Mainnet: UniswapV3;
-
-    const network = Network.BASE;
-    const dexHelper = new DummyDexHelper(network);
-    const TokenASymbol = 'USDbC';
-    const TokenA = Tokens[network][TokenASymbol];
-
-    const TokenBSymbol = 'DAI';
-    const TokenB = Tokens[network][TokenBSymbol];
-
-    beforeEach(async () => {
-      blockNumber = await dexHelper.web3Provider.eth.getBlockNumber();
-      sushiSwapV3 = new UniswapV3(network, dexKey, dexHelper);
-      sushiSwapV3Mainnet = new UniswapV3(Network.MAINNET, dexKey, dexHelper);
-    });
-
-    it('getPoolIdentifiers and getPricesVolume SELL', async function () {
-      const amounts = [0n, BI_POWS[6], 2000000n];
-
-      const pools = await sushiSwapV3.getPoolIdentifiers(
-        TokenA,
-        TokenB,
-        SwapSide.SELL,
-        blockNumber,
-      );
-      console.log(
-        `${TokenASymbol} <> ${TokenBSymbol} Pool Identifiers: `,
-        pools,
-      );
-
-      expect(pools.length).toBeGreaterThan(0);
-
-      const poolPrices = await sushiSwapV3.getPricesVolume(
-        TokenA,
-        TokenB,
-        amounts,
-        SwapSide.SELL,
-        blockNumber,
-        pools,
-      );
-      console.log(
-        `${TokenASymbol} <> ${TokenBSymbol} Pool Prices: `,
-        poolPrices,
-      );
-
-      expect(poolPrices).not.toBeNull();
-      checkPoolPrices(poolPrices!, amounts, SwapSide.SELL, dexKey);
-
-      let falseChecksCounter = 0;
-      await Promise.all(
-        poolPrices!.map(async price => {
-          const fee = sushiSwapV3.eventPools[price.poolIdentifier!]!.feeCode;
-          const res = await checkOnChainPricing(
-            dexHelper,
-            sushiSwapV3,
-            'quoteExactInputSingle',
-            blockNumber,
-            '0xb1E835Dc2785b52265711e17fCCb0fd018226a6e',
-            price.prices,
-            TokenA.address,
-            TokenB.address,
-            fee,
-            amounts,
-          );
-          if (res === false) falseChecksCounter++;
-        }),
-      );
-
-      expect(falseChecksCounter).toBeLessThan(poolPrices!.length);
-    });
-
-    it('getPoolIdentifiers and getPricesVolume BUY', async function () {
-      const amounts = [0n, BI_POWS[6], 2000000n];
-
-      const pools = await sushiSwapV3.getPoolIdentifiers(
-        TokenA,
-        TokenB,
-        SwapSide.BUY,
-        blockNumber,
-      );
-      console.log(
-        `${TokenASymbol} <> ${TokenBSymbol} Pool Identifiers: `,
-        pools,
-      );
-
-      expect(pools.length).toBeGreaterThan(0);
-
-      const poolPrices = await sushiSwapV3.getPricesVolume(
-        TokenA,
-        TokenB,
-        amounts,
-        SwapSide.BUY,
-        blockNumber,
-        pools,
-      );
-      console.log(
-        `${TokenASymbol} <> ${TokenBSymbol} Pool Prices: `,
-        poolPrices,
-      );
-
-      expect(poolPrices).not.toBeNull();
-      checkPoolPrices(poolPrices!, amounts, SwapSide.SELL, dexKey);
-
-      let falseChecksCounter = 0;
-      await Promise.all(
-        poolPrices!.map(async price => {
-          const fee = sushiSwapV3.eventPools[price.poolIdentifier!]!.feeCode;
-          const res = await checkOnChainPricing(
-            dexHelper,
-            sushiSwapV3,
-            'quoteExactOutputSingle',
-            blockNumber,
-            '0xb1E835Dc2785b52265711e17fCCb0fd018226a6e',
-            price.prices,
-            TokenA.address,
-            TokenB.address,
-            fee,
-            amounts,
-          );
-          if (res === false) falseChecksCounter++;
-        }),
-      );
-
-      expect(falseChecksCounter).toBeLessThan(poolPrices!.length);
-    });
-
-    it('getTopPoolsForToken', async function () {
-      const poolLiquidity = await sushiSwapV3.getTopPoolsForToken(
-        TokenB.address,
-        10,
-      );
-      console.log(`${TokenASymbol} Top Pools:`, poolLiquidity);
-
-      checkPoolsLiquidity(poolLiquidity, TokenB.address, dexKey);
-    });
-  });
-
 });
-

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

@@ -641,20 +641,17 @@ export class UniswapV3
           const balanceDestToken =
             _destAddress === pool.token0 ? state.balance0 : state.balance1;
 
-          const unitResult = this._getOutputs(
-            state,
-            [unitAmount],
-            zeroForOne,
-            side,
-            balanceDestToken,
-          );
-          const pricesResult = this._getOutputs(
-            state,
-            _amounts,
-            zeroForOne,
-            side,
-            balanceDestToken,
-          );
+          const unitResult = (await this.dexHelper.executeOnWorkerPool(
+            this.dexKey,
+            'getOutputs',
+            [state, [unitAmount], zeroForOne, side, balanceDestToken],
+          )) as ReturnType<typeof this.getOutputs>;
+
+          const pricesResult = (await this.dexHelper.executeOnWorkerPool(
+            this.dexKey,
+            'getOutputs',
+            [state, _amounts, zeroForOne, side, balanceDestToken],
+          )) as ReturnType<typeof this.getOutputs>;
 
           if (!unitResult || !pricesResult) {
             this.logger.debug('Prices or unit is not calculated');
@@ -1071,7 +1068,7 @@ export class UniswapV3
     return newConfig;
   }
 
-  private _getOutputs(
+  getOutputs(
     state: DeepReadonly<PoolState>,
     amounts: bigint[],
     zeroForOne: boolean,

package/src/dex/woo-fi-v2/config.ts

@@ -64,16 +64,6 @@ export const WooFiV2Config: DexConfigMap<DexParams> = {
         decimals: 6,
       },
     },
-    [Network.BASE]: {
-      wooPPV2Address: '0xb130a49065178465931d4f887056328CeA5D723f',
-      wooOracleV2Address: '0x2Fe5E5D341cFFa606a5d9DA1B6B646a381B0f7ec',
-      integrationHelperAddress: '0xC4E9B633685461E7B7A807D12a246C81f96F31B8',
-      // USDbC
-      quoteToken: {
-        address: '0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA',
-        decimals: 6,
-      },
-    },
   },
 };
 
@@ -94,7 +84,4 @@ export const Adapters: Record<number, AdapterMappings> = {
   [Network.AVALANCHE]: {
     [SwapSide.SELL]: [{ name: 'AvalancheAdapter01', index: 12 }],
   },
-  [Network.BASE]: {
-    [SwapSide.SELL]: [{ name: 'BaseAdapter01', index: 5 }],
-  },
 };

package/src/dex/woo-fi-v2/woo-fi-v2-e2e.test.ts

@@ -213,68 +213,4 @@ describe('WooFiV2 E2E', () => {
       tokenQuoteAmount,
     );
   });
-
-  describe('Base', () => {
-    const network = Network.BASE;
-
-    const baseATokenSymbol = 'USDbC';
-    const baseBTokenSymbol = 'ETH';
-
-    const tokenBaseAAmount = '100000000';
-    const tokenBaseBAmount = '1000000000000000000';
-
-    const tokens = Tokens[network];
-    const holders = Holders[network];
-
-    const provider = new StaticJsonRpcProvider(
-      generateConfig(network).privateHttpProvider,
-      network,
-    );
-
-    const sideToContractMethods = new Map([
-      [
-        SwapSide.SELL,
-        [
-          ContractMethod.simpleSwap,
-          ContractMethod.multiSwap,
-          ContractMethod.megaSwap,
-        ],
-      ],
-    ]);
-
-    sideToContractMethods.forEach((contractMethods, side) =>
-      describe(`${side}`, () => {
-        contractMethods.forEach((contractMethod: ContractMethod) => {
-          describe(`${contractMethod}`, () => {
-            it(`${baseATokenSymbol} -> ${baseBTokenSymbol}`, async () => {
-              await testE2E(
-                tokens[baseATokenSymbol],
-                tokens[baseBTokenSymbol],
-                holders[baseATokenSymbol],
-                tokenBaseAAmount,
-                side,
-                dexKey,
-                contractMethod,
-                network,
-                provider,
-              );
-            });
-            it(`${baseBTokenSymbol} -> ${baseATokenSymbol}`, async () => {
-              await testE2E(
-                tokens[baseBTokenSymbol],
-                tokens[baseATokenSymbol],
-                holders[baseBTokenSymbol],
-                tokenBaseBAmount,
-                side,
-                dexKey,
-                contractMethod,
-                network,
-                provider,
-              );
-            });
-          });
-        });
-      }),
-    );
-  });
 });

package/src/dex-helper/dummy-dex-helper.ts

@@ -246,6 +246,11 @@ export class DummyDexHelper implements IDexHelper {
   getLogger: LoggerConstructor;
   web3Provider: Web3;
   getTokenUSDPrice: (token: Token, amount: bigint) => Promise<number>;
+  executeOnWorkerPool: (
+    dexKeys: string,
+    methodSelector: string,
+    payload: any[],
+  ) => Promise<any>;
 
   constructor(network: number, rpcUrl?: string) {
     this.config = new ConfigHelper(false, generateConfig(network), 'is');
@@ -281,6 +286,14 @@ export class DummyDexHelper implements IDexHelper {
       5,
       this.getLogger(`PromiseScheduler-${network}`),
     );
+
+    this.executeOnWorkerPool = async (
+      dexKey: string,
+      methodSelector: string,
+      payload: any[],
+    ) => {
+      return null;
+    };
   }
 
   replaceProviderWithRPC(rpcUrl: string) {

package/src/dex-helper/idex-helper.ts

@@ -9,6 +9,7 @@ import { Token } from '../types';
 import { ConfigHelper } from '../config';
 import { MultiWrapper } from '../lib/multi-wrapper';
 import { PromiseScheduler } from '../lib/promise-scheduler';
+import { AsyncOrSync } from 'ts-essentials';
 
 export interface IDexHelper {
   config: ConfigHelper;
@@ -21,5 +22,11 @@ export interface IDexHelper {
   web3Provider: Web3;
   blockManager: IBlockManager;
   getLogger: LoggerConstructor;
+  executeOnWorkerPool: (
+    dexKey: string,
+    methodSelector: string,
+    // For POC it is ok to have any
+    payload: any[],
+  ) => Promise<any>;
   getTokenUSDPrice: (token: Token, amount: bigint) => Promise<number>;
 }

package/tests/constants-e2e.ts

@@ -892,30 +892,6 @@ export const Tokens: {
       address: '0x4200000000000000000000000000000000000006',
       decimals: 18,
     },
-    MAV: {
-      address: '0x64b88c73A5DfA78D1713fE1b4c69a22d7E0faAa7',
-      decimals: 18,
-    },
-    USDC: {
-      address: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
-      decimals: 6,
-    },
-    USDbC: {
-      address: '0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA',
-      decimals: 6,
-    },
-    DAI: {
-      address: '0x50c5725949a6f0c72e6c4a641f24049a917db0cb',
-      decimals: 18,
-    },
-    BAL: {
-      address: '0x4158734d47fc9692176b5085e0f52ee0da5d47f1',
-      decimals: 18,
-    },
-    GOLD: {
-      address: '0xbeFD5C25A59ef2C1316c5A4944931171F30Cd3E4',
-      decimals: 18,
-    },
     ETH: { address: ETHER_ADDRESS, decimals: 18 },
   },
 };
@@ -1141,12 +1117,6 @@ export const Holders: {
     WETH: '0x4bb6b2efe7036020ba6f02a05602546c9f25bf28',
     PRIME: '0x956bcc6b56c99db382d9d97a30ba5f1402144b3e',
     ETH: '0xdd9176ea3e7559d6b68b537ef555d3e89403f742',
-    MAV: '0x7499785aa5d1bdf0a0ac862c1ef3698d3cba6568',
-    USDC: '0xaac391f166f33cdaefaa4afa6616a3bea66b694d',
-    USDbC: '0xc9d05a1c3c8e01dcb701d6185cdc21a5bb94becb',
-    DAI: '0x20f03e26968b179025f65c1f4afadfd3959c8d03',
-    BAL: '0x854b004700885a61107b458f11ecc169a019b764',
-    GOLD: '0x1374c25b3710758c326ee0c70ec48b595d5ccf8c',
   },
 };
 

package/tests/utils-e2e.ts

@@ -86,7 +86,6 @@ const MULTISIG: { [nid: number]: string } = {
   [Network.AVALANCHE]: '0x1e2ECA5e812D08D2A7F8664D69035163ff5BfEC2',
   [Network.OPTIMISM]: '0xf01121e808F782d7F34E857c27dA31AD1f151b39',
   [Network.ARBITRUM]: '0x90DfD8a6454CFE19be39EaB42ac93CD850c7f339',
-  [Network.BASE]: '0x6C674c8Df1aC663b822c4B6A56B4E5e889379AE0',
 };
 
 class APIParaswapSDK implements IParaSwapSDK {

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/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>