@paraswap/dex-lib 3.5.4-v6.2.1 → 3.5.4

package/src/dex/maker-psm/maker-psm-e2e.test.ts

@@ -25,25 +25,24 @@ describe('MakerPsm E2E', () => {
 
     const tokenASymbol: string = 'USDC';
     const tokenBSymbol: string = 'DAI';
+    const nativeTokenSymbol = 'ETH';
 
     const tokenAAmount: string = '10000000';
     const tokenBAmount: string = '10000000000000000';
+    const nativeTokenAmount: string = '10000000000000000';
 
     const sideToContractMethods = new Map([
       [
         SwapSide.SELL,
         [
           ContractMethod.swapExactAmountIn,
-          ContractMethod.swapExactAmountInOutOnMakerPSM,
-        ],
-      ],
-      [
-        SwapSide.BUY,
-        [
-          ContractMethod.swapExactAmountOut,
-          ContractMethod.swapExactAmountInOutOnMakerPSM,
+          // ContractMethod.simpleSwap,
+          // ContractMethod.multiSwap,
+          // ContractMethod.megaSwap,
         ],
       ],
+      // [SwapSide.BUY, [ContractMethod.simpleBuy, ContractMethod.buy]],
+      [SwapSide.BUY, [ContractMethod.swapExactAmountOut]],
     ]);
 
     sideToContractMethods.forEach((contractMethods, side) =>
@@ -76,6 +75,32 @@ describe('MakerPsm E2E', () => {
               provider,
             );
           });
+          // 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,
+          //   );
+          // });
         });
       }),
     );

package/src/dex/maker-psm/maker-psm.ts

@@ -13,26 +13,14 @@ import {
   Logger,
   NumberAsString,
   DexExchangeParam,
-  ExchangeTxInfo,
-  PreprocessTransactionOptions,
 } from '../../types';
-import { SwapSide, Network, NULL_ADDRESS } from '../../constants';
+import { SwapSide, Network } from '../../constants';
 import * as CALLDATA_GAS_COST from '../../calldata-gas-cost';
 import { StatefulEventSubscriber } from '../../stateful-event-subscriber';
-import {
-  getDexKeysWithNetwork,
-  getBigIntPow,
-  uuidToBytes16,
-} from '../../utils';
+import { getDexKeysWithNetwork, getBigIntPow } from '../../utils';
 import { IDex } from '../../dex/idex';
 import { IDexHelper } from '../../dex-helper/idex-helper';
-import {
-  MakerPsmData,
-  PoolState,
-  PoolConfig,
-  MakerPsmParams,
-  MakerPsmDirectPayload,
-} from './types';
+import { MakerPsmData, PoolState, PoolConfig } from './types';
 import { SimpleExchange } from '../simple-exchange';
 import { MakerPsmConfig, Adapters } from './config';
 import PsmABI from '../../abi/maker-psm/psm.json';
@@ -40,12 +28,7 @@ import VatABI from '../../abi/maker-psm/vat.json';
 import { BI_POWS } from '../../bigint-constants';
 import { SpecialDex } from '../../executor/types';
 import { hexConcat, hexZeroPad, hexlify } from '@ethersproject/bytes';
-import {
-  ContractMethodV6,
-  OptimalSwapExchange,
-  ParaSwapVersion,
-} from '@paraswap/core';
-import { BigNumber } from 'ethers';
+import { ZEROS_12_BYTES } from '../../executor/constants';
 
 const vatInterface = new Interface(VatABI);
 const psmInterface = new Interface(PsmABI);
@@ -208,10 +191,7 @@ export class MakerPsmEventPool extends StatefulEventSubscriber<PoolState> {
   }
 }
 
-export class MakerPsm
-  extends SimpleExchange
-  implements IDex<MakerPsmData, MakerPsmDirectPayload>
-{
+export class MakerPsm extends SimpleExchange implements IDex<MakerPsmData> {
   protected eventPools: { [gemAddress: string]: MakerPsmEventPool };
 
   // warning: There is limit on swap
@@ -248,10 +228,6 @@ export class MakerPsm
     );
   }
 
