@paraswap/dex-lib 3.8.2 → 3.8.3-integral-dex

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

@@ -0,0 +1,110 @@
+import dotenv from 'dotenv';
+dotenv.config();
+
+import { testE2E } from '../../../tests/utils-e2e';
+import {
+  Tokens,
+  Holders,
+  NativeTokenSymbols,
+} from '../../../tests/constants-e2e';
+
+import { ContractMethod, Network, SwapSide } from '../../constants';
+import { StaticJsonRpcProvider } from '@ethersproject/providers';
+import { generateConfig } from '../../config';
+
+const dexKey = 'zerox';
+
+const testForNetwork = (
+  network: Network,
+  swapMap: Map<SwapSide, ContractMethod[]>,
+) => {
+  const tokens = Tokens[network];
+  const holders = Holders[network];
+
+  const nativeSymbol = NativeTokenSymbols[network];
+
+  const provider = new StaticJsonRpcProvider(
+    generateConfig(network).privateHttpProvider,
+    network,
+  );
+
+  const tokensToTest = [
+    [
+      {
+        symbol: 'USDC',
+        amount: (10 ** 8).toString(),
+      },
+      {
+        symbol: 'USDT',
+        amount: (10 ** 8).toString(),
+      },
+    ],
+    [
+      {
+        symbol: 'USDT',
+        amount: (10 ** 8).toString(),
+      },
+      {
+        symbol: 'DAI',
+        amount: (10 ** 8).toString(),
+      },
+    ],
+  ];
+
+  swapMap.forEach((contractMethods, side) =>
+    contractMethods.forEach((contractMethod: string) => {
+      tokensToTest.forEach(pair => {
+        describe(`${contractMethod}`, () => {
+          it(`${pair[0].symbol} -> ${pair[1].symbol}`, async () => {
+            await testE2E(
+              tokens[pair[0].symbol],
+              tokens[pair[1].symbol],
+              holders[pair[0].symbol],
+              side === SwapSide.SELL ? pair[0].amount : pair[1].amount,
+              side,
+              dexKey,
+              contractMethod as any,
+              network,
+              provider,
+            );
+          });
+
+          it(`${nativeSymbol} -> ${pair[0].symbol}`, async () => {
+            await testE2E(
+              tokens[nativeSymbol],
+              tokens[pair[0].symbol],
+              holders[nativeSymbol],
+              side === SwapSide.SELL ? '1000000000000000000' : pair[0].amount,
+              side,
+              dexKey,
+              contractMethod as any,
+              network,
+              provider,
+            );
+          });
+        });
+      });
+    }),
+  );
+};
+
+// Ensure you have the E2E_ENDPOINT_URL env variable set.
+
+describe('ZeroX v2.1 E2E', () => {
+  describe('Mainnet V6', () => {
+    const swapMap = new Map<SwapSide, ContractMethod[]>([
+      [SwapSide.SELL, [ContractMethod.swapExactAmountIn]],
+    ]);
+
+    testForNetwork(Network.MAINNET, swapMap);
+  });
+
+  describe('Polygon V6', () => {
+    const swapMap = new Map<SwapSide, ContractMethod[]>([
+      [SwapSide.SELL, [ContractMethod.swapExactAmountIn]],
+      [SwapSide.BUY, [ContractMethod.swapExactAmountOut]],
+    ]);
+
+    testForNetwork(Network.POLYGON, swapMap);
+  });
+});

package/src/generic-swap-transaction-builder.ts

