@pendle/core-v2 2.5.1-mainnet → 2.6.0-mainnet

package/contracts/interfaces/IPRouterHelper.sol

@@ -165,4 +165,12 @@ interface IPRouterHelper {
             uint256 netSyZapIn,
             uint256 netSyFeeOfRemove
         );
+
+    function removeLiquiditySingleToken(RemoveLiquiditySingleTokenStruct calldata fromMarket)
+        external
+        returns (uint256 netTokenOut, uint256 netSyFee);
+
+    function removeLiquiditySingleSy(RemoveLiquiditySingleSyStruct calldata fromMarket)
+        external
+        returns (uint256 netSyOut, uint256 netSyFee);
 }

package/contracts/router/PendleRouterHelper.sol

@@ -15,6 +15,7 @@ contract PendleRouterHelper is TokenHelper, IPRouterHelper {
     constructor(address _ROUTER, IAddressProvider provider) {
         ROUTER = IPAllAction(_ROUTER);
         WETH = _getWETHAddress(provider, 1);
+        _safeApproveInf(WETH, address(ROUTER));
     }
 
     function _getWETHAddress(IAddressProvider provider, uint256 providerId)
@@ -75,7 +76,7 @@ contract PendleRouterHelper is TokenHelper, IPRouterHelper {
             uint256 netSyFeeOfAdd
         )
     {
-        (netTokenZapIn, netSyFeeOfRemove) = _removeLiquiditySingleToken(fromMarket);
+        (netTokenZapIn, netSyFeeOfRemove) = removeLiquiditySingleToken(fromMarket);
         (netLpOut, netSyFeeOfAdd) = _addLiquiditySingleToken(
             toMarket,
             fromMarket.output.tokenOut,
@@ -95,7 +96,7 @@ contract PendleRouterHelper is TokenHelper, IPRouterHelper {
             uint256 netSyFeeOfRemove
         )
     {
-        (netTokenZapIn, netSyFeeOfRemove) = _removeLiquiditySingleToken(fromMarket);
+        (netTokenZapIn, netSyFeeOfRemove) = removeLiquiditySingleToken(fromMarket);
         (netLpOut, netYtOut) = _addLiquiditySingleTokenKeepYt(
             toMarket,
             fromMarket.output.tokenOut,
@@ -115,7 +116,7 @@ contract PendleRouterHelper is TokenHelper, IPRouterHelper {
             uint256 netSyFeeOfAdd
         )
     {
-        (netSyZapIn, netSyFeeOfRemove) = _removeLiquiditySingleSy(fromMarket);
+        (netSyZapIn, netSyFeeOfRemove) = removeLiquiditySingleSy(fromMarket);
         (netLpOut, netSyFeeOfAdd) = _addLiquiditySingleSy(toMarket, netSyZapIn);
     }
 
@@ -131,12 +132,12 @@ contract PendleRouterHelper is TokenHelper, IPRouterHelper {
             uint256 netSyFeeOfRemove
         )
     {
-        (netSyZapIn, netSyFeeOfRemove) = _removeLiquiditySingleSy(fromMarket);
+        (netSyZapIn, netSyFeeOfRemove) = removeLiquiditySingleSy(fromMarket);
         (netLpOut, netYtOut) = _addLiquiditySingleSyKeepYt(toMarket, netSyZapIn);
     }
 
-    function _removeLiquiditySingleToken(RemoveLiquiditySingleTokenStruct calldata fromMarket)
-        internal
+    function removeLiquiditySingleToken(RemoveLiquiditySingleTokenStruct calldata fromMarket)
+        public
         returns (uint256 netTokenOut, uint256 netSyFee)
     {
         _transferFrom(
@@ -169,8 +170,8 @@ contract PendleRouterHelper is TokenHelper, IPRouterHelper {
         );
     }
 
-    function _removeLiquiditySingleSy(RemoveLiquiditySingleSyStruct calldata fromMarket)
-        internal
+    function removeLiquiditySingleSy(RemoveLiquiditySingleSyStruct calldata fromMarket)
+        public
         returns (uint256 netSyOut, uint256 netSyFee)
     {
         _transferFrom(

package/deployments/1-core.json

@@ -28,5 +28,5 @@
     "votingController": "0x44087E105137a5095c008AaB6a6530182821F2F0",
     "gaugeController": "0x47D74516B33eD5D70ddE7119A40839f6Fcc24e57",
     "feeDistributor": "0xd7b34a6fDCb2A7ceD2115FF7f5fdD72aa6aA4dE2",
-    "routerHelper": "0xeb984195D54Df02BaF757e21B0705032FaEFde2E"
+    "routerHelper": "0x462206b11d185ef6F64B41D344325401C37EC335"
 }

package/deployments/42161-core.json

@@ -23,5 +23,5 @@
     "receiverEndpoint": "0xC9215ae9EC67385F38C755D862C8eE3702B5793A",
     "vePendle": "0x3209E9412cca80B18338f2a56ADA59c484c39644",
     "gaugeController": "0x1e56299ebc8a1010cec26005d12e3e5c5cc2db00",
-    "routerHelper": "0xeb984195D54Df02BaF757e21B0705032FaEFde2E"
+    "routerHelper": "0x462206b11d185ef6F64B41D344325401C37EC335"
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@pendle/core-v2",
   "description": "Core smart contracts of Pendle Protocol.",
   "license": "BUSL-1.1",
-  "version": "2.5.1-mainnet",
+  "version": "2.6.0-mainnet",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",

package/typechain-types/AggregatorInterface.ts

@@ -0,0 +1,233 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  BytesLike,
+  CallOverrides,
+  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 interface AggregatorInterfaceInterface extends utils.Interface {
+  contractName: "AggregatorInterface";
+  functions: {
+    "getAnswer(uint256)": FunctionFragment;
+    "getTimestamp(uint256)": FunctionFragment;
+    "latestAnswer()": FunctionFragment;
+    "latestRound()": FunctionFragment;
+    "latestTimestamp()": FunctionFragment;
+  };
+
+  encodeFunctionData(
+    functionFragment: "getAnswer",
+    values: [BigNumberish]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "getTimestamp",
+    values: [BigNumberish]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "latestAnswer",
+    values?: undefined
+  ): string;
+  encodeFunctionData(
+    functionFragment: "latestRound",
+    values?: undefined
+  ): string;
+  encodeFunctionData(
+    functionFragment: "latestTimestamp",
+    values?: undefined
+  ): string;
+
+  decodeFunctionResult(functionFragment: "getAnswer", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "getTimestamp",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "latestAnswer",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "latestRound",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "latestTimestamp",
+    data: BytesLike
+  ): Result;
+
+  events: {
+    "AnswerUpdated(int256,uint256,uint256)": EventFragment;
+    "NewRound(uint256,address,uint256)": EventFragment;
+  };
+
+  getEvent(nameOrSignatureOrTopic: "AnswerUpdated"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "NewRound"): EventFragment;
+}
+
+export type AnswerUpdatedEvent = TypedEvent<
+  [BigNumber, BigNumber, BigNumber],
+  { current: BigNumber; roundId: BigNumber; updatedAt: BigNumber }
+>;
+
+export type AnswerUpdatedEventFilter = TypedEventFilter<AnswerUpdatedEvent>;
+
+export type NewRoundEvent = TypedEvent<
+  [BigNumber, string, BigNumber],
+  { roundId: BigNumber; startedBy: string; startedAt: BigNumber }
+>;
+
+export type NewRoundEventFilter = TypedEventFilter<NewRoundEvent>;
+
+export interface AggregatorInterface extends BaseContract {
+  contractName: "AggregatorInterface";
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  interface: AggregatorInterfaceInterface;
+
+  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: {
+    getAnswer(
+      roundId: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber]>;
+
+    getTimestamp(
+      roundId: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber]>;
+
+    latestAnswer(overrides?: CallOverrides): Promise<[BigNumber]>;
+
+    latestRound(overrides?: CallOverrides): Promise<[BigNumber]>;
+
+    latestTimestamp(overrides?: CallOverrides): Promise<[BigNumber]>;
+  };
+
+  getAnswer(
+    roundId: BigNumberish,
+    overrides?: CallOverrides
+  ): Promise<BigNumber>;
+
+  getTimestamp(
+    roundId: BigNumberish,
+    overrides?: CallOverrides
+  ): Promise<BigNumber>;
+
+  latestAnswer(overrides?: CallOverrides): Promise<BigNumber>;
+
+  latestRound(overrides?: CallOverrides): Promise<BigNumber>;
+
+  latestTimestamp(overrides?: CallOverrides): Promise<BigNumber>;
+
+  callStatic: {
+    getAnswer(
+      roundId: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    getTimestamp(
+      roundId: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    latestAnswer(overrides?: CallOverrides): Promise<BigNumber>;
+
+    latestRound(overrides?: CallOverrides): Promise<BigNumber>;
+
+    latestTimestamp(overrides?: CallOverrides): Promise<BigNumber>;
+  };
+
+  filters: {
+    "AnswerUpdated(int256,uint256,uint256)"(
+      current?: BigNumberish | null,
+      roundId?: BigNumberish | null,
+      updatedAt?: null
+    ): AnswerUpdatedEventFilter;
+    AnswerUpdated(
+      current?: BigNumberish | null,
+      roundId?: BigNumberish | null,
+      updatedAt?: null
+    ): AnswerUpdatedEventFilter;
+
+    "NewRound(uint256,address,uint256)"(
+      roundId?: BigNumberish | null,
+      startedBy?: string | null,
+      startedAt?: null
+    ): NewRoundEventFilter;
+    NewRound(
+      roundId?: BigNumberish | null,
+      startedBy?: string | null,
+      startedAt?: null
+    ): NewRoundEventFilter;
+  };
+
+  estimateGas: {
+    getAnswer(
+      roundId: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    getTimestamp(
+      roundId: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    latestAnswer(overrides?: CallOverrides): Promise<BigNumber>;
+
+    latestRound(overrides?: CallOverrides): Promise<BigNumber>;
+
+    latestTimestamp(overrides?: CallOverrides): Promise<BigNumber>;
+  };
+
+  populateTransaction: {
+    getAnswer(
+      roundId: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
+    getTimestamp(
+      roundId: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
+    latestAnswer(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    latestRound(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    latestTimestamp(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+  };
+}