@paraswap/dex-lib 2.33.2 → 2.33.4-balancer-v2-multihop.0

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

@@ -0,0 +1,226 @@
+// import _ from 'lodash';
+// import { balancerV2Merge, AllBalancerV2Forks } from './optimizer';
+// import { UnoptimizedRate } from '../../types';
+// import { SwapSide } from '@paraswap/core';
+//
+// describe('BalancerV2 optimizer', () => {
+// These values are random and are not important. The only invariant here we need to make sure,
+// that the optimizer does not change these values
+//   const baseUnoptimizedRate: UnoptimizedRate = {
+//     blockNumber: 99,
+//     network: 1,
+//     srcToken: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
+//     srcDecimals: 18,
+//     srcAmount: '1',
+//     destToken: '0xcafe001067cdef266afb7eb5a286dcfd277f3de5',
+//     destDecimals: 18,
+//     destAmount: '2',
+//     gasCostUSD: '12.178524',
+//     gasCost: '747300',
+//     side: SwapSide.SELL,
+//     tokenTransferProxy: '0x216b4b4ba9f3e719726886d34a177484278bfcae',
+//     contractAddress: '0xDEF171Fe48CF0115B1d80b88dc8eAB59176FEe57',
+//     bestRoute: [],
+//   };
+//   it('balancerV2Merge swapExchanges: BalancerV2-BalancerV2Fork', () => {
+//     const testRate: UnoptimizedRate = _.cloneDeep(baseUnoptimizedRate);
+//     testRate.bestRoute = [
+//       {
+//         percent: 92,
+//         swaps: [
+//           {
+//             srcToken: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
+//             srcDecimals: 18,
+//             destToken: '0xcafe001067cdef266afb7eb5a286dcfd277f3de5',
+//             destDecimals: 18,
+//             swapExchanges: [
+//               {
+//                 exchange: 'BalancerV2',
+//                 srcAmount: '27001080000000000000',
+//                 destAmount: '1663710383246524230443584',
+//                 percent: 97.83,
+//                 poolAddresses: ['0xcb0e14e96f2cefa8550ad8e4aea344f211e5061d'],
+//                 data: {
+//                   poolId:
+//                     '0xcb0e14e96f2cefa8550ad8e4aea344f211e5061d00020000000000000000011a',
+//                   gasUSD: '2.395615',
+//                 },
+//               },
+//               {
+//                 exchange: 'BeetsFi',
+//                 srcAmount: '598920000000000000',
+//                 destAmount: '36257151080030344235259',
+//                 percent: 2.17,
+//                 poolAddresses: ['0x458ae80894A0924Ac763C034977e330c565F1687'],
+//                 data: {
+//                   poolId:
+//                     '0x87a867f5d240a782d43d90b6b06dea470f3f8f22000200000000000000000516',
+//                   gasUSD: '2.395615',
+//                 },
+//               },
+//             ],
+//           },
+//         ],
+//       },
+//       {
+//         percent: 8,
+//         swaps: [
+//           {
+//             srcToken: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
+//             srcDecimals: 18,
+//             destToken: '0x1f573d6fb3f13d689ff844b4ce37794d79a7ff1c',
+//             destDecimals: 18,
+//             swapExchanges: [
+//               {
+//                 exchange: 'Bancor',
+//                 srcAmount: '2400000000000000000',
+//                 destAmount: '9235411862479221870019',
+//                 percent: 100,
+//                 poolAddresses: ['0x4c9a2bD661D640dA3634A4988a9Bd2Bc0f18e5a9'],
+//                 data: {
+//                   path: [
+//                     '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
+//                     '0xb1CD6e4153B2a390Cf00A6556b0fC1458C4A5533',
+//                     '0x1f573d6fb3f13d689ff844b4ce37794d79a7ff1c',
+//                   ],
+//                   gasUSD: '3.259340',
+//                 },
+//               },
+//             ],
+//           },
+//           {
+//             srcToken: '0x1f573d6fb3f13d689ff844b4ce37794d79a7ff1c',
+//             srcDecimals: 18,
+//             destToken: '0xcafe001067cdef266afb7eb5a286dcfd277f3de5',
+//             destDecimals: 18,
+//             swapExchanges: [
+//               {
+//                 exchange: 'Bancor',
+//                 srcAmount: '9235411862479221870019',
+//                 destAmount: '144326625204595711989170',
+//                 percent: 100,
+//                 poolAddresses: ['0xe950137942F446a93C8309B3a7c1407ef1975856'],
+//                 data: {
+//                   path: [
+//                     '0x1f573d6fb3f13d689ff844b4ce37794d79a7ff1c',
+//                     '0xdD17F899D4Fa66249bfdba45F0c70817052559Ac',
+//                     '0xcafe001067cdef266afb7eb5a286dcfd277f3de5',
+//                   ],
+//                   gasUSD: '3.259340',
+//                 },
+//               },
+//             ],
+//           },
+//         ],
+//       },
+//     ];
+//
+//     const optimizedRate = balancerV2Merge(testRate);
+//
+//     const expectedRate: UnoptimizedRate = _.cloneDeep(baseUnoptimizedRate);
+//     expectedRate.bestRoute = [
+//       {
+//         percent: 92,
+//         swaps: [
+//           {
+//             srcToken: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
+//             srcDecimals: 18,
+//             destToken: '0xcafe001067cdef266afb7eb5a286dcfd277f3de5',
+//             destDecimals: 18,
+//             swapExchanges: [
+//               {
+//                 exchange: 'BalancerV2',
+//                 srcAmount: '27001080000000000000',
+//                 destAmount: '1663710383246524230443584',
+//                 percent: 97.83,
+//                 poolAddresses: ['0xcb0e14e96f2cefa8550ad8e4aea344f211e5061d'],
+//                 data: {
+//                   poolId:
+//                     '0xcb0e14e96f2cefa8550ad8e4aea344f211e5061d00020000000000000000011a',
+//                   gasUSD: '2.395615',
+//                 },
+//               },
+//               {
+//                 exchange: 'BeetsFi',
+//                 srcAmount: '598920000000000000',
+//                 destAmount: '36257151080030344235259',
+//                 percent: 2.17,
+//                 poolAddresses: ['0x458ae80894A0924Ac763C034977e330c565F1687'],
+//                 data: {
+//                   poolId:
+//                     '0x87a867f5d240a782d43d90b6b06dea470f3f8f22000200000000000000000516',
+//                   gasUSD: '2.395615',
+//                 },
+//               },
+//             ],
+//           },
+//         ],
+//       },
+//       {
+//         percent: 8,
+//         swaps: [
+//           {
+//             srcToken: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
+//             srcDecimals: 18,
+//             destToken: '0x1f573d6fb3f13d689ff844b4ce37794d79a7ff1c',
+//             destDecimals: 18,
+//             swapExchanges: [
+//               {
+//                 exchange: 'Bancor',
+//                 srcAmount: '2400000000000000000',
+//                 destAmount: '9235411862479221870019',
+//                 percent: 100,
+//                 poolAddresses: ['0x4c9a2bD661D640dA3634A4988a9Bd2Bc0f18e5a9'],
+//                 data: {
+//                   path: [
+//                     '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
+//                     '0xb1CD6e4153B2a390Cf00A6556b0fC1458C4A5533',
+//                     '0x1f573d6fb3f13d689ff844b4ce37794d79a7ff1c',
+//                   ],
+//                   gasUSD: '3.259340',
+//                 },
+//               },
+//             ],
+//           },
+//           {
+//             srcToken: '0x1f573d6fb3f13d689ff844b4ce37794d79a7ff1c',
+//             srcDecimals: 18,
+//             destToken: '0xcafe001067cdef266afb7eb5a286dcfd277f3de5',
+//             destDecimals: 18,
+//             swapExchanges: [
+//               {
+//                 exchange: 'Bancor',
+//                 srcAmount: '9235411862479221870019',
+//                 destAmount: '144326625204595711989170',
+//                 percent: 100,
+//                 poolAddresses: ['0xe950137942F446a93C8309B3a7c1407ef1975856'],
+//                 data: {
+//                   path: [
+//                     '0x1f573d6fb3f13d689ff844b4ce37794d79a7ff1c',
+//                     '0xdD17F899D4Fa66249bfdba45F0c70817052559Ac',
+//                     '0xcafe001067cdef266afb7eb5a286dcfd277f3de5',
+//                   ],
+//                   gasUSD: '3.259340',
+//                 },
+//               },
+//             ],
+//           },
+//         ],
+//       },
+//     ];
+//
+//     expect(optimizedRate).toStrictEqual(expectedRate);
+//   });
+//
+//   it('balancerV2Merge swapExchanges: No BalancerV2', () => {
+//     expect(true).toBe(true);
+//   });
+//
+//   it('balancerV2Merge swaps: BalancerV2-BalancerV2Fork', () => {
+//     expect(true).toBe(true);
+//   });
+//
+//   it('balancerV2Merge only one BalancerV2Fork in route', () => {
+//     expect(true).toBe(true);
+//   });
+// });

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

