@pendle/core-v2 6.2.1 → 6.2.2-sweed

package/typechain-types/{PendleMarketFactory.ts → PendleMarketFactoryV6Upg.ts}

@@ -22,15 +22,15 @@ import type {
   OnEvent,
 } from "./common";
 
-export interface PendleMarketFactoryInterface extends utils.Interface {
-  contractName: "PendleMarketFactory";
+export interface PendleMarketFactoryV6UpgInterface extends utils.Interface {
+  contractName: "PendleMarketFactoryV6Upg";
   functions: {
+    "VERSION()": FunctionFragment;
     "claimOwnership()": FunctionFragment;
-    "createNewMarket(address,int256,int256)": FunctionFragment;
-    "defaultFee()": FunctionFragment;
+    "createNewMarket(address,int256,int256,uint80)": FunctionFragment;
     "gaugeController()": FunctionFragment;
-    "getMarketConfig(address)": FunctionFragment;
-    "initialize(address,uint80,uint8,address,address)": FunctionFragment;
+    "getMarketConfig(address,address)": FunctionFragment;
+    "initialize(address,address,uint8)": FunctionFragment;
     "isValidMarket(address)": FunctionFragment;
     "marketCreationCodeContractA()": FunctionFragment;
     "marketCreationCodeContractB()": FunctionFragment;
@@ -39,30 +39,25 @@ export interface PendleMarketFactoryInterface extends utils.Interface {
     "maxLnFeeRateRoot()": FunctionFragment;
     "maxReserveFeePercent()": FunctionFragment;
     "minInitialAnchor()": FunctionFragment;
-    "overriddenFee(address)": FunctionFragment;
     "owner()": FunctionFragment;
     "pendingOwner()": FunctionFragment;
-    "setDefaultFee(uint80,uint8)": FunctionFragment;
-    "setOverriddenFee(address,uint80,uint8)": FunctionFragment;
-    "setTreasury(address)": FunctionFragment;
+    "reserveFeePercent()": FunctionFragment;
+    "setOverriddenFee(address,address,uint80)": FunctionFragment;
+    "setTreasuryAndFeeReserve(address,uint8)": FunctionFragment;
     "transferOwnership(address,bool,bool)": FunctionFragment;
     "treasury()": FunctionFragment;
-    "unsetOverriddenFee(address)": FunctionFragment;
     "vePendle()": FunctionFragment;
     "yieldContractFactory()": FunctionFragment;
   };
 
+  encodeFunctionData(functionFragment: "VERSION", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "claimOwnership",
     values?: undefined
   ): string;
   encodeFunctionData(
     functionFragment: "createNewMarket",
-    values: [string, BigNumberish, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "defaultFee",
-    values?: undefined
+    values: [string, BigNumberish, BigNumberish, BigNumberish]
   ): string;
   encodeFunctionData(
     functionFragment: "gaugeController",
@@ -70,11 +65,11 @@ export interface PendleMarketFactoryInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "getMarketConfig",
-    values: [string]
+    values: [string, string]
   ): string;
   encodeFunctionData(
     functionFragment: "initialize",
-    values: [string, BigNumberish, BigNumberish, string, string]
+    values: [string, string, BigNumberish]
   ): string;
   encodeFunctionData(
     functionFragment: "isValidMarket",
@@ -108,39 +103,35 @@ export interface PendleMarketFactoryInterface extends utils.Interface {
     functionFragment: "minInitialAnchor",
     values?: undefined
   ): string;
-  encodeFunctionData(
-    functionFragment: "overriddenFee",
-    values: [string]
-  ): string;
   encodeFunctionData(functionFragment: "owner", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "pendingOwner",
     values?: undefined
   ): string;
   encodeFunctionData(
-    functionFragment: "setDefaultFee",
-    values: [BigNumberish, BigNumberish]
+    functionFragment: "reserveFeePercent",
+    values?: undefined
   ): string;
   encodeFunctionData(
     functionFragment: "setOverriddenFee",
-    values: [string, BigNumberish, BigNumberish]
+    values: [string, string, BigNumberish]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "setTreasuryAndFeeReserve",
+    values: [string, BigNumberish]
   ): string;
-  encodeFunctionData(functionFragment: "setTreasury", values: [string]): string;
   encodeFunctionData(
     functionFragment: "transferOwnership",
     values: [string, boolean, boolean]
   ): string;
   encodeFunctionData(functionFragment: "treasury", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "unsetOverriddenFee",
-    values: [string]
-  ): string;
   encodeFunctionData(functionFragment: "vePendle", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "yieldContractFactory",
     values?: undefined
   ): string;
 
+  decodeFunctionResult(functionFragment: "VERSION", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "claimOwnership",
     data: BytesLike
@@ -149,7 +140,6 @@ export interface PendleMarketFactoryInterface extends utils.Interface {
     functionFragment: "createNewMarket",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(functionFragment: "defaultFee", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "gaugeController",
     data: BytesLike
@@ -191,17 +181,13 @@ export interface PendleMarketFactoryInterface extends utils.Interface {
     functionFragment: "minInitialAnchor",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "overriddenFee",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "pendingOwner",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "setDefaultFee",
+    functionFragment: "reserveFeePercent",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -209,7 +195,7 @@ export interface PendleMarketFactoryInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "setTreasury",
+    functionFragment: "setTreasuryAndFeeReserve",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -217,10 +203,6 @@ export interface PendleMarketFactoryInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "treasury", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "unsetOverriddenFee",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(functionFragment: "vePendle", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "yieldContractFactory",
@@ -228,29 +210,28 @@ export interface PendleMarketFactoryInterface extends utils.Interface {
   ): Result;
 
   events: {
-    "CreateNewMarket(address,address,int256,int256)": EventFragment;
+    "CreateNewMarket(address,address,int256,int256,uint256)": EventFragment;
     "Initialized(uint8)": EventFragment;
-    "NewMarketConfig(address,uint80,uint8)": EventFragment;
+    "NewTreasuryAndFeeReserve(address,uint8)": EventFragment;
     "OwnershipTransferred(address,address)": EventFragment;
-    "SetOverriddenFee(address,uint80,uint8)": EventFragment;
-    "UnsetOverriddenFee(address)": EventFragment;
+    "SetOverriddenFee(address,address,uint80)": EventFragment;
   };
 
   getEvent(nameOrSignatureOrTopic: "CreateNewMarket"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "Initialized"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "NewMarketConfig"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "NewTreasuryAndFeeReserve"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "OwnershipTransferred"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "SetOverriddenFee"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "UnsetOverriddenFee"): EventFragment;
 }
 
 export type CreateNewMarketEvent = TypedEvent<
-  [string, string, BigNumber, BigNumber],
+  [string, string, BigNumber, BigNumber, BigNumber],
   {
     market: string;
     PT: string;
     scalarRoot: BigNumber;
     initialAnchor: BigNumber;
+    lnFeeRateRoot: BigNumber;
   }
 >;
 
@@ -260,16 +241,13 @@ export type InitializedEvent = TypedEvent<[number], { version: number }>;
 
 export type InitializedEventFilter = TypedEventFilter<InitializedEvent>;
 
-export type NewMarketConfigEvent = TypedEvent<
-  [string, BigNumber, number],
-  {
-    treasury: string;
-    defaultLnFeeRateRoot: BigNumber;
-    reserveFeePercent: number;
-  }
+export type NewTreasuryAndFeeReserveEvent = TypedEvent<
+  [string, number],
+  { treasury: string; reserveFeePercent: number }
 >;
 
-export type NewMarketConfigEventFilter = TypedEventFilter<NewMarketConfigEvent>;
+export type NewTreasuryAndFeeReserveEventFilter =
+  TypedEventFilter<NewTreasuryAndFeeReserveEvent>;
 
 export type OwnershipTransferredEvent = TypedEvent<
   [string, string],
@@ -280,25 +258,20 @@ export type OwnershipTransferredEventFilter =
   TypedEventFilter<OwnershipTransferredEvent>;
 
 export type SetOverriddenFeeEvent = TypedEvent<
-  [string, BigNumber, number],
-  { router: string; lnFeeRateRoot: BigNumber; reserveFeePercent: number }
+  [string, string, BigNumber],
+  { router: string; market: string; lnFeeRateRoot: BigNumber }
 >;
 
 export type SetOverriddenFeeEventFilter =
   TypedEventFilter<SetOverriddenFeeEvent>;
 
-export type UnsetOverriddenFeeEvent = TypedEvent<[string], { router: string }>;
-
-export type UnsetOverriddenFeeEventFilter =
-  TypedEventFilter<UnsetOverriddenFeeEvent>;
-
-export interface PendleMarketFactory extends BaseContract {
-  contractName: "PendleMarketFactory";
+export interface PendleMarketFactoryV6Upg extends BaseContract {
+  contractName: "PendleMarketFactoryV6Upg";
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
   deployed(): Promise<this>;
 
-  interface: PendleMarketFactoryInterface;
+  interface: PendleMarketFactoryV6UpgInterface;
 
   queryFilter<TEvent extends TypedEvent>(
     event: TypedEventFilter<TEvent>,
@@ -320,6 +293,8 @@ export interface PendleMarketFactory extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
+    VERSION(overrides?: CallOverrides): Promise<[BigNumber]>;
+
     claimOwnership(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
@@ -328,38 +303,28 @@ export interface PendleMarketFactory extends BaseContract {
       PT: string,
       scalarRoot: BigNumberish,
       initialAnchor: BigNumberish,
+      lnFeeRateRoot: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    defaultFee(
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, number, boolean] & {
-        lnFeeRateRoot: BigNumber;
-        reserveFeePercent: number;
-        active: boolean;
-      }
-    >;
-
     gaugeController(overrides?: CallOverrides): Promise<[string]>;
 
     getMarketConfig(
+      market: string,
       router: string,
       overrides?: CallOverrides
     ): Promise<
       [string, BigNumber, number] & {
         _treasury: string;
-        _lnFeeRateRoot: BigNumber;
+        _overriddenFee: BigNumber;
         _reserveFeePercent: number;
       }
     >;
 
     initialize(
+      _owner: string,
       _treasury: string,
-      _defaultLnFeeRateRoot: BigNumberish,
-      _defaultReserveFeePercent: BigNumberish,
-      newVePendle: string,
-      newGaugeController: string,
+      _reserveFeePercent: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -382,36 +347,22 @@ export interface PendleMarketFactory extends BaseContract {
 
     minInitialAnchor(overrides?: CallOverrides): Promise<[BigNumber]>;
 
-    overriddenFee(
-      arg0: string,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, number, boolean] & {
-        lnFeeRateRoot: BigNumber;
-        reserveFeePercent: number;
-        active: boolean;
-      }
-    >;
-
     owner(overrides?: CallOverrides): Promise<[string]>;
 
     pendingOwner(overrides?: CallOverrides): Promise<[string]>;
 
-    setDefaultFee(
-      newLnFeeRateRoot: BigNumberish,
-      newReserveFeePercent: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
+    reserveFeePercent(overrides?: CallOverrides): Promise<[number]>;
 
     setOverriddenFee(
       router: string,
-      newLnFeeRateRoot: BigNumberish,
-      newReserveFeePercent: BigNumberish,
+      market: string,
+      newFee: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    setTreasury(
+    setTreasuryAndFeeReserve(
       newTreasury: string,
+      newReserveFeePercent: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -424,16 +375,13 @@ export interface PendleMarketFactory extends BaseContract {
 
     treasury(overrides?: CallOverrides): Promise<[string]>;
 
-    unsetOverriddenFee(
-      router: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
     vePendle(overrides?: CallOverrides): Promise<[string]>;
 
     yieldContractFactory(overrides?: CallOverrides): Promise<[string]>;
   };
 
+  VERSION(overrides?: CallOverrides): Promise<BigNumber>;
+
   claimOwnership(
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
@@ -442,38 +390,28 @@ export interface PendleMarketFactory extends BaseContract {
     PT: string,
     scalarRoot: BigNumberish,
     initialAnchor: BigNumberish,
+    lnFeeRateRoot: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  defaultFee(
-    overrides?: CallOverrides
-  ): Promise<
-    [BigNumber, number, boolean] & {
-      lnFeeRateRoot: BigNumber;
-      reserveFeePercent: number;
-      active: boolean;
-    }
-  >;
-
   gaugeController(overrides?: CallOverrides): Promise<string>;
 
   getMarketConfig(
+    market: string,
     router: string,
     overrides?: CallOverrides
   ): Promise<
     [string, BigNumber, number] & {
       _treasury: string;
-      _lnFeeRateRoot: BigNumber;
+      _overriddenFee: BigNumber;
       _reserveFeePercent: number;
     }
   >;
 
   initialize(
+    _owner: string,
     _treasury: string,
-    _defaultLnFeeRateRoot: BigNumberish,
-    _defaultReserveFeePercent: BigNumberish,
-    newVePendle: string,
-    newGaugeController: string,
+    _reserveFeePercent: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -493,36 +431,22 @@ export interface PendleMarketFactory extends BaseContract {
 
   minInitialAnchor(overrides?: CallOverrides): Promise<BigNumber>;
 
-  overriddenFee(
-    arg0: string,
-    overrides?: CallOverrides
-  ): Promise<
-    [BigNumber, number, boolean] & {
-      lnFeeRateRoot: BigNumber;
-      reserveFeePercent: number;
-      active: boolean;
-    }
-  >;
-
   owner(overrides?: CallOverrides): Promise<string>;
 
   pendingOwner(overrides?: CallOverrides): Promise<string>;
 
-  setDefaultFee(
-    newLnFeeRateRoot: BigNumberish,
-    newReserveFeePercent: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
+  reserveFeePercent(overrides?: CallOverrides): Promise<number>;
 
   setOverriddenFee(
     router: string,
-    newLnFeeRateRoot: BigNumberish,
-    newReserveFeePercent: BigNumberish,
+    market: string,
+    newFee: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  setTreasury(
+  setTreasuryAndFeeReserve(
     newTreasury: string,
+    newReserveFeePercent: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -535,54 +459,41 @@ export interface PendleMarketFactory extends BaseContract {
 
   treasury(overrides?: CallOverrides): Promise<string>;
 
-  unsetOverriddenFee(
-    router: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
   vePendle(overrides?: CallOverrides): Promise<string>;
 
   yieldContractFactory(overrides?: CallOverrides): Promise<string>;
 
   callStatic: {
+    VERSION(overrides?: CallOverrides): Promise<BigNumber>;
+
     claimOwnership(overrides?: CallOverrides): Promise<void>;
 
     createNewMarket(
       PT: string,
       scalarRoot: BigNumberish,
       initialAnchor: BigNumberish,
+      lnFeeRateRoot: BigNumberish,
       overrides?: CallOverrides
     ): Promise<string>;
 
-    defaultFee(
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, number, boolean] & {
-        lnFeeRateRoot: BigNumber;
-        reserveFeePercent: number;
-        active: boolean;
-      }
-    >;
-
     gaugeController(overrides?: CallOverrides): Promise<string>;
 
     getMarketConfig(
+      market: string,
       router: string,
       overrides?: CallOverrides
     ): Promise<
       [string, BigNumber, number] & {
         _treasury: string;
-        _lnFeeRateRoot: BigNumber;
+        _overriddenFee: BigNumber;
         _reserveFeePercent: number;
       }
     >;
 
     initialize(
+      _owner: string,
       _treasury: string,
-      _defaultLnFeeRateRoot: BigNumberish,
-      _defaultReserveFeePercent: BigNumberish,
-      newVePendle: string,
-      newGaugeController: string,
+      _reserveFeePercent: BigNumberish,
       overrides?: CallOverrides
     ): Promise<void>;
 
@@ -602,35 +513,24 @@ export interface PendleMarketFactory extends BaseContract {
 
     minInitialAnchor(overrides?: CallOverrides): Promise<BigNumber>;
 
-    overriddenFee(
-      arg0: string,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, number, boolean] & {
-        lnFeeRateRoot: BigNumber;
-        reserveFeePercent: number;
-        active: boolean;
-      }
-    >;
-
     owner(overrides?: CallOverrides): Promise<string>;
 
     pendingOwner(overrides?: CallOverrides): Promise<string>;
 
-    setDefaultFee(
-      newLnFeeRateRoot: BigNumberish,
-      newReserveFeePercent: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
+    reserveFeePercent(overrides?: CallOverrides): Promise<number>;
 
     setOverriddenFee(
       router: string,
-      newLnFeeRateRoot: BigNumberish,
-      newReserveFeePercent: BigNumberish,
+      market: string,
+      newFee: BigNumberish,
       overrides?: CallOverrides
     ): Promise<void>;
 
-    setTreasury(newTreasury: string, overrides?: CallOverrides): Promise<void>;
+    setTreasuryAndFeeReserve(
+      newTreasury: string,
+      newReserveFeePercent: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<void>;
 
     transferOwnership(
       newOwner: string,
@@ -641,43 +541,38 @@ export interface PendleMarketFactory extends BaseContract {
 
     treasury(overrides?: CallOverrides): Promise<string>;
 
-    unsetOverriddenFee(
-      router: string,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
     vePendle(overrides?: CallOverrides): Promise<string>;
 
     yieldContractFactory(overrides?: CallOverrides): Promise<string>;
   };
 
   filters: {
-    "CreateNewMarket(address,address,int256,int256)"(
+    "CreateNewMarket(address,address,int256,int256,uint256)"(
       market?: string | null,
       PT?: string | null,
       scalarRoot?: null,
-      initialAnchor?: null
+      initialAnchor?: null,
+      lnFeeRateRoot?: null
     ): CreateNewMarketEventFilter;
     CreateNewMarket(
       market?: string | null,
       PT?: string | null,
       scalarRoot?: null,
-      initialAnchor?: null
+      initialAnchor?: null,
+      lnFeeRateRoot?: null
     ): CreateNewMarketEventFilter;
 
     "Initialized(uint8)"(version?: null): InitializedEventFilter;
     Initialized(version?: null): InitializedEventFilter;
 
-    "NewMarketConfig(address,uint80,uint8)"(
+    "NewTreasuryAndFeeReserve(address,uint8)"(
       treasury?: string | null,
-      defaultLnFeeRateRoot?: null,
       reserveFeePercent?: null
-    ): NewMarketConfigEventFilter;
-    NewMarketConfig(
+    ): NewTreasuryAndFeeReserveEventFilter;
+    NewTreasuryAndFeeReserve(
       treasury?: string | null,
-      defaultLnFeeRateRoot?: null,
       reserveFeePercent?: null
-    ): NewMarketConfigEventFilter;
+    ): NewTreasuryAndFeeReserveEventFilter;
 
     "OwnershipTransferred(address,address)"(
       previousOwner?: string | null,
@@ -688,24 +583,21 @@ export interface PendleMarketFactory extends BaseContract {
       newOwner?: string | null
     ): OwnershipTransferredEventFilter;
 
-    "SetOverriddenFee(address,uint80,uint8)"(
+    "SetOverriddenFee(address,address,uint80)"(
       router?: string | null,
-      lnFeeRateRoot?: null,
-      reserveFeePercent?: null
+      market?: string | null,
+      lnFeeRateRoot?: null
     ): SetOverriddenFeeEventFilter;
     SetOverriddenFee(
       router?: string | null,
-      lnFeeRateRoot?: null,
-      reserveFeePercent?: null
+      market?: string | null,
+      lnFeeRateRoot?: null
     ): SetOverriddenFeeEventFilter;
-
-    "UnsetOverriddenFee(address)"(
-      router?: string | null
-    ): UnsetOverriddenFeeEventFilter;
-    UnsetOverriddenFee(router?: string | null): UnsetOverriddenFeeEventFilter;
   };
 
   estimateGas: {
+    VERSION(overrides?: CallOverrides): Promise<BigNumber>;
+
     claimOwnership(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
@@ -714,24 +606,22 @@ export interface PendleMarketFactory extends BaseContract {
       PT: string,
       scalarRoot: BigNumberish,
       initialAnchor: BigNumberish,
+      lnFeeRateRoot: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    defaultFee(overrides?: CallOverrides): Promise<BigNumber>;
-
     gaugeController(overrides?: CallOverrides): Promise<BigNumber>;
 
     getMarketConfig(
+      market: string,
       router: string,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
     initialize(
+      _owner: string,
       _treasury: string,
-      _defaultLnFeeRateRoot: BigNumberish,
-      _defaultReserveFeePercent: BigNumberish,
-      newVePendle: string,
-      newGaugeController: string,
+      _reserveFeePercent: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -754,27 +644,22 @@ export interface PendleMarketFactory extends BaseContract {
 
     minInitialAnchor(overrides?: CallOverrides): Promise<BigNumber>;
 
-    overriddenFee(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
-
     owner(overrides?: CallOverrides): Promise<BigNumber>;
 
     pendingOwner(overrides?: CallOverrides): Promise<BigNumber>;
 
-    setDefaultFee(
-      newLnFeeRateRoot: BigNumberish,
-      newReserveFeePercent: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
+    reserveFeePercent(overrides?: CallOverrides): Promise<BigNumber>;
 
     setOverriddenFee(
       router: string,
-      newLnFeeRateRoot: BigNumberish,
-      newReserveFeePercent: BigNumberish,
+      market: string,
+      newFee: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    setTreasury(
+    setTreasuryAndFeeReserve(
       newTreasury: string,
+      newReserveFeePercent: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -787,17 +672,14 @@ export interface PendleMarketFactory extends BaseContract {
 
     treasury(overrides?: CallOverrides): Promise<BigNumber>;
 
-    unsetOverriddenFee(
-      router: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
     vePendle(overrides?: CallOverrides): Promise<BigNumber>;
 
     yieldContractFactory(overrides?: CallOverrides): Promise<BigNumber>;
   };
 
   populateTransaction: {
+    VERSION(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
     claimOwnership(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
@@ -806,24 +688,22 @@ export interface PendleMarketFactory extends BaseContract {
       PT: string,
       scalarRoot: BigNumberish,
       initialAnchor: BigNumberish,
+      lnFeeRateRoot: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    defaultFee(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
     gaugeController(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     getMarketConfig(
+      market: string,
       router: string,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
     initialize(
+      _owner: string,
       _treasury: string,
-      _defaultLnFeeRateRoot: BigNumberish,
-      _defaultReserveFeePercent: BigNumberish,
-      newVePendle: string,
-      newGaugeController: string,
+      _reserveFeePercent: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -856,30 +736,22 @@ export interface PendleMarketFactory extends BaseContract {
 
     minInitialAnchor(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    overriddenFee(
-      arg0: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
     owner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     pendingOwner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    setDefaultFee(
-      newLnFeeRateRoot: BigNumberish,
-      newReserveFeePercent: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
+    reserveFeePercent(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     setOverriddenFee(
       router: string,
-      newLnFeeRateRoot: BigNumberish,
-      newReserveFeePercent: BigNumberish,
+      market: string,
+      newFee: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    setTreasury(
+    setTreasuryAndFeeReserve(
       newTreasury: string,
+      newReserveFeePercent: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -892,11 +764,6 @@ export interface PendleMarketFactory extends BaseContract {
 
     treasury(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    unsetOverriddenFee(
-      router: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
     vePendle(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     yieldContractFactory(