@pendle/core-v2 0.11.8-testnet → 0.11.10-testnet

package/contracts/offchain-helpers/RouterStatic.sol

@@ -3,14 +3,22 @@ pragma solidity 0.8.15;
 
 import "../interfaces/IPYieldContractFactory.sol";
 import "../interfaces/IPMarketFactory.sol";
+import "../interfaces/IPVotingEscrow.sol";
+import "../periphery/BoringOwnableUpgradeable.sol";
 import "./MarketMathStatic.sol";
 import "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
 import "../periphery/BoringOwnableUpgradeable.sol";
+import "../libraries/math/WeekMath.sol";
 
 /// EXCLUDED FROM ALL AUDITS, TO BE CALLED ONLY BY PENDLE's SDK
 contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeable {
     using Math for uint256;
+    using VeBalanceLib for VeBalance;
+    using VeBalanceLib for LockedPosition;
+
+    uint128 public constant MAX_LOCK_TIME = 104 weeks;
+    uint128 public constant MIN_LOCK_TIME = 1 weeks;
 
     struct TokenAmount {
         address token;
@@ -47,12 +55,16 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
 
     IPYieldContractFactory internal immutable yieldContractFactory;
     IPMarketFactory internal immutable marketFactory;
+    IPVotingEscrow internal immutable vePENDLE;
 
-    constructor(IPYieldContractFactory _yieldContractFactory, IPMarketFactory _marketFactory)
-        initializer
-    {
+    constructor(
+        IPYieldContractFactory _yieldContractFactory,
+        IPMarketFactory _marketFactory,
+        IPVotingEscrow _vePENDLE
+    ) initializer {
         yieldContractFactory = _yieldContractFactory;
         marketFactory = _marketFactory;
+        vePENDLE = _vePENDLE;
     }
 
     function initialize() external initializer {
@@ -570,6 +582,67 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             );
     }
 
+    function swapExactPtForYtStatic(address market, uint256 exactPtIn)
+        external
+        returns (
+            uint256 netYtOut,
+            uint256 totalPtToSwap,
+            uint256 netScyFee,
+            uint256 priceImpact
+        )
+    {
+        return MarketMathStatic.swapExactPtForYt(market, exactPtIn, getDefaultApproxParams());
+    }
+
+    function swapExactYtForPtStatic(address market, uint256 exactYtIn)
+        external
+        returns (
+            uint256 netPtOut,
+            uint256 totalPtSwapped,
+            uint256 netScyFee,
+            uint256 priceImpact
+        )
+    {
+        return MarketMathStatic.swapExactYtForPt(market, exactYtIn, getDefaultApproxParams());
+    }
+
+    // ============= vePENDLE =============
+
+    function increaseLockPositionStatic(
+        address user,
+        uint128 additionalAmountToLock,
+        uint128 newExpiry
+    ) external view returns (uint128 newVeBalance) {
+        require(
+            WeekMath.isValidWTime(newExpiry) && !MiniHelpers.isTimeInThePast(newExpiry),
+            "invalid newExpiry"
+        );
+
+        require(newExpiry <= block.timestamp + MAX_LOCK_TIME, "max lock time exceeded");
+        require(newExpiry >= block.timestamp + MIN_LOCK_TIME, "insufficient lock time");
+
+        LockedPosition memory oldPosition;
+
+        {
+            (uint128 amount, uint128 expiry) = vePENDLE.positionData(user);
+            oldPosition = LockedPosition(amount, expiry);
+        }
+
+        require(oldPosition.expiry <= newExpiry, "new expiry must be after current expiry");
+        uint128 newTotalAmountLocked = additionalAmountToLock + oldPosition.amount;
+        require(newTotalAmountLocked > 0, "zero total amount locked");
+
+        uint128 additionalDurationToLock = newExpiry - oldPosition.expiry;
+
+        LockedPosition memory newPosition = LockedPosition(
+            oldPosition.amount + additionalAmountToLock,
+            oldPosition.expiry + additionalDurationToLock
+        );
+
+        VeBalance memory newBalance = newPosition.convertToVeBalance();
+        return newBalance.getCurrentValue();
+    }
+
     // ============= OTHER HELPERS =============
 
     function mintPYFromScyStatic(address YT, uint256 amountScyToMint)

package/deployments/43113-core.json

@@ -7,7 +7,7 @@
     "yieldContractFactory": "0x38E5A1D591553b5FF18b151B587745a4A9B206d2",
     "marketFactory": "0xE646E5425fD448b2f9dDF6de12383CcF5275143B",
     "router": "0xa4C21f51DE870a283f362A7331f0C4f8288c3e41",
-    "routerStatic": "0xc875e3b8aED24cc54C4750D790036D631F6cacbD",
+    "routerStatic": "0x4ea00Cd73C773764A398e27ed2F789f50F168c52",
     "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.8-testnet",
+  "version": "0.11.10-testnet",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",
@@ -37,8 +37,6 @@
     "typescript": "^4.8.2"
   },
   "scripts": {
-    "prepublish": "yarn hardhat compile",
-    "publish": "npm publish",
     "compile": "yarn hardhat compile",
     "size": "yarn hardhat size-contracts",
     "clean": "yarn hardhat clean",

package/typechain-types/ActionSwapPTYT.ts

@@ -0,0 +1,233 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from "ethers";
+import { FunctionFragment, Result, EventFragment } from "@ethersproject/abi";
+import { Listener, Provider } from "@ethersproject/providers";
+import type {
+  TypedEventFilter,
+  TypedEvent,
+  TypedListener,
+  OnEvent,
+} from "./common";
+
+export type ApproxParamsStruct = {
+  guessMin: BigNumberish;
+  guessMax: BigNumberish;
+  guessOffchain: BigNumberish;
+  maxIteration: BigNumberish;
+  eps: BigNumberish;
+};
+
+export type ApproxParamsStructOutput = [
+  BigNumber,
+  BigNumber,
+  BigNumber,
+  BigNumber,
+  BigNumber
+] & {
+  guessMin: BigNumber;
+  guessMax: BigNumber;
+  guessOffchain: BigNumber;
+  maxIteration: BigNumber;
+  eps: BigNumber;
+};
+
+export interface ActionSwapPTYTInterface extends utils.Interface {
+  contractName: "ActionSwapPTYT";
+  functions: {
+    "swapExactPtForYt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
+    "swapExactYtForPt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
+  };
+
+  encodeFunctionData(
+    functionFragment: "swapExactPtForYt",
+    values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "swapExactYtForPt",
+    values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
+  ): string;
+
+  decodeFunctionResult(
+    functionFragment: "swapExactPtForYt",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "swapExactYtForPt",
+    data: BytesLike
+  ): Result;
+
+  events: {
+    "SwapPtAndYt(address,address,address,int256,int256)": EventFragment;
+  };
+
+  getEvent(nameOrSignatureOrTopic: "SwapPtAndYt"): EventFragment;
+}
+
+export type SwapPtAndYtEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber],
+  {
+    caller: string;
+    market: string;
+    receiver: string;
+    netPtToAccount: BigNumber;
+    netYtToAccount: BigNumber;
+  }
+>;
+
+export type SwapPtAndYtEventFilter = TypedEventFilter<SwapPtAndYtEvent>;
+
+export interface ActionSwapPTYT extends BaseContract {
+  contractName: "ActionSwapPTYT";
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  interface: ActionSwapPTYTInterface;
+
+  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: {
+    swapExactPtForYt(
+      receiver: string,
+      market: string,
+      exactPtIn: BigNumberish,
+      minYtOut: BigNumberish,
+      guessTotalPtToSwap: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    swapExactYtForPt(
+      receiver: string,
+      market: string,
+      exactYtIn: BigNumberish,
+      minPtOut: BigNumberish,
+      guessTotalPtSwapped: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+  };
+
+  swapExactPtForYt(
+    receiver: string,
+    market: string,
+    exactPtIn: BigNumberish,
+    minYtOut: BigNumberish,
+    guessTotalPtToSwap: ApproxParamsStruct,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  swapExactYtForPt(
+    receiver: string,
+    market: string,
+    exactYtIn: BigNumberish,
+    minPtOut: BigNumberish,
+    guessTotalPtSwapped: ApproxParamsStruct,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  callStatic: {
+    swapExactPtForYt(
+      receiver: string,
+      market: string,
+      exactPtIn: BigNumberish,
+      minYtOut: BigNumberish,
+      guessTotalPtToSwap: ApproxParamsStruct,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    swapExactYtForPt(
+      receiver: string,
+      market: string,
+      exactYtIn: BigNumberish,
+      minPtOut: BigNumberish,
+      guessTotalPtSwapped: ApproxParamsStruct,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+  };
+
+  filters: {
+    "SwapPtAndYt(address,address,address,int256,int256)"(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      netPtToAccount?: null,
+      netYtToAccount?: null
+    ): SwapPtAndYtEventFilter;
+    SwapPtAndYt(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      netPtToAccount?: null,
+      netYtToAccount?: null
+    ): SwapPtAndYtEventFilter;
+  };
+
+  estimateGas: {
+    swapExactPtForYt(
+      receiver: string,
+      market: string,
+      exactPtIn: BigNumberish,
+      minYtOut: BigNumberish,
+      guessTotalPtToSwap: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    swapExactYtForPt(
+      receiver: string,
+      market: string,
+      exactYtIn: BigNumberish,
+      minPtOut: BigNumberish,
+      guessTotalPtSwapped: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+  };
+
+  populateTransaction: {
+    swapExactPtForYt(
+      receiver: string,
+      market: string,
+      exactPtIn: BigNumberish,
+      minYtOut: BigNumberish,
+      guessTotalPtToSwap: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    swapExactYtForPt(
+      receiver: string,
+      market: string,
+      exactYtIn: BigNumberish,
+      minPtOut: BigNumberish,
+      guessTotalPtSwapped: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+  };
+}

package/typechain-types/IPActionSwapPTYT.ts

@@ -0,0 +1,233 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from "ethers";
+import { FunctionFragment, Result, EventFragment } from "@ethersproject/abi";
+import { Listener, Provider } from "@ethersproject/providers";
+import type {
+  TypedEventFilter,
+  TypedEvent,
+  TypedListener,
+  OnEvent,
+} from "./common";
+
+export type ApproxParamsStruct = {
+  guessMin: BigNumberish;
+  guessMax: BigNumberish;
+  guessOffchain: BigNumberish;
+  maxIteration: BigNumberish;
+  eps: BigNumberish;
+};
+
+export type ApproxParamsStructOutput = [
+  BigNumber,
+  BigNumber,
+  BigNumber,
+  BigNumber,
+  BigNumber
+] & {
+  guessMin: BigNumber;
+  guessMax: BigNumber;
+  guessOffchain: BigNumber;
+  maxIteration: BigNumber;
+  eps: BigNumber;
+};
+
+export interface IPActionSwapPTYTInterface extends utils.Interface {
+  contractName: "IPActionSwapPTYT";
+  functions: {
+    "swapExactPtForYt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
+    "swapExactYtForPt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
+  };
+
+  encodeFunctionData(
+    functionFragment: "swapExactPtForYt",
+    values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "swapExactYtForPt",
+    values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
+  ): string;
+
+  decodeFunctionResult(
+    functionFragment: "swapExactPtForYt",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "swapExactYtForPt",
+    data: BytesLike
+  ): Result;
+
+  events: {
+    "SwapPtAndYt(address,address,address,int256,int256)": EventFragment;
+  };
+
+  getEvent(nameOrSignatureOrTopic: "SwapPtAndYt"): EventFragment;
+}
+
+export type SwapPtAndYtEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber],
+  {
+    caller: string;
+    market: string;
+    receiver: string;
+    netPtToAccount: BigNumber;
+    netYtToAccount: BigNumber;
+  }
+>;
+
+export type SwapPtAndYtEventFilter = TypedEventFilter<SwapPtAndYtEvent>;
+
+export interface IPActionSwapPTYT extends BaseContract {
+  contractName: "IPActionSwapPTYT";
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  interface: IPActionSwapPTYTInterface;
+
+  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: {
+    swapExactPtForYt(
+      receiver: string,
+      market: string,
+      exactPtIn: BigNumberish,
+      minYtOut: BigNumberish,
+      guessTotalPtToSwap: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    swapExactYtForPt(
+      receiver: string,
+      market: string,
+      exactYtIn: BigNumberish,
+      minPtOut: BigNumberish,
+      guessTotalPtSwapped: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+  };
+
+  swapExactPtForYt(
+    receiver: string,
+    market: string,
+    exactPtIn: BigNumberish,
+    minYtOut: BigNumberish,
+    guessTotalPtToSwap: ApproxParamsStruct,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  swapExactYtForPt(
+    receiver: string,
+    market: string,
+    exactYtIn: BigNumberish,
+    minPtOut: BigNumberish,
+    guessTotalPtSwapped: ApproxParamsStruct,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  callStatic: {
+    swapExactPtForYt(
+      receiver: string,
+      market: string,
+      exactPtIn: BigNumberish,
+      minYtOut: BigNumberish,
+      guessTotalPtToSwap: ApproxParamsStruct,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    swapExactYtForPt(
+      receiver: string,
+      market: string,
+      exactYtIn: BigNumberish,
+      minPtOut: BigNumberish,
+      guessTotalPtSwapped: ApproxParamsStruct,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+  };
+
+  filters: {
+    "SwapPtAndYt(address,address,address,int256,int256)"(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      netPtToAccount?: null,
+      netYtToAccount?: null
+    ): SwapPtAndYtEventFilter;
+    SwapPtAndYt(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      netPtToAccount?: null,
+      netYtToAccount?: null
+    ): SwapPtAndYtEventFilter;
+  };
+
+  estimateGas: {
+    swapExactPtForYt(
+      receiver: string,
+      market: string,
+      exactPtIn: BigNumberish,
+      minYtOut: BigNumberish,
+      guessTotalPtToSwap: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    swapExactYtForPt(
+      receiver: string,
+      market: string,
+      exactYtIn: BigNumberish,
+      minPtOut: BigNumberish,
+      guessTotalPtSwapped: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+  };
+
+  populateTransaction: {
+    swapExactPtForYt(
+      receiver: string,
+      market: string,
+      exactPtIn: BigNumberish,
+      minYtOut: BigNumberish,
+      guessTotalPtToSwap: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    swapExactYtForPt(
+      receiver: string,
+      market: string,
+      exactYtIn: BigNumberish,
+      minPtOut: BigNumberish,
+      guessTotalPtSwapped: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+  };
+}