@@ -3,17 +3,14 @@ import { BalancerSwapV2 } from './types';
 import { SwapSide } from '../../constants';
 import { BalancerConfig } from './config';
 
-const MAX_UINT256 =
-  '115792089237316195423570985008687907853269984665640564039457584007913129639935';
-
-const AllBalancerV2Forks = Object.keys(BalancerConfig);
+export const AllBalancerV2Forks = Object.keys(BalancerConfig);
 
 export function balancerV2Merge(or: UnoptimizedRate): UnoptimizedRate {
   const fixSwap = (
     rawSwap: OptimalSwapExchange<any>[],
+    newBalancers: { [key: string]: OptimalSwapExchange<any> },
     side: SwapSide,
   ): OptimalSwapExchange<any>[] => {
-    const newBalancers: { [key: string]: OptimalSwapExchange<any> } = {};
     let optimizedSwap = new Array<OptimalSwapExchange<any>>();
     rawSwap.forEach((s: OptimalSwapExchange<any>) => {
       const exchangeKey = s.exchange.toLowerCase();
@@ -59,12 +56,17 @@ export function balancerV2Merge(or: UnoptimizedRate): UnoptimizedRate {
     return optimizedSwap;
   };
 
-  or.bestRoute = or.bestRoute.map(r => ({
-    ...r,
-    swaps: r.swaps.map(s => ({
-      ...s,
-      swapExchanges: fixSwap(s.swapExchanges, or.side),
-    })),
-  }));
+  or.bestRoute = or.bestRoute.map(r => {
+    const newBalancers: {
+      [key: string]: OptimalSwapExchange<any>;
+    } = {};
+    return {
+      ...r,
+      swaps: r.swaps.map(s => ({
+        ...s,
+        swapExchanges: fixSwap(s.swapExchanges, newBalancers, or.side),
+      })),
+    };
+  });
   return or;
 }

package/src/dex/index.ts

@@ -73,6 +73,7 @@ import { SpiritSwapV3 } from './quickswap/spiritswap-v3';
 import { TraderJoeV21 } from './trader-joe-v2.1';
 import { PancakeswapV3 } from './pancakeswap-v3/pancakeswap-v3';
 import { Algebra } from './algebra/algebra';
+import { NomiswapV2 } from './uniswap-v2/nomiswap-v2';
 
 const LegacyDexes = [
   CurveV2,
@@ -143,6 +144,7 @@ const Dexes = [
   MaverickV1,
   Camelot,
   SwaapV2,
+  NomiswapV2,
 ];
 
 export type LegacyDexConstructor = new (dexHelper: IDexHelper) => IDexTxBuilder<

package/src/dex/solidly/solidly-e2e.test.ts

@@ -2,7 +2,11 @@ import dotenv from 'dotenv';
 dotenv.config();
 
 import { testE2E } from '../../../tests/utils-e2e';
-import { Tokens, Holders, NativeTokenSymbols } from '../../../tests/constants-e2e';
+import {
+  Tokens,
+  Holders,
+  NativeTokenSymbols,
+} from '../../../tests/constants-e2e';
 import { Network, ContractMethod, SwapSide } from '../../constants';
 import { StaticJsonRpcProvider } from '@ethersproject/providers';
 import { generateConfig } from '../../config';
@@ -410,7 +414,6 @@ describe('Solidly E2E', () => {
         tokenBAmount,
         nativeTokenAmount,
       );
-
     });
   });
 
@@ -1401,5 +1404,4 @@ describe('Solidly E2E', () => {
       );
     });
   });
