@paraswap/dex-lib 4.0.22-bal-v2-base-subgraph.0 → 4.0.22

package/src/dex/balancer-v2/balancer-v2-integration.test.ts

@@ -30,9 +30,11 @@ async function getOnChainPricingForWeightedPool(
         return 0n;
       }
 
-      const params = balancerV2.getBalancerV2BatchSwapParam(
+      const params = balancerV2.getBalancerParam(
         srcTokenAddress,
         destTokenAddress,
+        '0',
+        '0',
         {
           swaps: [
             {
@@ -42,8 +44,6 @@ async function getOnChainPricingForWeightedPool(
           ],
         },
         side,
-        balancerV2.dexHelper.config.data.augustusV6Address!,
-        balancerV2.dexHelper.config.data.augustusV6Address!,
       );
 
       const calldata = [
@@ -611,243 +611,85 @@ describe('BalancerV2', function () {
   });
 
   describe('GyroE', () => {
-    describe('sDAI > GYD', () => {
-      // sDAI<>GYD - more likely to have continued liqudity
-      const gyroEAddr = '0x1cce5169bde03f3d5ad0206f6bd057953539dae6';
-
-      it('getPoolIdentifiers and getPricesVolume', async function () {
-        const network = Network.MAINNET;
-        const dexHelper = new DummyDexHelper(network);
-        // const blocknumber = await dexHelper.web3Provider.eth.getBlockNumber();
-        const blocknumber = 19425305;
-        const balancerV2 = new BalancerV2(network, dexKey, dexHelper);
-        const tokens = Tokens[network];
-
-        await balancerV2.initializePricing(blocknumber);
-
-        const pools = await balancerV2.getPoolIdentifiers(
-          tokens.GYD,
-          tokens.sDAI,
-          SwapSide.SELL,
-          blocknumber,
-        );
-        console.log('GYD <> sDAI Pool Identifiers (Mainnet): ', pools);
-
-        const isPool = pools.find(poolIdentifier =>
-          poolIdentifier.includes(gyroEAddr),
-        );
-
-        expect(isPool).toBeDefined();
-
-        const poolPrices = await balancerV2.getPricesVolume(
-          tokens.GYD,
-          tokens.sDAI,
-          amounts,
-          SwapSide.SELL,
-          blocknumber,
-          pools,
-        );
-        console.log('GYD <> sDAI Pool Prices (Mainnet): ', poolPrices);
-
-        expect(poolPrices).not.toBeNull();
-        checkPoolPrices(poolPrices!, amounts, SwapSide.SELL, dexKey);
-        const isPoolPrice = poolPrices!.find(price =>
-          price.data.poolId.includes(gyroEAddr),
-        );
-        expect(isPoolPrice).toBeDefined();
-
-        const onChainPrices = await getOnChainPricingForWeightedPool(
-          balancerV2,
-          blocknumber,
-          isPoolPrice!,
-          amounts,
-          tokens.GYD.address,
-          tokens.sDAI.address,
-          SwapSide.SELL,
-        );
-
-        console.log('GYD <> sDAI on-chain prices: ', onChainPrices);
-
-        expect(onChainPrices).toEqual(isPoolPrice!.prices);
-
-        await balancerV2.releaseResources();
-      });
-
-      it('getTopPoolsForToken', async function () {
-        const network = Network.MAINNET;
-        const dexHelper = new DummyDexHelper(network);
-        const blocknumber = await dexHelper.web3Provider.eth.getBlockNumber();
-        const balancerV2 = new BalancerV2(network, dexKey, dexHelper);
-        await balancerV2.initializePricing(blocknumber);
-        const tokens = Tokens[network];
-
-        const poolLiquidity = await balancerV2.getTopPoolsForToken(
-          tokens.sDAI.address.toLowerCase(),
-          10,
-        );
-        console.log('sDAI Top Pools (Mainnet):', poolLiquidity);
-
-        checkPoolsLiquidity(poolLiquidity, tokens.sDAI.address, dexKey);
-        const isTopPool = poolLiquidity.find(
-          pool => pool.address === gyroEAddr,
-        );
-        expect(isTopPool).toBeDefined();
-        await balancerV2.releaseResources();
-      });
+    // sDAI<>GYD - more likely to have continued liqudity
+    const gyroEAddr = '0x1cce5169bde03f3d5ad0206f6bd057953539dae6';
+
+    it('getPoolIdentifiers and getPricesVolume', async function () {
+      const network = Network.MAINNET;
+      const dexHelper = new DummyDexHelper(network);
+      // const blocknumber = await dexHelper.web3Provider.eth.getBlockNumber();
+      const blocknumber = 19425305;
+      const balancerV2 = new BalancerV2(network, dexKey, dexHelper);
+      const tokens = Tokens[network];
+
+      await balancerV2.initializePricing(blocknumber);
+
+      const pools = await balancerV2.getPoolIdentifiers(
+        tokens.GYD,
+        tokens.sDAI,
+        SwapSide.SELL,
+        blocknumber,
+      );
+      console.log('GYD <> sDAI Pool Identifiers (Mainnet): ', pools);
+
+      const isPool = pools.find(poolIdentifier =>
+        poolIdentifier.includes(gyroEAddr),
+      );
+
+      expect(isPool).toBeDefined();
+
+      const poolPrices = await balancerV2.getPricesVolume(
+        tokens.GYD,
+        tokens.sDAI,
+        amounts,
+        SwapSide.SELL,
+        blocknumber,
+        pools,
+      );
+      console.log('GYD <> sDAI Pool Prices (Mainnet): ', poolPrices);
+
+      expect(poolPrices).not.toBeNull();
+      checkPoolPrices(poolPrices!, amounts, SwapSide.SELL, dexKey);
+      const isPoolPrice = poolPrices!.find(price =>
+        price.data.poolId.includes(gyroEAddr),
+      );
+      expect(isPoolPrice).toBeDefined();
+
+      const onChainPrices = await getOnChainPricingForWeightedPool(
+        balancerV2,
+        blocknumber,
+        isPoolPrice!,
+        amounts,
+        tokens.GYD.address,
+        tokens.sDAI.address,
+        SwapSide.SELL,
+      );
+
+      console.log('GYD <> sDAI on-chain prices: ', onChainPrices);
+
+      expect(onChainPrices).toEqual(isPoolPrice!.prices);
+
+      await balancerV2.releaseResources();
     });
 
-    describe('WETH / USDC', () => {
-      const gyroEAddr = '0x4c42b5057a8663e2b1ac21685d1502c937a03817';
-
-      it('SELL WETH -> USDC getPoolIdentifiers and getPricesVolume', async function () {
-        const network = Network.BASE;
-
-        const dexHelper = new DummyDexHelper(network);
-        const blocknumber = await dexHelper.web3Provider.eth.getBlockNumber();
-        // const blocknumber = 19425305;
-        const balancerV2 = new BalancerV2(network, dexKey, dexHelper);
-        const tokens = Tokens[network];
-
-        const amounts = [
-          0n,
-          BI_POWS[18],
-          2n * BI_POWS[18],
-          3n * BI_POWS[18],
-          4n * BI_POWS[18],
-          5n * BI_POWS[18],
-          6n * BI_POWS[18],
-          7n * BI_POWS[18],
-          8n * BI_POWS[18],
-          9n * BI_POWS[18],
-          10n * BI_POWS[18],
-        ];
-
-        await balancerV2.initializePricing(blocknumber);
-
-        const pools = await balancerV2.getPoolIdentifiers(
-          tokens.WETH,
-          tokens.USDC,
-          SwapSide.SELL,
-          blocknumber,
-        );
-        console.log('WETH <> USDC Pool Identifiers (Mainnet): ', pools);
-
-        const isPool = pools.find(poolIdentifier =>
-          poolIdentifier.includes(gyroEAddr),
-        );
-
-        expect(isPool).toBeDefined();
-
-        const poolPrices = await balancerV2.getPricesVolume(
-          tokens.WETH,
-          tokens.USDC,
-          amounts,
-          SwapSide.SELL,
-          blocknumber,
-          pools,
-        );
-        console.log('WETH <> USDC Pool Prices (Base): ', poolPrices);
-
-        expect(poolPrices).not.toBeNull();
-
-        // checkPoolPrices(poolPrices!, amounts, SwapSide.SELL, dexKey);
-        const isPoolPrice = poolPrices!.find(price =>
-          price.data.poolId.includes(gyroEAddr),
-        );
-        expect(isPoolPrice).toBeDefined();
-
-        const onChainPrices = await getOnChainPricingForWeightedPool(
-          balancerV2,
-          blocknumber,
-          isPoolPrice!,
-          amounts,
-          tokens.WETH.address,
-          tokens.USDC.address,
-          SwapSide.SELL,
-        );
-
-        console.log('WETH <> USDC on-chain prices: ', onChainPrices);
-
-        expect(onChainPrices).toEqual(isPoolPrice!.prices);
-
-        await balancerV2.releaseResources();
-      });
-
-      it('SELL USDC -> WETH getPoolIdentifiers and getPricesVolume', async function () {
-        const network = Network.BASE;
-        const dexHelper = new DummyDexHelper(network);
-        // const blocknumber = await dexHelper.web3Provider.eth.getBlockNumber();
-        const blocknumber = 24931862;
-        const balancerV2 = new BalancerV2(network, dexKey, dexHelper);
-        const tokens = Tokens[network];
-
-        const amounts = [
-          0n,
-          1000000n,
-          // BI_POWS[6],
-          // 2n * BI_POWS[6],
-          // 3n * BI_POWS[6],
-          // 4n * BI_POWS[6],
-          // 5n * BI_POWS[6],
-          // 6n * BI_POWS[6],
-          // 7n * BI_POWS[6],
-          // 8n * BI_POWS[6],
-          // 9n * BI_POWS[6],
-          // 10n * BI_POWS[6],
-        ];
-
-        await balancerV2.initializePricing(blocknumber);
-
-        const pools = await balancerV2.getPoolIdentifiers(
-          tokens.USDC,
-          tokens.WETH,
-          SwapSide.SELL,
-          blocknumber,
-        );
-        console.log('USDC -> WETH Pool Identifiers (Base): ', pools);
-
-        const isPool = pools.find(poolIdentifier =>
-          poolIdentifier.includes(gyroEAddr),
-        );
-
-        expect(isPool).toBeDefined();
-
-        const poolPrices = await balancerV2.getPricesVolume(
-          tokens.USDC,
-          tokens.WETH,
-          amounts,
-          SwapSide.SELL,
-          blocknumber,
-          pools,
-        );
-        console.log('USDC -> WETH Pool Prices (Base): ', poolPrices);
-
-        expect(poolPrices).not.toBeNull();
-
-        // checkPoolPrices(poolPrices!, amounts, SwapSide.SELL, dexKey);
-        const isPoolPrice = poolPrices!.find(price =>
-          price.data.poolId.includes(gyroEAddr),
-        );
-        expect(isPoolPrice).toBeDefined();
-
-        console.log('isPoolPrice: ', isPoolPrice);
-
-        const onChainPrices = await getOnChainPricingForWeightedPool(
-          balancerV2,
-          blocknumber,
-          isPoolPrice!,
-          amounts,
-          tokens.USDC.address,
-          tokens.WETH.address,
-          SwapSide.SELL,
-        );
-
-        console.log('USDC -> WETH on-chain prices: ', onChainPrices);
-
-        expect(onChainPrices).toEqual(isPoolPrice!.prices);
-
-        await balancerV2.releaseResources();
-      });
+    it('getTopPoolsForToken', async function () {
+      const network = Network.MAINNET;
+      const dexHelper = new DummyDexHelper(network);
+      const blocknumber = await dexHelper.web3Provider.eth.getBlockNumber();
+      const balancerV2 = new BalancerV2(network, dexKey, dexHelper);
+      await balancerV2.initializePricing(blocknumber);
+      const tokens = Tokens[network];
+
+      const poolLiquidity = await balancerV2.getTopPoolsForToken(
+        tokens.sDAI.address.toLowerCase(),
+        10,
+      );
+      console.log('sDAI Top Pools (Mainnet):', poolLiquidity);
+
+      checkPoolsLiquidity(poolLiquidity, tokens.sDAI.address, dexKey);
+      const isTopPool = poolLiquidity.find(pool => pool.address === gyroEAddr);
+      expect(isTopPool).toBeDefined();
+      await balancerV2.releaseResources();
     });
   });
 });

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

@@ -21,7 +21,8 @@ export const BalancerConfig: DexConfigMap<DexParams> = {
       vaultAddress: '0xBA12222222228d8Ba445958a75a0704d566BF2C8',
     },
     [Network.BASE]: {
-      subgraphURL: 'E7XyutxXVLrp8njmjF16Hh38PCJuHm12RRyMt5ma4ctX',
+      subgraphURL:
+        'https://api.studio.thegraph.com/query/24660/balancer-base-v2/version/latest',
       vaultAddress: '0xBA12222222228d8Ba445958a75a0704d566BF2C8',
     },
     [Network.GNOSIS]: {

package/src/dex/bebop/bebop.ts

@@ -13,7 +13,7 @@ import {
   NumberAsString,
   DexExchangeParam,
 } from '../../types';
-import { SwapSide, Network, ETHER_ADDRESS } from '../../constants';
+import { SwapSide, Network } from '../../constants';
 import * as CALLDATA_GAS_COST from '../../calldata-gas-cost';
 import { getDexKeysWithNetwork, Utils } from '../../utils';
 import { IDex } from '../../dex/idex';
@@ -56,11 +56,10 @@ import BigNumber from 'bignumber.js';
 import { getBigNumberPow } from '../../bignumber-constants';
 import { ethers, utils } from 'ethers';
 import qs from 'qs';
-import { isEqual } from 'lodash';
 
 export class Bebop extends SimpleExchange implements IDex<BebopData> {
   readonly hasConstantPriceLargeAmounts = false;
-  readonly needWrapNative = false;
+  readonly needWrapNative = true;
 
   readonly isFeeOnTransferSupported = false;
   readonly isStatePollingDex = true;
@@ -186,11 +185,7 @@ export class Bebop extends SimpleExchange implements IDex<BebopData> {
       srcToken.address.toLowerCase(),
       destToken.address.toLowerCase(),
     ]);
-    const nativeWrappedSet = new Set([
-      this.dexHelper.config.data.wrappedNativeTokenAddress.toLowerCase(),
-      ETHER_ADDRESS.toLowerCase(),
-    ]);
-    if (tokensSet.size < 2 || isEqual(tokensSet, nativeWrappedSet)) {
+    if (tokensSet.size < 2) {
       return [];
     }
 
@@ -281,11 +276,14 @@ export class Bebop extends SimpleExchange implements IDex<BebopData> {
   // across DEXes. It is recommended to use
   // ${dexKey}_${poolAddress} as a poolIdentifier
   async getPoolIdentifiers(
-    srcToken: Token,
-    destToken: Token,
+    _srcToken: Token,
+    _destToken: Token,
     side: SwapSide,
     blockNumber: number,
   ): Promise<string[]> {
+    const srcToken = this.dexHelper.config.wrapETH(_srcToken);
+    const destToken = this.dexHelper.config.wrapETH(_destToken);
+
     if (
       (await this.calculateInstructions(srcToken, destToken, side)).length > 0
     ) {
@@ -387,8 +385,8 @@ export class Bebop extends SimpleExchange implements IDex<BebopData> {
   // should be used. If limitPools is undefined then
   // any pools can be used.
   async getPricesVolume(
-    srcToken: Token,
-    destToken: Token,
+    _srcToken: Token,
+    _destToken: Token,
     amounts: bigint[],
     side: SwapSide,
     blockNumber: number,
@@ -399,6 +397,9 @@ export class Bebop extends SimpleExchange implements IDex<BebopData> {
       return null;
     }
 
+    const srcToken = this.dexHelper.config.wrapETH(_srcToken);
+    const destToken = this.dexHelper.config.wrapETH(_destToken);
+
     try {
       let pools = limitPools
         ? limitPools.filter(
@@ -696,14 +697,17 @@ export class Bebop extends SimpleExchange implements IDex<BebopData> {
 
   async preProcessTransaction(
     optimalSwapExchange: OptimalSwapExchange<BebopData>,
-    srcToken: Token,
-    destToken: Token,
+    _srcToken: Token,
+    _destToken: Token,
     side: SwapSide,
     options: PreprocessTransactionOptions,
   ): Promise<[OptimalSwapExchange<BebopData>, ExchangeTxInfo]> {
     const isSell = side === SwapSide.SELL;
     const isBuy = side === SwapSide.BUY;
 
+    const srcToken = this.dexHelper.config.wrapETH(_srcToken);
+    const destToken = this.dexHelper.config.wrapETH(_destToken);
+
     const params = {
       sell_tokens: utils.getAddress(srcToken.address),
       buy_tokens: utils.getAddress(destToken.address),

package/src/dex/bebop/rate-fetcher.ts

@@ -1,4 +1,4 @@
-import { ETHER_ADDRESS, Network } from '../../constants';
+import { Network } from '../../constants';
 import { IDexHelper } from '../../dex-helper';
 import { Fetcher } from '../../lib/fetcher/fetcher';
 import { validateAndCast, ValidationError } from '../../lib/validators';
@@ -10,11 +10,7 @@ import {
   BebopRateFetcherConfig,
   BebopTokensResponse,
 } from './types';
-import {
-  BebopPricingUpdate,
-  pricesResponseValidator,
-  tokensResponseValidator,
-} from './validators';
+import { BebopPricingUpdate, tokensResponseValidator } from './validators';
 import { WebSocketFetcher } from '../../lib/fetcher/wsFetcher';
 import { utils } from 'ethers';
 
@@ -156,20 +152,9 @@ export class RateFetcher {
   }
 
   private handlePricesResponse(resp: BebopPricingResponse): void {
-    const wethAddress =
-      this.dexHelper.config.data.wrappedNativeTokenAddress.toLowerCase();
     const normalizedPrices: BebopPricingResponse = {};
     for (const [pair, levels] of Object.entries(resp)) {
       normalizedPrices[pair.toLowerCase()] = levels;
-      const [base, quote] = pair.split('/');
-      // Also enter native token prices. Pricing doesn't come with these
-      if (
-        base.toLowerCase() === wethAddress ||
-        quote.toLowerCase() === wethAddress
-      ) {
-        const nativePair = pair.replace(base, ETHER_ADDRESS);
-        normalizedPrices[nativePair.toLowerCase()] = levels;
-      }
     }
 
     this.dexHelper.cache.setex(

package/src/dex/maverick-v1/config.ts

@@ -14,7 +14,8 @@ export const MaverickV1Config: DexConfigMap<DexParams> = {
       poolInspectorAddress: '0xaA5BF61a664109e959D69C38734d4EA7dF74e456',
     },
     [Network.BASE]: {
-      subgraphURL: 'CSxkHjxpG1TxTBQMn55uG1DWpdD4Lsix4RNX4RTLvK4T',
+      subgraphURL:
+        'https://api.studio.thegraph.com/query/42519/maverick-base/version/latest',
       routerAddress: '0x32AED3Bce901DA12ca8489788F3A99fCe1056e14',
       poolInspectorAddress: '0x65A3AD03Be97619284bA7AA1E3Ca05638B9d6364',
     },

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

@@ -117,7 +117,8 @@ export const UniswapV3Config: DexConfigMap<DexParams> = {
       chunksCount: 10,
       initRetryFrequency: 10,
       initHash: `0xe34f199b19b2b4f47f68442619d555527d244f78a3297ea89325f843f87b8b54`,
-      subgraphURL: 'GqzP4Xaehti8KSfQmv3ZctFSjnSUYZ4En5NRsiTbvZpz',
+      subgraphURL:
+        'https://api.studio.thegraph.com/query/48211/uniswap-v3-base/version/latest',
     },
   },
   SushiSwapV3: {

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>