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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraswap/dex-lib",
-  "version": "3.5.4-v6.2.0",
+  "version": "3.5.4-v6.2.1",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "repository": "https://github.com/paraswap/paraswap-dex-lib",

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,24 +25,25 @@ 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.simpleSwap,
-          // ContractMethod.multiSwap,
-          // ContractMethod.megaSwap,
+          ContractMethod.swapExactAmountInOutOnMakerPSM,
+        ],
+      ],
+      [
+        SwapSide.BUY,
+        [
+          ContractMethod.swapExactAmountOut,
+          ContractMethod.swapExactAmountInOutOnMakerPSM,
         ],
       ],
-      // [SwapSide.BUY, [ContractMethod.simpleBuy, ContractMethod.buy]],
-      [SwapSide.BUY, [ContractMethod.swapExactAmountOut]],
     ]);
 
     sideToContractMethods.forEach((contractMethods, side) =>
@@ -75,32 +76,6 @@ 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,14 +13,26 @@ import {
   Logger,
   NumberAsString,
   DexExchangeParam,
+  ExchangeTxInfo,
+  PreprocessTransactionOptions,
 } from '../../types';
-import { SwapSide, Network } from '../../constants';
+import { SwapSide, Network, NULL_ADDRESS } from '../../constants';
 import * as CALLDATA_GAS_COST from '../../calldata-gas-cost';
 import { StatefulEventSubscriber } from '../../stateful-event-subscriber';
-import { getDexKeysWithNetwork, getBigIntPow } from '../../utils';
+import {
+  getDexKeysWithNetwork,
+  getBigIntPow,
+  uuidToBytes16,
+} from '../../utils';
 import { IDex } from '../../dex/idex';
 import { IDexHelper } from '../../dex-helper/idex-helper';
-import { MakerPsmData, PoolState, PoolConfig } from './types';
+import {
+  MakerPsmData,
+  PoolState,
+  PoolConfig,
+  MakerPsmParams,
+  MakerPsmDirectPayload,
+} from './types';
 import { SimpleExchange } from '../simple-exchange';
 import { MakerPsmConfig, Adapters } from './config';
 import PsmABI from '../../abi/maker-psm/psm.json';
@@ -28,7 +40,12 @@ 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 { ZEROS_12_BYTES } from '../../executor/constants';
+import {
+  ContractMethodV6,
+  OptimalSwapExchange,
+  ParaSwapVersion,
+} from '@paraswap/core';
+import { BigNumber } from 'ethers';
 
 const vatInterface = new Interface(VatABI);
 const psmInterface = new Interface(PsmABI);
@@ -191,7 +208,10 @@ export class MakerPsmEventPool extends StatefulEventSubscriber<PoolState> {
   }
 }
 
-export class MakerPsm extends SimpleExchange implements IDex<MakerPsmData> {
+export class MakerPsm
+  extends SimpleExchange
+  implements IDex<MakerPsmData, MakerPsmDirectPayload>
+{
   protected eventPools: { [gemAddress: string]: MakerPsmEventPool };
 
   // warning: There is limit on swap
@@ -228,6 +248,10 @@ export class MakerPsm extends SimpleExchange implements IDex<MakerPsmData> {
     );
   }
 
+  static getDirectFunctionNameV6(): string[] {
+    return [ContractMethodV6.swapExactAmountInOutOnMakerPSM];
+  }
+
   async initializePricing(blockNumber: number) {
     const poolStates = await getOnChainState(
       this.dexHelper.multiContract,
@@ -496,6 +520,46 @@ export class MakerPsm extends SimpleExchange implements IDex<MakerPsmData> {
     );
   }
 
+  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,
@@ -544,6 +608,73 @@ export class MakerPsm extends SimpleExchange implements IDex<MakerPsmData> {
       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/scripts/gem.abi.json

@@ -0,0 +1,136 @@
+[
+  {
+    "inputs": [
+      { "internalType": "address", "name": "vat_", "type": "address" },
+      { "internalType": "bytes32", "name": "ilk_", "type": "bytes32" },
+      { "internalType": "address", "name": "gem_", "type": "address" }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "anonymous": true,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "bytes4",
+        "name": "sig",
+        "type": "bytes4"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "usr",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "bytes32",
+        "name": "arg1",
+        "type": "bytes32"
+      },
+      {
+        "indexed": true,
+        "internalType": "bytes32",
+        "name": "arg2",
+        "type": "bytes32"
+      },
+      {
+        "indexed": false,
+        "internalType": "bytes",
+        "name": "data",
+        "type": "bytes"
+      }
+    ],
+    "name": "LogNote",
+    "type": "event"
+  },
+  {
+    "inputs": [],
+    "name": "cage",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "dec",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "address", "name": "usr", "type": "address" }],
+    "name": "deny",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "guy", "type": "address" },
+      { "internalType": "uint256", "name": "wad", "type": "uint256" }
+    ],
+    "name": "exit",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "gem",
+    "outputs": [
+      { "internalType": "contract GemLike_2", "name": "", "type": "address" }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "ilk",
+    "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "urn", "type": "address" },
+      { "internalType": "uint256", "name": "wad", "type": "uint256" },
+      { "internalType": "address", "name": "_msgSender", "type": "address" }
+    ],
+    "name": "join",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "live",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "address", "name": "usr", "type": "address" }],
+    "name": "rely",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "vat",
+    "outputs": [
+      { "internalType": "contract VatLike_4", "name": "", "type": "address" }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "name": "wards",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  }
+]