-
 });

package/src/dex/uniswap-v2/nomiswap-v2.ts

@@ -0,0 +1,62 @@
+import { Network } from '../../constants';
+import { getDexKeysWithNetwork } from '../../utils';
+import { IDexHelper } from '../../dex-helper/idex-helper';
+import { UniswapV2, UniswapV2Pair } from '../uniswap-v2/uniswap-v2';
+import { Interface } from '@ethersproject/abi';
+import NomiswapPoolABI from '../../abi/nomiswap-v2/nomiswap-v2-pool.json';
+import { DexParams } from './types';
+import { DexConfigMap } from '../../types';
+
+export const NomiswapV2Config: DexConfigMap<DexParams> = {
+  NomiswapV2: {
+    [Network.BSC]: {
+      factoryAddress: '0xd6715A8be3944ec72738F0BFDC739d48C3c29349',
+      initCode:
+        '0x83eb759f5ea0525124f03d4ac741bb4af0bb1c703d5f694bd42a8bd72e495a01',
+      poolGasCost: 120 * 1000,
+      feeCode: 0, // this is ignored as Nomiswap uses dynamic fees,
+      subgraphURL: 'https://api.thegraph.com/subgraphs/name/nominex/nomiswap-exchange-subgraph',
+    },
+  },
+};
+
+export class NomiswapV2 extends UniswapV2 {
+  nomiswapPool: Interface;
+
+  public static dexKeysWithNetwork: { key: string; networks: Network[] }[] =
+    getDexKeysWithNetwork(NomiswapV2Config);
+
+  constructor(
+    protected network: Network,
+    dexKey: string,
+    protected dexHelper: IDexHelper,
+  ) {
+    super(
+      network,
+      dexKey,
+      dexHelper,
+      true,
+      NomiswapV2Config[dexKey][network].factoryAddress,
+      NomiswapV2Config[dexKey][network].subgraphURL,
+      NomiswapV2Config[dexKey][network].initCode,
+      NomiswapV2Config[dexKey][network].feeCode,
+      NomiswapV2Config[dexKey][network].poolGasCost,
+    );
+    this.nomiswapPool = new Interface(NomiswapPoolABI);
+  }
+
+  protected getFeesMultiCallData(pair: UniswapV2Pair) {
+    const callEntry = {
+      target: pair.exchange!,
+      callData: this.nomiswapPool.encodeFunctionData('swapFee', []),
+    };
+    const callDecoder = (values: any[]) =>
+      parseInt(
+        this.nomiswapPool.decodeFunctionResult('swapFee', values)[0].toString(),
+      ) * 10;
+    return {
+      callEntry,
+      callDecoder,
+    };
+  }
+}

