@paraswap/dex-lib 2.20.3 → 2.21.1-chronos

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

@@ -11,9 +11,6 @@ import {
   Logger,
   NumberAsString,
   PoolPrices,
-  TxInfo,
-  PreprocessTransactionOptions,
-  ExchangeTxInfo,
 } from '../../types';
 import { SwapSide, Network, CACHE_PREFIX } from '../../constants';
 import * as CALLDATA_GAS_COST from '../../calldata-gas-cost';
@@ -22,7 +19,6 @@ import {
   getDexKeysWithNetwork,
   interpolate,
   isTruthy,
-  uuidToBytes16,
 } from '../../utils';
 import { IDex } from '../../dex/idex';
 import { IDexHelper } from '../../dex-helper/idex-helper';
@@ -33,7 +29,6 @@ import {
   UniswapV3Data,
   UniswapV3Functions,
   UniswapV3Param,
-  UniswapV3SimpleSwapParams,
 } from './types';
 import {
   getLocalDeadlineAsFriendlyPlaceholder,
@@ -44,16 +39,14 @@ import { UniswapV3EventPool } from './uniswap-v3-pool';
 import UniswapV3RouterABI from '../../abi/uniswap-v3/UniswapV3Router.abi.json';
 import UniswapV3QuoterABI from '../../abi/uniswap-v3/UniswapV3Quoter.abi.json';
 import UniswapV3MultiABI from '../../abi/uniswap-v3/UniswapMulti.abi.json';
-import DirectSwapABI from '../../abi/DirectSwap.json';
 import UniswapV3StateMulticallABI from '../../abi/uniswap-v3/UniswapV3StateMulticall.abi.json';
 import {
-  DirectMethods,
   UNISWAPV3_EFFICIENCY_FACTOR,
   UNISWAPV3_POOL_SEARCH_OVERHEAD,
   UNISWAPV3_TICK_BASE_OVERHEAD,
   UNISWAPV3_TICK_GAS_COST,
 } from './constants';
-import { assert, DeepReadonly } from 'ts-essentials';
+import { DeepReadonly } from 'ts-essentials';
 import { uniswapV3Math } from './contract-math/uniswap-v3-math';
 import { Contract } from 'web3-eth-contract';
 import { AbiItem } from 'web3-utils';
@@ -63,7 +56,6 @@ import {
   DEFAULT_ID_ERC20,
   DEFAULT_ID_ERC20_AS_STRING,
 } from '../../lib/tokens/types';
-import { OptimalSwapExchange } from '@paraswap/core';
 
 type PoolPairsInfo = {
   token0: Address;
@@ -85,8 +77,6 @@ export class UniswapV3
   readonly hasConstantPriceLargeAmounts = false;
   readonly needWrapNative = true;
 
-  readonly directSwapIface = new Interface(DirectSwapABI);
-
   intervalTask?: NodeJS.Timeout;
 
   public static dexKeysWithNetwork: { key: string; networks: Network[] }[] =
@@ -123,7 +113,7 @@ export class UniswapV3
     // To receive revert reasons
     this.dexHelper.web3Provider.eth.handleRevert = false;
 
-    // Normalize once all config addresses and use across all scenarios
+    // Normalise once all config addresses and use across all scenarios
     this.config = this._toLowerForAllConfigAddresses();
 
     this.notExistingPoolSetKey =
@@ -459,7 +449,6 @@ export class UniswapV3
               fee: pool.feeCodeAsString,
             },
           ],
-          exchange: pool.poolAddress,
         },
         poolIdentifier: this.getPoolIdentifier(
           pool.token0,
@@ -742,130 +731,6 @@ export class UniswapV3
     return arr;
   }
 
