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

package/src/config.ts

@@ -50,11 +50,11 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     tokenTransferProxyAddress: '0x216b4b4ba9f3e719726886d34a177484278bfcae',
     multicallV2Address: '0x5BA1e12693Dc8F9c48aAD8770482f4739bEeD696',
     privateHttpProvider: process.env.HTTP_PROVIDER_1,
-    augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
+    augustusV6Address: '0x000dB803A70511E09dA650D4C0506d0000100000',
     executorsAddresses: {
-      Executor01: '0x5f0000d4780a00d2dce0a00004000800cb0e5041',
-      Executor02: '0xd08d0006f00040b400180f9500b00c5026ac0900',
-      Executor03: '0x5006860a0906b0d8c9c050200947000030081006',
+      Executor01: '0x9000D0c03F00f002C440030024042c02E2e0E0d0',
+      Executor02: '0xb0DE0000b80000520aCf020C52D006500017055f',
+      Executor03: '0xBa0200000D0903dC0c1000801B0573090078E09E',
     },
     adapterAddresses: {
       Adapter01: '0x9bE264469eF954c139Da4A45Cf76CbCC5e3A6A73',
@@ -142,11 +142,11 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     tokenTransferProxyAddress: '0x216b4b4ba9f3e719726886d34a177484278bfcae',
     multicallV2Address: '0xC50F4c1E81c873B2204D7eFf7069Ffec6Fbe136D',
     privateHttpProvider: process.env.HTTP_PROVIDER_56,
-    augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
+    augustusV6Address: '0x000dB803A70511E09dA650D4C0506d0000100000',
     executorsAddresses: {
-      Executor01: '0x5f0000d4780a00d2dce0a00004000800cb0e5041',
-      Executor02: '0xd08d0006f00040b400180f9500b00c5026ac0900',
-      Executor03: '0x5006860a0906b0d8c9c050200947000030081006',
+      Executor01: '0x9000D0c03F00f002C440030024042c02E2e0E0d0',
+      Executor02: '0xb0DE0000b80000520aCf020C52D006500017055f',
+      Executor03: '0xBa0200000D0903dC0c1000801B0573090078E09E',
     },
     hashFlowAuthToken: process.env.API_KEY_HASHFLOW_AUTH_TOKEN || '',
     swaapV2AuthToken: process.env.API_KEY_SWAAP_V2_AUTH_TOKEN || '',
@@ -177,11 +177,11 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     tokenTransferProxyAddress: '0x216b4b4ba9f3e719726886d34a177484278bfcae',
     multicallV2Address: '0x275617327c958bD06b5D6b871E7f491D76113dd8',
     privateHttpProvider: process.env.HTTP_PROVIDER_137,
-    augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
+    augustusV6Address: '0x000dB803A70511E09dA650D4C0506d0000100000',
     executorsAddresses: {
-      Executor01: '0x5f0000d4780a00d2dce0a00004000800cb0e5041',
-      Executor02: '0xd08d0006f00040b400180f9500b00c5026ac0900',
-      Executor03: '0x5006860a0906b0d8c9c050200947000030081006',
+      Executor01: '0x9000D0c03F00f002C440030024042c02E2e0E0d0',
+      Executor02: '0xb0DE0000b80000520aCf020C52D006500017055f',
+      Executor03: '0xBa0200000D0903dC0c1000801B0573090078E09E',
     },
     hashFlowAuthToken: process.env.API_KEY_HASHFLOW_AUTH_TOKEN || '',
     hashFlowDisabledMMs:
@@ -217,11 +217,11 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     hashFlowDisabledMMs:
       process.env[`HASHFLOW_DISABLED_MMS_43114`]?.split(',') || [],
     dexalotAuthToken: process.env.API_KEY_DEXALOT_AUTH_TOKEN || '',
-    augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
+    augustusV6Address: '0x000dB803A70511E09dA650D4C0506d0000100000',
     executorsAddresses: {
-      Executor01: '0x5f0000d4780a00d2dce0a00004000800cb0e5041',
-      Executor02: '0xd08d0006f00040b400180f9500b00c5026ac0900',
-      Executor03: '0x5006860a0906b0d8c9c050200947000030081006',
+      Executor01: '0x9000D0c03F00f002C440030024042c02E2e0E0d0',
+      Executor02: '0xb0DE0000b80000520aCf020C52D006500017055f',
+      Executor03: '0xBa0200000D0903dC0c1000801B0573090078E09E',
     },
     adapterAddresses: {
       AvalancheAdapter01: '0x745Ec73855CeC7249E5fF4c9DD81cc65b4D297a9',
@@ -251,11 +251,11 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     hashFlowAuthToken: process.env.API_KEY_HASHFLOW_AUTH_TOKEN || '',
     hashFlowDisabledMMs:
       process.env[`HASHFLOW_DISABLED_MMS_250`]?.split(',') || [],
-    augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
+    augustusV6Address: '0x000dB803A70511E09dA650D4C0506d0000100000',
     executorsAddresses: {
-      Executor01: '0x5f0000d4780a00d2dce0a00004000800cb0e5041',
-      Executor02: '0xd08d0006f00040b400180f9500b00c5026ac0900',
-      Executor03: '0x5006860a0906b0d8c9c050200947000030081006',
+      Executor01: '0x9000D0c03F00f002C440030024042c02E2e0E0d0',
+      Executor02: '0xb0DE0000b80000520aCf020C52D006500017055f',
+      Executor03: '0xBa0200000D0903dC0c1000801B0573090078E09E',
     },
     adapterAddresses: {
       FantomAdapter01: '0x654dE10890f8B2C5bF54E50Af169a7E93165C416',
@@ -286,11 +286,11 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     swaapV2AuthToken: process.env.API_KEY_SWAAP_V2_AUTH_TOKEN || '',
     hashFlowDisabledMMs:
       process.env[`HASHFLOW_DISABLED_MMS_42161`]?.split(',') || [],
-    augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
+    augustusV6Address: '0x000dB803A70511E09dA650D4C0506d0000100000',
     executorsAddresses: {
-      Executor01: '0x5f0000d4780a00d2dce0a00004000800cb0e5041',
-      Executor02: '0xd08d0006f00040b400180f9500b00c5026ac0900',
-      Executor03: '0x5006860a0906b0d8c9c050200947000030081006',
+      Executor01: '0x9000D0c03F00f002C440030024042c02E2e0E0d0',
+      Executor02: '0xb0DE0000b80000520aCf020C52D006500017055f',
+      Executor03: '0xBa0200000D0903dC0c1000801B0573090078E09E',
     },
     dexalotAuthToken: process.env.API_KEY_DEXALOT_AUTH_TOKEN || '',
     adapterAddresses: {
@@ -320,11 +320,11 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     tokenTransferProxyAddress: '0x216b4b4ba9f3e719726886d34a177484278bfcae',
     multicallV2Address: '0x2DC0E2aa608532Da689e89e237dF582B783E552C',
     privateHttpProvider: process.env.HTTP_PROVIDER_10,
-    augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
+    augustusV6Address: '0x000dB803A70511E09dA650D4C0506d0000100000',
     executorsAddresses: {
-      Executor01: '0x5f0000d4780a00d2dce0a00004000800cb0e5041',
-      Executor02: '0xd08d0006f00040b400180f9500b00c5026ac0900',
-      Executor03: '0x5006860a0906b0d8c9c050200947000030081006',
+      Executor01: '0x9000D0c03F00f002C440030024042c02E2e0E0d0',
+      Executor02: '0xb0DE0000b80000520aCf020C52D006500017055f',
+      Executor03: '0xBa0200000D0903dC0c1000801B0573090078E09E',
     },
     hashFlowAuthToken: process.env.API_KEY_HASHFLOW_AUTH_TOKEN || '',
     swaapV2AuthToken: process.env.API_KEY_SWAAP_V2_AUTH_TOKEN || '',
@@ -356,11 +356,11 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     tokenTransferProxyAddress: '0xc8a21fcd5a100c3ecc037c97e2f9c53a8d3a02a1',
     multicallV2Address: '0x6cA478C852DfA8941FC819fDf248606eA04780B6',
     privateHttpProvider: process.env.HTTP_PROVIDER_1101,
-    augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
+    augustusV6Address: '0x000dB803A70511E09dA650D4C0506d0000100000',
     executorsAddresses: {
-      Executor01: '0x5f0000d4780a00d2dce0a00004000800cb0e5041',
-      Executor02: '0xd08d0006f00040b400180f9500b00c5026ac0900',
-      Executor03: '0x5006860a0906b0d8c9c050200947000030081006',
+      Executor01: '0x9000D0c03F00f002C440030024042c02E2e0E0d0',
+      Executor02: '0xb0DE0000b80000520aCf020C52D006500017055f',
+      Executor03: '0xBa0200000D0903dC0c1000801B0573090078E09E',
     },
     adapterAddresses: {
       PolygonZkEvmAdapter01: '0xd63B7691dD98fa89A2ea5e1604700489c585aa7B',
@@ -394,11 +394,11 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     hashFlowAuthToken: process.env.API_KEY_HASHFLOW_AUTH_TOKEN || '',
     swaapV2AuthToken: process.env.API_KEY_SWAAP_V2_AUTH_TOKEN || '',
     hashFlowDisabledMMs: [],
-    augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
+    augustusV6Address: '0x000dB803A70511E09dA650D4C0506d0000100000',
     executorsAddresses: {
-      Executor01: '0x5f0000d4780a00d2dce0a00004000800cb0e5041',
-      Executor02: '0xd08d0006f00040b400180f9500b00c5026ac0900',
-      Executor03: '0x5006860a0906b0d8c9c050200947000030081006',
+      Executor01: '0x9000D0c03F00f002C440030024042c02E2e0E0d0',
+      Executor02: '0xb0DE0000b80000520aCf020C52D006500017055f',
+      Executor03: '0xBa0200000D0903dC0c1000801B0573090078E09E',
     },
     adapterAddresses: {
       BaseAdapter01: '0xe53d24CD81cC81bbf271AD7B02D0d67f851D727c',

package/src/constants.ts

@@ -61,8 +61,6 @@ export const DEST_TOKEN_DEX_TRANSFERS = 1;
 export const BPS_MAX_VALUE = 10000n;
 
 export const FEE_PERCENT_IN_BASIS_POINTS_MASK = BigNumber.from('0x3FFF');
-export const IS_USER_SURPLUS_MASK = BigNumber.from('1').shl(90);
-export const IS_DIRECT_TRANSFER_MASK = BigNumber.from('1').shl(91);
 export const IS_CAP_SURPLUS_MASK = BigNumber.from('1').shl(92);
 export const IS_SKIP_BLACKLIST_MASK = BigNumber.from('1').shl(93);
 export const IS_REFERRAL_MASK = BigNumber.from('1').shl(94);

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

@@ -1326,7 +1326,7 @@ export class BalancerV2
     deadline: NumberAsString,
     partner: string,
     beneficiary: string,
-    contractMethod: string,
+    contractMethod?: string,
   ): TxInfo<BalancerV2DirectParam> {
     if (
       contractMethod !== DirectMethods.directSell &&
@@ -1397,7 +1397,7 @@ export class BalancerV2
     partnerAndFee: string,
     beneficiary: string,
     blockNumber: number,
-    contractMethod: string,
+    contractMethod?: string,
   ) {
     if (!contractMethod) throw new Error(`contractMethod need to be passed`);
 

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

@@ -937,7 +937,7 @@ export class CurveV1
     deadline: NumberAsString,
     partner: string,
     beneficiary: string,
-    contractMethod: string,
+    contractMethod?: string,
   ): TxInfo<DirectCurveV1Param> {
     if (contractMethod !== DIRECT_METHOD_NAME) {
       throw new Error(`Invalid contract method ${contractMethod}`);
@@ -997,7 +997,7 @@ export class CurveV1
     partnerAndFee: string,
     beneficiary: string,
     blockNumber: number,
-    contractMethod: string,
+    contractMethod?: string,
   ) {
     if (contractMethod !== DIRECT_METHOD_NAME_V6) {
       throw new Error(`Invalid contract method ${contractMethod}`);

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

@@ -999,7 +999,7 @@ export class CurveV1Factory
     deadline: NumberAsString,
     partner: string,
     beneficiary: string,
-    contractMethod: string,
+    contractMethod?: string,
   ): TxInfo<DirectCurveV1Param> {
     if (contractMethod !== DIRECT_METHOD_NAME) {
       throw new Error(`Invalid contract method ${contractMethod}`);
@@ -1059,7 +1059,7 @@ export class CurveV1Factory
     partnerAndFee: string,
     beneficiary: string,
     blockNumber: number,
-    contractMethod: string,
+    contractMethod?: string,
   ) {
     if (contractMethod !== DIRECT_METHOD_NAME_V6) {
       throw new Error(`Invalid contract method ${contractMethod}`);

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

@@ -213,7 +213,7 @@ export class CurveV2
     _0: NumberAsString,
     partner: string,
     beneficiary: string,
-    contractMethod: string,
+    contractMethod?: string,
   ): TxInfo<DirectCurveV2Param> {
     if (contractMethod !== DIRECT_METHOD_NAME) {
       throw new Error(`Invalid contract method ${contractMethod}`);
@@ -272,7 +272,7 @@ export class CurveV2
     partnerAndFee: string,
     beneficiary: string,
     blockNumber: number,
-    contractMethod: string,
+    contractMethod?: string,
   ) {
     if (contractMethod !== DIRECT_METHOD_NAME_V6) {
       throw new Error(`Invalid contract method ${contractMethod}`);

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

@@ -221,7 +221,7 @@ export class GenericRFQ extends ParaSwapLimitOrders {
     partnerAndFee: string,
     beneficiary: string,
     blockNumber: number,
-    contractMethod: string,
+    contractMethod?: string,
   ) {
     if (!contractMethod) throw new Error(`contractMethod need to be passed`);
     if (!GenericRFQ.getDirectFunctionNameV6().includes(contractMethod!)) {

package/src/dex/idex.ts

@@ -106,7 +106,7 @@ export interface IDexTxBuilder<ExchangeData, DirectParam = null> {
     deadline: NumberAsString,
     partner: string,
     beneficiary: string,
-    contractMethod: string,
+    contractMethod?: string,
   ): TxInfo<DirectParam>;
 
   // Same as above but for V6
@@ -123,7 +123,7 @@ export interface IDexTxBuilder<ExchangeData, DirectParam = null> {
     partnerAndFee: string,
     beneficiary: string,
     blockNumber: number,
-    contractMethod: string,
+    contractMethod?: string,
   ): TxInfo<DirectParam>;
 }
 

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) => {