package/src/dex/uniswap-v2/uniswap-v2-e2e-bsc.test.ts

@@ -2,11 +2,110 @@ import dotenv from 'dotenv';
 dotenv.config();
 
 import { testE2E } from '../../../tests/utils-e2e';
-import { Tokens, Holders } from '../../../tests/constants-e2e';
+import { Tokens, Holders, NativeTokenSymbols } from '../../../tests/constants-e2e';
 import { Network, ContractMethod, SwapSide } from '../../constants';
 import { StaticJsonRpcProvider } from '@ethersproject/providers';
 import { generateConfig } from '../../config';
 
+function testForNetwork(
+  network: Network,
+  dexKey: string,
+  tokenASymbol: string,
+  tokenBSymbol: string,
+  tokenAAmount: string,
+  tokenBAmount: string,
+  nativeTokenAmount: string,
+  slippage?: number | undefined,
+) {
+  const provider = new StaticJsonRpcProvider(
+    generateConfig(network).privateHttpProvider,
+    network,
+  );
+  const tokens = Tokens[network];
+  const holders = Holders[network];
+  const nativeTokenSymbol = NativeTokenSymbols[network];
+
+  const sideToContractMethods = new Map([
+    [
+      SwapSide.SELL,
+      [
+        ContractMethod.simpleSwap,
+        ContractMethod.multiSwap,
+        ContractMethod.megaSwap,
+      ],
+    ],
+    [
+      SwapSide.BUY,
+      [
+        ContractMethod.simpleBuy,
+        ContractMethod.buy,
+      ],
+    ],
+  ]);
+
+  describe(`${network}`, () => {
+    sideToContractMethods.forEach((contractMethods, side) =>
+      describe(`${side}`, () => {
+        contractMethods.forEach((contractMethod: ContractMethod) => {
+          describe(`${contractMethod}`, () => {
+            it(`${nativeTokenSymbol} -> ${tokenASymbol}`, async () => {
+              await testE2E(
+                tokens[nativeTokenSymbol],
+                tokens[tokenASymbol],
+                holders[nativeTokenSymbol],
+                side === SwapSide.SELL ? nativeTokenAmount : tokenAAmount,
+                side,
+                dexKey,
+                contractMethod,
+                network,
+                provider,
+                undefined,
+                undefined,
+                undefined,
+                slippage,
+              );
+            });
+            it(`${tokenASymbol} -> ${nativeTokenSymbol}`, async () => {
+              await testE2E(
+                tokens[tokenASymbol],
+                tokens[nativeTokenSymbol],
+                holders[tokenASymbol],
+                side === SwapSide.SELL ? tokenAAmount : nativeTokenAmount,
+                side,
+                dexKey,
+                contractMethod,
+                network,
+                provider,
+                undefined,
+                undefined,
+                undefined,
+                slippage,
+              );
+            });
+            it(`${tokenASymbol} -> ${tokenBSymbol}`, async () => {
+              await testE2E(
+                tokens[tokenASymbol],
+                tokens[tokenBSymbol],
+                holders[tokenASymbol],
+                side === SwapSide.SELL ? tokenAAmount : tokenBAmount,
+                side,
+                dexKey,
+                contractMethod,
+                network,
+                provider,
+                undefined,
+                undefined,
+                undefined,
+                slippage,
+              );
+            });
+          });
+        });
+      }),
+    );
+  });
+}
+
 describe('UniswapV2 E2E BSC', () => {
   const network = Network.BSC;
   const tokens = Tokens[network];
@@ -1407,6 +1506,28 @@ describe('UniswapV2 E2E BSC', () => {
     });
   });
 
