@paraswap/dex-lib 4.1.16 → 4.1.17-arena

package/src/dex/generic-rfq/example-api.test.ts

@@ -90,6 +90,9 @@ const blacklist = {
 export const startTestServer = (account: ethers.Wallet) => {
   const app = express();
 
+  // to overcome isEmpty(pairs) check on handleRatesResponse in rate-fetcher
+  let pairsReturned = false;
+
   /**
    * Use JSON Body parser...
    */
@@ -100,10 +103,15 @@ export const startTestServer = (account: ethers.Wallet) => {
   });
 
   app.get('/pairs', (req, res) => {
+    pairsReturned = true;
     return res.status(200).json(pairs);
   });
 
-  app.get('/prices', (req, res) => {
+  app.get('/prices', async (req, res) => {
+    if (!pairsReturned) {
+      // sleep for 1 second
+      await new Promise(resolve => setTimeout(resolve, 1000));
+    }
     return res.status(200).json(prices);
   });
 
@@ -202,6 +210,9 @@ export const startTestServer = (account: ethers.Wallet) => {
       order,
     );
 
+    // to prevent overwriting taker to augustus v5
+    signableOrderData.data.taker = payload.takerAddress;
+
     const signature = await paraSwapLimitOrderSDK.signLimitOrder(
       signableOrderData,
     );

package/src/dex/generic-rfq/generic-rfq-e2e.test.ts

@@ -1,27 +1,16 @@
 import dotenv from 'dotenv';
 dotenv.config();
 
-import { ethers } from 'ethers';
-import { Network, ContractMethod, SwapSide, MAX_UINT } from '../../constants';
+import { Network, ContractMethod, SwapSide } from '../../constants';
 import { generateConfig } from '../../config';
 import { newTestE2E, getEnv } from '../../../tests/utils-e2e';
 import {
-  SmartTokens,
   GENERIC_ADDR1,
+  GENERIC_ADDR2,
   Tokens,
 } from '../../../tests/constants-e2e';
 import { RFQConfig } from './types';
 import { testConfig } from './e2e-test-config';
-import { SmartToken } from '../../../tests/smart-tokens';
-import { Token } from '../../types';
-
-const PK_KEY = process.env.TEST_PK_KEY;
-
-if (!PK_KEY) {
-  throw new Error('Missing TEST_PK_KEY');
-}
-
-const testAccount = new ethers.Wallet(PK_KEY!);
 
 jest.setTimeout(1000 * 60 * 3);
 
@@ -93,45 +82,14 @@ describe(`GenericRFQ ${dexKey} E2E`, () => {
   for (const [_network, testCases] of Object.entries(testConfig)) {
     const network = parseInt(_network, 10);
     const tokens = Tokens[network];
-    const smartTokens = SmartTokens[network];
     const config = generateConfig(network);
 
     config.rfqConfigs[dexKey] = buildConfigForGenericRFQ();
     describe(`${Network[network]}`, () => {
       for (const testCase of testCases) {
-        let srcToken: Token | SmartToken, destToken: Token | SmartToken;
-
-        if (SKIP_TENDERLY) {
-          srcToken = tokens[testCase.srcToken];
-          destToken = tokens[testCase.destToken];
-        } else {
-          if (!smartTokens.hasOwnProperty(testCase.srcToken)) {
-            throw new Error(
-              `Please add "addBalance" and "addAllowance" functions for ${testCase.srcToken} on ${Network[network]} (in constants-e2e.ts).`,
-            );
-          }
-          if (!smartTokens.hasOwnProperty(testCase.destToken)) {
-            throw new Error(
-              `Please add "addBalance" and "addAllowance" functions for ${testCase.destToken} on ${Network[network]} (in constants-e2e.ts).`,
-            );
-          }
-          srcToken = new SmartToken(tokens[testCase.srcToken]);
-          destToken = new SmartToken(tokens[testCase.destToken]);
-
-          srcToken.addBalance(testAccount.address, MAX_UINT);
-          srcToken.addAllowance(
-            testAccount.address,
-            config.augustusRFQAddress,
-            MAX_UINT,
-          );
+        const srcToken = tokens[testCase.srcToken];
+        const destToken = tokens[testCase.destToken];
 
-          destToken.addBalance(testAccount.address, MAX_UINT);
-          destToken.addAllowance(
-            testAccount.address,
-            config.augustusRFQAddress,
-            MAX_UINT,
-          );
-        }
         const contractMethod =
           testCase.swapSide === SwapSide.BUY
             ? ContractMethod.swapOnAugustusRFQTryBatchFill
@@ -143,7 +101,7 @@ describe(`GenericRFQ ${dexKey} E2E`, () => {
               srcToken,
               destToken,
               senderAddress: GENERIC_ADDR1,
-              thirdPartyAddress: testAccount.address,
+              thirdPartyAddress: GENERIC_ADDR2,
               _amount: testCase.amount,
               swapSide: testCase.swapSide as SwapSide,
               dexKeys: [dexKey],

package/src/dex/generic-rfq/generic-rfq-local-e2e.test.ts

@@ -5,7 +5,7 @@ import { ethers } from 'ethers';
 import { Network, ContractMethod, SwapSide, MAX_UINT } from '../../constants';
 import { generateConfig } from '../../config';
 import { newTestE2E } from '../../../tests/utils-e2e';
-import { SmartTokens, GENERIC_ADDR1 } from '../../../tests/constants-e2e';
+import { GENERIC_ADDR1, Tokens } from '../../../tests/constants-e2e';
 import { startTestServer } from './example-api.test';
 
 const PK_KEY = process.env.TEST_PK_KEY;
@@ -26,30 +26,16 @@ describe('GenericRFQ E2E Mainnet', () => {
   });
 
   const network = Network.MAINNET;
-  const smartTokens = SmartTokens[network];
+  const tokens = Tokens[network];
 
-  const srcToken = smartTokens.WETH;
-  const destToken = smartTokens.DAI;
+  const srcToken = tokens.WETH;
+  const destToken = tokens.DAI;
 
   const config = generateConfig(network);
 
   describe('GenericRFQ', () => {
     const dexKey = 'DummyParaSwapPool';
 
-    srcToken.addBalance(testAccount.address, MAX_UINT);
-    srcToken.addAllowance(
-      testAccount.address,
-      config.augustusRFQAddress,
-      MAX_UINT,
-    );
-
-    destToken.addBalance(testAccount.address, MAX_UINT);
-    destToken.addAllowance(
-      testAccount.address,
-      config.augustusRFQAddress,
-      MAX_UINT,
-    );
-
     describe('Simpleswap', () => {
       it('SELL WETH -> DAI', async () => {
         await newTestE2E({
@@ -60,7 +46,7 @@ describe('GenericRFQ E2E Mainnet', () => {
           thirdPartyAddress: testAccount.address,
           _amount: '1000000000000000000',
           swapSide: SwapSide.SELL,
-          dexKey: dexKey,
+          dexKeys: dexKey,
           contractMethod: ContractMethod.simpleSwap,
           network: network,
         });
@@ -75,7 +61,7 @@ describe('GenericRFQ E2E Mainnet', () => {
           thirdPartyAddress: testAccount.address,
           _amount: '1000000000000000000',
           swapSide: SwapSide.SELL,
-          dexKey: dexKey,
+          dexKeys: dexKey,
           contractMethod: ContractMethod.simpleSwap,
           network: network,
         });
@@ -90,7 +76,7 @@ describe('GenericRFQ E2E Mainnet', () => {
           thirdPartyAddress: testAccount.address,
           _amount: '1000000000000000000',
           swapSide: SwapSide.BUY,
-          dexKey: dexKey,
+          dexKeys: dexKey,
           contractMethod: ContractMethod.simpleBuy,
           network: network,
         });
@@ -105,7 +91,7 @@ describe('GenericRFQ E2E Mainnet', () => {
           thirdPartyAddress: testAccount.address,
           _amount: '1000000000000000000',
           swapSide: SwapSide.BUY,
-          dexKey: dexKey,
+          dexKeys: dexKey,
           contractMethod: ContractMethod.simpleBuy,
           network: network,
         });

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

@@ -337,6 +337,15 @@ export const UniswapV2Config: DexConfigMap<DexParams> = {
       feeCode: 30,
     },
   },
+  ArenaDex: {
+    [Network.AVALANCHE]: {
+      factoryAddress: '0x231DF4D421f1F9e0AAe9bA3634a87EBC87A09c39',
+      initCode:
+        '0x5eae27f407e5d417db3b2c176a2221883934aa8eecf365f8795afb69ee0b23d1',
+      poolGasCost: 120 * 1000,
+      feeCode: 30,
+    },
+  },
   PancakeSwap: {
     [Network.BSC]: {
       factoryAddress: '0xBCfCcbde45cE874adCB698cC183deBcF17952812',

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

@@ -2,11 +2,101 @@ 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,
+) {
+  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.swapExactAmountIn]],
+    [SwapSide.BUY, [ContractMethod.swapExactAmountOut]],
+  ]);
+
+  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,
+              );
+            });
+            it(`${tokenASymbol} -> ${nativeTokenSymbol}`, async () => {
+              await testE2E(
+                tokens[tokenASymbol],
+                tokens[nativeTokenSymbol],
+                holders[tokenASymbol],
+                side === SwapSide.SELL ? tokenAAmount : nativeTokenAmount,
+                side,
+                dexKey,
+                contractMethod,
+                network,
+                provider,
+              );
+            });
+            it(`${tokenASymbol} -> ${tokenBSymbol}`, async () => {
+              await testE2E(
+                tokens[tokenASymbol],
+                tokens[tokenBSymbol],
+                holders[tokenASymbol],
+                side === SwapSide.SELL ? tokenAAmount : tokenBAmount,
+                side,
+                dexKey,
+                contractMethod,
+                network,
+                provider,
+              );
+            });
+            it(`${tokenBSymbol} -> ${tokenASymbol}`, async () => {
+              await testE2E(
+                tokens[tokenBSymbol],
+                tokens[tokenASymbol],
+                holders[tokenBSymbol],
+                side === SwapSide.SELL ? tokenBAmount : tokenAAmount,
+                side,
+                dexKey,
+                contractMethod,
+                network,
+                provider,
+              );
+            });
+          });
+        });
+      }),
+    );
+  });
+}
+
 describe('UniswapV2 E2E Avalanche', () => {
   const network = Network.AVALANCHE;
   const tokens = Tokens[network];
@@ -196,6 +286,20 @@ describe('UniswapV2 E2E Avalanche', () => {
     });
   });
 
+  describe('ArenaDex', () => {
+    const dexKey = 'ArenaDex';
+
+    testForNetwork(
+      network,
+      dexKey,
+      'ARENA',
+      'WAVAX',
+      '10000000',
+      '10000000',
+      '10000000',
+    );
+  });
+
   describe('TraderJoe', () => {
     const dexKey = 'TraderJoe';
     describe('TraderJoe: Fail: (Joe: K)', () => {

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

@@ -390,9 +390,10 @@ export const UniswapV3Config: DexConfigMap<DexParams> = {
       quoter: '0x254cF9E1E6e233aa1AC962CB9B05b2cfeAaE15b0',
       router: '0x1b2b6cE813b99b840Fe632c63bcA5394938Ef01e',
       supportedFees: SUPPORTED_FEES,
-      tickSpacings: [1n, 50n, 100n, 200n, 2000n],
+      tickSpacings: [1n, 10n, 50n, 100n, 200n, 2000n],
       tickSpacingsToFees: {
         '1': 100n,
+        '10': 500n,
         '50': 500n,
         '100': 500n,
         '200': 3000n,

package/tests/constants-e2e.ts

@@ -1,15 +1,4 @@
-import {
-  SmartTokenParams,
-  balanceOfFn,
-  allowanceFn,
-  SmartToken,
-  balancesFn,
-  allowedFn,
-  _balancesFn,
-  _allowancesFn,
-  balanceAndBlacklistStatesFn,
-} from '../tests/smart-tokens';
-import { Address } from '../src/types';
+import { Address, Token } from '../src/types';
 import { ETHER_ADDRESS, Network } from '../src/constants';
 
 export const GIFTER_ADDRESS = '0xb22fC4eC94D555A5049593ca4552c810Fb8a6d00';
@@ -17,7 +6,7 @@ export const GENERIC_ADDR1 = '0xbe9317f6711e2da074fe1f168fd9c402bc0a9d1b';
 export const GENERIC_ADDR2 = '0x230a1ac45690b9ae1176389434610b9526d2f21b';
 
 export const Tokens: {
-  [network: number]: { [symbol: string]: SmartTokenParams };
+  [network: number]: { [symbol: string]: Token };
 } = {
   [Network.MAINNET]: {
     sUSDS: {
@@ -132,8 +121,6 @@ export const Tokens: {
       address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
       decimals: 6,
       symbol: 'USDC',
-      addBalance: balanceAndBlacklistStatesFn,
-      addAllowance: allowedFn,
     },
     INST: {
       address: '0x6f40d4A6237C257fff2dB00FA0510DeEECd303eb',
@@ -166,8 +153,6 @@ export const Tokens: {
     WBTC: {
       address: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599',
       decimals: 8,
-      addBalance: balancesFn,
-      addAllowance: allowedFn,
     },
     sBTC: {
       address: '0xfe18be6b3bd88a2d2a7f928d00292e7a9963cfc6',
@@ -184,8 +169,6 @@ export const Tokens: {
     USDT: {
       address: '0xdac17f958d2ee523a2206206994597c13d831ec7',
       decimals: 6,
-      addBalance: balancesFn,
-      addAllowance: allowedFn,
     },
     STETH: {
       address: '0xae7ab96520de3a18e5e111b5eaab095312d7fe84',
@@ -214,8 +197,6 @@ export const Tokens: {
     WETH: {
       address: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
       decimals: 18,
-      addBalance: balanceOfFn,
-      addAllowance: allowanceFn,
     },
     PSP: {
       address: '0xcafe001067cdef266afb7eb5a286dcfd277f3de5',
@@ -232,8 +213,6 @@ export const Tokens: {
     DAI: {
       address: '0x6b175474e89094c44da98b954eedeac495271d0f',
       decimals: 18,
-      addBalance: balanceOfFn,
-      addAllowance: allowanceFn,
     },
     MLN: {
       address: '0xec67005c4e498ec7f55e092bd1d35cbc47c91892',
@@ -617,8 +596,6 @@ export const Tokens: {
     USDCe: {
       address: '0x2791bca1f2de4661ed88a30c99a7a9449aa84174',
       decimals: 6,
-      addBalance: _balancesFn,
-      addAllowance: _allowancesFn,
     },
     MLN: {
       address: '0xa9f37d84c856fda3812ad0519dad44fa0a3fe207',
@@ -677,8 +654,6 @@ export const Tokens: {
     WMATIC: {
       address: '0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270',
       decimals: 18,
-      addBalance: balanceOfFn,
-      addAllowance: allowanceFn,
     },
     AMWMATIC: {
       address: '0x8dF3aad3a84da6b69A4DA8aeC3eA40d9091B2Ac4',
@@ -1060,8 +1035,6 @@ export const Tokens: {
     USDT: {
       address: '0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7',
       decimals: 6,
-      addAllowance: _allowancesFn,
-      addBalance: balanceOfFn,
     },
     POPS: {
       address: '0x240248628B7B6850352764C5dFa50D1592A033A8',
@@ -1070,8 +1043,6 @@ export const Tokens: {
     WAVAX: {
       address: '0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7',
       decimals: 18,
-      addAllowance: allowanceFn,
-      addBalance: balanceOfFn,
     },
     sAVAX: {
       address: '0x2b2C81e08f1Af8835a78Bb2A90AE924ACE0eA4bE',
@@ -1206,6 +1177,10 @@ export const Tokens: {
       address: '0x6ab707aca953edaefbc4fd23ba73294241490620',
       decimals: 6,
     },
+    ARENA: {
+      address: '0xB8d7710f7d8349A506b75dD184F05777c82dAd0C',
+      decimals: 18,
+    },
     TRYB: {
       address: '0x564a341df6c126f90cf3ecb92120fd7190acb401',
       decimals: 6,
@@ -1231,8 +1206,6 @@ export const Tokens: {
     WETH: {
       address: '0x82aF49447D8a07e3bd95BD0d56f35241523fBab1',
       decimals: 18,
-      addBalance: _balancesFn,
-      addAllowance: _allowancesFn,
     },
     waArbWETH: {
       address: '0x4ce13a79f45c1be00bdabd38b764ac28c082704e',
@@ -1247,8 +1220,6 @@ export const Tokens: {
       address: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
       decimals: 6,
       symbol: 'USDC',
-      addBalance: balanceAndBlacklistStatesFn,
-      addAllowance: allowedFn,
     },
     SUSHI: {
       address: '0xd4d42F0b6DEF4CE0383636770eF773390d85c61A',
@@ -1269,8 +1240,6 @@ export const Tokens: {
     USDT: {
       address: '0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9',
       decimals: 6,
-      addBalance: _balancesFn,
-      addAllowance: _allowancesFn,
     },
     waArbUSDT: {
       address: '0xa6D12574eFB239FC1D2099732bd8b5dC6306897F',
@@ -1415,8 +1384,6 @@ export const Tokens: {
     WETH: {
       address: '0x4200000000000000000000000000000000000006',
       decimals: 18,
-      addBalance: balanceOfFn,
-      addAllowance: allowanceFn,
     },
     ETH: { address: ETHER_ADDRESS, decimals: 18 },
     USDCe: {
@@ -2069,6 +2036,7 @@ export const Holders: {
     PHAR: '0x654296D56532f62B7d91d335791d3c364a9385b5',
     stataUSDT: '', // no holders yet
     aaveUSDT: '0xB2d3ad6e99D2A043EF77e3812461Ad2D4Ae3da8B',
+    ARENA: '0xEBf747761b6942adaBAA58A594BA24931AfA0a3F',
     TRYB: '0x7137FdccfB6Ee406771E8F5c1B466e4d3074dd45',
   },
   [Network.ARBITRUM]: {
@@ -2226,20 +2194,6 @@ export const Holders: {
   },
 };
 
-export const SmartTokens = Object.keys(Tokens).reduce((acc, _network) => {
-  const network = parseInt(_network, 10);
-  acc[+network] = Object.keys(Tokens[network]).reduce((_acc, tokenName) => {
-    const token: SmartTokenParams = Tokens[network][tokenName]!;
-
-    if (token.addAllowance && token.addBalance) {
-      _acc[tokenName] = new SmartToken(token);
-    }
-
-    return _acc;
-  }, {} as Record<string, SmartToken>);
-  return acc;
-}, {} as Record<number, Record<string, SmartToken>>);
-
 export const NativeTokenSymbols: { [network: number]: string } = {
   [Network.MAINNET]: 'ETH',
   [Network.POLYGON]: 'MATIC',

package/tests/{tenderly-simulation-new.test.ts → tenderly-simulation.test.ts}

@@ -1,8 +1,8 @@
 import { ethers } from 'ethers';
-import { TenderlySimulatorNew } from './tenderly-simulation-new';
+import { TenderlySimulator } from './tenderly-simulation';
 
 describe('Tenderly', () => {
-  const tenderly = TenderlySimulatorNew.getInstance();
+  const tenderly = TenderlySimulator.getInstance();
   const USDC = '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48';
   const USDT = '0xdac17f958d2ee523a2206206994597c13d831ec7';
   const account = '0x89f53c184ed91cd333fdec0eceeddcaea0cc28cf';