@pendle/core-v2 3.0.0 → 4.0.0

package/typechain-types/IPLimitRouter.ts

@@ -9,6 +9,7 @@ import {
   CallOverrides,
   ContractTransaction,
   Overrides,
+  PayableOverrides,
   PopulatedTransaction,
   Signer,
   utils,
@@ -84,12 +85,11 @@ export interface IPLimitRouterInterface extends utils.Interface {
     "cancelBatch((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes)[])": FunctionFragment;
     "cancelSingle((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes))": FunctionFragment;
     "feeRecipient()": FunctionFragment;
-    "flashFill(((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],address,uint256,bytes)": FunctionFragment;
+    "fill(((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],address,uint256,bytes,bytes)": FunctionFragment;
     "hashOrder((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes))": FunctionFragment;
-    "lnFeeRateRoot()": FunctionFragment;
-    "normalFill(((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],address,uint256,bytes)": FunctionFragment;
     "orderStatuses(bytes32[])": FunctionFragment;
     "orderStatusesRaw(bytes32[])": FunctionFragment;
+    "simulate(address,bytes)": FunctionFragment;
   };
 
   encodeFunctionData(
@@ -109,21 +109,19 @@ export interface IPLimitRouterInterface extends utils.Interface {
     values?: undefined
   ): string;
   encodeFunctionData(
-    functionFragment: "flashFill",
-    values: [FillOrderParamsStruct[], string, BigNumberish, BytesLike]
+    functionFragment: "fill",
+    values: [
+      FillOrderParamsStruct[],
+      string,
+      BigNumberish,
+      BytesLike,
+      BytesLike
+    ]
   ): string;
   encodeFunctionData(
     functionFragment: "hashOrder",
     values: [OrderStruct]
   ): string;
-  encodeFunctionData(
-    functionFragment: "lnFeeRateRoot",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "normalFill",
-    values: [FillOrderParamsStruct[], string, BigNumberish, BytesLike]
-  ): string;
   encodeFunctionData(
     functionFragment: "orderStatuses",
     values: [BytesLike[]]
@@ -132,6 +130,10 @@ export interface IPLimitRouterInterface extends utils.Interface {
     functionFragment: "orderStatusesRaw",
     values: [BytesLike[]]
   ): string;
+  encodeFunctionData(
+    functionFragment: "simulate",
+    values: [string, BytesLike]
+  ): string;
 
   decodeFunctionResult(
     functionFragment: "DOMAIN_SEPARATOR",
@@ -149,13 +151,8 @@ export interface IPLimitRouterInterface extends utils.Interface {
     functionFragment: "feeRecipient",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(functionFragment: "flashFill", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "fill", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "hashOrder", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "lnFeeRateRoot",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "normalFill", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "orderStatuses",
     data: BytesLike
@@ -164,6 +161,7 @@ export interface IPLimitRouterInterface extends utils.Interface {
     functionFragment: "orderStatusesRaw",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(functionFragment: "simulate", data: BytesLike): Result;
 
   events: {
     "OrderCanceled(address,bytes32)": EventFragment;
@@ -239,26 +237,17 @@ export interface IPLimitRouter extends BaseContract {
 
     feeRecipient(overrides?: CallOverrides): Promise<[string]>;
 
-    flashFill(
+    fill(
       params: FillOrderParamsStruct[],
       receiver: string,
-      maxInput: BigNumberish,
+      maxTaking: BigNumberish,
+      optData: BytesLike,
       callback: BytesLike,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     hashOrder(order: OrderStruct, overrides?: CallOverrides): Promise<[string]>;
 
-    lnFeeRateRoot(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    normalFill(
-      params: FillOrderParamsStruct[],
-      receiver: string,
-      maxTaking: BigNumberish,
-      callback: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
     orderStatuses(
       orderHashes: BytesLike[],
       overrides?: CallOverrides
@@ -278,6 +267,12 @@ export interface IPLimitRouter extends BaseContract {
         filledAmounts: BigNumber[];
       }
     >;
+
+    simulate(
+      target: string,
+      data: BytesLike,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
   };
 
   DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<string>;
@@ -294,26 +289,17 @@ export interface IPLimitRouter extends BaseContract {
 
   feeRecipient(overrides?: CallOverrides): Promise<string>;
 
-  flashFill(
+  fill(
     params: FillOrderParamsStruct[],
     receiver: string,
-    maxInput: BigNumberish,
+    maxTaking: BigNumberish,
+    optData: BytesLike,
     callback: BytesLike,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   hashOrder(order: OrderStruct, overrides?: CallOverrides): Promise<string>;
 
-  lnFeeRateRoot(overrides?: CallOverrides): Promise<BigNumber>;
-
-  normalFill(
-    params: FillOrderParamsStruct[],
-    receiver: string,
-    maxTaking: BigNumberish,
-    callback: BytesLike,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
   orderStatuses(
     orderHashes: BytesLike[],
     overrides?: CallOverrides
@@ -334,6 +320,12 @@ export interface IPLimitRouter extends BaseContract {
     }
   >;
 
+  simulate(
+    target: string,
+    data: BytesLike,
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   callStatic: {
     DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<string>;
 
@@ -346,38 +338,24 @@ export interface IPLimitRouter extends BaseContract {
 
     feeRecipient(overrides?: CallOverrides): Promise<string>;
 
-    flashFill(
-      params: FillOrderParamsStruct[],
-      receiver: string,
-      maxInput: BigNumberish,
-      callback: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber, BigNumber] & {
-        netOutputToTaker: BigNumber;
-        netInputFromTaker: BigNumber;
-        totalFee: BigNumber;
-      }
-    >;
-
-    hashOrder(order: OrderStruct, overrides?: CallOverrides): Promise<string>;
-
-    lnFeeRateRoot(overrides?: CallOverrides): Promise<BigNumber>;
-
-    normalFill(
+    fill(
       params: FillOrderParamsStruct[],
       receiver: string,
       maxTaking: BigNumberish,
+      optData: BytesLike,
       callback: BytesLike,
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, BigNumber, BigNumber] & {
+      [BigNumber, BigNumber, BigNumber, string] & {
         actualMaking: BigNumber;
         actualTaking: BigNumber;
         totalFee: BigNumber;
+        callbackReturn: string;
       }
     >;
 
+    hashOrder(order: OrderStruct, overrides?: CallOverrides): Promise<string>;
+
     orderStatuses(
       orderHashes: BytesLike[],
       overrides?: CallOverrides
@@ -397,6 +375,12 @@ export interface IPLimitRouter extends BaseContract {
         filledAmounts: BigNumber[];
       }
     >;
+
+    simulate(
+      target: string,
+      data: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<void>;
   };
 
   filters: {
@@ -446,10 +430,11 @@ export interface IPLimitRouter extends BaseContract {
 
     feeRecipient(overrides?: CallOverrides): Promise<BigNumber>;
 
-    flashFill(
+    fill(
       params: FillOrderParamsStruct[],
       receiver: string,
-      maxInput: BigNumberish,
+      maxTaking: BigNumberish,
+      optData: BytesLike,
       callback: BytesLike,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
@@ -459,16 +444,6 @@ export interface IPLimitRouter extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    lnFeeRateRoot(overrides?: CallOverrides): Promise<BigNumber>;
-
-    normalFill(
-      params: FillOrderParamsStruct[],
-      receiver: string,
-      maxTaking: BigNumberish,
-      callback: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
     orderStatuses(
       orderHashes: BytesLike[],
       overrides?: CallOverrides
@@ -478,6 +453,12 @@ export interface IPLimitRouter extends BaseContract {
       orderHashes: BytesLike[],
       overrides?: CallOverrides
     ): Promise<BigNumber>;
+
+    simulate(
+      target: string,
+      data: BytesLike,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
   };
 
   populateTransaction: {
@@ -495,10 +476,11 @@ export interface IPLimitRouter extends BaseContract {
 
     feeRecipient(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    flashFill(
+    fill(
       params: FillOrderParamsStruct[],
       receiver: string,
-      maxInput: BigNumberish,
+      maxTaking: BigNumberish,
+      optData: BytesLike,
       callback: BytesLike,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
@@ -508,16 +490,6 @@ export interface IPLimitRouter extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    lnFeeRateRoot(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    normalFill(
-      params: FillOrderParamsStruct[],
-      receiver: string,
-      maxTaking: BigNumberish,
-      callback: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
     orderStatuses(
       orderHashes: BytesLike[],
       overrides?: CallOverrides
@@ -527,5 +499,11 @@ export interface IPLimitRouter extends BaseContract {
       orderHashes: BytesLike[],
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
+
+    simulate(
+      target: string,
+      data: BytesLike,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
   };
 }

package/typechain-types/IPLimitRouterCallback.ts

@@ -0,0 +1,120 @@
+/* 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 { Listener, Provider } from "@ethersproject/providers";
+import type {
+  TypedEventFilter,
+  TypedEvent,
+  TypedListener,
+  OnEvent,
+} from "./common";
+
+export interface IPLimitRouterCallbackInterface extends utils.Interface {
+  contractName: "IPLimitRouterCallback";
+  functions: {
+    "limitRouterCallback(uint256,uint256,uint256,bytes)": FunctionFragment;
+  };
+
+  encodeFunctionData(
+    functionFragment: "limitRouterCallback",
+    values: [BigNumberish, BigNumberish, BigNumberish, BytesLike]
+  ): string;
+
+  decodeFunctionResult(
+    functionFragment: "limitRouterCallback",
+    data: BytesLike
+  ): Result;
+
+  events: {};
+}
+
+export interface IPLimitRouterCallback extends BaseContract {
+  contractName: "IPLimitRouterCallback";
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  interface: IPLimitRouterCallbackInterface;
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>;
+
+  listeners<TEvent extends TypedEvent>(
+    eventFilter?: TypedEventFilter<TEvent>
+  ): Array<TypedListener<TEvent>>;
+  listeners(eventName?: string): Array<Listener>;
+  removeAllListeners<TEvent extends TypedEvent>(
+    eventFilter: TypedEventFilter<TEvent>
+  ): this;
+  removeAllListeners(eventName?: string): this;
+  off: OnEvent<this>;
+  on: OnEvent<this>;
+  once: OnEvent<this>;
+  removeListener: OnEvent<this>;
+
+  functions: {
+    limitRouterCallback(
+      actualMaking: BigNumberish,
+      actualTaking: BigNumberish,
+      totalFee: BigNumberish,
+      data: BytesLike,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+  };
+
+  limitRouterCallback(
+    actualMaking: BigNumberish,
+    actualTaking: BigNumberish,
+    totalFee: BigNumberish,
+    data: BytesLike,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  callStatic: {
+    limitRouterCallback(
+      actualMaking: BigNumberish,
+      actualTaking: BigNumberish,
+      totalFee: BigNumberish,
+      data: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<string>;
+  };
+
+  filters: {};
+
+  estimateGas: {
+    limitRouterCallback(
+      actualMaking: BigNumberish,
+      actualTaking: BigNumberish,
+      totalFee: BigNumberish,
+      data: BytesLike,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+  };
+
+  populateTransaction: {
+    limitRouterCallback(
+      actualMaking: BigNumberish,
+      actualTaking: BigNumberish,
+      totalFee: BigNumberish,
+      data: BytesLike,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+  };
+}

package/typechain-types/IPRouterHelper.ts

@@ -40,7 +40,6 @@ export type TokenOutputStruct = {
   tokenOut: string;
   minTokenOut: BigNumberish;
   tokenRedeemSy: string;
-  bulk: string;
   pendleSwap: string;
   swapData: SwapDataStruct;
 };
@@ -50,13 +49,11 @@ export type TokenOutputStructOutput = [
   BigNumber,
   string,
   string,
-  string,
   SwapDataStructOutput
 ] & {
   tokenOut: string;
   minTokenOut: BigNumber;
   tokenRedeemSy: string;
-  bulk: string;
   pendleSwap: string;
   swapData: SwapDataStructOutput;
 };
@@ -119,41 +116,31 @@ export declare namespace IPRouterHelper {
     market: string;
     minLpOut: BigNumberish;
     minYtOut: BigNumberish;
-    bulk: string;
   };
 
   export type AddLiquiditySingleTokenKeepYtStructStructOutput = [
     string,
     BigNumber,
-    BigNumber,
-    string
-  ] & {
-    market: string;
-    minLpOut: BigNumber;
-    minYtOut: BigNumber;
-    bulk: string;
-  };
+    BigNumber
+  ] & { market: string; minLpOut: BigNumber; minYtOut: BigNumber };
 
   export type AddLiquiditySingleTokenStructStruct = {
     market: string;
     minLpOut: BigNumberish;
     guessNetTokenIn: BigNumberish;
     guessPtReceivedFromSy: ApproxParamsStruct;
-    bulk: string;
   };
 
   export type AddLiquiditySingleTokenStructStructOutput = [
     string,
     BigNumber,
     BigNumber,
-    ApproxParamsStructOutput,
-    string
+    ApproxParamsStructOutput
   ] & {
     market: string;
     minLpOut: BigNumber;
     guessNetTokenIn: BigNumber;
     guessPtReceivedFromSy: ApproxParamsStructOutput;
-    bulk: string;
   };
 
   export type AddLiquiditySingleSyKeepYtStructStruct = {
@@ -192,9 +179,9 @@ export interface IPRouterHelperInterface extends utils.Interface {
   contractName: "IPRouterHelper";
   functions: {
     "removeLiquiditySingleSy((address,uint256,bool))": FunctionFragment;
-    "removeLiquiditySingleToken((address,uint256,bool,(address,uint256,address,address,address,(uint8,address,bytes,bool))))": FunctionFragment;
-    "transferLiquidityDifferentSyKeepYt((address,uint256,bool,(address,uint256,address,address,address,(uint8,address,bytes,bool))),(address,uint256,uint256,address))": FunctionFragment;
-    "transferLiquidityDifferentSyNormal((address,uint256,bool,(address,uint256,address,address,address,(uint8,address,bytes,bool))),(address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256),address))": FunctionFragment;
+    "removeLiquiditySingleToken((address,uint256,bool,(address,uint256,address,address,(uint8,address,bytes,bool))))": FunctionFragment;
+    "transferLiquidityDifferentSyKeepYt((address,uint256,bool,(address,uint256,address,address,(uint8,address,bytes,bool))),(address,uint256,uint256))": FunctionFragment;
+    "transferLiquidityDifferentSyNormal((address,uint256,bool,(address,uint256,address,address,(uint8,address,bytes,bool))),(address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256)))": FunctionFragment;
     "transferLiquiditySameSyKeepYt((address,uint256,bool),(address,uint256,uint256))": FunctionFragment;
     "transferLiquiditySameSyNormal((address,uint256,bool),(address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256)))": FunctionFragment;
   };