@paraswap/dex-lib 2.21.0 → 2.21.1-chronos

package/src/router/directswap.ts

@@ -3,11 +3,6 @@ import { IDex } from '../dex/idex';
 import { Address, OptimalRate, TxInfo, Adapters } from '../types';
 import { SwapSide } from '../constants';
 import { DexAdapterService } from '../dex';
-import { assert } from 'ts-essentials';
-import {
-  encodeFeePercent,
-  encodeFeePercentForReferrer,
-} from './payload-encoder';
 
 export class DirectSwap<DexDirectReturn> implements IRouter<DexDirectReturn> {
   // This is just psuedo name as the DirectSwap
@@ -56,7 +51,6 @@ export class DirectSwap<DexDirectReturn> implements IRouter<DexDirectReturn> {
       );
 
     const swapExchange = priceRoute.bestRoute[0].swaps[0].swapExchanges[0];
-
     const srcAmount =
       priceRoute.side === SwapSide.SELL ? swapExchange.srcAmount : minMaxAmount;
     const destAmount =
@@ -64,31 +58,14 @@ export class DirectSwap<DexDirectReturn> implements IRouter<DexDirectReturn> {
         ? minMaxAmount
         : swapExchange.destAmount;
 
-    const expectedAmount =
-      priceRoute.side === SwapSide.SELL
-        ? priceRoute.destAmount
-        : priceRoute.srcAmount;
-
     return dex.getDirectParam!(
       priceRoute.srcToken,
       priceRoute.destToken,
       srcAmount,
       destAmount,
-      expectedAmount,
       swapExchange.data,
       priceRoute.side,
       permit,
-      uuid,
-      referrerAddress
-        ? encodeFeePercentForReferrer(priceRoute.side)
-        : encodeFeePercent(
-            partnerFeePercent,
-            positiveSlippageToUser,
-            priceRoute.side,
-          ),
-      deadline,
-      referrerAddress || partnerAddress,
-      beneficiary,
       priceRoute.contractMethod,
     );
   }

package/src/router/index.ts

@@ -5,7 +5,9 @@ import { Buy } from './buy';
 import { SimpleSwap, SimpleBuy } from './simpleswap';
 import { SimpleBuyNFT } from './simpleswapnft';
 import { DirectSwap } from './directswap';
+import { Adapters } from '../types';
 import { DexAdapterService } from '../dex';
+import { SwapSide } from '../constants';
 
 export class RouterService {
   hybridRouters = [

package/src/router/payload-encoder.ts

@@ -16,42 +16,25 @@ import { convertToBasisPoints } from '../utils';
 const OneShift14 = 1n << 14n;
 const OneShift15 = 1n << 15n;
 const OneShift16 = 1n << 16n;
-const OneShift17 = 1n << 17n;
 const OneShift248 = 1n << 248n;
 
-// Referrer gets 25% of positive slippage
+// Referrer gets 50% of what ParaSwap takes i.e. 25% of positive slippage
 // Set 16th bit to indicate referral program
-const REFERRER_FEE = 2500n | OneShift14 | OneShift16 | OneShift248;
-
-const HALF_SPLIT = '5000';
+const REFERRER_FEE = 5000n | OneShift14 | OneShift16 | OneShift248;
 
 export function encodeFeePercent(
   partnerFeePercent: string,
   positiveSlippageToUser: boolean,
   side: SwapSide,
 ) {
-  const isNoFeeAndPositiveSlippageToPartner =
-    positiveSlippageToUser === false && BigInt(partnerFeePercent) === 0n;
-
-  let fee = isNoFeeAndPositiveSlippageToPartner
-    ? BigInt(HALF_SPLIT)
-    : BigInt(partnerFeePercent);
-
+  let fee = BigInt(partnerFeePercent);
   if (fee > 10000) throw new Error('fee bps should be less than 10000');
 
-  // Set 16th bit as referrer to split positive slippage for partner and protocol
-  // Set 17th bit to flag on Subgraph that this is a special case
-  if (isNoFeeAndPositiveSlippageToPartner) {
-    fee |= OneShift16;
-    fee |= OneShift17;
-  }
-
   // Set 14th bit if positiveSlippageToUser is true
   if (positiveSlippageToUser) fee |= OneShift14;
 
   // Set 15th bit to take fee from srcToken
-  if (side === SwapSide.BUY && !isNoFeeAndPositiveSlippageToPartner)
-    fee |= OneShift15;
+  if (side === SwapSide.BUY) fee |= OneShift15;
 
   // Bits 248 - 255 is used for version;
   // Set version = 1;
@@ -64,7 +47,7 @@ export function encodeFeePercentForReferrer(side: SwapSide) {
   let fee = REFERRER_FEE;
 
   // Set 15th bit to take fee from srcToken
-  // if (side === SwapSide.BUY) fee |= OneShift15; // stop setting this flag to take right circuit
+  if (side === SwapSide.BUY) fee |= OneShift15;
 
   return fee.toString();
 }

package/src/types.ts

@@ -275,7 +275,6 @@ export type Config = {
   hashFlowAuthToken?: string;
   hashFlowDisabledMMs: string[];
   uniswapV3EventLoggingSampleRate?: number;
-  swaapV2AuthToken?: string;
 };
 
 export type BigIntAsString = string;
@@ -289,7 +288,6 @@ export type PreprocessTransactionOptions = {
   txOrigin: Address;
   hmac?: string;
   mockRfqAndLO?: boolean;
-  isDirectMethod?: boolean;
 };
 
 export type TransferFeeParams = {

package/src/utils.ts

@@ -8,11 +8,6 @@ import _ from 'lodash';
 import { MultiResult } from './lib/multi-wrapper';
 import { Contract } from 'web3-eth-contract';
 import Web3 from 'web3';
-import { AxiosError } from 'axios';
-
-export const isAxiosError = (e: any): e is AxiosError => {
-  return e.isAxiosError === true;
-};
 
 export const isETHAddress = (address: string) =>
   address.toLowerCase() === ETHER_ADDRESS.toLowerCase();

package/tests/constants-e2e.ts

@@ -704,6 +704,10 @@ export const Tokens: {
       address: '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1',
       decimals: 18,
     },
+    ARB: {
+      address: '0x912ce59144191c1204e64559fe8253a0e49e6548',
+      decimals: 18,
+    },
     WETH: {
       address: '0x82aF49447D8a07e3bd95BD0d56f35241523fBab1',
       decimals: 18,
@@ -898,10 +902,10 @@ export const Holders: {
   [Network.POLYGON]: {
     MATIC: '0xe7804c37c13166fF0b37F5aE0BB07A3aEbb6e245',
     DAI: '0x06959153B974D0D5fDfd87D561db6d8d4FA0bb0B',
-    WETH: '0x62ac55b745f9b08f1a81dcbbe630277095cf4be1',
+    WETH: '0x72a53cdbbcc1b9efa39c834a540550e23463aacb',
     WMATIC: '0xFffbCD322cEace527C8ec6Da8de2461C6D9d4e6e',
     AMWMATIC: '0x8832924854e3Cedb0a6Abf372e6CCFF9F7654332',
-    USDC: '0xf89d7b9c864f589bbf53a82105107622b35eaa40',
+    USDC: '0x06959153B974D0D5fDfd87D561db6d8d4FA0bb0B',
     POPS: '0x2693b57ee51f4e2a26dfb339a911fa8731061f49',
     MUST: '0x9f2a409848fb9b7bd058b24a23e8dbf1e166a109',
     AMDAI: '0xFA0DCe8280FCDf369a4cbFc1830d3302789307a6',
@@ -917,8 +921,8 @@ export const Holders: {
     RADIO: '0x60531b9c3645546d864604ee0fc5b7d6adc81cc2',
     HANZO: '0x8a151b6ec99c7b90b342ab401d511b480309b220',
     RVLT: '0x815f87ca3db2b9491115a7769aeacb140361c5a9',
-    stMATIC: '0x6725b8cd3cdbc82a6044689a8bbc64a915d200e7',
-    axlUSDC: '0xe743a49f04f2f77eb2d3b753ae3ad599de8cea84',
+    stMATIC: '0x3b39669766fe815aa91834b3bd258dea3edbb6d5',
+    axlUSDC: '0x42875ae5766dfd4d70772a3a956842e4b708d59a',
     deUSDC: '0x94d5ead1f80cf0b4d3480ab59dff16d47c93e9fe',
     amUSDT: '0x832b11846a27b3ba25d68ae80c39fab155d18c49',
     amUSDC: '0x6e7f19cd23049c7118e14470e2bf85d2e26ee0ae',
@@ -991,6 +995,7 @@ export const Holders: {
     YUSD: '0x6c1a5ef2acde1fd2fc68def440d2c1eb35bae24a',
   },
   [Network.ARBITRUM]: {
+    ARB: '0xb65edba80a3d81903ecd499c8eb9cf0e19096bd0',
     ETH: '0xF977814e90dA44bFA03b6295A0616a897441aceC',
     DAI: '0x07d7f291e731a41d3f0ea4f1ae5b6d920ffb3fe0',
     WETH: '0xc31e54c7a869b9fcbecc14363cf510d1c41fa443',

package/tests/utils-e2e.ts

@@ -29,37 +29,12 @@ import { constructSimpleSDK, SimpleFetchSDK } from '@paraswap/sdk';
 import axios from 'axios';
 import { SmartToken, StateOverrides } from './smart-tokens';
 import { GIFTER_ADDRESS } from './constants-e2e';
-import { generateDeployBytecode, sleep } from './utils';
+import { sleep } from './utils';
 import { assert } from 'ts-essentials';
 
 export const testingEndpoint = process.env.E2E_TEST_ENDPOINT;
 
-const testContractProjectRootPath = process.env.TEST_CONTRACT_PROJECT_ROOT_PATH;
-const testContractName = process.env.TEST_CONTRACT_NAME;
-const testContractConfigFileName = process.env.TEST_CONTRACT_CONFIG_FILE_NAME;
-const testContractRelativePath = process.env.TEST_CONTRACT_RELATIVE_PATH;
-// Comma separated fields from config or actual values
-const testContractDeployArgs = process.env.TEST_CONTRACT_DEPLOY_ARGS;
-
-// If you want to test against deployed and verified contract
-const deployedTestContractAddress = process.env.DEPLOYED_TEST_CONTRACT_ADDRESS;
-const testContractType = process.env.TEST_CONTRACT_TYPE;
-
-// Only for router tests
-const testDirectRouterAbiPath = process.env.TEST_DIRECT_ROUTER_ABI_PATH;
-
-const directRouterIface = new Interface(
-  testDirectRouterAbiPath ? require(testDirectRouterAbiPath) : '[]',
-);
-
-const testContractBytecode = generateDeployBytecode(
-  testContractProjectRootPath,
-  testContractName,
-  testContractConfigFileName,
-  testContractRelativePath,
-  testContractDeployArgs,
-  testContractType,
-);
+const adapterBytecode = '';
 
 const erc20Interface = new Interface(Erc20ABI);
 const augustusInterface = new Interface(AugustusABI);
@@ -171,7 +146,7 @@ function allowTokenTransferProxyParams(
   };
 }
 
-function deployContractParams(bytecode: string, network = Network.MAINNET) {
+function deployAdapterParams(bytecode: string, network = Network.MAINNET) {
   const ownerAddress = DEPLOYER_ADDRESS[network];
   if (!ownerAddress) throw new Error('No deployer address set for network');
   return {
@@ -181,51 +156,13 @@ function deployContractParams(bytecode: string, network = Network.MAINNET) {
   };
 }
 
-function augustusSetImplementationParams(
-  contractAddress: Address,
-  network: Network,
-  functionName: string,
-) {
+function whiteListAdapterParams(contractAddress: Address, network: Network) {
   const augustusAddress = generateConfig(network).augustusAddress;
   if (!augustusAddress) throw new Error('No whitelist address set for network');
   const ownerAddress = MULTISIG[network];
   if (!ownerAddress) throw new Error('No whitelist owner set for network');
-
-  return {
-    from: ownerAddress,
-    to: augustusAddress,
-    data: augustusInterface.encodeFunctionData('setImplementation', [
-      directRouterIface.getSighash(functionName),
-      contractAddress,
-    ]),
-    value: '0',
-  };
-}
-
-function augustusGrantRoleParams(
-  contractAddress: Address,
-  network: Network,
-  type: string = 'adapter',
-) {
-  const augustusAddress = generateConfig(network).augustusAddress;
-  if (!augustusAddress) throw new Error('No whitelist address set for network');
-  const ownerAddress = MULTISIG[network];
-  if (!ownerAddress) throw new Error('No whitelist owner set for network');
-
-  let role: string;
-  switch (type) {
-    case 'adapter':
-      role =
-        '0x8429d542926e6695b59ac6fbdcd9b37e8b1aeb757afab06ab60b1bb5878c3b49';
-      break;
-    case 'router':
-      role =
-        '0x7a05a596cb0ce7fdea8a1e1ec73be300bdb35097c944ce1897202f7a13122eb2';
-      break;
-    default:
-      throw new Error(`Unrecognized type ${type}`);
-  }
-
+  const role =
+    '0x8429d542926e6695b59ac6fbdcd9b37e8b1aeb757afab06ab60b1bb5878c3b49';
   return {
     from: ownerAddress,
     to: augustusAddress,
@@ -237,21 +174,6 @@ function augustusGrantRoleParams(
   };
 }
 
-export function formatDeployMessage(
-  type: 'router' | 'adapter',
-  address: Address,
-  forkId: string,
-  contractName: string,
-  contractPath: string,
-) {
-  // This formatting is useful for verification on Tenderly
-  return `Deployed ${type} contract with env params:
-    TENDERLY_FORK_ID=${forkId}
-    TENDERLY_VERIFY_CONTRACT_ADDRESS=${address}
-    TENDERLY_VERIFY_CONTRACT_NAME=${contractName}
-    TENDERLY_VERIFY_CONTRACT_PATH=${contractPath}`;
-}
-
 export async function testE2E(
   srcToken: Token,
   destToken: Token,
@@ -261,13 +183,12 @@ export async function testE2E(
   dexKey: string,
   contractMethod: ContractMethod,
   network: Network = Network.MAINNET,
-  _0: Provider,
+  provider: Provider,
   poolIdentifiers?: string[],
   limitOrderProvider?: DummyLimitOrderProvider,
   transferFees?: TransferFeeParams,
   // Specified in BPS: part of 10000
   slippage?: number,
-  sleepMs?: number,
 ) {
   const amount = BigInt(_amount);
   const ts = new TenderlySimulation(network);
@@ -281,63 +202,26 @@ export async function testE2E(
     expect(allowanceTx!.success).toEqual(true);
   }
 
-  if (deployedTestContractAddress) {
-    const whitelistTx = await ts.simulate(
-      augustusGrantRoleParams(
-        deployedTestContractAddress,
-        network,
-        testContractType || 'adapter',
-      ),
-    );
-    expect(whitelistTx.success).toEqual(true);
-
-    if (testContractType === 'router') {
-      const setImplementationTx = await ts.simulate(
-        augustusSetImplementationParams(
-          deployedTestContractAddress,
-          network,
-          contractMethod,
-        ),
-      );
-      expect(setImplementationTx.success).toEqual(true);
-    }
-  } else if (testContractBytecode) {
+  if (adapterBytecode) {
     const deployTx = await ts.simulate(
-      deployContractParams(testContractBytecode, network),
+      deployAdapterParams(adapterBytecode, network),
     );
 
     expect(deployTx.success).toEqual(true);
-
-    const contractAddress =
+    const adapterAddress =
       deployTx.transaction.transaction_info.contract_address;
     console.log(
-      formatDeployMessage(
-        'adapter',
-        contractAddress,
-        ts.forkId,
-        testContractName || '',
-        testContractRelativePath || '',
-      ),
+      'Deployed adapter to address',
+      adapterAddress,
+      'used',
+      deployTx.gasUsed,
+      'gas',
     );
+
     const whitelistTx = await ts.simulate(
-      augustusGrantRoleParams(
-        contractAddress,
-        network,
-        testContractType || 'adapter',
-      ),
+      whiteListAdapterParams(adapterAddress, network),
     );
     expect(whitelistTx.success).toEqual(true);
-
-    if (testContractType === 'router') {
-      const setImplementationTx = await ts.simulate(
-        augustusSetImplementationParams(
-          contractAddress,
-          network,
-          contractMethod,
-        ),
-      );
-      expect(setImplementationTx.success).toEqual(true);
-    }
   }
 
   const useAPI = testingEndpoint && !poolIdentifiers;
@@ -348,10 +232,6 @@ export async function testE2E(
 
   if (paraswap.initializePricing) await paraswap.initializePricing();
 
-  if (sleepMs) {
-    await sleep(sleepMs);
-  }
-
   if (paraswap.dexHelper?.replaceProviderWithRPC) {
     paraswap.dexHelper?.replaceProviderWithRPC(
       `https://rpc.tenderly.co/fork/${ts.forkId}`,
@@ -465,13 +345,13 @@ export async function newTestE2E({
     await ts.setup();
   }
 
-  if (useTenderly && testContractBytecode) {
+  if (useTenderly && adapterBytecode) {
     assert(
       ts instanceof TenderlySimulation,
       '`ts`  is not an instance of TenderlySimulation',
     );
     const deployTx = await ts.simulate(
-      deployContractParams(testContractBytecode, network),
+      deployAdapterParams(adapterBytecode, network),
     );
 
     expect(deployTx.success).toEqual(true);
@@ -486,7 +366,7 @@ export async function newTestE2E({
     );
 
     const whitelistTx = await ts.simulate(
-      augustusGrantRoleParams(adapterAddress, network),
+      whiteListAdapterParams(adapterAddress, network),
     );
     expect(whitelistTx.success).toEqual(true);
   }

package/tests/utils.ts

@@ -1,8 +1,5 @@
-/* eslint-disable no-console */
-import { ethers } from 'ethers';
 import { PoolPrices, PoolLiquidity, Address } from '../src/types';
 import { SwapSide } from '../src/constants';
-import { assert } from 'ts-essentials';
 
 // Assuming that the amounts are increasing at same interval, and start with 0
 export function checkPoolPrices(
@@ -76,52 +73,3 @@ export const sleep = (time: number) =>
   new Promise(resolve => {
     setTimeout(resolve, time);
   });
-
-export const generateDeployBytecode = (
-  testContractProjectRootPath: string | undefined,
-  testContractName: string | undefined,
-  testContractConfigFileName: string | undefined,
-  testContractRelativePath: string | undefined,
-  testContractDeployArgs: string | undefined,
-  testContractType: string | undefined,
-): string => {
-  if (
-    !testContractProjectRootPath ||
-    !testContractName ||
-    !testContractConfigFileName ||
-    !testContractRelativePath ||
-    !testContractDeployArgs ||
-    !testContractType
-  ) {
-    return '';
-  }
-
-  const artifactJsonPath = `${testContractProjectRootPath}/artifacts/${testContractName}.json`;
-  const configJsonPath = `${testContractProjectRootPath}/config/${testContractConfigFileName}.json`;
-  const fieldsToPickFromConfig = testContractDeployArgs.split(',');
-
-  const artifact = require(artifactJsonPath) as {
-    abi: ethers.ContractInterface;
-    bytecode: string;
-  };
-  // I don't want to type this testing thing. If something is wrong, I will just throw
-  const config = require(configJsonPath) as any;
-  const factory = new ethers.ContractFactory(artifact.abi, artifact.bytecode);
-
-  const args = fieldsToPickFromConfig.map(f => {
-    const value = config[f];
-    if (value === undefined) {
-      console.log(
-        `Field ${f} is not defined in configJsonPath=${configJsonPath}. Using value as it is`,
-      );
-      return f;
-    }
-    return value;
-  });
-
-  const deployedBytecode = factory.getDeployTransaction(...args).data;
-
-  assert(deployedBytecode !== undefined, 'deployedBytecode is undefined');
-
-  return deployedBytecode.toString();
-};