+  describe('NomiswapV2', () => {
+    const dexKey = 'NomiswapV2';
+    const network = Network.BSC;
+
+    const tokenASymbol: string = 'USDC';
+    const tokenBSymbol: string = 'USDT';
+
+    const tokenAAmount: string = '1111100000';
+    const tokenBAmount: string = '1000000000';
+    const nativeTokenAmount = '11000000000000';
+
+    testForNetwork(
+      network,
+      dexKey,
+      tokenASymbol,
+      tokenBSymbol,
+      tokenAAmount,
+      tokenBAmount,
+      nativeTokenAmount,
+    );
+  });
+
   describe(`Swapsicle`, () => {
     const dexKey = 'Swapsicle';
 

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

@@ -112,7 +112,6 @@ function testForNetwork(
   });
 }
 
-
 describe('UniswapV3 E2E', () => {
 
   describe('UniswapV3', () => {

package/tests/constants-e2e.ts

@@ -462,7 +462,7 @@ export const Tokens: {
     },
     EQUAL: {
       address: '0x3fd3a0c85b70754efc07ac9ac0cbbdce664865a6',
-      decimals: 18
+      decimals: 18,
     },
     POPS: {
       address: '0x9dE4b40bDcE50Ec6a1A668bF85997BbBD324069a',