@pendle/core-v2 0.21.0-testnet → 1.0.1-mainnet

package/deployments/1-markets/STETH-MARCH30.json

@@ -0,0 +1,10 @@
+{
+    "name": "SY stETH",
+    "SY": "0xcbC72d92b2dc8187414F6734718563898740C0BC",
+    "YT": "0xA53ad7E3A87546CCa450992d54d517c3C939c2BF",
+    "PT": "0xcf44E8402a99Db82d2AccCC4d9354657Be2121Db",
+    "market": "0x54E28e62Ea9E8D755DC6e74674eAbE2aBfdB004E",
+    "expiry": 1680134400,
+    "scalarRoot": "31400000000000000000",
+    "initAnchor": "1020480000000000000"
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@pendle/core-v2",
   "description": "Core smart contracts of Pendle Protocol.",
   "license": "BUSL-1.1",
-  "version": "0.21.0-testnet",
+  "version": "1.0.1-mainnet",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",
@@ -25,16 +25,16 @@
   "devDependencies": {
     "@typechain/ethers-v5": "^9.0.0",
     "@typechain/hardhat": "^4.0.0",
-    "hardhat": "^2.12.5",
+    "hardhat": "^2.12.2",
     "hardhat-contract-sizer": "^2.6.1",
     "hardhat-storage-layout-diff": "^0.0.4",
-    "prettier": "^2.8.2",
-    "prettier-plugin-solidity": "^1.1.1",
+    "prettier": "^2.7.1",
+    "prettier-plugin-solidity": "^1.0.0-rc.1",
     "solc": "^0.8.17",
     "solhint": "^3.3.7",
     "ts-node": "^10.9.1",
     "typechain": "^8.1.1",
-    "typescript": "^4.9.4"
+    "typescript": "^4.9.3"
   },
   "scripts": {
     "compile": "yarn hardhat compile",
@@ -42,7 +42,7 @@
     "clean": "yarn hardhat clean",
     "fcompile": "yarn clean && yarn compile"
   },
-  "packageManager": "yarn@3.3.1",
+  "packageManager": "yarn@3.2.2",
   "dependencies": {
     "@openzeppelin/contracts": "4.7.3",
     "@openzeppelin/contracts-upgradeable": "4.7.3"

package/typechain-types/IApeStaking.ts

@@ -30,7 +30,6 @@ export interface IApeStakingInterface extends utils.Interface {
     "claimSelfApeCoin()": FunctionFragment;
     "depositSelfApeCoin(uint256)": FunctionFragment;
     "pendingRewards(uint256,address,uint256)": FunctionFragment;
-    "pools(uint256)": FunctionFragment;
     "withdrawApeCoin(uint256,address)": FunctionFragment;
   };
 
@@ -51,7 +50,6 @@ export interface IApeStakingInterface extends utils.Interface {
     functionFragment: "pendingRewards",
     values: [BigNumberish, string, BigNumberish]
   ): string;
-  encodeFunctionData(functionFragment: "pools", values: [BigNumberish]): string;
   encodeFunctionData(
     functionFragment: "withdrawApeCoin",
     values: [BigNumberish, string]
@@ -74,7 +72,6 @@ export interface IApeStakingInterface extends utils.Interface {
     functionFragment: "pendingRewards",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(functionFragment: "pools", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "withdrawApeCoin",
     data: BytesLike
@@ -139,13 +136,6 @@ export interface IApeStaking extends BaseContract {
       overrides?: CallOverrides
     ): Promise<[BigNumber]>;
 
-    pools(
-      id: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [number, number, BigNumber, BigNumber] & { totalStaked: BigNumber }
-    >;
-
     withdrawApeCoin(
       _amount: BigNumberish,
       _recipient: string,
@@ -178,13 +168,6 @@ export interface IApeStaking extends BaseContract {
     overrides?: CallOverrides
   ): Promise<BigNumber>;
 
-  pools(
-    id: BigNumberish,
-    overrides?: CallOverrides
-  ): Promise<
-    [number, number, BigNumber, BigNumber] & { totalStaked: BigNumber }
-  >;
-
   withdrawApeCoin(
     _amount: BigNumberish,
     _recipient: string,
@@ -218,13 +201,6 @@ export interface IApeStaking extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    pools(
-      id: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [number, number, BigNumber, BigNumber] & { totalStaked: BigNumber }
-    >;
-
     withdrawApeCoin(
       _amount: BigNumberish,
       _recipient: string,
@@ -258,8 +234,6 @@ export interface IApeStaking extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    pools(id: BigNumberish, overrides?: CallOverrides): Promise<BigNumber>;
-
     withdrawApeCoin(
       _amount: BigNumberish,
       _recipient: string,
@@ -291,11 +265,6 @@ export interface IApeStaking extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    pools(
-      id: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
     withdrawApeCoin(
       _amount: BigNumberish,
       _recipient: string,

package/typechain-types/IPFeeDistributor.ts

@@ -25,59 +25,58 @@ import type {
 export interface IPFeeDistributorInterface extends utils.Interface {
   contractName: "IPFeeDistributor";
   functions: {
-    "claimReward(address,address[])": FunctionFragment;
-    "getAllPools()": FunctionFragment;
+    "claimReward(address)": FunctionFragment;
+    "fund(uint256[])": FunctionFragment;
+    "incentivesForEpoch(uint256)": FunctionFragment;
   };
 
+  encodeFunctionData(functionFragment: "claimReward", values: [string]): string;
   encodeFunctionData(
-    functionFragment: "claimReward",
-    values: [string, string[]]
+    functionFragment: "fund",
+    values: [BigNumberish[]]
   ): string;
   encodeFunctionData(
-    functionFragment: "getAllPools",
-    values?: undefined
+    functionFragment: "incentivesForEpoch",
+    values: [BigNumberish]
   ): string;
 
   decodeFunctionResult(
     functionFragment: "claimReward",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(functionFragment: "fund", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "getAllPools",
+    functionFragment: "incentivesForEpoch",
     data: BytesLike
   ): Result;
 
   events: {
     "ClaimReward(address,address,uint256,uint256)": EventFragment;
-    "PoolAdded(address,uint256)": EventFragment;
-    "UpdateFee(address,uint256,uint256)": EventFragment;
+    "Fund(uint256,uint256)": EventFragment;
   };
 
   getEvent(nameOrSignatureOrTopic: "ClaimReward"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "PoolAdded"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "UpdateFee"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "Fund"): EventFragment;
 }
 
 export type ClaimRewardEvent = TypedEvent<
   [string, string, BigNumber, BigNumber],
-  { pool: string; user: string; wTime: BigNumber; amount: BigNumber }
+  {
+    user: string;
+    rewardToken: string;
+    lastEpochClaimed: BigNumber;
+    totalReward: BigNumber;
+  }
 >;
 
 export type ClaimRewardEventFilter = TypedEventFilter<ClaimRewardEvent>;
 
-export type PoolAddedEvent = TypedEvent<
-  [string, BigNumber],
-  { pool: string; startWeek: BigNumber }
->;
-
-export type PoolAddedEventFilter = TypedEventFilter<PoolAddedEvent>;
-
-export type UpdateFeeEvent = TypedEvent<
-  [string, BigNumber, BigNumber],
-  { pool: string; wTime: BigNumber; amount: BigNumber }
+export type FundEvent = TypedEvent<
+  [BigNumber, BigNumber],
+  { epoch: BigNumber; incentive: BigNumber }
 >;
 
-export type UpdateFeeEventFilter = TypedEventFilter<UpdateFeeEvent>;
+export type FundEventFilter = TypedEventFilter<FundEvent>;
 
 export interface IPFeeDistributor extends BaseContract {
   contractName: "IPFeeDistributor";
@@ -109,83 +108,101 @@ export interface IPFeeDistributor extends BaseContract {
   functions: {
     claimReward(
       user: string,
-      pools: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    getAllPools(overrides?: CallOverrides): Promise<[string[]]>;
+    fund(
+      rewardsForEpoch: BigNumberish[],
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    incentivesForEpoch(
+      epoch: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
   };
 
   claimReward(
     user: string,
-    pools: string[],
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  getAllPools(overrides?: CallOverrides): Promise<string[]>;
+  fund(
+    rewardsForEpoch: BigNumberish[],
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  incentivesForEpoch(
+    epoch: BigNumberish,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
 
   callStatic: {
-    claimReward(
-      user: string,
-      pools: string[],
+    claimReward(user: string, overrides?: CallOverrides): Promise<BigNumber>;
+
+    fund(
+      rewardsForEpoch: BigNumberish[],
       overrides?: CallOverrides
-    ): Promise<BigNumber[]>;
+    ): Promise<void>;
 
-    getAllPools(overrides?: CallOverrides): Promise<string[]>;
+    incentivesForEpoch(
+      epoch: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
   };
 
   filters: {
     "ClaimReward(address,address,uint256,uint256)"(
-      pool?: string | null,
       user?: string | null,
-      wTime?: null,
-      amount?: null
+      rewardToken?: string | null,
+      lastEpochClaimed?: null,
+      totalReward?: null
     ): ClaimRewardEventFilter;
     ClaimReward(
-      pool?: string | null,
       user?: string | null,
-      wTime?: null,
-      amount?: null
+      rewardToken?: string | null,
+      lastEpochClaimed?: null,
+      totalReward?: null
     ): ClaimRewardEventFilter;
 
-    "PoolAdded(address,uint256)"(
-      pool?: string | null,
-      startWeek?: BigNumberish | null
-    ): PoolAddedEventFilter;
-    PoolAdded(
-      pool?: string | null,
-      startWeek?: BigNumberish | null
-    ): PoolAddedEventFilter;
-
-    "UpdateFee(address,uint256,uint256)"(
-      pool?: string | null,
-      wTime?: BigNumberish | null,
-      amount?: null
-    ): UpdateFeeEventFilter;
-    UpdateFee(
-      pool?: string | null,
-      wTime?: BigNumberish | null,
-      amount?: null
-    ): UpdateFeeEventFilter;
+    "Fund(uint256,uint256)"(
+      epoch?: BigNumberish | null,
+      incentive?: null
+    ): FundEventFilter;
+    Fund(epoch?: BigNumberish | null, incentive?: null): FundEventFilter;
   };
 
   estimateGas: {
     claimReward(
       user: string,
-      pools: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    getAllPools(overrides?: CallOverrides): Promise<BigNumber>;
+    fund(
+      rewardsForEpoch: BigNumberish[],
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    incentivesForEpoch(
+      epoch: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
   };
 
   populateTransaction: {
     claimReward(
       user: string,
-      pools: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    getAllPools(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+    fund(
+      rewardsForEpoch: BigNumberish[],
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    incentivesForEpoch(
+      epoch: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
   };
 }

package/typechain-types/IPFeeDistributorFactory.ts

@@ -1,8 +1,19 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-import { BaseContract, BigNumber, BigNumberish, Signer, utils } from "ethers";
-import { EventFragment } from "@ethersproject/abi";
+import {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from "ethers";
+import { FunctionFragment, Result } from "@ethersproject/abi";
 import { Listener, Provider } from "@ethersproject/providers";
 import type {
   TypedEventFilter,
@@ -13,31 +24,41 @@ import type {
 
 export interface IPFeeDistributorFactoryInterface extends utils.Interface {
   contractName: "IPFeeDistributorFactory";
-  functions: {};
-
-  events: {
-    "ClaimReward(address,address,uint256,uint256)": EventFragment;
-    "Fund(address,uint256,uint256)": EventFragment;
+  functions: {
+    "getUserAndTotalSharesAt(address,address,uint256)": FunctionFragment;
+    "lastFinishedEpoch()": FunctionFragment;
+    "updateUserShare(address,address)": FunctionFragment;
   };
 
-  getEvent(nameOrSignatureOrTopic: "ClaimReward"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "Fund"): EventFragment;
+  encodeFunctionData(
+    functionFragment: "getUserAndTotalSharesAt",
+    values: [string, string, BigNumberish]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "lastFinishedEpoch",
+    values?: undefined
+  ): string;
+  encodeFunctionData(
+    functionFragment: "updateUserShare",
+    values: [string, string]
+  ): string;
+
+  decodeFunctionResult(
+    functionFragment: "getUserAndTotalSharesAt",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "lastFinishedEpoch",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "updateUserShare",
+    data: BytesLike
+  ): Result;
+
+  events: {};
 }
 
-export type ClaimRewardEvent = TypedEvent<
-  [string, string, BigNumber, BigNumber],
-  { pool: string; user: string; epoch: BigNumber; amountReward: BigNumber }
->;
-
-export type ClaimRewardEventFilter = TypedEventFilter<ClaimRewardEvent>;
-
-export type FundEvent = TypedEvent<
-  [string, BigNumber, BigNumber],
-  { pool: string; epoch: BigNumber; incentive: BigNumber }
->;
-
-export type FundEventFilter = TypedEventFilter<FundEvent>;
-
 export interface IPFeeDistributorFactory extends BaseContract {
   contractName: "IPFeeDistributorFactory";
   connect(signerOrProvider: Signer | Provider | string): this;
@@ -65,37 +86,102 @@ export interface IPFeeDistributorFactory extends BaseContract {
   once: OnEvent<this>;
   removeListener: OnEvent<this>;
 
-  functions: {};
-
-  callStatic: {};
-
-  filters: {
-    "ClaimReward(address,address,uint256,uint256)"(
-      pool?: string | null,
-      user?: string | null,
-      epoch?: null,
-      amountReward?: null
-    ): ClaimRewardEventFilter;
-    ClaimReward(
-      pool?: string | null,
-      user?: string | null,
-      epoch?: null,
-      amountReward?: null
-    ): ClaimRewardEventFilter;
-
-    "Fund(address,uint256,uint256)"(
-      pool?: string | null,
-      epoch?: BigNumberish | null,
-      incentive?: null
-    ): FundEventFilter;
-    Fund(
-      pool?: string | null,
-      epoch?: BigNumberish | null,
-      incentive?: null
-    ): FundEventFilter;
+  functions: {
+    getUserAndTotalSharesAt(
+      user: string,
+      pool: string,
+      epoch: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<
+      [BigNumber, BigNumber] & { userShare: BigNumber; totalShare: BigNumber }
+    >;
+
+    lastFinishedEpoch(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    updateUserShare(
+      user: string,
+      pool: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
   };
 
-  estimateGas: {};
+  getUserAndTotalSharesAt(
+    user: string,
+    pool: string,
+    epoch: BigNumberish,
+    overrides?: CallOverrides
+  ): Promise<
+    [BigNumber, BigNumber] & { userShare: BigNumber; totalShare: BigNumber }
+  >;
+
+  lastFinishedEpoch(
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  updateUserShare(
+    user: string,
+    pool: string,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  callStatic: {
+    getUserAndTotalSharesAt(
+      user: string,
+      pool: string,
+      epoch: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<
+      [BigNumber, BigNumber] & { userShare: BigNumber; totalShare: BigNumber }
+    >;
+
+    lastFinishedEpoch(overrides?: CallOverrides): Promise<BigNumber>;
+
+    updateUserShare(
+      user: string,
+      pool: string,
+      overrides?: CallOverrides
+    ): Promise<void>;
+  };
+
+  filters: {};
+
+  estimateGas: {
+    getUserAndTotalSharesAt(
+      user: string,
+      pool: string,
+      epoch: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    lastFinishedEpoch(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    updateUserShare(
+      user: string,
+      pool: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+  };
 
-  populateTransaction: {};
+  populateTransaction: {
+    getUserAndTotalSharesAt(
+      user: string,
+      pool: string,
+      epoch: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
+    lastFinishedEpoch(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    updateUserShare(
+      user: string,
+      pool: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+  };
 }

package/typechain-types/IRewards.ts

@@ -203,13 +203,7 @@ export interface IRewards extends BaseContract {
 
     extraRewardsLength(overrides?: CallOverrides): Promise<[BigNumber]>;
 
-    "getReward()"(
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    "getReward(address,bool)"(
-      arg0: string,
-      arg1: boolean,
+    getReward(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -283,13 +277,7 @@ export interface IRewards extends BaseContract {
 
   extraRewardsLength(overrides?: CallOverrides): Promise<BigNumber>;
 
-  "getReward()"(
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  "getReward(address,bool)"(
-    arg0: string,
-    arg1: boolean,
+  getReward(
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -357,13 +345,7 @@ export interface IRewards extends BaseContract {
 
     extraRewardsLength(overrides?: CallOverrides): Promise<BigNumber>;
 
-    "getReward()"(overrides?: CallOverrides): Promise<void>;
-
-    "getReward(address,bool)"(
-      arg0: string,
-      arg1: boolean,
-      overrides?: CallOverrides
-    ): Promise<void>;
+    getReward(overrides?: CallOverrides): Promise<void>;
 
     lastTimeRewardApplicable(overrides?: CallOverrides): Promise<BigNumber>;
 
@@ -432,13 +414,7 @@ export interface IRewards extends BaseContract {
 
     extraRewardsLength(overrides?: CallOverrides): Promise<BigNumber>;
 
-    "getReward()"(
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    "getReward(address,bool)"(
-      arg0: string,
-      arg1: boolean,
+    getReward(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -515,13 +491,7 @@ export interface IRewards extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    "getReward()"(
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    "getReward(address,bool)"(
-      arg0: string,
-      arg1: boolean,
+    getReward(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;