@@ -623,7 +623,9 @@ export class GenericSwapTransactionBuilder {
     // This assumes that the sum of all swaps srcAmount would sum to priceRoute.srcAmount
     // Also that it is a direct swap.
     const _srcAmount =
-      swapIndex > 0 || side === SwapSide.SELL
+      swapIndex > 0 ||
+      side === SwapSide.SELL ||
+      this.dexAdapterService.getDexKeySpecial(se.exchange) === 'zerox'
         ? se.srcAmount
         : (
             (BigInt(se.srcAmount) * BigInt(minMaxAmount)) /

package/src/router/simpleswap.ts

@@ -103,7 +103,9 @@ export abstract class SimpleRouterBase<RouterParam>
           // This assumes that the sum of all swaps srcAmount would sum to priceRoute.srcAmount
           // Also that it is a direct swap.
           const _srcAmount =
-            swapIndex > 0 || this.side === SwapSide.SELL
+            swapIndex > 0 ||
+            this.side === SwapSide.SELL ||
+            this.dexAdapterService.getDexKeySpecial(se.exchange) === 'zerox'
               ? se.srcAmount
               : (
                   (BigInt(se.srcAmount) * BigInt(minMaxAmount)) /

package/tests/constants-e2e.ts

@@ -1556,7 +1556,7 @@ export const Holders: {
     USDA: '0x2686bC6A56D205010637CE1DF124b20Cb19E4054',
     stUSD: '0x4e83c0a323b68E3Bc7CC8a4E35326Fd0544A291E',
     crvUSD: '0xA920De414eA4Ab66b97dA1bFE9e6EcA7d4219635',
-    GHO: '0x0F11640BF66e2D9352d9c41434A5C6E597c5e4c8',
+    GHO: '0x844Dc85EdD8492A56228D293cfEbb823EF3E10EC',
     wibBTC: '0xFbdCA68601f835b27790D98bbb8eC7f05FDEaA9B',
     MATIC: '0x7073783eee7e9b3e6e4ddac4d7f49dc46044dd9a',
     POL: '0x05A47D9f589a001C15E38D068dCc5DaE6D96a2eb',
@@ -1678,7 +1678,7 @@ export const Holders: {
     BETS: '0x8cc2284c90d05578633418f9cde104f402375a65',
     HATCHY: '0x14ec295ec8def851ec6e2959df872dd24e422631',
     USDCe: '0x3a2434c698f8d79af1f5a9e43013157ca8b11a66',
-    USDC: '0x187b6Ab771482CCFEE7cD2C35176080631082368',
+    USDC: '0x0d0707963952f2fba59dd06f2b425ace40b492fe',
     USDTe: '0x84d34f4f83a87596cd3fb6887cff8f17bf5a7b83',
     WETHe: '0x9bdB521a97E95177BF252C253E256A60C3e14447',
     POPS: '0x5268c2331658cb0b2858cfa9db27d8f22f5434bc',

package/tests/utils-e2e.ts

@@ -43,7 +43,6 @@ import {
   constructSimpleSDK,
   SimpleFetchSDK,
 } from '@paraswap/sdk';
-import { ParaSwapVersion } from '@paraswap/core';
 import axios from 'axios';
 import { SmartToken, StateOverrides } from './smart-tokens';
 import {
@@ -128,7 +127,6 @@ class APIParaswapSDK implements IParaSwapSDK {
   ) {
     this.dexKeys = Array.isArray(dexKeys) ? dexKeys : [dexKeys];
     this.paraSwap = constructSimpleSDK({
-      version: ParaSwapVersion.V6,
       chainId: network,
       axios,
       apiURL: testingEndpoint,

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>

package/src/abi/curve-v1-factory/CurveV1Router.abi.json

@@ -1,331 +0,0 @@
-[
-  {
-    "name": "Exchange",
-    "inputs": [
-      {
-        "name": "sender",
-        "type": "address",
-        "indexed": true
-      },
-      {
-        "name": "receiver",
-        "type": "address",
-        "indexed": true
-      },
-      {
-        "name": "route",
-        "type": "address[11]",
-        "indexed": false
-      },
-      {
-        "name": "swap_params",
-        "type": "uint256[5][5]",
-        "indexed": false
-      },
-      {
-        "name": "pools",
-        "type": "address[5]",
-        "indexed": false
-      },
-      {
-        "name": "in_amount",
-        "type": "uint256",
-        "indexed": false
-      },
-      {
-        "name": "out_amount",
-        "type": "uint256",
-        "indexed": false
-      }
-    ],
-    "anonymous": false,
-    "type": "event"
-  },
-  {
-    "stateMutability": "payable",
-    "type": "fallback"
-  },
-  {
-    "stateMutability": "nonpayable",
-    "type": "constructor",
-    "inputs": [
-      {
-        "name": "_weth",
-        "type": "address"
-      },
-      {
-        "name": "_stable_calc",
-        "type": "address"
-      },
-      {
-        "name": "_crypto_calc",
-        "type": "address"
-      }
-    ],
-    "outputs": []
-  },
-  {
-    "stateMutability": "payable",
-    "type": "function",
-    "name": "exchange",
-    "inputs": [
-      {
-        "name": "_route",
-        "type": "address[11]"
-      },
-      {
-        "name": "_swap_params",
-        "type": "uint256[5][5]"
-      },
-      {
-        "name": "_amount",
-        "type": "uint256"
-      },
-      {
-        "name": "_min_dy",
-        "type": "uint256"
-      }
-    ],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ]
-  },
-  {
-    "stateMutability": "payable",
-    "type": "function",
-    "name": "exchange",
-    "inputs": [
-      {
-        "name": "_route",
-        "type": "address[11]"
-      },
-      {
-        "name": "_swap_params",
-        "type": "uint256[5][5]"
-      },
-      {
-        "name": "_amount",
-        "type": "uint256"
-      },
-      {
-        "name": "_min_dy",
-        "type": "uint256"
-      },
-      {
-        "name": "_pools",
-        "type": "address[5]"
-      }
-    ],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ]
-  },
-  {
-    "stateMutability": "payable",
-    "type": "function",
-    "name": "exchange",
-    "inputs": [
-      {
-        "name": "_route",
-        "type": "address[11]"
-      },
-      {
-        "name": "_swap_params",
-        "type": "uint256[5][5]"
-      },
-      {
-        "name": "_amount",
-        "type": "uint256"
-      },
-      {
-        "name": "_min_dy",
-        "type": "uint256"
-      },
-      {
-        "name": "_pools",
-        "type": "address[5]"
-      },
-      {
-        "name": "_receiver",
-        "type": "address"
-      }
-    ],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ]
-  },
-  {
-    "stateMutability": "view",
-    "type": "function",
-    "name": "get_dy",
-    "inputs": [
-      {
-        "name": "_route",
-        "type": "address[11]"
-      },
-      {
-        "name": "_swap_params",
-        "type": "uint256[5][5]"
-      },
-      {
-        "name": "_amount",
-        "type": "uint256"
-      }
-    ],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ]
-  },
-  {
-    "stateMutability": "view",
-    "type": "function",
-    "name": "get_dy",
-    "inputs": [
-      {
-        "name": "_route",
-        "type": "address[11]"
-      },
-      {
-        "name": "_swap_params",
-        "type": "uint256[5][5]"
-      },
-      {
-        "name": "_amount",
-        "type": "uint256"
-      },
-      {
-        "name": "_pools",
-        "type": "address[5]"
-      }
-    ],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ]
-  },
-  {
-    "stateMutability": "view",
-    "type": "function",
-    "name": "get_dx",
-    "inputs": [
-      {
-        "name": "_route",
-        "type": "address[11]"
-      },
-      {
-        "name": "_swap_params",
-        "type": "uint256[5][5]"
-      },
-      {
-        "name": "_out_amount",
-        "type": "uint256"
-      },
-      {
-        "name": "_pools",
-        "type": "address[5]"
-      }
-    ],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ]
-  },
-  {
-    "stateMutability": "view",
-    "type": "function",
-    "name": "get_dx",
-    "inputs": [
-      {
-        "name": "_route",
-        "type": "address[11]"
-      },
-      {
-        "name": "_swap_params",
-        "type": "uint256[5][5]"
-      },
-      {
-        "name": "_out_amount",
-        "type": "uint256"
-      },
-      {
-        "name": "_pools",
-        "type": "address[5]"
-      },
-      {
-        "name": "_base_pools",
-        "type": "address[5]"
-      }
-    ],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ]
-  },
-  {
-    "stateMutability": "view",
-    "type": "function",
-    "name": "get_dx",
-    "inputs": [
-      {
-        "name": "_route",
-        "type": "address[11]"
-      },
-      {
-        "name": "_swap_params",
-        "type": "uint256[5][5]"
-      },
-      {
-        "name": "_out_amount",
-        "type": "uint256"
-      },
-      {
-        "name": "_pools",
-        "type": "address[5]"
-      },
-      {
-        "name": "_base_pools",
-        "type": "address[5]"
-      },
-      {
-        "name": "_base_tokens",
-        "type": "address[5]"
-      }
-    ],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ]
-  },
-  {
-    "stateMutability": "view",
-    "type": "function",
-    "name": "version",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "string"
-      }
-    ]
-  }
-]

