@pendle/core-v2 3.0.0-beta-2 → 3.0.0-beta-4

package/typechain-types/PendleOrderMixin.ts

@@ -33,6 +33,7 @@ export type OrderStruct = {
   receiver: string;
   makingAmount: BigNumberish;
   lnImpliedRate: BigNumberish;
+  failSafeRate: BigNumberish;
   permit: BytesLike;
 };
 
@@ -47,6 +48,7 @@ export type OrderStructOutput = [
   string,
   BigNumber,
   BigNumber,
+  BigNumber,
   string
 ] & {
   salt: BigNumber;
@@ -59,6 +61,7 @@ export type OrderStructOutput = [
   receiver: string;
   makingAmount: BigNumber;
   lnImpliedRate: BigNumber;
+  failSafeRate: BigNumber;
   permit: string;
 };
 
@@ -74,42 +77,20 @@ export type FillOrderParamsStructOutput = [
   BigNumber
 ] & { order: OrderStructOutput; signature: string; makingAmount: BigNumber };
 
-export declare namespace IPOrderMixinType {
-  export type OnchainParamsStruct = {
-    timeToExpiry: BigNumberish;
-    pyIndex: BigNumberish;
-    feeRecipient: string;
-    lnFeeRateRoot: BigNumberish;
-  };
-
-  export type OnchainParamsStructOutput = [
-    BigNumber,
-    BigNumber,
-    string,
-    BigNumber
-  ] & {
-    timeToExpiry: BigNumber;
-    pyIndex: BigNumber;
-    feeRecipient: string;
-    lnFeeRateRoot: BigNumber;
-  };
-}
-
 export interface PendleOrderMixinInterface extends utils.Interface {
   contractName: "PendleOrderMixin";
   functions: {
     "advanceNonce(uint8)": FunctionFragment;
     "claimOwnership()": FunctionFragment;
     "feeRecipient()": FunctionFragment;
-    "flashFill(((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,bytes),bytes,uint256)[],address,uint256,bytes)": FunctionFragment;
-    "getOnchainParams(address)": FunctionFragment;
-    "hashOrder((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,bytes))": FunctionFragment;
+    "flashFill(((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],address,uint256,bytes)": FunctionFragment;
+    "hashOrder((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes))": FunctionFragment;
     "increaseNonce()": FunctionFragment;
     "initialize(address,uint96)": FunctionFragment;
     "lnFeeRateRoot()": FunctionFragment;
     "nonce(address)": FunctionFragment;
     "nonceEquals(address,uint256)": FunctionFragment;
-    "normalFill(((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,bytes),bytes,uint256)[],address,uint256,bytes)": FunctionFragment;
+    "normalFill(((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],address,uint256,bytes)": FunctionFragment;
     "owner()": FunctionFragment;
     "pendingOwner()": FunctionFragment;
     "setFees(address,uint96)": FunctionFragment;
@@ -132,10 +113,6 @@ export interface PendleOrderMixinInterface extends utils.Interface {
     functionFragment: "flashFill",
     values: [FillOrderParamsStruct[], string, BigNumberish, BytesLike]
   ): string;
-  encodeFunctionData(
-    functionFragment: "getOnchainParams",
-    values: [string]
-  ): string;
   encodeFunctionData(
     functionFragment: "hashOrder",
     values: [OrderStruct]
@@ -188,10 +165,6 @@ export interface PendleOrderMixinInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "flashFill", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "getOnchainParams",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(functionFragment: "hashOrder", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "increaseNonce",
@@ -220,49 +193,20 @@ export interface PendleOrderMixinInterface extends utils.Interface {
   ): Result;
 
   events: {
-    "FlashFill(uint8,address,address,uint256,uint256,uint256,uint256,uint256)": EventFragment;
     "Initialized(uint8)": EventFragment;
     "NonceIncreased(address,uint256,uint256)": EventFragment;
-    "NormalFill(uint8,address,address,uint256,uint256,uint256,uint256,uint256)": EventFragment;
-    "OrderCanceled(address,bytes32,uint256)": EventFragment;
-    "OrderRemainingUpdated(bytes32,uint256)": EventFragment;
+    "OrderCanceled(address,bytes32)": EventFragment;
+    "OrderFilled(bytes32,uint8,address,address,uint256,uint256,uint256,uint256)": EventFragment;
     "OwnershipTransferred(address,address)": EventFragment;
   };
 
-  getEvent(nameOrSignatureOrTopic: "FlashFill"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "Initialized"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "NonceIncreased"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "NormalFill"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "OrderCanceled"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "OrderRemainingUpdated"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "OrderFilled"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "OwnershipTransferred"): EventFragment;
 }
 
-export type FlashFillEvent = TypedEvent<
-  [
-    number,
-    string,
-    string,
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    BigNumber
-  ],
-  {
-    orderType: number;
-    YT: string;
-    taker: string;
-    netOutputToTaker: BigNumber;
-    netInputFromTaker: BigNumber;
-    totalFee: BigNumber;
-    rawTotalMaking: BigNumber;
-    rawTotalTaking: BigNumber;
-  }
->;
-
-export type FlashFillEventFilter = TypedEventFilter<FlashFillEvent>;
-
 export type InitializedEvent = TypedEvent<[number], { version: number }>;
 
 export type InitializedEventFilter = TypedEventFilter<InitializedEvent>;
@@ -274,45 +218,28 @@ export type NonceIncreasedEvent = TypedEvent<
 
 export type NonceIncreasedEventFilter = TypedEventFilter<NonceIncreasedEvent>;
 
-export type NormalFillEvent = TypedEvent<
-  [
-    number,
-    string,
-    string,
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    BigNumber
-  ],
-  {
-    orderType: number;
-    YT: string;
-    taker: string;
-    actualMaking: BigNumber;
-    actualTaking: BigNumber;
-    totalFee: BigNumber;
-    rawTotalMaking: BigNumber;
-    rawTotalTaking: BigNumber;
-  }
->;
-
-export type NormalFillEventFilter = TypedEventFilter<NormalFillEvent>;
-
 export type OrderCanceledEvent = TypedEvent<
-  [string, string, BigNumber],
-  { maker: string; orderHash: string; remaining: BigNumber }
+  [string, string],
+  { maker: string; orderHash: string }
 >;
 
 export type OrderCanceledEventFilter = TypedEventFilter<OrderCanceledEvent>;
 
-export type OrderRemainingUpdatedEvent = TypedEvent<
-  [string, BigNumber],
-  { orderHash: string; remaining: BigNumber }
+export type OrderFilledEvent = TypedEvent<
+  [string, number, string, string, BigNumber, BigNumber, BigNumber, BigNumber],
+  {
+    orderHash: string;
+    orderType: number;
+    YT: string;
+    token: string;
+    netInputFromMaker: BigNumber;
+    netOutputToMaker: BigNumber;
+    feeAmount: BigNumber;
+    notionalVolume: BigNumber;
+  }
 >;
 
-export type OrderRemainingUpdatedEventFilter =
-  TypedEventFilter<OrderRemainingUpdatedEvent>;
+export type OrderFilledEventFilter = TypedEventFilter<OrderFilledEvent>;
 
 export type OwnershipTransferredEvent = TypedEvent<
   [string, string],
@@ -369,11 +296,6 @@ export interface PendleOrderMixin extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    getOnchainParams(
-      YT: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
     hashOrder(order: OrderStruct, overrides?: CallOverrides): Promise<[string]>;
 
     increaseNonce(
@@ -441,11 +363,6 @@ export interface PendleOrderMixin extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  getOnchainParams(
-    YT: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
   hashOrder(order: OrderStruct, overrides?: CallOverrides): Promise<string>;
 
   increaseNonce(
@@ -517,11 +434,6 @@ export interface PendleOrderMixin extends BaseContract {
       }
     >;
 
-    getOnchainParams(
-      YT: string,
-      overrides?: CallOverrides
-    ): Promise<IPOrderMixinType.OnchainParamsStructOutput>;
-
     hashOrder(order: OrderStruct, overrides?: CallOverrides): Promise<string>;
 
     increaseNonce(overrides?: CallOverrides): Promise<void>;
@@ -575,27 +487,6 @@ export interface PendleOrderMixin extends BaseContract {
   };
 
   filters: {
-    "FlashFill(uint8,address,address,uint256,uint256,uint256,uint256,uint256)"(
-      orderType?: BigNumberish | null,
-      YT?: string | null,
-      taker?: string | null,
-      netOutputToTaker?: null,
-      netInputFromTaker?: null,
-      totalFee?: null,
-      rawTotalMaking?: null,
-      rawTotalTaking?: null
-    ): FlashFillEventFilter;
-    FlashFill(
-      orderType?: BigNumberish | null,
-      YT?: string | null,
-      taker?: string | null,
-      netOutputToTaker?: null,
-      netInputFromTaker?: null,
-      totalFee?: null,
-      rawTotalMaking?: null,
-      rawTotalTaking?: null
-    ): FlashFillEventFilter;
-
     "Initialized(uint8)"(version?: null): InitializedEventFilter;
     Initialized(version?: null): InitializedEventFilter;
 
@@ -610,46 +501,35 @@ export interface PendleOrderMixin extends BaseContract {
       newNonce?: null
     ): NonceIncreasedEventFilter;
 
-    "NormalFill(uint8,address,address,uint256,uint256,uint256,uint256,uint256)"(
-      orderType?: BigNumberish | null,
-      YT?: string | null,
-      taker?: string | null,
-      actualMaking?: null,
-      actualTaking?: null,
-      totalFee?: null,
-      rawTotalMaking?: null,
-      rawTotalTaking?: null
-    ): NormalFillEventFilter;
-    NormalFill(
-      orderType?: BigNumberish | null,
-      YT?: string | null,
-      taker?: string | null,
-      actualMaking?: null,
-      actualTaking?: null,
-      totalFee?: null,
-      rawTotalMaking?: null,
-      rawTotalTaking?: null
-    ): NormalFillEventFilter;
-
-    "OrderCanceled(address,bytes32,uint256)"(
+    "OrderCanceled(address,bytes32)"(
       maker?: string | null,
-      orderHash?: BytesLike | null,
-      remaining?: null
+      orderHash?: BytesLike | null
     ): OrderCanceledEventFilter;
     OrderCanceled(
       maker?: string | null,
-      orderHash?: BytesLike | null,
-      remaining?: null
+      orderHash?: BytesLike | null
     ): OrderCanceledEventFilter;
 
-    "OrderRemainingUpdated(bytes32,uint256)"(
+    "OrderFilled(bytes32,uint8,address,address,uint256,uint256,uint256,uint256)"(
       orderHash?: BytesLike | null,
-      remaining?: null
-    ): OrderRemainingUpdatedEventFilter;
-    OrderRemainingUpdated(
+      orderType?: BigNumberish | null,
+      YT?: string | null,
+      token?: null,
+      netInputFromMaker?: null,
+      netOutputToMaker?: null,
+      feeAmount?: null,
+      notionalVolume?: null
+    ): OrderFilledEventFilter;
+    OrderFilled(
       orderHash?: BytesLike | null,
-      remaining?: null
-    ): OrderRemainingUpdatedEventFilter;
+      orderType?: BigNumberish | null,
+      YT?: string | null,
+      token?: null,
+      netInputFromMaker?: null,
+      netOutputToMaker?: null,
+      feeAmount?: null,
+      notionalVolume?: null
+    ): OrderFilledEventFilter;
 
     "OwnershipTransferred(address,address)"(
       previousOwner?: string | null,
@@ -681,11 +561,6 @@ export interface PendleOrderMixin extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    getOnchainParams(
-      YT: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
     hashOrder(
       order: OrderStruct,
       overrides?: CallOverrides
@@ -757,11 +632,6 @@ export interface PendleOrderMixin extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    getOnchainParams(
-      YT: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
     hashOrder(
       order: OrderStruct,
       overrides?: CallOverrides

package/typechain-types/{PendleRouter.ts → PendleRouterV3.ts}

@@ -46,8 +46,8 @@ export declare namespace IDiamondLoupe {
   };
 }
 
-export interface PendleRouterInterface extends utils.Interface {
-  contractName: "PendleRouter";
+export interface PendleRouterV3Interface extends utils.Interface {
+  contractName: "PendleRouterV3";
   functions: {
     "facetAddress(bytes4)": FunctionFragment;
     "facetAddresses()": FunctionFragment;
@@ -101,13 +101,13 @@ export type DiamondCutEvent = TypedEvent<
 
 export type DiamondCutEventFilter = TypedEventFilter<DiamondCutEvent>;
 
-export interface PendleRouter extends BaseContract {
-  contractName: "PendleRouter";
+export interface PendleRouterV3 extends BaseContract {
+  contractName: "PendleRouterV3";
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
   deployed(): Promise<this>;
 
-  interface: PendleRouterInterface;
+  interface: PendleRouterV3Interface;
 
   queryFilter<TEvent extends TypedEvent>(
     event: TypedEventFilter<TEvent>,

package/typechain-types/{AutomationCompatibleInterface.ts → SimulateHelper.ts}

@@ -4,10 +4,11 @@
 import {
   BaseContract,
   BigNumber,
+  BigNumberish,
   BytesLike,
   CallOverrides,
   ContractTransaction,
-  Overrides,
+  PayableOverrides,
   PopulatedTransaction,
   Signer,
   utils,
@@ -21,42 +22,41 @@ import type {
   OnEvent,
 } from "./common";
 
-export interface AutomationCompatibleInterfaceInterface
-  extends utils.Interface {
-  contractName: "AutomationCompatibleInterface";
+export interface SimulateHelperInterface extends utils.Interface {
+  contractName: "SimulateHelper";
   functions: {
-    "checkUpkeep(bytes)": FunctionFragment;
-    "performUpkeep(bytes)": FunctionFragment;
+    "callThenRevert(bytes)": FunctionFragment;
+    "multicallRevert(uint256,bytes[])": FunctionFragment;
   };
 
   encodeFunctionData(
-    functionFragment: "checkUpkeep",
+    functionFragment: "callThenRevert",
     values: [BytesLike]
   ): string;
   encodeFunctionData(
-    functionFragment: "performUpkeep",
-    values: [BytesLike]
+    functionFragment: "multicallRevert",
+    values: [BigNumberish, BytesLike[]]
   ): string;
 
   decodeFunctionResult(
-    functionFragment: "checkUpkeep",
+    functionFragment: "callThenRevert",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "performUpkeep",
+    functionFragment: "multicallRevert",
     data: BytesLike
   ): Result;
 
   events: {};
 }
 
-export interface AutomationCompatibleInterface extends BaseContract {
-  contractName: "AutomationCompatibleInterface";
+export interface SimulateHelper extends BaseContract {
+  contractName: "SimulateHelper";
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
   deployed(): Promise<this>;
 
-  interface: AutomationCompatibleInterfaceInterface;
+  interface: SimulateHelperInterface;
 
   queryFilter<TEvent extends TypedEvent>(
     event: TypedEventFilter<TEvent>,
@@ -78,64 +78,69 @@ export interface AutomationCompatibleInterface extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
-    checkUpkeep(
-      checkData: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
+    callThenRevert(
+      callData: BytesLike,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    performUpkeep(
-      performData: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
+    multicallRevert(
+      gasLimit: BigNumberish,
+      callDatas: BytesLike[],
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
   };
 
-  checkUpkeep(
-    checkData: BytesLike,
-    overrides?: Overrides & { from?: string | Promise<string> }
+  callThenRevert(
+    callData: BytesLike,
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  performUpkeep(
-    performData: BytesLike,
-    overrides?: Overrides & { from?: string | Promise<string> }
+  multicallRevert(
+    gasLimit: BigNumberish,
+    callDatas: BytesLike[],
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   callStatic: {
-    checkUpkeep(
-      checkData: BytesLike,
+    callThenRevert(
+      callData: BytesLike,
       overrides?: CallOverrides
-    ): Promise<
-      [boolean, string] & { upkeepNeeded: boolean; performData: string }
-    >;
+    ): Promise<void>;
 
-    performUpkeep(
-      performData: BytesLike,
+    multicallRevert(
+      gasLimit: BigNumberish,
+      callDatas: BytesLike[],
       overrides?: CallOverrides
-    ): Promise<void>;
+    ): Promise<
+      [string[], BigNumber[]] & { res: string[]; gasUsed: BigNumber[] }
+    >;
   };
 
   filters: {};
 
   estimateGas: {
-    checkUpkeep(
-      checkData: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
+    callThenRevert(
+      callData: BytesLike,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    performUpkeep(
-      performData: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
+    multicallRevert(
+      gasLimit: BigNumberish,
+      callDatas: BytesLike[],
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
   };
 
   populateTransaction: {
-    checkUpkeep(
-      checkData: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
+    callThenRevert(
+      callData: BytesLike,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    performUpkeep(
-      performData: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
+    multicallRevert(
+      gasLimit: BigNumberish,
+      callDatas: BytesLike[],
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
   };
 }