-  getTokenFromAddress(address: Address): Token {
-    // In this Dex decimals are not used
-    return { address, decimals: 0 };
-  }
-
-  async preProcessTransaction(
-    optimalSwapExchange: OptimalSwapExchange<UniswapV3Data>,
-    srcToken: Token,
-    _0: Token,
-    _1: SwapSide,
-    options: PreprocessTransactionOptions,
-  ): Promise<[OptimalSwapExchange<UniswapV3Data>, ExchangeTxInfo]> {
-    if (!options.isDirectMethod) {
-      return [
-        optimalSwapExchange,
-        {
-          deadline: BigInt(getLocalDeadlineAsFriendlyPlaceholder()),
-        },
-      ];
-    }
-
-    assert(
-      optimalSwapExchange.data !== undefined,
-      `preProcessTransaction: data field is missing`,
-    );
-
-    let isApproved: boolean | undefined;
-
-    try {
-      this.erc20Contract.options.address =
-        this.dexHelper.config.wrapETH(srcToken).address;
-      const allowance = await this.erc20Contract.methods
-        .allowance(this.augustusAddress, this.config.router)
-        .call(undefined, 'latest');
-      isApproved =
-        BigInt(allowance.toString()) >= BigInt(optimalSwapExchange.srcAmount);
-    } catch (e) {
-      this.logger.error(
-        `preProcessTransaction failed to retrieve allowance info: `,
-        e,
-      );
-    }
-
-    return [
-      {
-        ...optimalSwapExchange,
-        data: {
-          ...optimalSwapExchange.data,
-          isApproved,
-        },
-      },
-      {
-        deadline: BigInt(getLocalDeadlineAsFriendlyPlaceholder()),
-      },
-    ];
-  }
-
-  getDirectParam(
-    srcToken: Address,
-    destToken: Address,
-    srcAmount: NumberAsString,
-    destAmount: NumberAsString,
-    expectedAmount: NumberAsString,
-    data: UniswapV3Data,
-    side: SwapSide,
-    permit: string,
-    uuid: string,
-    feePercent: NumberAsString,
-    deadline: NumberAsString,
-    partner: string,
-    beneficiary: string,
-    contractMethod?: string,
-  ): TxInfo<UniswapV3Param> {
-    if (
-      contractMethod !== DirectMethods.directSell &&
-      contractMethod !== DirectMethods.directBuy
-    ) {
-      throw new Error(`Invalid contract method ${contractMethod}`);
-    }
-
-    let isApproved: boolean = !!data.isApproved;
-    if (data.isApproved === undefined) {
-      this.logger.warn(`isApproved is undefined, defaulting to false`);
-    }
-
-    const path = this._encodePath(data.path, side);
-
-    const swapParams: UniswapV3Param = [
-      srcToken,
-      destToken,
-      this.config.router,
-      srcAmount,
-      destAmount,
-      expectedAmount,
-      feePercent,
-      deadline,
-      partner,
-      isApproved,
-      beneficiary,
-      path,
-      permit,
-      uuidToBytes16(uuid),
-    ];
-
-    const encoder = (...params: UniswapV3Param) => {
-      return this.directSwapIface.encodeFunctionData(
-        side === SwapSide.SELL
-          ? DirectMethods.directSell
-          : DirectMethods.directBuy,
-        [params],
-      );
-    };
-
-    return {
-      params: swapParams,
-      encoder,
-      networkFee: '0',
-    };
-  }
-
-  static getDirectFunctionName(): string[] {
-    return [DirectMethods.directSell, DirectMethods.directBuy];
-  }
-
   async getSimpleParam(
     srcToken: string,
     destToken: string,
@@ -880,7 +745,7 @@ export class UniswapV3
         : UniswapV3Functions.exactOutput;
 
     const path = this._encodePath(data.path, side);
-    const swapFunctionParams: UniswapV3SimpleSwapParams =
+    const swapFunctionParams: UniswapV3Param =
       side === SwapSide.SELL
         ? {
             recipient: this.augustusAddress,

package/src/dex/woo-fi-v2/config.ts

@@ -6,7 +6,7 @@ export const WooFiV2Config: DexConfigMap<DexParams> = {
   WooFiV2: {
     [Network.OPTIMISM]: {
       wooPPV2Address: '0xd1778F9DF3eee5473A9640f13682e3846f61fEbC',
-      wooOracleV2Address: '0xd589484d3A27B7Ce5C2C7F829EB2e1D163f95817',
+      wooOracleV2Address: '0x464959aD46e64046B891F562cFF202a465D522F3',
       integrationHelperAddress: '0x96329d66074EB8386Ae8bFD6698B2E3FDA87e15E',
       // USDC
       quoteToken: {
@@ -16,7 +16,7 @@ export const WooFiV2Config: DexConfigMap<DexParams> = {
     },
     [Network.BSC]: {
       wooPPV2Address: '0x59dE3B49314Bf5067719364A2Cb43e8525ab93FA',
-      wooOracleV2Address: '0x72dc7fa5eeb901a34173C874A7333c8d1b34bca9',
+      wooOracleV2Address: '0x4B11B9BfAafA840c436a1ddDc13D3738C8ebfD62',
       integrationHelperAddress: '0xAA9c15cd603428cA8ddD45e933F8EfE3Afbcc173',
       // USDT
       quoteToken: {
@@ -26,7 +26,7 @@ export const WooFiV2Config: DexConfigMap<DexParams> = {
     },
     [Network.POLYGON]: {
       wooPPV2Address: '0x7081A38158BD050Ae4a86e38E0225Bc281887d7E',
-      wooOracleV2Address: '0x31aE608cBadD1214D6A3d5dcf49E45Fb18E2a48E',
+      wooOracleV2Address: '0xeFF23B4bE1091b53205E35f3AfCD9C7182bf3062',
       integrationHelperAddress: '0x7Ba560eB735AbDCf9a3a5692272652A0cc81850d',
       // USDC
       quoteToken: {
@@ -36,7 +36,7 @@ export const WooFiV2Config: DexConfigMap<DexParams> = {
     },
     [Network.FANTOM]: {
       wooPPV2Address: '0x286ab107c5E9083dBed35A2B5fb0242538F4f9bf',
-      wooOracleV2Address: '0xB1d022F8F3e43868DaaDfa7040e63781C16aB4A6',
+      wooOracleV2Address: '0x8840e26e0ebf7D100A0644DD8576DC62B03cbf04',
       integrationHelperAddress: '0x6641959FE5EED7166F2254cF04b0d20c96776D9A',
       // USDC
       quoteToken: {
@@ -46,7 +46,7 @@ export const WooFiV2Config: DexConfigMap<DexParams> = {
     },
     [Network.ARBITRUM]: {
       wooPPV2Address: '0xeFF23B4bE1091b53205E35f3AfCD9C7182bf3062',
-      wooOracleV2Address: '0x73504eaCB100c7576146618DC306c97454CB3620',
+      wooOracleV2Address: '0x37a9dE70b6734dFCA54395D8061d9411D9910739',
       integrationHelperAddress: '0x28D2B949024FE50627f1EbC5f0Ca3Ca721148E40',
       // USDC
       quoteToken: {
@@ -56,7 +56,7 @@ export const WooFiV2Config: DexConfigMap<DexParams> = {
     },
     [Network.AVALANCHE]: {
       wooPPV2Address: '0x3b3E4b4741e91aF52d0e9ad8660573E951c88524',
-      wooOracleV2Address: '0xc13843aE0D2C5ca9E0EfB93a78828446D8173d19',
+      wooOracleV2Address: '0x9ACA557590F5020BDA4Ba63065Fc3A1253Bf8000',
       integrationHelperAddress: '0x020630613E296c3E9b06186f630D1bF97A2B6Ad1',
       // USDC
       quoteToken: {

package/src/dex/zerox/index.ts

@@ -269,16 +269,9 @@ export class ZeroX
     destToken: Address,
     srcAmount: NumberAsString,
     destAmount: NumberAsString,
-    expectedAmount: NumberAsString,
     data: ZeroXData,
     side: SwapSide,
     permit: string,
-    uuid: string,
-    feePercent: NumberAsString,
-    deadline: NumberAsString,
-    partner: string,
-    beneficiary: string,
-    contractMethod?: string,
   ): TxInfo<ZeroXParam> {
     const usePermit = permit !== '0x';
     const encoder = (...params: ZeroXParam) => {

package/src/implementations/local-paraswap-sdk.ts

@@ -17,8 +17,6 @@ import {
 } from '../types';
 import { SwapSide, NULL_ADDRESS, ContractMethod } from '../constants';
 import { LimitOrderExchange } from '../dex/limit-order-exchange';
-import { v4 as uuid } from 'uuid';
-import { DirectContractMethods } from '@paraswap/core/build/constants';
 
 export interface IParaSwapSDK {
   getPrices(
@@ -207,8 +205,6 @@ export class LocalParaswapSDK implements IParaSwapSDK {
         : priceRoute.srcAmount,
     );
 
-    const contractMethod = priceRoute.contractMethod;
-
     // Call preprocessTransaction for each exchange before we build transaction
     try {
       priceRoute.bestRoute = await Promise.all(
@@ -238,9 +234,6 @@ export class LocalParaswapSDK implements IParaSwapSDK {
                         {
                           slippageFactor,
                           txOrigin: userAddress,
-                          isDirectMethod: DirectContractMethods.includes(
-                            contractMethod as ContractMethod,
-                          ),
                         },
                       );
 
@@ -271,7 +264,7 @@ export class LocalParaswapSDK implements IParaSwapSDK {
       partnerAddress: NULL_ADDRESS,
       partnerFeePercent: '0',
       deadline: deadline.toString(),
-      uuid: uuid(),
+      uuid: '00000000-0000-0000-0000-000000000000',
     });
   }
 }

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',