package/src/dex/curve-v1-factory/optimizer.ts

@@ -1,61 +0,0 @@
-import { UnoptimizedRate } from '../../types';
-import { OptimalSwap, ParaSwapVersion } from '@paraswap/core';
-import _ from 'lodash';
-import { CurveV1FactoryConfig } from './config';
-import { CurveV1StableNgConfig } from '../curve-v1-stable-ng/config';
-
-const CurveV1FactoryForks = Object.keys(CurveV1FactoryConfig)
-  .concat(Object.keys(CurveV1StableNgConfig))
-  .map(dexName => dexName.toLowerCase());
-
-export function curveV1Merge(or: UnoptimizedRate): UnoptimizedRate {
-  // apply optimisation only for V6
-  if (or.version !== ParaSwapVersion.V6) {
-    return or;
-  }
-
-  const fixRoute = (rawRate: OptimalSwap[]): OptimalSwap[] => {
-    let lastExchange: false | OptimalSwap = false;
-    let optimizedRate = new Array<OptimalSwap>();
-    rawRate.forEach((s: OptimalSwap) => {
-      if (
-        s.swapExchanges.length !== 1 ||
-        !CurveV1FactoryForks.includes(s.swapExchanges[0].exchange.toLowerCase())
-      ) {
-        lastExchange = false;
-        optimizedRate.push(s);
-      } else if (
-        lastExchange &&
-        _.last(
-          <any[]>lastExchange.swapExchanges[0].data.path,
-        )!.tokenOut.toLowerCase() ===
-          s.swapExchanges[0].data.path[0].tokenIn.toLowerCase()
-      ) {
-        lastExchange.swapExchanges[0].data.path.push(
-          s.swapExchanges[0].data.path[0],
-        );
-        lastExchange.swapExchanges[0].poolAddresses!.push(
-          s.swapExchanges[0].poolAddresses![0],
-        );
-        lastExchange.swapExchanges[0].data.gasUSD = (
-          parseFloat(lastExchange.swapExchanges[0].data.gasUSD) +
-          parseFloat(s.swapExchanges[0].data.gasUSD)
-        ).toFixed(6);
-        lastExchange.destToken = s.destToken;
-        lastExchange.destDecimals = s.destDecimals;
-        lastExchange.swapExchanges[0].destAmount =
-          s.swapExchanges[0].destAmount;
-      } else {
-        lastExchange = _.cloneDeep(s);
-        optimizedRate.push(lastExchange);
-      }
-    });
-    return optimizedRate;
-  };
-  or.bestRoute = or.bestRoute.map(r => ({
-    ...r,
-    swaps: fixRoute(r.swaps),
-  }));
-
-  return or;
-}