-  static getDirectFunctionNameV6(): string[] {
-    return [ContractMethodV6.swapExactAmountInOutOnMakerPSM];
-  }
-
   async initializePricing(blockNumber: number) {
     const poolStates = await getOnChainState(
       this.dexHelper.multiContract,
@@ -520,46 +496,6 @@ export class MakerPsm
     );
   }
 
-  getTokenFromAddress(address: Address): Token {
-    return { address, decimals: 0 };
-  }
-
-  async preProcessTransaction?(
-    optimalSwapExchange: OptimalSwapExchange<MakerPsmData>,
-    srcToken: Token,
-    destToken: Token,
-    side: SwapSide,
-    options: PreprocessTransactionOptions,
-  ): Promise<[OptimalSwapExchange<MakerPsmData>, ExchangeTxInfo]> {
-    if (!optimalSwapExchange.data) {
-      throw new Error(
-        `Error_${this.dexKey}_preProcessTransaction payload is not received`,
-      );
-    }
-
-    let isApproved = false;
-
-    // isApproved is only used in direct method and available only for v6, then no need to check approve for v5
-    // because it's either done in getSimpleParam or approve call in the adapter smart contract
-    if (options.version === ParaSwapVersion.V6 && options.isDirectMethod) {
-      isApproved = await this.dexHelper.augustusApprovals.hasApproval(
-        options.executionContractAddress,
-        srcToken.address,
-        srcToken.address.toLowerCase() === this.dai.address.toLowerCase()
-          ? optimalSwapExchange.data.psmAddress
-          : optimalSwapExchange.data.gemJoinAddress,
-      );
-    }
-
-    return [
-      {
-        ...optimalSwapExchange,
-        data: { ...optimalSwapExchange.data, isApproved },
-      },
-      {},
-    ];
-  }
-
   getDexParam(
     srcToken: Address,
     destToken: Address,
@@ -608,73 +544,6 @@ export class MakerPsm
       returnAmountPos: undefined,
     };
   }
