@pendle/core-v2 0.5.1-beta-4 → 0.6.0

package/typechain-types/IPYieldContractFactory.ts

@@ -11,7 +11,7 @@ import {
   Signer,
   utils,
 } from "ethers";
-import { FunctionFragment, Result } from "@ethersproject/abi";
+import { FunctionFragment, Result, EventFragment } from "@ethersproject/abi";
 import { Listener, Provider } from "@ethersproject/providers";
 import type {
   TypedEventFilter,
@@ -24,10 +24,10 @@ export interface IPYieldContractFactoryInterface extends utils.Interface {
   contractName: "IPYieldContractFactory";
   functions: {
     "expiryDivisor()": FunctionFragment;
-    "getOT(address,uint256)": FunctionFragment;
+    "getPT(address,uint256)": FunctionFragment;
     "getYT(address,uint256)": FunctionFragment;
     "interestFeeRate()": FunctionFragment;
-    "isOT(address)": FunctionFragment;
+    "isPT(address)": FunctionFragment;
     "isYT(address)": FunctionFragment;
     "treasury()": FunctionFragment;
   };
@@ -37,7 +37,7 @@ export interface IPYieldContractFactoryInterface extends utils.Interface {
     values?: undefined
   ): string;
   encodeFunctionData(
-    functionFragment: "getOT",
+    functionFragment: "getPT",
     values: [string, BigNumberish]
   ): string;
   encodeFunctionData(
@@ -48,7 +48,7 @@ export interface IPYieldContractFactoryInterface extends utils.Interface {
     functionFragment: "interestFeeRate",
     values?: undefined
   ): string;
-  encodeFunctionData(functionFragment: "isOT", values: [string]): string;
+  encodeFunctionData(functionFragment: "isPT", values: [string]): string;
   encodeFunctionData(functionFragment: "isYT", values: [string]): string;
   encodeFunctionData(functionFragment: "treasury", values?: undefined): string;
 
@@ -56,19 +56,57 @@ export interface IPYieldContractFactoryInterface extends utils.Interface {
     functionFragment: "expiryDivisor",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(functionFragment: "getOT", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "getPT", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "getYT", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "interestFeeRate",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(functionFragment: "isOT", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "isPT", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "isYT", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "treasury", data: BytesLike): Result;
 
-  events: {};
+  events: {
+    "CreateYieldContract(address,address,address,uint256)": EventFragment;
+    "SetExpiryDivisor(uint256)": EventFragment;
+    "SetInterestFeeRate(uint256)": EventFragment;
+    "SetTreasury(address)": EventFragment;
+  };
+
+  getEvent(nameOrSignatureOrTopic: "CreateYieldContract"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "SetExpiryDivisor"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "SetInterestFeeRate"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "SetTreasury"): EventFragment;
 }
 
+export type CreateYieldContractEvent = TypedEvent<
+  [string, string, string, BigNumber],
+  { SCY: string; PT: string; YT: string; expiry: BigNumber }
+>;
+
+export type CreateYieldContractEventFilter =
+  TypedEventFilter<CreateYieldContractEvent>;
+
+export type SetExpiryDivisorEvent = TypedEvent<
+  [BigNumber],
+  { newExpiryDivisor: BigNumber }
+>;
+
+export type SetExpiryDivisorEventFilter =
+  TypedEventFilter<SetExpiryDivisorEvent>;
+
+export type SetInterestFeeRateEvent = TypedEvent<
+  [BigNumber],
+  { newInterestFeeRate: BigNumber }
+>;
+
+export type SetInterestFeeRateEventFilter =
+  TypedEventFilter<SetInterestFeeRateEvent>;
+
+export type SetTreasuryEvent = TypedEvent<[string], { treasury: string }>;
+
+export type SetTreasuryEventFilter = TypedEventFilter<SetTreasuryEvent>;
+
 export interface IPYieldContractFactory extends BaseContract {
   contractName: "IPYieldContractFactory";
   connect(signerOrProvider: Signer | Provider | string): this;
@@ -99,7 +137,7 @@ export interface IPYieldContractFactory extends BaseContract {
   functions: {
     expiryDivisor(overrides?: CallOverrides): Promise<[BigNumber]>;
 
-    getOT(
+    getPT(
       SCY: string,
       expiry: BigNumberish,
       overrides?: CallOverrides
@@ -113,7 +151,7 @@ export interface IPYieldContractFactory extends BaseContract {
 
     interestFeeRate(overrides?: CallOverrides): Promise<[BigNumber]>;
 
-    isOT(arg0: string, overrides?: CallOverrides): Promise<[boolean]>;
+    isPT(arg0: string, overrides?: CallOverrides): Promise<[boolean]>;
 
     isYT(arg0: string, overrides?: CallOverrides): Promise<[boolean]>;
 
@@ -122,7 +160,7 @@ export interface IPYieldContractFactory extends BaseContract {
 
   expiryDivisor(overrides?: CallOverrides): Promise<BigNumber>;
 
-  getOT(
+  getPT(
     SCY: string,
     expiry: BigNumberish,
     overrides?: CallOverrides
@@ -136,7 +174,7 @@ export interface IPYieldContractFactory extends BaseContract {
 
   interestFeeRate(overrides?: CallOverrides): Promise<BigNumber>;
 
-  isOT(arg0: string, overrides?: CallOverrides): Promise<boolean>;
+  isPT(arg0: string, overrides?: CallOverrides): Promise<boolean>;
 
   isYT(arg0: string, overrides?: CallOverrides): Promise<boolean>;
 
@@ -145,7 +183,7 @@ export interface IPYieldContractFactory extends BaseContract {
   callStatic: {
     expiryDivisor(overrides?: CallOverrides): Promise<BigNumber>;
 
-    getOT(
+    getPT(
       SCY: string,
       expiry: BigNumberish,
       overrides?: CallOverrides
@@ -159,19 +197,47 @@ export interface IPYieldContractFactory extends BaseContract {
 
     interestFeeRate(overrides?: CallOverrides): Promise<BigNumber>;
 
-    isOT(arg0: string, overrides?: CallOverrides): Promise<boolean>;
+    isPT(arg0: string, overrides?: CallOverrides): Promise<boolean>;
 
     isYT(arg0: string, overrides?: CallOverrides): Promise<boolean>;
 
     treasury(overrides?: CallOverrides): Promise<string>;
   };
 
-  filters: {};
+  filters: {
+    "CreateYieldContract(address,address,address,uint256)"(
+      SCY?: string | null,
+      PT?: null,
+      YT?: null,
+      expiry?: null
+    ): CreateYieldContractEventFilter;
+    CreateYieldContract(
+      SCY?: string | null,
+      PT?: null,
+      YT?: null,
+      expiry?: null
+    ): CreateYieldContractEventFilter;
+
+    "SetExpiryDivisor(uint256)"(
+      newExpiryDivisor?: null
+    ): SetExpiryDivisorEventFilter;
+    SetExpiryDivisor(newExpiryDivisor?: null): SetExpiryDivisorEventFilter;
+
+    "SetInterestFeeRate(uint256)"(
+      newInterestFeeRate?: null
+    ): SetInterestFeeRateEventFilter;
+    SetInterestFeeRate(
+      newInterestFeeRate?: null
+    ): SetInterestFeeRateEventFilter;
+
+    "SetTreasury(address)"(treasury?: string | null): SetTreasuryEventFilter;
+    SetTreasury(treasury?: string | null): SetTreasuryEventFilter;
+  };
 
   estimateGas: {
     expiryDivisor(overrides?: CallOverrides): Promise<BigNumber>;
 
-    getOT(
+    getPT(
       SCY: string,
       expiry: BigNumberish,
       overrides?: CallOverrides
@@ -185,7 +251,7 @@ export interface IPYieldContractFactory extends BaseContract {
 
     interestFeeRate(overrides?: CallOverrides): Promise<BigNumber>;
 
-    isOT(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
+    isPT(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
 
     isYT(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
 
@@ -195,7 +261,7 @@ export interface IPYieldContractFactory extends BaseContract {
   populateTransaction: {
     expiryDivisor(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    getOT(
+    getPT(
       SCY: string,
       expiry: BigNumberish,
       overrides?: CallOverrides
@@ -209,7 +275,7 @@ export interface IPYieldContractFactory extends BaseContract {
 
     interestFeeRate(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    isOT(
+    isPT(
       arg0: string,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;

package/typechain-types/IPYieldToken.ts

@@ -25,7 +25,7 @@ import type {
 export interface IPYieldTokenInterface extends utils.Interface {
   contractName: "IPYieldToken";
   functions: {
-    "OT()": FunctionFragment;
+    "PT()": FunctionFragment;
     "SCY()": FunctionFragment;
     "allowance(address,address)": FunctionFragment;
     "approve(address,uint256)": FunctionFragment;
@@ -35,14 +35,15 @@ export interface IPYieldTokenInterface extends utils.Interface {
     "getGlobalReward(address)": FunctionFragment;
     "getInterestData(address)": FunctionFragment;
     "getRewardTokens()": FunctionFragment;
-    "getScyIndexBeforeExpiry()": FunctionFragment;
+    "getScyIndex()": FunctionFragment;
     "getUserReward(address,address)": FunctionFragment;
     "isExpired()": FunctionFragment;
-    "mintYO(address,address)": FunctionFragment;
+    "mintPY(address,address)": FunctionFragment;
     "name()": FunctionFragment;
     "redeemDueInterest(address)": FunctionFragment;
+    "redeemDueInterestAndRewards(address)": FunctionFragment;
     "redeemDueRewards(address)": FunctionFragment;
-    "redeemYO(address)": FunctionFragment;
+    "redeemPY(address)": FunctionFragment;
     "symbol()": FunctionFragment;
     "totalSupply()": FunctionFragment;
     "transfer(address,uint256)": FunctionFragment;
@@ -53,7 +54,7 @@ export interface IPYieldTokenInterface extends utils.Interface {
     "withdrawFeeToTreasury()": FunctionFragment;
   };
 
-  encodeFunctionData(functionFragment: "OT", values?: undefined): string;
+  encodeFunctionData(functionFragment: "PT", values?: undefined): string;
   encodeFunctionData(functionFragment: "SCY", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "allowance",
@@ -79,7 +80,7 @@ export interface IPYieldTokenInterface extends utils.Interface {
     values?: undefined
   ): string;
   encodeFunctionData(
-    functionFragment: "getScyIndexBeforeExpiry",
+    functionFragment: "getScyIndex",
     values?: undefined
   ): string;
   encodeFunctionData(
@@ -88,7 +89,7 @@ export interface IPYieldTokenInterface extends utils.Interface {
   ): string;
   encodeFunctionData(functionFragment: "isExpired", values?: undefined): string;
   encodeFunctionData(
-    functionFragment: "mintYO",
+    functionFragment: "mintPY",
     values: [string, string]
   ): string;
   encodeFunctionData(functionFragment: "name", values?: undefined): string;
@@ -96,11 +97,15 @@ export interface IPYieldTokenInterface extends utils.Interface {
     functionFragment: "redeemDueInterest",
     values: [string]
   ): string;
+  encodeFunctionData(
+    functionFragment: "redeemDueInterestAndRewards",
+    values: [string]
+  ): string;
   encodeFunctionData(
     functionFragment: "redeemDueRewards",
     values: [string]
   ): string;
-  encodeFunctionData(functionFragment: "redeemYO", values: [string]): string;
+  encodeFunctionData(functionFragment: "redeemPY", values: [string]): string;
   encodeFunctionData(functionFragment: "symbol", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "totalSupply",
@@ -131,7 +136,7 @@ export interface IPYieldTokenInterface extends utils.Interface {
     values?: undefined
   ): string;
 
-  decodeFunctionResult(functionFragment: "OT", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "PT", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "SCY", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "allowance", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "approve", data: BytesLike): Result;
@@ -151,7 +156,7 @@ export interface IPYieldTokenInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "getScyIndexBeforeExpiry",
+    functionFragment: "getScyIndex",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -159,17 +164,21 @@ export interface IPYieldTokenInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "isExpired", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "mintYO", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "mintPY", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "name", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "redeemDueInterest",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "redeemDueInterestAndRewards",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "redeemDueRewards",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(functionFragment: "redeemYO", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "redeemPY", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "symbol", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "totalSupply",
@@ -199,11 +208,17 @@ export interface IPYieldTokenInterface extends utils.Interface {
 
   events: {
     "Approval(address,address,uint256)": EventFragment;
+    "RedeemInterest(address,uint256)": EventFragment;
+    "RedeemReward(address,uint256[])": EventFragment;
     "Transfer(address,address,uint256)": EventFragment;
+    "WithdrawFeeToTreasury(uint256[],uint256)": EventFragment;
   };
 
   getEvent(nameOrSignatureOrTopic: "Approval"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "RedeemInterest"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "RedeemReward"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "Transfer"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "WithdrawFeeToTreasury"): EventFragment;
 }
 
 export type ApprovalEvent = TypedEvent<
@@ -213,6 +228,20 @@ export type ApprovalEvent = TypedEvent<
 
 export type ApprovalEventFilter = TypedEventFilter<ApprovalEvent>;
 
+export type RedeemInterestEvent = TypedEvent<
+  [string, BigNumber],
+  { user: string; interestOut: BigNumber }
+>;
+
+export type RedeemInterestEventFilter = TypedEventFilter<RedeemInterestEvent>;
+
+export type RedeemRewardEvent = TypedEvent<
+  [string, BigNumber[]],
+  { user: string; amountRewardsOut: BigNumber[] }
+>;
+
+export type RedeemRewardEventFilter = TypedEventFilter<RedeemRewardEvent>;
+
 export type TransferEvent = TypedEvent<
   [string, string, BigNumber],
   { from: string; to: string; value: BigNumber }
@@ -220,6 +249,14 @@ export type TransferEvent = TypedEvent<
 
 export type TransferEventFilter = TypedEventFilter<TransferEvent>;
 
+export type WithdrawFeeToTreasuryEvent = TypedEvent<
+  [BigNumber[], BigNumber],
+  { amountRewardsOut: BigNumber[]; scyOut: BigNumber }
+>;
+
+export type WithdrawFeeToTreasuryEventFilter =
+  TypedEventFilter<WithdrawFeeToTreasuryEvent>;
+
 export interface IPYieldToken extends BaseContract {
   contractName: "IPYieldToken";
   connect(signerOrProvider: Signer | Provider | string): this;
@@ -248,7 +285,7 @@ export interface IPYieldToken extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
-    OT(overrides?: CallOverrides): Promise<[string]>;
+    PT(overrides?: CallOverrides): Promise<[string]>;
 
     SCY(overrides?: CallOverrides): Promise<[string]>;
 
@@ -289,7 +326,7 @@ export interface IPYieldToken extends BaseContract {
 
     getRewardTokens(overrides?: CallOverrides): Promise<[string[]]>;
 
-    getScyIndexBeforeExpiry(
+    getScyIndex(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -306,8 +343,8 @@ export interface IPYieldToken extends BaseContract {
 
     isExpired(overrides?: CallOverrides): Promise<[boolean]>;
 
-    mintYO(
-      receiverOT: string,
+    mintPY(
+      receiverPT: string,
       receiverYT: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
@@ -319,12 +356,17 @@ export interface IPYieldToken extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
+    redeemDueInterestAndRewards(
+      user: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
     redeemDueRewards(
       user: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    redeemYO(
+    redeemPY(
       receiver: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
@@ -365,7 +407,7 @@ export interface IPYieldToken extends BaseContract {
     ): Promise<ContractTransaction>;
   };
 
-  OT(overrides?: CallOverrides): Promise<string>;
+  PT(overrides?: CallOverrides): Promise<string>;
 
   SCY(overrides?: CallOverrides): Promise<string>;
 
@@ -403,7 +445,7 @@ export interface IPYieldToken extends BaseContract {
 
   getRewardTokens(overrides?: CallOverrides): Promise<string[]>;
 
-  getScyIndexBeforeExpiry(
+  getScyIndex(
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -417,8 +459,8 @@ export interface IPYieldToken extends BaseContract {
 
   isExpired(overrides?: CallOverrides): Promise<boolean>;
 
-  mintYO(
-    receiverOT: string,
+  mintPY(
+    receiverPT: string,
     receiverYT: string,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
@@ -430,12 +472,17 @@ export interface IPYieldToken extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  redeemDueInterestAndRewards(
+    user: string,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   redeemDueRewards(
     user: string,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  redeemYO(
+  redeemPY(
     receiver: string,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
@@ -476,7 +523,7 @@ export interface IPYieldToken extends BaseContract {
   ): Promise<ContractTransaction>;
 
   callStatic: {
-    OT(overrides?: CallOverrides): Promise<string>;
+    PT(overrides?: CallOverrides): Promise<string>;
 
     SCY(overrides?: CallOverrides): Promise<string>;
 
@@ -517,7 +564,14 @@ export interface IPYieldToken extends BaseContract {
 
     getRewardTokens(overrides?: CallOverrides): Promise<string[]>;
 
-    getScyIndexBeforeExpiry(overrides?: CallOverrides): Promise<BigNumber>;
+    getScyIndex(
+      overrides?: CallOverrides
+    ): Promise<
+      [BigNumber, BigNumber] & {
+        currentIndex: BigNumber;
+        lastIndexBeforeExpiry: BigNumber;
+      }
+    >;
 
     getUserReward(
       user: string,
@@ -532,8 +586,8 @@ export interface IPYieldToken extends BaseContract {
 
     isExpired(overrides?: CallOverrides): Promise<boolean>;
 
-    mintYO(
-      receiverOT: string,
+    mintPY(
+      receiverPT: string,
       receiverYT: string,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
@@ -545,12 +599,22 @@ export interface IPYieldToken extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
+    redeemDueInterestAndRewards(
+      user: string,
+      overrides?: CallOverrides
+    ): Promise<
+      [BigNumber, BigNumber[]] & {
+        interestOut: BigNumber;
+        rewardsOut: BigNumber[];
+      }
+    >;
+
     redeemDueRewards(
       user: string,
       overrides?: CallOverrides
     ): Promise<BigNumber[]>;
 
-    redeemYO(receiver: string, overrides?: CallOverrides): Promise<BigNumber>;
+    redeemPY(receiver: string, overrides?: CallOverrides): Promise<BigNumber>;
 
     symbol(overrides?: CallOverrides): Promise<string>;
 
@@ -590,6 +654,24 @@ export interface IPYieldToken extends BaseContract {
       value?: null
     ): ApprovalEventFilter;
 
+    "RedeemInterest(address,uint256)"(
+      user?: string | null,
+      interestOut?: null
+    ): RedeemInterestEventFilter;
+    RedeemInterest(
+      user?: string | null,
+      interestOut?: null
+    ): RedeemInterestEventFilter;
+
+    "RedeemReward(address,uint256[])"(
+      user?: string | null,
+      amountRewardsOut?: null
+    ): RedeemRewardEventFilter;
+    RedeemReward(
+      user?: string | null,
+      amountRewardsOut?: null
+    ): RedeemRewardEventFilter;
+
     "Transfer(address,address,uint256)"(
       from?: string | null,
       to?: string | null,
@@ -600,10 +682,19 @@ export interface IPYieldToken extends BaseContract {
       to?: string | null,
       value?: null
     ): TransferEventFilter;
+
+    "WithdrawFeeToTreasury(uint256[],uint256)"(
+      amountRewardsOut?: null,
+      scyOut?: null
+    ): WithdrawFeeToTreasuryEventFilter;
+    WithdrawFeeToTreasury(
+      amountRewardsOut?: null,
+      scyOut?: null
+    ): WithdrawFeeToTreasuryEventFilter;
   };
 
   estimateGas: {
-    OT(overrides?: CallOverrides): Promise<BigNumber>;
+    PT(overrides?: CallOverrides): Promise<BigNumber>;
 
     SCY(overrides?: CallOverrides): Promise<BigNumber>;
 
@@ -637,7 +728,7 @@ export interface IPYieldToken extends BaseContract {
 
     getRewardTokens(overrides?: CallOverrides): Promise<BigNumber>;
 
-    getScyIndexBeforeExpiry(
+    getScyIndex(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -649,8 +740,8 @@ export interface IPYieldToken extends BaseContract {
 
     isExpired(overrides?: CallOverrides): Promise<BigNumber>;
 
-    mintYO(
-      receiverOT: string,
+    mintPY(
+      receiverPT: string,
       receiverYT: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
@@ -662,12 +753,17 @@ export interface IPYieldToken extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
+    redeemDueInterestAndRewards(
+      user: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
     redeemDueRewards(
       user: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    redeemYO(
+    redeemPY(
       receiver: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
@@ -709,7 +805,7 @@ export interface IPYieldToken extends BaseContract {
   };
 
   populateTransaction: {
-    OT(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+    PT(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     SCY(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
@@ -746,7 +842,7 @@ export interface IPYieldToken extends BaseContract {
 
     getRewardTokens(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    getScyIndexBeforeExpiry(
+    getScyIndex(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -758,8 +854,8 @@ export interface IPYieldToken extends BaseContract {
 
     isExpired(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    mintYO(
-      receiverOT: string,
+    mintPY(
+      receiverPT: string,
       receiverYT: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
@@ -771,12 +867,17 @@ export interface IPYieldToken extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
+    redeemDueInterestAndRewards(
+      user: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
     redeemDueRewards(
       user: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    redeemYO(
+    redeemPY(
       receiver: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;