@pendle/core-v2 0.11.2-testnet → 0.11.3-testnet

package/contracts/libraries/kyberswap/IMultihopRouter.sol

@@ -0,0 +1,139 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity >=0.7.6;
+
+pragma abicoder v2;
+
+interface IMultihopRouter {
+    enum DexType {
+        UNI,
+        STABLESWAP,
+        CURVE,
+        KYBERDMM,
+        SADDLE,
+        UNIV3PROMM,
+        BALANCERV2,
+        KYBERRFQ,
+        DODO,
+        VELODROME,
+        PLATYPUS
+    }
+
+    event Exchange(address pair, uint256 amountOut, address output);
+    struct Swap {
+        bytes data;
+        //dexType:
+        //  0: uni
+        //  1: stable swap
+        //  2: curve
+        //  3: kyber dmm
+        //  4: saddle
+        //  5: univ3 or kyber ProMM
+        //  6: balancerv2
+        //  7: kyber RFQ
+        //  8: dodo
+        //  9: velodrome
+        //  10: platypus
+        //dexId:
+        //  0: firebird
+        uint16 dexOption; //dexType(8bit) + dexId(8bit)
+    }
+
+    struct UniSwap {
+        address pool;
+        address tokenIn;
+        address tokenOut;
+        address recipient;
+        uint256 collectAmount; // amount that should be transferred to the pool
+        uint256 limitReturnAmount;
+    }
+
+    struct StableSwap {
+        address pool;
+        address tokenFrom;
+        address tokenTo;
+        uint8 tokenIndexFrom;
+        uint8 tokenIndexTo;
+        uint256 dx;
+        uint256 minDy;
+        uint256 poolLength;
+        address poolLp;
+    }
+
+    struct CurveSwap {
+        address pool;
+        address tokenFrom;
+        address tokenTo;
+        int128 tokenIndexFrom;
+        int128 tokenIndexTo;
+        uint256 dx;
+        uint256 minDy;
+        bool usePoolUnderlying;
+        bool useTriCrypto;
+    }
+
+    struct UniSwapV3ProMM {
+        address recipient;
+        address pool;
+        address tokenIn;
+        address tokenOut;
+        uint256 swapAmount;
+        uint256 limitReturnAmount;
+        uint160 sqrtPriceLimitX96;
+        bool isUniV3; // true = UniV3, false = ProMM
+    }
+    struct SwapCallbackData {
+        bytes path;
+        address payer;
+    }
+    struct SwapCallbackDataPath {
+        address pool;
+        address tokenIn;
+        address tokenOut;
+    }
+
+    struct BalancerV2 {
+        address vault;
+        bytes32 poolId;
+        address assetIn;
+        address assetOut;
+        uint256 amount;
+        uint256 limit;
+    }
+
+    struct KyberRFQ {
+        address rfq;
+        bytes order;
+        bytes signature;
+        uint256 amount;
+        address payable target;
+    }
+
+    struct DODO {
+        address recipient;
+        address pool;
+        address tokenFrom;
+        address tokenTo;
+        uint256 amount;
+        uint256 minReceiveQuote;
+        address sellHelper;
+        bool isSellBase;
+        bool isVersion2;
+    }
+
+    function factory() external view returns (address);
+
+    function formula() external view returns (address);
+
+    function WETH() external view returns (address);
+
+    function multihopBatchSwapExactIn(
+        Swap[][] memory swapSequences,
+        address tokenIn,
+        address tokenOut,
+        uint256 minTotalAmountOut,
+        address to,
+        uint256 deadline,
+        bytes memory destTokenFeeData
+    ) external payable returns (uint256 totalAmountOut);
+}

package/contracts/libraries/kyberswap/KyberSwapHelper.sol

@@ -26,6 +26,7 @@ import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "@openzeppelin/contracts/utils/Address.sol";
 import "../helpers/TokenHelper.sol";