-
-  getDirectParamV6(
-    srcToken: Address,
-    destToken: Address,
-    fromAmount: NumberAsString,
-    toAmount: NumberAsString,
-    quotedAmount: NumberAsString,
-    data: MakerPsmData,
-    side: SwapSide,
-    permit: string,
-    uuid: string,
-    partnerAndFee: string,
-    beneficiary: string,
-    blockNumber: number,
-    contractMethod: string,
-  ) {
-    if (!contractMethod) throw new Error(`contractMethod need to be passed`);
-    if (!MakerPsm.getDirectFunctionNameV6().includes(contractMethod!)) {
-      throw new Error(`Invalid contract method ${contractMethod}`);
-    }
-
-    const beneficiaryParam = BigNumber.from(
-      '0x96a18a51d8e8320cba1e4ae45c69fbec0146a14f',
-    );
-    const approveParam = !data.isApproved
-      ? BigNumber.from(1).shl(255)
-      : BigNumber.from(0);
-    const directionParam =
-      side === SwapSide.SELL ? BigNumber.from(0) : BigNumber.from(1).shl(254);
-
-    const beneficiaryDirectionApproveFlag = beneficiaryParam
-      .or(directionParam)
-      .or(approveParam);
-
-    const to18ConversionFactor = getBigIntPow(18 - data.gemDecimals);
-
-    const metadata = hexConcat([
-      hexZeroPad(uuidToBytes16(uuid), 16),
-      hexZeroPad(hexlify(blockNumber), 16),
-    ]);
-
-    const params: MakerPsmParams = [
-      srcToken,
-      // dest token is not used on the contract
-      NULL_ADDRESS,
-      fromAmount,
-      toAmount,
-      data.toll,
-      to18ConversionFactor.toString(),
-      data.psmAddress,
-      data.gemJoinAddress,
-      metadata,
-      beneficiaryDirectionApproveFlag.toString(),
-    ];
-
-    const payload: MakerPsmDirectPayload = [params, permit];
-
-    const encoder = (...params: (string | MakerPsmDirectPayload)[]) => {
-      return this.augustusV6Interface.encodeFunctionData(
-        ContractMethodV6.swapExactAmountInOutOnMakerPSM,
-        [...params],
-      );
-    };
-
-    return { params: payload, encoder, networkFee: '0' };
-  }
-
   // Returns list of top pools based on liquidity. Max
   // limit number pools should be returned.
   async getTopPoolsForToken(

package/src/dex/maker-psm/types.ts

@@ -1,4 +1,4 @@
-import { Address, NumberAsString, Token } from '../../types';
+import { Address, Token } from '../../types';
 
 export type PoolState = {
   tin: bigint; // toll in
@@ -13,7 +13,6 @@ export type MakerPsmData = {
   gemJoinAddress: Address;
   gemDecimals: number;
   toll: string;
-  isApproved?: boolean;
 };
 
 export type PoolConfig = {
@@ -28,18 +27,3 @@ export type DexParams = {
   vatAddress: Address;
   pools: PoolConfig[];
 };
-
-export type MakerPsmParams = [
-  srcToken: Address,
-  destToken: Address,
-  fromAmount: NumberAsString,
-  toAmount: NumberAsString,
-  toll: NumberAsString,
-  to18ConversionFactor: NumberAsString,
-  exchange: Address,
-  gemJoinAddress: Address,
-  metadata: string,
-  beneficiaryDirectionApproveFlag: NumberAsString,
-];
-
-export type MakerPsmDirectPayload = [params: MakerPsmParams, permit: string];

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

@@ -938,7 +938,7 @@ export class UniswapV2
     deadline: NumberAsString,
     partner: string,
     beneficiary: string,
-    contractMethod: string,
+    contractMethod?: string,
   ): TxInfo<UniswapParam> {
     if (!contractMethod) throw new Error(`contractMethod need to be passed`);
     if (permit !== '0x') contractMethod += 'WithPermit';
@@ -1014,7 +1014,7 @@ export class UniswapV2
     partnerAndFee: string,
     beneficiary: string,
     blockNumber: number,
-    contractMethod: string,
+    contractMethod?: string,
   ) {
     if (!contractMethod) throw new Error(`contractMethod need to be passed`);
     if (!UniswapV2.getDirectFunctionNameV6().includes(contractMethod!)) {

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

@@ -960,7 +960,7 @@ export class UniswapV3
     deadline: NumberAsString,
     partner: string,
     beneficiary: string,
-    contractMethod: string,
+    contractMethod?: string,
   ): TxInfo<UniswapV3Param> {
     if (!UniswapV3.getDirectFunctionName().includes(contractMethod!)) {
       throw new Error(`Invalid contract method ${contractMethod}`);
@@ -1023,7 +1023,7 @@ export class UniswapV3
     partnerAndFee: string,
     beneficiary: string,
     blockNumber: number,
-    contractMethod: string,
+    contractMethod?: string,
   ) {
     if (!UniswapV3.getDirectFunctionNameV6().includes(contractMethod!)) {
       throw new Error(`Invalid contract method ${contractMethod}`);

package/src/dex/zerox/index.ts

@@ -275,7 +275,7 @@ export class ZeroX
     deadline: NumberAsString,
     partner: string,
     beneficiary: string,
-    contractMethod: string,
+    contractMethod?: string,
   ): TxInfo<ZeroXParam> {
     const usePermit = permit !== '0x';
     const encoder = (...params: ZeroXParam) => {

package/tests/constants-e2e.ts

@@ -1314,7 +1314,7 @@ export const Holders: {
     CVX: '0x0aCA67Fa70B142A3b9bF2eD89A81B40ff85dACdC',
     MIM: '0xa046a8660e66d178ee07ec97c585eeb6aa18c26c',
     AnkETH: '0xF7260D4ADc48fEefd5a19a9Eb23f9747CeE15C92',
-    DAI: '0xd1668fb5f690c59ab4b0cabad0f8c1617895052b',
+    DAI: '0x2fEb1512183545f48f6b9C5b4EbfCaF49CfCa6F3',
     oldFRAX: '0x183d0dc5867c01bfb1dbbc41d6a9d3de6e044626',
     newFRAX: '0x183d0dc5867c01bfb1dbbc41d6a9d3de6e044626',
     FEI: '0x19c549357034d10db8d75ed812b45be1dd8a7218',