@paraswap/dex-lib 2.35.7-worker-pool.3 → 2.36.1

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

@@ -641,14 +641,14 @@ export class UniswapV3
           const balanceDestToken =
             _destAddress === pool.token0 ? state.balance0 : state.balance1;
 
-          const unitResult = await this._getOutputs(
+          const unitResult = this._getOutputs(
             state,
             [unitAmount],
             zeroForOne,
             side,
             balanceDestToken,
           );
-          const pricesResult = await this._getOutputs(
+          const pricesResult = this._getOutputs(
             state,
             _amounts,
             zeroForOne,
@@ -1071,20 +1071,20 @@ export class UniswapV3
     return newConfig;
   }
 
-  private async _getOutputs(
+  private _getOutputs(
     state: DeepReadonly<PoolState>,
     amounts: bigint[],
     zeroForOne: boolean,
     side: SwapSide,
     destTokenBalance: bigint,
-  ): Promise<OutputResult | null> {
+  ): OutputResult | null {
     try {
-      const outputsResult = (await this.dexHelper.executeOnWorkerPool(
-        this.network,
-        this.dexKey,
-        'queryOutputs',
-        [state, amounts, zeroForOne, side],
-      )) as ReturnType<typeof uniswapV3Math.queryOutputs>;
+      const outputsResult = uniswapV3Math.queryOutputs(
+        state,
+        amounts,
+        zeroForOne,
+        side,
+      );
 
       if (side === SwapSide.SELL) {
         if (outputsResult.outputs[0] > destTokenBalance) {

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

@@ -64,6 +64,16 @@ export const WooFiV2Config: DexConfigMap<DexParams> = {
         decimals: 6,
       },
     },
+    [Network.BASE]: {
+      wooPPV2Address: '0xb130a49065178465931d4f887056328CeA5D723f',
+      wooOracleV2Address: '0x2Fe5E5D341cFFa606a5d9DA1B6B646a381B0f7ec',
+      integrationHelperAddress: '0xC4E9B633685461E7B7A807D12a246C81f96F31B8',
+      // USDbC
+      quoteToken: {
+        address: '0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA',
+        decimals: 6,
+      },
+    },
   },
 };
 
@@ -84,4 +94,7 @@ 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,4 +213,68 @@ 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,12 +246,6 @@ export class DummyDexHelper implements IDexHelper {
   getLogger: LoggerConstructor;
   web3Provider: Web3;
   getTokenUSDPrice: (token: Token, amount: bigint) => Promise<number>;
-  executeOnWorkerPool: (
-    network: number,
-    dexKeys: string,
-    methodSelector: string,
-    payload: unknown[],
-  ) => Promise<unknown>;
 
   constructor(network: number, rpcUrl?: string) {
     this.config = new ConfigHelper(false, generateConfig(network), 'is');
@@ -287,15 +281,6 @@ export class DummyDexHelper implements IDexHelper {
       5,
       this.getLogger(`PromiseScheduler-${network}`),
     );
-
-    this.executeOnWorkerPool = async (
-      network: number,
-      dexKey: string,
-      methodSelector: string,
-      payload: unknown[],
-    ) => {
-      return null;
-    };
   }
 
   replaceProviderWithRPC(rpcUrl: string) {

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

@@ -21,12 +21,5 @@ export interface IDexHelper {
   web3Provider: Web3;
   blockManager: IBlockManager;
   getLogger: LoggerConstructor;
-  executeOnWorkerPool: (
-    network: number,
-    dexKey: string,
-    methodSelector: string,
-    payload: unknown[],
-    // For POC it is ok to have this unknown
-  ) => Promise<unknown>;
   getTokenUSDPrice: (token: Token, amount: bigint) => Promise<number>;
 }

package/src/lib/api3-feed.ts

@@ -51,6 +51,14 @@ export class Api3FeedSubscriber<State> extends PartialEventSubscriber<
     };
   }
 
+  static getDapiNameHashMultiCallInput(proxy: Address): MultiCallInput {
+    return {
+      target: proxy,
+      callData:
+        Api3FeedSubscriber.proxyInterface.encodeFunctionData('dapiNameHash'),
+    };
+  }
+
   static getDataFeedId(proxy: Address): MultiCallInput {
     return {
       target: proxy,
@@ -59,6 +67,33 @@ export class Api3FeedSubscriber<State> extends PartialEventSubscriber<
     };
   }
 
+  static getFeedIdFromDapiNameHash(
+    api3Server: Address,
+    dapiNameHash: string,
+  ): MultiCallInput {
+    return {
+      target: api3Server,
+      callData: Api3FeedSubscriber.api3ServerV1Iface.encodeFunctionData(
+        'dapiNameHashToDataFeedId',
+        [dapiNameHash],
+      ),
+    };
+  }
+
+  static decodeFeedIdFromDapiNameHash(multicallOutput: MultiCallOutput) {
+    return Api3FeedSubscriber.api3ServerV1Iface.decodeFunctionResult(
+      'dapiNameHashToDataFeedId',
+      multicallOutput,
+    )[0];
+  }
+
+  static decodeDapiNameHash(multicallOutput: MultiCallOutput) {
+    return Api3FeedSubscriber.proxyInterface.decodeFunctionResult(
+      'dapiNameHash',
+      multicallOutput,
+    )[0];
+  }
+
   static decodeDataFeedId(multicallOutput: MultiCallOutput) {
     return Api3FeedSubscriber.proxyInterface.decodeFunctionResult(
       'dataFeedId',

package/tests/constants-e2e.ts

@@ -892,6 +892,30 @@ 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 },
   },
 };
@@ -1117,6 +1141,12 @@ 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,6 +86,7 @@ const MULTISIG: { [nid: number]: string } = {
   [Network.AVALANCHE]: '0x1e2ECA5e812D08D2A7F8664D69035163ff5BfEC2',
   [Network.OPTIMISM]: '0xf01121e808F782d7F34E857c27dA31AD1f151b39',
   [Network.ARBITRUM]: '0x90DfD8a6454CFE19be39EaB42ac93CD850c7f339',
+  [Network.BASE]: '0x6C674c8Df1aC663b822c4B6A56B4E5e889379AE0',
 };
 
 class APIParaswapSDK implements IParaSwapSDK {