@pendle/core-v2 3.0.0-beta-11 → 3.0.0-beta-13

package/typechain-types/IPAllActionV3.ts

@@ -141,18 +141,21 @@ export type LimitOrderDataStruct = {
   epsSkipMarket: BigNumberish;
   normalFills: FillOrderParamsStruct[];
   flashFills: FillOrderParamsStruct[];
+  optData: BytesLike;
 };
 
 export type LimitOrderDataStructOutput = [
   string,
   BigNumber,
   FillOrderParamsStructOutput[],
-  FillOrderParamsStructOutput[]
+  FillOrderParamsStructOutput[],
+  string
 ] & {
   limitRouter: string;
   epsSkipMarket: BigNumber;
   normalFills: FillOrderParamsStructOutput[];
   flashFills: FillOrderParamsStructOutput[];
+  optData: string;
 };
 
 export type TokenOutputStruct = {
@@ -210,42 +213,42 @@ export interface IPAllActionV3Interface extends utils.Interface {
   functions: {
     "addLiquidityDualSyAndPt(address,address,uint256,uint256,uint256)": FunctionFragment;
     "addLiquidityDualTokenAndPt(address,address,(address,uint256,address,address,(uint8,address,bytes,bool)),uint256,uint256)": FunctionFragment;
-    "addLiquiditySinglePt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[]))": FunctionFragment;
-    "addLiquiditySingleSy(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[]))": FunctionFragment;
+    "addLiquiditySinglePt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],bytes))": FunctionFragment;
+    "addLiquiditySingleSy(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],bytes))": FunctionFragment;
     "addLiquiditySingleSyKeepYt(address,address,uint256,uint256,uint256)": FunctionFragment;
-    "addLiquiditySingleToken(address,address,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,address,address,(uint8,address,bytes,bool)),(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[]))": FunctionFragment;
+    "addLiquiditySingleToken(address,address,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,address,address,(uint8,address,bytes,bool)),(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],bytes))": FunctionFragment;
     "addLiquiditySingleTokenKeepYt(address,address,uint256,uint256,(address,uint256,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
     "boostMarkets(address[])": FunctionFragment;
     "facetAddress(bytes4)": FunctionFragment;
     "facetAddresses()": FunctionFragment;
     "facetFunctionSelectors(address)": FunctionFragment;
     "facets()": FunctionFragment;
+    "limitRouterCallback(uint256,uint256,uint256,bytes)": FunctionFragment;
     "mintPyFromSy(address,address,uint256,uint256)": FunctionFragment;
     "mintPyFromToken(address,address,uint256,(address,uint256,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
     "mintSyFromToken(address,address,uint256,(address,uint256,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
     "multicall((bool,bytes)[])": FunctionFragment;
-    "normalFillCallback(uint256,uint256,uint256,bytes)": FunctionFragment;
     "redeemDueInterestAndRewards(address,address[],address[],address[])": FunctionFragment;
     "redeemPyToSy(address,address,uint256,uint256)": FunctionFragment;
     "redeemPyToToken(address,address,uint256,(address,uint256,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
     "redeemSyToToken(address,address,uint256,(address,uint256,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
     "removeLiquidityDualSyAndPt(address,address,uint256,uint256,uint256)": FunctionFragment;
     "removeLiquidityDualTokenAndPt(address,address,uint256,(address,uint256,address,address,(uint8,address,bytes,bool)),uint256)": FunctionFragment;
-    "removeLiquiditySinglePt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[]))": FunctionFragment;
-    "removeLiquiditySingleSy(address,address,uint256,uint256,(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[]))": FunctionFragment;
-    "removeLiquiditySingleToken(address,address,uint256,(address,uint256,address,address,(uint8,address,bytes,bool)),(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[]))": FunctionFragment;
+    "removeLiquiditySinglePt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],bytes))": FunctionFragment;
+    "removeLiquiditySingleSy(address,address,uint256,uint256,(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],bytes))": FunctionFragment;
+    "removeLiquiditySingleToken(address,address,uint256,(address,uint256,address,address,(uint8,address,bytes,bool)),(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],bytes))": FunctionFragment;
     "simulate(address,bytes)": FunctionFragment;
     "swapCallback(int256,int256,bytes)": FunctionFragment;
-    "swapExactPtForSy(address,address,uint256,uint256,(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[]))": FunctionFragment;
-    "swapExactPtForToken(address,address,uint256,(address,uint256,address,address,(uint8,address,bytes,bool)),(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[]))": FunctionFragment;
+    "swapExactPtForSy(address,address,uint256,uint256,(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],bytes))": FunctionFragment;
+    "swapExactPtForToken(address,address,uint256,(address,uint256,address,address,(uint8,address,bytes,bool)),(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],bytes))": FunctionFragment;
     "swapExactPtForYt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
-    "swapExactSyForPt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[]))": FunctionFragment;
-    "swapExactSyForYt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[]))": FunctionFragment;
-    "swapExactTokenForPt(address,address,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,address,address,(uint8,address,bytes,bool)),(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[]))": FunctionFragment;
-    "swapExactTokenForYt(address,address,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,address,address,(uint8,address,bytes,bool)),(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[]))": FunctionFragment;
+    "swapExactSyForPt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],bytes))": FunctionFragment;
+    "swapExactSyForYt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],bytes))": FunctionFragment;
+    "swapExactTokenForPt(address,address,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,address,address,(uint8,address,bytes,bool)),(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],bytes))": FunctionFragment;
+    "swapExactTokenForYt(address,address,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,address,address,(uint8,address,bytes,bool)),(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],bytes))": FunctionFragment;
     "swapExactYtForPt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
-    "swapExactYtForSy(address,address,uint256,uint256,(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[]))": FunctionFragment;
-    "swapExactYtForToken(address,address,uint256,(address,uint256,address,address,(uint8,address,bytes,bool)),(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[]))": FunctionFragment;
+    "swapExactYtForSy(address,address,uint256,uint256,(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],bytes))": FunctionFragment;
+    "swapExactYtForToken(address,address,uint256,(address,uint256,address,address,(uint8,address,bytes,bool)),(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],bytes))": FunctionFragment;
     "swapTokenToToken(address,uint256,(address,uint256,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
     "swapTokenToTokenViaSy(address,address,(address,uint256,address,address,(uint8,address,bytes,bool)),address,uint256)": FunctionFragment;
   };
@@ -316,6 +319,10 @@ export interface IPAllActionV3Interface extends utils.Interface {
     values: [string]
   ): string;
   encodeFunctionData(functionFragment: "facets", values?: undefined): string;
+  encodeFunctionData(
+    functionFragment: "limitRouterCallback",
+    values: [BigNumberish, BigNumberish, BigNumberish, BytesLike]
+  ): string;
   encodeFunctionData(
     functionFragment: "mintPyFromSy",
     values: [string, string, BigNumberish, BigNumberish]
@@ -332,10 +339,6 @@ export interface IPAllActionV3Interface extends utils.Interface {
     functionFragment: "multicall",
     values: [IPActionMiscV3.Call3Struct[]]
   ): string;
-  encodeFunctionData(
-    functionFragment: "normalFillCallback",
-    values: [BigNumberish, BigNumberish, BigNumberish, BytesLike]
-  ): string;
   encodeFunctionData(
     functionFragment: "redeemDueInterestAndRewards",
     values: [string, string[], string[], string[]]
@@ -527,6 +530,10 @@ export interface IPAllActionV3Interface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "facets", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "limitRouterCallback",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "mintPyFromSy",
     data: BytesLike
@@ -540,10 +547,6 @@ export interface IPAllActionV3Interface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "multicall", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "normalFillCallback",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "redeemDueInterestAndRewards",
     data: BytesLike
@@ -1159,6 +1162,14 @@ export interface IPAllActionV3 extends BaseContract {
       }
     >;
 
+    limitRouterCallback(
+      actualMaking: BigNumberish,
+      actualTaking: BigNumberish,
+      totalFee: BigNumberish,
+      data: BytesLike,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
     mintPyFromSy(
       receiver: string,
       YT: string,
@@ -1188,14 +1199,6 @@ export interface IPAllActionV3 extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    normalFillCallback(
-      actualMaking: BigNumberish,
-      actualTaking: BigNumberish,
-      totalFee: BigNumberish,
-      data: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
     redeemDueInterestAndRewards(
       user: string,
       sys: string[],
@@ -1483,6 +1486,14 @@ export interface IPAllActionV3 extends BaseContract {
 
   facets(overrides?: CallOverrides): Promise<IDiamondLoupe.FacetStructOutput[]>;
 
+  limitRouterCallback(
+    actualMaking: BigNumberish,
+    actualTaking: BigNumberish,
+    totalFee: BigNumberish,
+    data: BytesLike,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   mintPyFromSy(
     receiver: string,
     YT: string,
@@ -1512,14 +1523,6 @@ export interface IPAllActionV3 extends BaseContract {
     overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  normalFillCallback(
-    actualMaking: BigNumberish,
-    actualTaking: BigNumberish,
-    totalFee: BigNumberish,
-    data: BytesLike,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
   redeemDueInterestAndRewards(
     user: string,
     sys: string[],
@@ -1841,6 +1844,14 @@ export interface IPAllActionV3 extends BaseContract {
       overrides?: CallOverrides
     ): Promise<IDiamondLoupe.FacetStructOutput[]>;
 
+    limitRouterCallback(
+      actualMaking: BigNumberish,
+      actualTaking: BigNumberish,
+      totalFee: BigNumberish,
+      data: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<string>;
+
     mintPyFromSy(
       receiver: string,
       YT: string,
@@ -1872,14 +1883,6 @@ export interface IPAllActionV3 extends BaseContract {
       overrides?: CallOverrides
     ): Promise<IPActionMiscV3.ResultStructOutput[]>;
 
-    normalFillCallback(
-      actualMaking: BigNumberish,
-      actualTaking: BigNumberish,
-      totalFee: BigNumberish,
-      data: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
     redeemDueInterestAndRewards(
       user: string,
       sys: string[],
@@ -2635,6 +2638,14 @@ export interface IPAllActionV3 extends BaseContract {
 
     facets(overrides?: CallOverrides): Promise<BigNumber>;
 
+    limitRouterCallback(
+      actualMaking: BigNumberish,
+      actualTaking: BigNumberish,
+      totalFee: BigNumberish,
+      data: BytesLike,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
     mintPyFromSy(
       receiver: string,
       YT: string,
@@ -2664,14 +2675,6 @@ export interface IPAllActionV3 extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    normalFillCallback(
-      actualMaking: BigNumberish,
-      actualTaking: BigNumberish,
-      totalFee: BigNumberish,
-      data: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
     redeemDueInterestAndRewards(
       user: string,
       sys: string[],
@@ -2960,6 +2963,14 @@ export interface IPAllActionV3 extends BaseContract {
 
     facets(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
+    limitRouterCallback(
+      actualMaking: BigNumberish,
+      actualTaking: BigNumberish,
+      totalFee: BigNumberish,
+      data: BytesLike,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
     mintPyFromSy(
       receiver: string,
       YT: string,
@@ -2989,14 +3000,6 @@ export interface IPAllActionV3 extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    normalFillCallback(
-      actualMaking: BigNumberish,
-      actualTaking: BigNumberish,
-      totalFee: BigNumberish,
-      data: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
     redeemDueInterestAndRewards(
       user: string,
       sys: string[],

package/typechain-types/IPInterestManagerYT.ts

@@ -10,7 +10,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,
@@ -35,9 +35,21 @@ export interface IPInterestManagerYTInterface extends utils.Interface {
     data: BytesLike
   ): Result;
 
-  events: {};
+  events: {
+    "CollectInterestFee(uint256)": EventFragment;
+  };
+
+  getEvent(nameOrSignatureOrTopic: "CollectInterestFee"): EventFragment;
 }
 
+export type CollectInterestFeeEvent = TypedEvent<
+  [BigNumber],
+  { amountInterestFee: BigNumber }
+>;
+
+export type CollectInterestFeeEventFilter =
+  TypedEventFilter<CollectInterestFeeEvent>;
+
 export interface IPInterestManagerYT extends BaseContract {
   contractName: "IPInterestManagerYT";
   connect(signerOrProvider: Signer | Provider | string): this;
@@ -99,7 +111,12 @@ export interface IPInterestManagerYT extends BaseContract {
     >;
   };
 
-  filters: {};
+  filters: {
+    "CollectInterestFee(uint256)"(
+      amountInterestFee?: null
+    ): CollectInterestFeeEventFilter;
+    CollectInterestFee(amountInterestFee?: null): CollectInterestFeeEventFilter;
+  };
 
   estimateGas: {
     userInterest(user: string, overrides?: CallOverrides): Promise<BigNumber>;

package/typechain-types/IPLimitRouter.ts

@@ -85,8 +85,8 @@ 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;
+    "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;
-    "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;
@@ -109,12 +109,18 @@ export interface IPLimitRouterInterface extends utils.Interface {
     values?: undefined
   ): string;
   encodeFunctionData(
-    functionFragment: "hashOrder",
-    values: [OrderStruct]
+    functionFragment: "fill",
+    values: [
+      FillOrderParamsStruct[],
+      string,
+      BigNumberish,
+      BytesLike,
+      BytesLike
+    ]
   ): string;
   encodeFunctionData(
-    functionFragment: "normalFill",
-    values: [FillOrderParamsStruct[], string, BigNumberish, BytesLike]
+    functionFragment: "hashOrder",
+    values: [OrderStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "orderStatuses",
@@ -145,8 +151,8 @@ export interface IPLimitRouterInterface extends utils.Interface {
     functionFragment: "feeRecipient",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(functionFragment: "fill", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "hashOrder", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "normalFill", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "orderStatuses",
     data: BytesLike
@@ -231,16 +237,17 @@ export interface IPLimitRouter extends BaseContract {
 
     feeRecipient(overrides?: CallOverrides): Promise<[string]>;
 
-    hashOrder(order: OrderStruct, overrides?: CallOverrides): Promise<[string]>;
-
-    normalFill(
+    fill(
       params: FillOrderParamsStruct[],
       receiver: string,
       maxTaking: BigNumberish,
+      optData: BytesLike,
       callback: BytesLike,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
+    hashOrder(order: OrderStruct, overrides?: CallOverrides): Promise<[string]>;
+
     orderStatuses(
       orderHashes: BytesLike[],
       overrides?: CallOverrides
@@ -282,16 +289,17 @@ export interface IPLimitRouter extends BaseContract {
 
   feeRecipient(overrides?: CallOverrides): Promise<string>;
 
-  hashOrder(order: OrderStruct, overrides?: CallOverrides): Promise<string>;
-
-  normalFill(
+  fill(
     params: FillOrderParamsStruct[],
     receiver: string,
     maxTaking: BigNumberish,
+    optData: BytesLike,
     callback: BytesLike,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  hashOrder(order: OrderStruct, overrides?: CallOverrides): Promise<string>;
+
   orderStatuses(
     orderHashes: BytesLike[],
     overrides?: CallOverrides
@@ -330,12 +338,11 @@ export interface IPLimitRouter extends BaseContract {
 
     feeRecipient(overrides?: CallOverrides): Promise<string>;
 
-    hashOrder(order: OrderStruct, overrides?: CallOverrides): Promise<string>;
-
-    normalFill(
+    fill(
       params: FillOrderParamsStruct[],
       receiver: string,
       maxTaking: BigNumberish,
+      optData: BytesLike,
       callback: BytesLike,
       overrides?: CallOverrides
     ): Promise<
@@ -347,6 +354,8 @@ export interface IPLimitRouter extends BaseContract {
       }
     >;
 
+    hashOrder(order: OrderStruct, overrides?: CallOverrides): Promise<string>;
+
     orderStatuses(
       orderHashes: BytesLike[],
       overrides?: CallOverrides
@@ -421,19 +430,20 @@ export interface IPLimitRouter extends BaseContract {
 
     feeRecipient(overrides?: CallOverrides): Promise<BigNumber>;
 
-    hashOrder(
-      order: OrderStruct,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    normalFill(
+    fill(
       params: FillOrderParamsStruct[],
       receiver: string,
       maxTaking: BigNumberish,
+      optData: BytesLike,
       callback: BytesLike,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
+    hashOrder(
+      order: OrderStruct,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     orderStatuses(
       orderHashes: BytesLike[],
       overrides?: CallOverrides
@@ -466,19 +476,20 @@ export interface IPLimitRouter extends BaseContract {
 
     feeRecipient(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    hashOrder(
-      order: OrderStruct,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    normalFill(
+    fill(
       params: FillOrderParamsStruct[],
       receiver: string,
       maxTaking: BigNumberish,
+      optData: BytesLike,
       callback: BytesLike,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
+    hashOrder(
+      order: OrderStruct,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
     orderStatuses(
       orderHashes: BytesLike[],
       overrides?: CallOverrides

package/typechain-types/IPLimitRouterCallback.ts

@@ -25,16 +25,16 @@ import type {
 export interface IPLimitRouterCallbackInterface extends utils.Interface {
   contractName: "IPLimitRouterCallback";
   functions: {
-    "normalFillCallback(uint256,uint256,uint256,bytes)": FunctionFragment;
+    "limitRouterCallback(uint256,uint256,uint256,bytes)": FunctionFragment;
   };
 
   encodeFunctionData(
-    functionFragment: "normalFillCallback",
+    functionFragment: "limitRouterCallback",
     values: [BigNumberish, BigNumberish, BigNumberish, BytesLike]
   ): string;
 
   decodeFunctionResult(
-    functionFragment: "normalFillCallback",
+    functionFragment: "limitRouterCallback",
     data: BytesLike
   ): Result;
 
@@ -69,7 +69,7 @@ export interface IPLimitRouterCallback extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
-    normalFillCallback(
+    limitRouterCallback(
       actualMaking: BigNumberish,
       actualTaking: BigNumberish,
       totalFee: BigNumberish,
@@ -78,7 +78,7 @@ export interface IPLimitRouterCallback extends BaseContract {
     ): Promise<ContractTransaction>;
   };
 
-  normalFillCallback(
+  limitRouterCallback(
     actualMaking: BigNumberish,
     actualTaking: BigNumberish,
     totalFee: BigNumberish,
@@ -87,7 +87,7 @@ export interface IPLimitRouterCallback extends BaseContract {
   ): Promise<ContractTransaction>;
 
   callStatic: {
-    normalFillCallback(
+    limitRouterCallback(
       actualMaking: BigNumberish,
       actualTaking: BigNumberish,
       totalFee: BigNumberish,
@@ -99,7 +99,7 @@ export interface IPLimitRouterCallback extends BaseContract {
   filters: {};
 
   estimateGas: {
-    normalFillCallback(
+    limitRouterCallback(
       actualMaking: BigNumberish,
       actualTaking: BigNumberish,
       totalFee: BigNumberish,
@@ -109,7 +109,7 @@ export interface IPLimitRouterCallback extends BaseContract {
   };
 
   populateTransaction: {
-    normalFillCallback(
+    limitRouterCallback(
       actualMaking: BigNumberish,
       actualTaking: BigNumberish,
       totalFee: BigNumberish,