+import "./AggregationRouterHelper.sol";
 
 struct TokenInput {
     address tokenIn;
@@ -53,9 +54,14 @@ abstract contract KyberSwapHelper is TokenHelper {
     function _kyberswap(
         address tokenIn,
         uint256 amountIn,
-        bytes calldata kybercall
+        bytes memory rawKybercall
     ) internal {
         _safeApproveInf(tokenIn, kyberSwapRouter);
+
+        bytes memory kybercall = AggregationRouterHelper.getScaledInputData(
+            rawKybercall,
+            amountIn
+        );
         kyberSwapRouter.functionCallWithValue(kybercall, tokenIn == NATIVE ? amountIn : 0);
     }
 }

package/contracts/libraries/math/MarketMathCore.sol

@@ -234,7 +234,9 @@ library MarketMathCore {
             netPtToAccount
         );
 
-        netScyToAccount = index.assetToScy(netAssetToAccount);
+        netScyToAccount = netAssetToAccount < 0
+            ? index.assetToScyUp(netAssetToAccount)
+            : index.assetToScy(netAssetToAccount);
         netScyToReserve = index.assetToScy(netAssetToReserve);
 
         /// ------------------------------------------------------------

package/contracts/offchain-helpers/RouterStatic.sol

@@ -4,12 +4,12 @@ pragma solidity 0.8.15;
 import "../interfaces/IPYieldContractFactory.sol";
 import "../interfaces/IPMarketFactory.sol";
 import "./MarketMathStatic.sol";
-import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
-import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
-import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+import "@openzeppelin/contracts/proxy/utils/Initializable.sol";
+import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
+import "../periphery/BoringOwnableUpgradeable.sol";
 
 /// EXCLUDED FROM ALL AUDITS, TO BE CALLED ONLY BY PENDLE's SDK
-contract RouterStatic is OwnableUpgradeable, UUPSUpgradeable {
+contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeable {
     using Math for uint256;
 
     struct TokenAmount {
@@ -56,7 +56,7 @@ contract RouterStatic is OwnableUpgradeable, UUPSUpgradeable {
     }
 
     function initialize() external initializer {
-        __Ownable_init();
+        __BoringOwnable_init();
     }
 
     function getDefaultApproxParams() public pure returns (ApproxParams memory) {

package/contracts/offchain-helpers/SSTORE2DeployerContract.sol

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.8.15;
+import "../libraries/helpers/SSTORE2Deployer.sol";
+import "../periphery/BoringOwnableUpgradeable.sol";
+
+contract SSTORE2DeployerContract is BoringOwnableUpgradeable {
+    event Deployed(string name, address addr);
+
+    constructor() initializer {
+        __BoringOwnable_init();
+    }
+
+    function deploy(string memory name, bytes calldata creationCode)
+        external
+        onlyOwner
+        returns (address res)
+    {
+        res = SSTORE2Deployer.setCreationCode(creationCode);
+        emit Deployed(name, res);
+    }
+}

package/contracts/periphery/BoringOwnableUpgradeable.sol

@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
+import "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 
 contract BoringOwnableUpgradeableData {
     address public owner;
     address public pendingOwner;
 }
 
-contract BoringOwnableUpgradeable is BoringOwnableUpgradeableData, Initializable {
+abstract contract BoringOwnableUpgradeable is BoringOwnableUpgradeableData, Initializable {
     event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
 
     function __BoringOwnable_init() internal onlyInitializing {

package/deployments/43113-core.json

@@ -7,7 +7,7 @@
     "yieldContractFactory": "0x38E5A1D591553b5FF18b151B587745a4A9B206d2",
     "marketFactory": "0xE646E5425fD448b2f9dDF6de12383CcF5275143B",
     "router": "0xa4C21f51DE870a283f362A7331f0C4f8288c3e41",
-    "routerStatic": "0xc875e3b8aED24cc54C4750D790036D631F6cacbD",
+    "routerStatic": "0x7d8Cd904F0b7d06fB846110817bA3519bf76381a",
     "startTime": 1657756800,
     "vePendle": "0x3AE0fee115057cCF8A0B5255751027C26D83B912",
     "votingController": "0x76815E13679C7F18a406f5BA94E352E656BeE378",

package/package.json

@@ -2,7 +2,7 @@
   "name": "@pendle/core-v2",
   "description": "Core smart contracts of Pendle Protocol.",
   "license": "BUSL-1.1",
-  "version": "0.11.2-testnet",
+  "version": "0.11.3-testnet",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",
@@ -25,7 +25,7 @@
   "devDependencies": {
     "@typechain/ethers-v5": "^9.0.0",
     "@typechain/hardhat": "^4.0.0",
-    "hardhat": "^2.10.2",
+    "hardhat": "^2.11.0",
     "hardhat-contract-sizer": "^2.6.1",
     "hardhat-storage-layout-diff": "^0.0.4",
     "prettier": "^2.7.1",
@@ -34,7 +34,7 @@
     "solhint": "^3.3.7",
     "ts-node": "^10.9.1",
     "typechain": "^8.1.0",
-    "typescript": "^4.7.4"
+    "typescript": "^4.8.2"
   },
   "scripts": {
     "compile": "yarn hardhat compile",
@@ -44,7 +44,6 @@
   },
   "packageManager": "yarn@3.2.2",
   "dependencies": {
-    "@openzeppelin/contracts": "^4.5.0",
-    "@openzeppelin/contracts-upgradeable": "^4.5.2"
+    "@openzeppelin/contracts": "^4.5.0"
   }
 }

package/typechain-types/ActionMintRedeem.ts

@@ -51,6 +51,32 @@ export type TokenOutputStructOutput = [string, BigNumber, string, string] & {
   kybercall: string;
 };
 
+export declare namespace IPActionMintRedeem {
+  export type RouterYtRedeemStructStruct = {
+    yts: string[];
+    scyAddrs: string[];
+    tokenRedeemScys: string[];
+  };
+
+  export type RouterYtRedeemStructStructOutput = [
+    string[],
+    string[],
+    string[]
+  ] & { yts: string[]; scyAddrs: string[]; tokenRedeemScys: string[] };
+
+  export type RouterSwapAllStructStruct = {
+    tokens: string[];
+    kybercalls: BytesLike[];
+    outputToken: string;
+  };
+
+  export type RouterSwapAllStructStructOutput = [string[], string[], string] & {
+    tokens: string[];
+    kybercalls: string[];
+    outputToken: string;
+  };
+}
+
 export interface ActionMintRedeemInterface extends utils.Interface {
   contractName: "ActionMintRedeem";
   functions: {
@@ -59,6 +85,7 @@ export interface ActionMintRedeemInterface extends utils.Interface {
     "mintPyFromToken(address,address,uint256,(address,uint256,address,bytes))": FunctionFragment;
     "mintScyFromToken(address,address,uint256,(address,uint256,address,bytes))": FunctionFragment;
     "redeemDueInterestAndRewards(address,address[],address[],address[])": FunctionFragment;
+    "redeemDueInterestAndRewardsThenSwapAll(address[],(address[],address[],address[]),address[],(address[],bytes[],address))": FunctionFragment;
     "redeemPyToScy(address,address,uint256,uint256)": FunctionFragment;
     "redeemPyToToken(address,address,uint256,(address,uint256,address,bytes))": FunctionFragment;
     "redeemScyToToken(address,address,uint256,(address,uint256,address,bytes))": FunctionFragment;
@@ -84,6 +111,15 @@ export interface ActionMintRedeemInterface extends utils.Interface {
     functionFragment: "redeemDueInterestAndRewards",
     values: [string, string[], string[], string[]]
   ): string;
+  encodeFunctionData(
+    functionFragment: "redeemDueInterestAndRewardsThenSwapAll",
+    values: [
+      string[],
+      IPActionMintRedeem.RouterYtRedeemStructStruct,
+      string[],
+      IPActionMintRedeem.RouterSwapAllStructStruct
+    ]
+  ): string;
   encodeFunctionData(
     functionFragment: "redeemPyToScy",
     values: [string, string, BigNumberish, BigNumberish]
@@ -117,6 +153,10 @@ export interface ActionMintRedeemInterface extends utils.Interface {
     functionFragment: "redeemDueInterestAndRewards",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "redeemDueInterestAndRewardsThenSwapAll",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "redeemPyToScy",
     data: BytesLike
@@ -134,6 +174,8 @@ export interface ActionMintRedeemInterface extends utils.Interface {
     "MintPyFromScy(address,address,address,uint256,uint256)": EventFragment;
     "MintPyFromToken(address,address,address,address,uint256,uint256)": EventFragment;
     "MintScyFromToken(address,address,address,address,uint256,uint256)": EventFragment;
+    "RedeemDueInterestAndRewards(address,address[],address[],address[],uint256[][],uint256[],uint256[][],uint256[][])": EventFragment;
+    "RedeemDueInterestAndRewardsThenSwapAll(address,address[],address[],address[],address,uint256)": EventFragment;
     "RedeemPyToScy(address,address,address,uint256,uint256)": EventFragment;
     "RedeemPyToToken(address,address,address,uint256,address,uint256)": EventFragment;
     "RedeemScyToToken(address,address,address,uint256,address,uint256)": EventFragment;
@@ -142,6 +184,12 @@ export interface ActionMintRedeemInterface extends utils.Interface {
   getEvent(nameOrSignatureOrTopic: "MintPyFromScy"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "MintPyFromToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "MintScyFromToken"): EventFragment;
+  getEvent(
+    nameOrSignatureOrTopic: "RedeemDueInterestAndRewards"
+  ): EventFragment;
+  getEvent(
+    nameOrSignatureOrTopic: "RedeemDueInterestAndRewardsThenSwapAll"
+  ): EventFragment;
   getEvent(nameOrSignatureOrTopic: "RedeemPyToScy"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "RedeemPyToToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "RedeemScyToToken"): EventFragment;
@@ -189,6 +237,47 @@ export type MintScyFromTokenEvent = TypedEvent<
 export type MintScyFromTokenEventFilter =
   TypedEventFilter<MintScyFromTokenEvent>;
 
+export type RedeemDueInterestAndRewardsEvent = TypedEvent<
+  [
+    string,
+    string[],
+    string[],
+    string[],
+    BigNumber[][],
+    BigNumber[],
+    BigNumber[][],
+    BigNumber[][]
+  ],
+  {
+    user: string;
+    scys: string[];
+    yts: string[];
+    markets: string[];
+    scyRewards: BigNumber[][];
+    ytInterests: BigNumber[];
+    ytRewards: BigNumber[][];
+    marketRewards: BigNumber[][];
+  }
+>;
+
+export type RedeemDueInterestAndRewardsEventFilter =
+  TypedEventFilter<RedeemDueInterestAndRewardsEvent>;
+
+export type RedeemDueInterestAndRewardsThenSwapAllEvent = TypedEvent<
+  [string, string[], string[], string[], string, BigNumber],
+  {
+    user: string;
+    scys: string[];
+    yts: string[];
+    markets: string[];
+    tokenOut: string;
+    netTokenOut: BigNumber;
+  }
+>;
+
+export type RedeemDueInterestAndRewardsThenSwapAllEventFilter =
+  TypedEventFilter<RedeemDueInterestAndRewardsThenSwapAllEvent>;
+
 export type RedeemPyToScyEvent = TypedEvent<
   [string, string, string, BigNumber, BigNumber],
   {
@@ -293,6 +382,14 @@ export interface ActionMintRedeem extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
+    redeemDueInterestAndRewardsThenSwapAll(
+      scys: string[],
+      dataYT: IPActionMintRedeem.RouterYtRedeemStructStruct,
+      markets: string[],
+      dataSwap: IPActionMintRedeem.RouterSwapAllStructStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
     redeemPyToScy(
       receiver: string,
       YT: string,
@@ -352,6 +449,14 @@ export interface ActionMintRedeem extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  redeemDueInterestAndRewardsThenSwapAll(
+    scys: string[],
+    dataYT: IPActionMintRedeem.RouterYtRedeemStructStruct,
+    markets: string[],
+    dataSwap: IPActionMintRedeem.RouterSwapAllStructStruct,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   redeemPyToScy(
     receiver: string,
     YT: string,
@@ -418,6 +523,19 @@ export interface ActionMintRedeem extends BaseContract {
       }
     >;
 
+    redeemDueInterestAndRewardsThenSwapAll(
+      scys: string[],
+      dataYT: IPActionMintRedeem.RouterYtRedeemStructStruct,
+      markets: string[],
+      dataSwap: IPActionMintRedeem.RouterSwapAllStructStruct,
+      overrides?: CallOverrides
+    ): Promise<
+      [BigNumber, BigNumber[]] & {
+        netTokenOut: BigNumber;
+        amountsSwapped: BigNumber[];
+      }
+    >;
+
     redeemPyToScy(
       receiver: string,
       YT: string,
@@ -493,6 +611,44 @@ export interface ActionMintRedeem extends BaseContract {
       netScyOut?: null
     ): MintScyFromTokenEventFilter;
 
+    "RedeemDueInterestAndRewards(address,address[],address[],address[],uint256[][],uint256[],uint256[][],uint256[][])"(
+      user?: string | null,
+      scys?: null,
+      yts?: null,
+      markets?: null,
+      scyRewards?: null,
+      ytInterests?: null,
+      ytRewards?: null,
+      marketRewards?: null
+    ): RedeemDueInterestAndRewardsEventFilter;
+    RedeemDueInterestAndRewards(
+      user?: string | null,
+      scys?: null,
+      yts?: null,
+      markets?: null,
+      scyRewards?: null,
+      ytInterests?: null,
+      ytRewards?: null,
+      marketRewards?: null
+    ): RedeemDueInterestAndRewardsEventFilter;
+
+    "RedeemDueInterestAndRewardsThenSwapAll(address,address[],address[],address[],address,uint256)"(
+      user?: string | null,
+      scys?: null,
+      yts?: null,
+      markets?: null,
+      tokenOut?: string | null,
+      netTokenOut?: null
+    ): RedeemDueInterestAndRewardsThenSwapAllEventFilter;
+    RedeemDueInterestAndRewardsThenSwapAll(
+      user?: string | null,
+      scys?: null,
+      yts?: null,
+      markets?: null,
+      tokenOut?: string | null,
+      netTokenOut?: null
+    ): RedeemDueInterestAndRewardsThenSwapAllEventFilter;
+
     "RedeemPyToScy(address,address,address,uint256,uint256)"(
       caller?: string | null,
       receiver?: string | null,
@@ -578,6 +734,14 @@ export interface ActionMintRedeem extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
+    redeemDueInterestAndRewardsThenSwapAll(
+      scys: string[],
+      dataYT: IPActionMintRedeem.RouterYtRedeemStructStruct,
+      markets: string[],
+      dataSwap: IPActionMintRedeem.RouterSwapAllStructStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
     redeemPyToScy(
       receiver: string,
       YT: string,
@@ -638,6 +802,14 @@ export interface ActionMintRedeem extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
+    redeemDueInterestAndRewardsThenSwapAll(
+      scys: string[],
+      dataYT: IPActionMintRedeem.RouterYtRedeemStructStruct,
+      markets: string[],
+      dataSwap: IPActionMintRedeem.RouterSwapAllStructStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
     redeemPyToScy(
       receiver: string,
       YT: string,

package/typechain-types/AggregationRouterHelper.ts

@@ -0,0 +1,108 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  BytesLike,
+  CallOverrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from "ethers";
+import { FunctionFragment, Result } from "@ethersproject/abi";
+import { Listener, Provider } from "@ethersproject/providers";
+import type {
+  TypedEventFilter,
+  TypedEvent,
+  TypedListener,
+  OnEvent,
+} from "./common";
+
+export interface AggregationRouterHelperInterface extends utils.Interface {
+  contractName: "AggregationRouterHelper";
+  functions: {
+    "getScaledInputData(bytes,uint256)": FunctionFragment;
+  };
+
+  encodeFunctionData(
+    functionFragment: "getScaledInputData",
+    values: [BytesLike, BigNumberish]
+  ): string;
+
+  decodeFunctionResult(
+    functionFragment: "getScaledInputData",
+    data: BytesLike
+  ): Result;
+
+  events: {};
+}
+
+export interface AggregationRouterHelper extends BaseContract {
+  contractName: "AggregationRouterHelper";
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  interface: AggregationRouterHelperInterface;
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>;
+
+  listeners<TEvent extends TypedEvent>(
+    eventFilter?: TypedEventFilter<TEvent>
+  ): Array<TypedListener<TEvent>>;
+  listeners(eventName?: string): Array<Listener>;
+  removeAllListeners<TEvent extends TypedEvent>(
+    eventFilter: TypedEventFilter<TEvent>
+  ): this;
+  removeAllListeners(eventName?: string): this;
+  off: OnEvent<this>;
+  on: OnEvent<this>;
+  once: OnEvent<this>;
+  removeListener: OnEvent<this>;
+
+  functions: {
+    getScaledInputData(
+      kybercall: BytesLike,
+      newAmount: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<[string]>;
+  };
+
+  getScaledInputData(
+    kybercall: BytesLike,
+    newAmount: BigNumberish,
+    overrides?: CallOverrides
+  ): Promise<string>;
+
+  callStatic: {
+    getScaledInputData(
+      kybercall: BytesLike,
+      newAmount: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<string>;
+  };
+
+  filters: {};
+
+  estimateGas: {
+    getScaledInputData(
+      kybercall: BytesLike,
+      newAmount: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+  };
+
+  populateTransaction: {
+    getScaledInputData(
+      kybercall: BytesLike,
+      newAmount: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+  };
+}