@pendle/core-v2 0.17.8-testnet → 0.19.0-testnet

package/typechain-types/IPFeeDistributor.ts

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

package/typechain-types/IPFeeDistributorFactory.ts

@@ -1,19 +1,8 @@
 /* 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 } from "@ethersproject/abi";
+import { BaseContract, BigNumber, BigNumberish, Signer, utils } from "ethers";
+import { EventFragment } from "@ethersproject/abi";
 import { Listener, Provider } from "@ethersproject/providers";
 import type {
   TypedEventFilter,
@@ -24,41 +13,31 @@ import type {
 
 export interface IPFeeDistributorFactoryInterface extends utils.Interface {
   contractName: "IPFeeDistributorFactory";
-  functions: {
-    "getUserAndTotalSharesAt(address,address,uint256)": FunctionFragment;
-    "lastFinishedEpoch()": FunctionFragment;
-    "updateUserShare(address,address)": FunctionFragment;
+  functions: {};
+
+  events: {
+    "ClaimReward(address,address,uint256,uint256)": EventFragment;
+    "Fund(address,uint256,uint256)": 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: {};
+  getEvent(nameOrSignatureOrTopic: "ClaimReward"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "Fund"): EventFragment;
 }
 
+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;
@@ -86,102 +65,37 @@ export interface IPFeeDistributorFactory extends BaseContract {
   once: OnEvent<this>;
   removeListener: OnEvent<this>;
 
-  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>;
+  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;
   };
 
-  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>;
-  };
+  estimateGas: {};
 
-  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>;
-  };
+  populateTransaction: {};
 }

package/typechain-types/MarketMathStatic.ts

@@ -20,10 +20,33 @@ import type {
   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 MarketMathStaticInterface extends utils.Interface {
   contractName: "MarketMathStatic";
   functions: {
     "addLiquidityDualSyAndPtStatic(address,uint256,uint256)": FunctionFragment;
+    "getDefaultApproxParams()": FunctionFragment;
     "getPtImpliedYield(address)": FunctionFragment;
     "removeLiquidityDualSyAndPtStatic(address,uint256)": FunctionFragment;
   };
@@ -32,6 +55,10 @@ export interface MarketMathStaticInterface extends utils.Interface {
     functionFragment: "addLiquidityDualSyAndPtStatic",
     values: [string, BigNumberish, BigNumberish]
   ): string;
+  encodeFunctionData(
+    functionFragment: "getDefaultApproxParams",
+    values?: undefined
+  ): string;
   encodeFunctionData(
     functionFragment: "getPtImpliedYield",
     values: [string]
@@ -45,6 +72,10 @@ export interface MarketMathStaticInterface extends utils.Interface {
     functionFragment: "addLiquidityDualSyAndPtStatic",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "getDefaultApproxParams",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "getPtImpliedYield",
     data: BytesLike
@@ -98,6 +129,10 @@ export interface MarketMathStatic extends BaseContract {
       }
     >;
 
+    getDefaultApproxParams(
+      overrides?: CallOverrides
+    ): Promise<[ApproxParamsStructOutput]>;
+
     getPtImpliedYield(
       market: string,
       overrides?: CallOverrides
@@ -125,6 +160,10 @@ export interface MarketMathStatic extends BaseContract {
     }
   >;
 
+  getDefaultApproxParams(
+    overrides?: CallOverrides
+  ): Promise<ApproxParamsStructOutput>;
+
   getPtImpliedYield(
     market: string,
     overrides?: CallOverrides
@@ -152,6 +191,10 @@ export interface MarketMathStatic extends BaseContract {
       }
     >;
 
+    getDefaultApproxParams(
+      overrides?: CallOverrides
+    ): Promise<ApproxParamsStructOutput>;
+
     getPtImpliedYield(
       market: string,
       overrides?: CallOverrides
@@ -176,6 +219,8 @@ export interface MarketMathStatic extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
+    getDefaultApproxParams(overrides?: CallOverrides): Promise<BigNumber>;
+
     getPtImpliedYield(
       market: string,
       overrides?: CallOverrides
@@ -196,6 +241,10 @@ export interface MarketMathStatic extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
+    getDefaultApproxParams(
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
     getPtImpliedYield(
       market: string,
       overrides?: CallOverrides