@pendle/core-v2 2.29.1 → 3.0.0-beta-1

package/typechain-types/IPAllAction.ts

@@ -41,7 +41,6 @@ export type TokenInputStruct = {
   tokenIn: string;
   netTokenIn: BigNumberish;
   tokenMintSy: string;
-  bulk: string;
   pendleSwap: string;
   swapData: SwapDataStruct;
 };
@@ -51,13 +50,11 @@ export type TokenInputStructOutput = [
   BigNumber,
   string,
   string,
-  string,
   SwapDataStructOutput
 ] & {
   tokenIn: string;
   netTokenIn: BigNumber;
   tokenMintSy: string;
-  bulk: string;
   pendleSwap: string;
   swapData: SwapDataStructOutput;
 };
@@ -84,11 +81,81 @@ export type ApproxParamsStructOutput = [
   eps: BigNumber;
 };
 
+export type OrderStruct = {
+  salt: BigNumberish;
+  expiry: BigNumberish;
+  nonce: BigNumberish;
+  orderType: BigNumberish;
+  token: string;
+  YT: string;
+  maker: string;
+  receiver: string;
+  makingAmount: BigNumberish;
+  lnImpliedRate: BigNumberish;
+  permit: BytesLike;
+};
+
+export type OrderStructOutput = [
+  BigNumber,
+  BigNumber,
+  BigNumber,
+  number,
+  string,
+  string,
+  string,
+  string,
+  BigNumber,
+  BigNumber,
+  string
+] & {
+  salt: BigNumber;
+  expiry: BigNumber;
+  nonce: BigNumber;
+  orderType: number;
+  token: string;
+  YT: string;
+  maker: string;
+  receiver: string;
+  makingAmount: BigNumber;
+  lnImpliedRate: BigNumber;
+  permit: string;
+};
+
+export type FillOrderParamsStruct = {
+  order: OrderStruct;
+  signature: BytesLike;
+  makingAmount: BigNumberish;
+};
+
+export type FillOrderParamsStructOutput = [
+  OrderStructOutput,
+  string,
+  BigNumber
+] & { order: OrderStructOutput; signature: string; makingAmount: BigNumber };
+
+export type LimitOrderDataStruct = {
+  limitRouter: string;
+  epsSkipMarket: BigNumberish;
+  normalFills: FillOrderParamsStruct[];
+  flashFills: FillOrderParamsStruct[];
+};
+
+export type LimitOrderDataStructOutput = [
+  string,
+  BigNumber,
+  FillOrderParamsStructOutput[],
+  FillOrderParamsStructOutput[]
+] & {
+  limitRouter: string;
+  epsSkipMarket: BigNumber;
+  normalFills: FillOrderParamsStructOutput[];
+  flashFills: FillOrderParamsStructOutput[];
+};
+
 export type TokenOutputStruct = {
   tokenOut: string;
   minTokenOut: BigNumberish;
   tokenRedeemSy: string;
-  bulk: string;
   pendleSwap: string;
   swapData: SwapDataStruct;
 };
@@ -98,13 +165,11 @@ export type TokenOutputStructOutput = [
   BigNumber,
   string,
   string,
-  string,
   SwapDataStructOutput
 ] & {
   tokenOut: string;
   minTokenOut: BigNumber;
   tokenRedeemSy: string;
-  bulk: string;
   pendleSwap: string;
   swapData: SwapDataStructOutput;
 };
@@ -148,45 +213,43 @@ export interface IPAllActionInterface extends utils.Interface {
   contractName: "IPAllAction";
   functions: {
     "addLiquidityDualSyAndPt(address,address,uint256,uint256,uint256)": FunctionFragment;
-    "addLiquidityDualTokenAndPt(address,address,(address,uint256,address,address,address,(uint8,address,bytes,bool)),uint256,uint256)": FunctionFragment;
-    "addLiquiditySinglePt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
-    "addLiquiditySingleSy(address,address,uint256,uint256,(uint256,uint256,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,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,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,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,bytes),bytes,uint256)[]))": FunctionFragment;
     "addLiquiditySingleSyKeepYt(address,address,uint256,uint256,uint256)": FunctionFragment;
-    "addLiquiditySingleToken(address,address,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,address,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
-    "addLiquiditySingleTokenKeepYt(address,address,uint256,uint256,(address,uint256,address,address,address,(uint8,address,bytes,bool)))": 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,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,bytes),bytes,uint256)[]))": FunctionFragment;
+    "addLiquiditySingleTokenKeepYt(address,address,uint256,uint256,(address,uint256,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
     "approveInf((address[],address)[])": FunctionFragment;
-    "batchExec((bool,bytes)[])": FunctionFragment;
+    "callThenRevert(address,bytes)": FunctionFragment;
     "facetAddress(bytes4)": FunctionFragment;
     "facetAddresses()": FunctionFragment;
     "facetFunctionSelectors(address)": FunctionFragment;
     "facets()": FunctionFragment;
     "mintPyFromSy(address,address,uint256,uint256)": FunctionFragment;
-    "mintPyFromToken(address,address,uint256,(address,uint256,address,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
-    "mintSyFromToken(address,address,uint256,(address,uint256,address,address,address,(uint8,address,bytes,bool)))": 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;
+    "multicallRevert(uint256,(bool,bytes)[])": FunctionFragment;
     "redeemDueInterestAndRewards(address,address[],address[],address[])": FunctionFragment;
     "redeemPyToSy(address,address,uint256,uint256)": FunctionFragment;
-    "redeemPyToToken(address,address,uint256,(address,uint256,address,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
-    "redeemSyToToken(address,address,uint256,(address,uint256,address,address,address,(uint8,address,bytes,bool)))": 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,address,(uint8,address,bytes,bool)),uint256)": FunctionFragment;
-    "removeLiquiditySinglePt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
-    "removeLiquiditySingleSy(address,address,uint256,uint256)": FunctionFragment;
-    "removeLiquiditySingleToken(address,address,uint256,(address,uint256,address,address,address,(uint8,address,bytes,bool)))": 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,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,bytes),bytes,uint256)[]))": FunctionFragment;
+    "removeLiquiditySingleSy(address,address,uint256,uint256,(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,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,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,bytes),bytes,uint256)[]))": FunctionFragment;
     "swapCallback(int256,int256,bytes)": FunctionFragment;
-    "swapExactPtForSy(address,address,uint256,uint256)": FunctionFragment;
-    "swapExactPtForToken(address,address,uint256,(address,uint256,address,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
+    "swapExactPtForSy(address,address,uint256,uint256,(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,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,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,bytes),bytes,uint256)[]))": FunctionFragment;
     "swapExactPtForYt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
-    "swapExactSyForPt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
-    "swapExactSyForYt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
-    "swapExactTokenForPt(address,address,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,address,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
-    "swapExactTokenForYt(address,address,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,address,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
+    "swapExactSyForPt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,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,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,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,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,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,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,bytes),bytes,uint256)[]))": FunctionFragment;
     "swapExactYtForPt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
-    "swapExactYtForSy(address,address,uint256,uint256)": FunctionFragment;
-    "swapExactYtForToken(address,address,uint256,(address,uint256,address,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
-    "swapPtForExactSy(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
-    "swapSyForExactPt(address,address,uint256,uint256)": FunctionFragment;
-    "swapSyForExactYt(address,address,uint256,uint256)": FunctionFragment;
-    "swapYtForExactSy(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,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,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,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,bytes),bytes,uint256)[]))": FunctionFragment;
   };
 
   encodeFunctionData(
@@ -199,11 +262,25 @@ export interface IPAllActionInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "addLiquiditySinglePt",
-    values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
+    values: [
+      string,
+      string,
+      BigNumberish,
+      BigNumberish,
+      ApproxParamsStruct,
+      LimitOrderDataStruct
+    ]
   ): string;
   encodeFunctionData(
     functionFragment: "addLiquiditySingleSy",
-    values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
+    values: [
+      string,
+      string,
+      BigNumberish,
+      BigNumberish,
+      ApproxParamsStruct,
+      LimitOrderDataStruct
+    ]
   ): string;
   encodeFunctionData(
     functionFragment: "addLiquiditySingleSyKeepYt",
@@ -211,7 +288,14 @@ export interface IPAllActionInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "addLiquiditySingleToken",
-    values: [string, string, BigNumberish, ApproxParamsStruct, TokenInputStruct]
+    values: [
+      string,
+      string,
+      BigNumberish,
+      ApproxParamsStruct,
+      TokenInputStruct,
+      LimitOrderDataStruct
+    ]
   ): string;
   encodeFunctionData(
     functionFragment: "addLiquiditySingleTokenKeepYt",
@@ -222,8 +306,8 @@ export interface IPAllActionInterface extends utils.Interface {
     values: [IPActionMisc.MultiApprovalStruct[]]
   ): string;
   encodeFunctionData(
-    functionFragment: "batchExec",
-    values: [IPActionMisc.Call3Struct[]]
+    functionFragment: "callThenRevert",
+    values: [string, BytesLike]
   ): string;
   encodeFunctionData(
     functionFragment: "facetAddress",
@@ -250,6 +334,14 @@ export interface IPAllActionInterface extends utils.Interface {
     functionFragment: "mintSyFromToken",
     values: [string, string, BigNumberish, TokenInputStruct]
   ): string;
+  encodeFunctionData(
+    functionFragment: "multicall",
+    values: [IPActionMisc.Call3Struct[]]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "multicallRevert",
+    values: [BigNumberish, IPActionMisc.Call3Struct[]]
+  ): string;
   encodeFunctionData(
     functionFragment: "redeemDueInterestAndRewards",
     values: [string, string[], string[], string[]]
@@ -276,15 +368,28 @@ export interface IPAllActionInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "removeLiquiditySinglePt",
-    values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
+    values: [
+      string,
+      string,
+      BigNumberish,
+      BigNumberish,
+      ApproxParamsStruct,
+      LimitOrderDataStruct
+    ]
   ): string;
   encodeFunctionData(
     functionFragment: "removeLiquiditySingleSy",
-    values: [string, string, BigNumberish, BigNumberish]
+    values: [string, string, BigNumberish, BigNumberish, LimitOrderDataStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "removeLiquiditySingleToken",
-    values: [string, string, BigNumberish, TokenOutputStruct]
+    values: [
+      string,
+      string,
+      BigNumberish,
+      TokenOutputStruct,
+      LimitOrderDataStruct
+    ]
   ): string;
   encodeFunctionData(
     functionFragment: "swapCallback",
@@ -292,11 +397,17 @@ export interface IPAllActionInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactPtForSy",
-    values: [string, string, BigNumberish, BigNumberish]
+    values: [string, string, BigNumberish, BigNumberish, LimitOrderDataStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactPtForToken",
-    values: [string, string, BigNumberish, TokenOutputStruct]
+    values: [
+      string,
+      string,
+      BigNumberish,
+      TokenOutputStruct,
+      LimitOrderDataStruct
+    ]
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactPtForYt",
@@ -304,19 +415,47 @@ export interface IPAllActionInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactSyForPt",
-    values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
+    values: [
+      string,
+      string,
+      BigNumberish,
+      BigNumberish,
+      ApproxParamsStruct,
+      LimitOrderDataStruct
+    ]
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactSyForYt",
-    values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
+    values: [
+      string,
+      string,
+      BigNumberish,
+      BigNumberish,
+      ApproxParamsStruct,
+      LimitOrderDataStruct
+    ]
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactTokenForPt",
-    values: [string, string, BigNumberish, ApproxParamsStruct, TokenInputStruct]
+    values: [
+      string,
+      string,
+      BigNumberish,
+      ApproxParamsStruct,
+      TokenInputStruct,
+      LimitOrderDataStruct
+    ]
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactTokenForYt",
-    values: [string, string, BigNumberish, ApproxParamsStruct, TokenInputStruct]
+    values: [
+      string,
+      string,
+      BigNumberish,
+      ApproxParamsStruct,
+      TokenInputStruct,
+      LimitOrderDataStruct
+    ]
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactYtForPt",
@@ -324,27 +463,17 @@ export interface IPAllActionInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactYtForSy",
-    values: [string, string, BigNumberish, BigNumberish]
+    values: [string, string, BigNumberish, BigNumberish, LimitOrderDataStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactYtForToken",
-    values: [string, string, BigNumberish, TokenOutputStruct]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "swapPtForExactSy",
-    values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "swapSyForExactPt",
-    values: [string, string, BigNumberish, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "swapSyForExactYt",
-    values: [string, string, BigNumberish, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "swapYtForExactSy",
-    values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
+    values: [
+      string,
+      string,
+      BigNumberish,
+      TokenOutputStruct,
+      LimitOrderDataStruct
+    ]
   ): string;
 
   decodeFunctionResult(
@@ -376,7 +505,10 @@ export interface IPAllActionInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "approveInf", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "batchExec", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "callThenRevert",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "facetAddress",
     data: BytesLike
@@ -402,6 +534,11 @@ export interface IPAllActionInterface extends utils.Interface {
     functionFragment: "mintSyFromToken",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(functionFragment: "multicall", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "multicallRevert",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "redeemDueInterestAndRewards",
     data: BytesLike
@@ -482,22 +619,6 @@ export interface IPAllActionInterface extends utils.Interface {
     functionFragment: "swapExactYtForToken",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "swapPtForExactSy",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "swapSyForExactPt",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "swapSyForExactYt",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "swapYtForExactSy",
-    data: BytesLike
-  ): Result;
 
   events: {
     "AddLiquidityDualSyAndPt(address,address,address,uint256,uint256,uint256)": EventFragment;
@@ -934,6 +1055,7 @@ export interface IPAllAction extends BaseContract {
       netPtIn: BigNumberish,
       minLpOut: BigNumberish,
       guessPtSwapToSy: ApproxParamsStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -943,6 +1065,7 @@ export interface IPAllAction extends BaseContract {
       netSyIn: BigNumberish,
       minLpOut: BigNumberish,
       guessPtReceivedFromSy: ApproxParamsStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -961,6 +1084,7 @@ export interface IPAllAction extends BaseContract {
       minLpOut: BigNumberish,
       guessPtReceivedFromSy: ApproxParamsStruct,
       input: TokenInputStruct,
+      limit: LimitOrderDataStruct,
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -978,9 +1102,10 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    batchExec(
-      calls: IPActionMisc.Call3Struct[],
-      overrides?: Overrides & { from?: string | Promise<string> }
+    callThenRevert(
+      target: string,
+      callData: BytesLike,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     facetAddress(
@@ -1029,6 +1154,17 @@ export interface IPAllAction extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
+    multicall(
+      calls: IPActionMisc.Call3Struct[],
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    multicallRevert(
+      gasLimit: BigNumberish,
+      calls: IPActionMisc.Call3Struct[],
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
     redeemDueInterestAndRewards(
       user: string,
       sys: string[],
@@ -1085,6 +1221,7 @@ export interface IPAllAction extends BaseContract {
       netLpToRemove: BigNumberish,
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -1093,6 +1230,7 @@ export interface IPAllAction extends BaseContract {
       market: string,
       netLpToRemove: BigNumberish,
       minSyOut: BigNumberish,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -1101,6 +1239,7 @@ export interface IPAllAction extends BaseContract {
       market: string,
       netLpToRemove: BigNumberish,
       output: TokenOutputStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -1116,6 +1255,7 @@ export interface IPAllAction extends BaseContract {
       market: string,
       exactPtIn: BigNumberish,
       minSyOut: BigNumberish,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -1124,6 +1264,7 @@ export interface IPAllAction extends BaseContract {
       market: string,
       exactPtIn: BigNumberish,
       output: TokenOutputStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -1142,6 +1283,7 @@ export interface IPAllAction extends BaseContract {
       exactSyIn: BigNumberish,
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -1151,6 +1293,7 @@ export interface IPAllAction extends BaseContract {
       exactSyIn: BigNumberish,
       minYtOut: BigNumberish,
       guessYtOut: ApproxParamsStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -1160,6 +1303,7 @@ export interface IPAllAction extends BaseContract {
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
       input: TokenInputStruct,
+      limit: LimitOrderDataStruct,
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -1169,6 +1313,7 @@ export interface IPAllAction extends BaseContract {
       minYtOut: BigNumberish,
       guessYtOut: ApproxParamsStruct,
       input: TokenInputStruct,
+      limit: LimitOrderDataStruct,
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -1186,48 +1331,16 @@ export interface IPAllAction extends BaseContract {
       market: string,
       exactYtIn: BigNumberish,
       minSyOut: BigNumberish,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     swapExactYtForToken(
       receiver: string,
       market: string,
-      netYtIn: BigNumberish,
+      exactYtIn: BigNumberish,
       output: TokenOutputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    swapPtForExactSy(
-      receiver: string,
-      market: string,
-      exactSyOut: BigNumberish,
-      maxPtIn: BigNumberish,
-      guessPtIn: ApproxParamsStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    swapSyForExactPt(
-      receiver: string,
-      market: string,
-      exactPtOut: BigNumberish,
-      maxSyIn: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    swapSyForExactYt(
-      receiver: string,
-      market: string,
-      exactYtOut: BigNumberish,
-      maxSyIn: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    swapYtForExactSy(
-      receiver: string,
-      market: string,
-      exactSyOut: BigNumberish,
-      maxYtIn: BigNumberish,
-      guessYtIn: ApproxParamsStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
   };
@@ -1256,6 +1369,7 @@ export interface IPAllAction extends BaseContract {
     netPtIn: BigNumberish,
     minLpOut: BigNumberish,
     guessPtSwapToSy: ApproxParamsStruct,
+    limit: LimitOrderDataStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -1265,6 +1379,7 @@ export interface IPAllAction extends BaseContract {
     netSyIn: BigNumberish,
     minLpOut: BigNumberish,
     guessPtReceivedFromSy: ApproxParamsStruct,
+    limit: LimitOrderDataStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -1283,6 +1398,7 @@ export interface IPAllAction extends BaseContract {
     minLpOut: BigNumberish,
     guessPtReceivedFromSy: ApproxParamsStruct,
     input: TokenInputStruct,
+    limit: LimitOrderDataStruct,
     overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -1300,9 +1416,10 @@ export interface IPAllAction extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  batchExec(
-    calls: IPActionMisc.Call3Struct[],
-    overrides?: Overrides & { from?: string | Promise<string> }
+  callThenRevert(
+    target: string,
+    callData: BytesLike,
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   facetAddress(
@@ -1343,6 +1460,17 @@ export interface IPAllAction extends BaseContract {
     overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  multicall(
+    calls: IPActionMisc.Call3Struct[],
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  multicallRevert(
+    gasLimit: BigNumberish,
+    calls: IPActionMisc.Call3Struct[],
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   redeemDueInterestAndRewards(
     user: string,
     sys: string[],
@@ -1399,6 +1527,7 @@ export interface IPAllAction extends BaseContract {
     netLpToRemove: BigNumberish,
     minPtOut: BigNumberish,
     guessPtOut: ApproxParamsStruct,
+    limit: LimitOrderDataStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -1407,6 +1536,7 @@ export interface IPAllAction extends BaseContract {
     market: string,
     netLpToRemove: BigNumberish,
     minSyOut: BigNumberish,
+    limit: LimitOrderDataStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -1415,6 +1545,7 @@ export interface IPAllAction extends BaseContract {
     market: string,
     netLpToRemove: BigNumberish,
     output: TokenOutputStruct,
+    limit: LimitOrderDataStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -1430,6 +1561,7 @@ export interface IPAllAction extends BaseContract {
     market: string,
     exactPtIn: BigNumberish,
     minSyOut: BigNumberish,
+    limit: LimitOrderDataStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -1438,6 +1570,7 @@ export interface IPAllAction extends BaseContract {
     market: string,
     exactPtIn: BigNumberish,
     output: TokenOutputStruct,
+    limit: LimitOrderDataStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -1456,6 +1589,7 @@ export interface IPAllAction extends BaseContract {
     exactSyIn: BigNumberish,
     minPtOut: BigNumberish,
     guessPtOut: ApproxParamsStruct,
+    limit: LimitOrderDataStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -1465,6 +1599,7 @@ export interface IPAllAction extends BaseContract {
     exactSyIn: BigNumberish,
     minYtOut: BigNumberish,
     guessYtOut: ApproxParamsStruct,
+    limit: LimitOrderDataStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -1474,6 +1609,7 @@ export interface IPAllAction extends BaseContract {
     minPtOut: BigNumberish,
     guessPtOut: ApproxParamsStruct,
     input: TokenInputStruct,
+    limit: LimitOrderDataStruct,
     overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -1483,6 +1619,7 @@ export interface IPAllAction extends BaseContract {
     minYtOut: BigNumberish,
     guessYtOut: ApproxParamsStruct,
     input: TokenInputStruct,
+    limit: LimitOrderDataStruct,
     overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -1500,48 +1637,16 @@ export interface IPAllAction extends BaseContract {
     market: string,
     exactYtIn: BigNumberish,
     minSyOut: BigNumberish,
+    limit: LimitOrderDataStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   swapExactYtForToken(
     receiver: string,
     market: string,
-    netYtIn: BigNumberish,
+    exactYtIn: BigNumberish,
     output: TokenOutputStruct,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  swapPtForExactSy(
-    receiver: string,
-    market: string,
-    exactSyOut: BigNumberish,
-    maxPtIn: BigNumberish,
-    guessPtIn: ApproxParamsStruct,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  swapSyForExactPt(
-    receiver: string,
-    market: string,
-    exactPtOut: BigNumberish,
-    maxSyIn: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  swapSyForExactYt(
-    receiver: string,
-    market: string,
-    exactYtOut: BigNumberish,
-    maxSyIn: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  swapYtForExactSy(
-    receiver: string,
-    market: string,
-    exactSyOut: BigNumberish,
-    maxYtIn: BigNumberish,
-    guessYtIn: ApproxParamsStruct,
+    limit: LimitOrderDataStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -1569,11 +1674,7 @@ export interface IPAllAction extends BaseContract {
       minLpOut: BigNumberish,
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, BigNumber, BigNumber] & {
-        netLpOut: BigNumber;
-        netTokenUsed: BigNumber;
-        netPtUsed: BigNumber;
-      }
+      [BigNumber, BigNumber] & { netLpOut: BigNumber; netPtUsed: BigNumber }
     >;
 
     addLiquiditySinglePt(
@@ -1582,6 +1683,7 @@ export interface IPAllAction extends BaseContract {
       netPtIn: BigNumberish,
       minLpOut: BigNumberish,
       guessPtSwapToSy: ApproxParamsStruct,
+      limit: LimitOrderDataStruct,
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber] & { netLpOut: BigNumber; netSyFee: BigNumber }
@@ -1593,6 +1695,7 @@ export interface IPAllAction extends BaseContract {
       netSyIn: BigNumberish,
       minLpOut: BigNumberish,
       guessPtReceivedFromSy: ApproxParamsStruct,
+      limit: LimitOrderDataStruct,
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber] & { netLpOut: BigNumber; netSyFee: BigNumber }
@@ -1615,6 +1718,7 @@ export interface IPAllAction extends BaseContract {
       minLpOut: BigNumberish,
       guessPtReceivedFromSy: ApproxParamsStruct,
       input: TokenInputStruct,
+      limit: LimitOrderDataStruct,
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber] & { netLpOut: BigNumber; netSyFee: BigNumber }
@@ -1636,10 +1740,11 @@ export interface IPAllAction extends BaseContract {
       overrides?: CallOverrides
     ): Promise<void>;
 
-    batchExec(
-      calls: IPActionMisc.Call3Struct[],
+    callThenRevert(
+      target: string,
+      callData: BytesLike,
       overrides?: CallOverrides
-    ): Promise<IPActionMisc.ResultStructOutput[]>;
+    ): Promise<void>;
 
     facetAddress(
       _functionSelector: BytesLike,
@@ -1681,6 +1786,19 @@ export interface IPAllAction extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
+    multicall(
+      calls: IPActionMisc.Call3Struct[],
+      overrides?: CallOverrides
+    ): Promise<IPActionMisc.ResultStructOutput[]>;
+
+    multicallRevert(
+      gasLimit: BigNumberish,
+      calls: IPActionMisc.Call3Struct[],
+      overrides?: CallOverrides
+    ): Promise<
+      [string[], BigNumber[]] & { res: string[]; gasUsed: BigNumber[] }
+    >;
+
     redeemDueInterestAndRewards(
       user: string,
       sys: string[],
@@ -1741,6 +1859,7 @@ export interface IPAllAction extends BaseContract {
       netLpToRemove: BigNumberish,
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
+      limit: LimitOrderDataStruct,
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber] & { netPtOut: BigNumber; netSyFee: BigNumber }
@@ -1751,6 +1870,7 @@ export interface IPAllAction extends BaseContract {
       market: string,
       netLpToRemove: BigNumberish,
       minSyOut: BigNumberish,
+      limit: LimitOrderDataStruct,
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber] & { netSyOut: BigNumber; netSyFee: BigNumber }
@@ -1761,6 +1881,7 @@ export interface IPAllAction extends BaseContract {
       market: string,
       netLpToRemove: BigNumberish,
       output: TokenOutputStruct,
+      limit: LimitOrderDataStruct,
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber] & { netTokenOut: BigNumber; netSyFee: BigNumber }
@@ -1778,6 +1899,7 @@ export interface IPAllAction extends BaseContract {
       market: string,
       exactPtIn: BigNumberish,
       minSyOut: BigNumberish,
+      limit: LimitOrderDataStruct,
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber] & { netSyOut: BigNumber; netSyFee: BigNumber }
@@ -1788,6 +1910,7 @@ export interface IPAllAction extends BaseContract {
       market: string,
       exactPtIn: BigNumberish,
       output: TokenOutputStruct,
+      limit: LimitOrderDataStruct,
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber] & { netTokenOut: BigNumber; netSyFee: BigNumber }
@@ -1810,6 +1933,7 @@ export interface IPAllAction extends BaseContract {
       exactSyIn: BigNumberish,
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
+      limit: LimitOrderDataStruct,
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber] & { netPtOut: BigNumber; netSyFee: BigNumber }
@@ -1821,6 +1945,7 @@ export interface IPAllAction extends BaseContract {
       exactSyIn: BigNumberish,
       minYtOut: BigNumberish,
       guessYtOut: ApproxParamsStruct,
+      limit: LimitOrderDataStruct,
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber] & { netYtOut: BigNumber; netSyFee: BigNumber }
@@ -1832,6 +1957,7 @@ export interface IPAllAction extends BaseContract {
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
       input: TokenInputStruct,
+      limit: LimitOrderDataStruct,
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber] & { netPtOut: BigNumber; netSyFee: BigNumber }
@@ -1843,6 +1969,7 @@ export interface IPAllAction extends BaseContract {
       minYtOut: BigNumberish,
       guessYtOut: ApproxParamsStruct,
       input: TokenInputStruct,
+      limit: LimitOrderDataStruct,
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber] & { netYtOut: BigNumber; netSyFee: BigNumber }
@@ -1864,6 +1991,7 @@ export interface IPAllAction extends BaseContract {
       market: string,
       exactYtIn: BigNumberish,
       minSyOut: BigNumberish,
+      limit: LimitOrderDataStruct,
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber] & { netSyOut: BigNumber; netSyFee: BigNumber }
@@ -1872,54 +2000,13 @@ export interface IPAllAction extends BaseContract {
     swapExactYtForToken(
       receiver: string,
       market: string,
-      netYtIn: BigNumberish,
+      exactYtIn: BigNumberish,
       output: TokenOutputStruct,
+      limit: LimitOrderDataStruct,
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber] & { netTokenOut: BigNumber; netSyFee: BigNumber }
     >;
-
-    swapPtForExactSy(
-      receiver: string,
-      market: string,
-      exactSyOut: BigNumberish,
-      maxPtIn: BigNumberish,
-      guessPtIn: ApproxParamsStruct,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & { netPtIn: BigNumber; netSyFee: BigNumber }
-    >;
-
-    swapSyForExactPt(
-      receiver: string,
-      market: string,
-      exactPtOut: BigNumberish,
-      maxSyIn: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & { netSyIn: BigNumber; netSyFee: BigNumber }
-    >;
-
-    swapSyForExactYt(
-      receiver: string,
-      market: string,
-      exactYtOut: BigNumberish,
-      maxSyIn: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & { netSyIn: BigNumber; netSyFee: BigNumber }
-    >;
-
-    swapYtForExactSy(
-      receiver: string,
-      market: string,
-      exactSyOut: BigNumberish,
-      maxYtIn: BigNumberish,
-      guessYtIn: ApproxParamsStruct,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & { netYtIn: BigNumber; netSyFee: BigNumber }
-    >;
   };
 
   filters: {
@@ -2328,6 +2415,7 @@ export interface IPAllAction extends BaseContract {
       netPtIn: BigNumberish,
       minLpOut: BigNumberish,
       guessPtSwapToSy: ApproxParamsStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -2337,6 +2425,7 @@ export interface IPAllAction extends BaseContract {
       netSyIn: BigNumberish,
       minLpOut: BigNumberish,
       guessPtReceivedFromSy: ApproxParamsStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -2355,6 +2444,7 @@ export interface IPAllAction extends BaseContract {
       minLpOut: BigNumberish,
       guessPtReceivedFromSy: ApproxParamsStruct,
       input: TokenInputStruct,
+      limit: LimitOrderDataStruct,
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -2372,9 +2462,10 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    batchExec(
-      calls: IPActionMisc.Call3Struct[],
-      overrides?: Overrides & { from?: string | Promise<string> }
+    callThenRevert(
+      target: string,
+      callData: BytesLike,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     facetAddress(
@@ -2415,6 +2506,17 @@ export interface IPAllAction extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
+    multicall(
+      calls: IPActionMisc.Call3Struct[],
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    multicallRevert(
+      gasLimit: BigNumberish,
+      calls: IPActionMisc.Call3Struct[],
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
     redeemDueInterestAndRewards(
       user: string,
       sys: string[],
@@ -2471,6 +2573,7 @@ export interface IPAllAction extends BaseContract {
       netLpToRemove: BigNumberish,
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -2479,6 +2582,7 @@ export interface IPAllAction extends BaseContract {
       market: string,
       netLpToRemove: BigNumberish,
       minSyOut: BigNumberish,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -2487,6 +2591,7 @@ export interface IPAllAction extends BaseContract {
       market: string,
       netLpToRemove: BigNumberish,
       output: TokenOutputStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -2502,6 +2607,7 @@ export interface IPAllAction extends BaseContract {
       market: string,
       exactPtIn: BigNumberish,
       minSyOut: BigNumberish,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -2510,6 +2616,7 @@ export interface IPAllAction extends BaseContract {
       market: string,
       exactPtIn: BigNumberish,
       output: TokenOutputStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -2528,6 +2635,7 @@ export interface IPAllAction extends BaseContract {
       exactSyIn: BigNumberish,
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -2537,6 +2645,7 @@ export interface IPAllAction extends BaseContract {
       exactSyIn: BigNumberish,
       minYtOut: BigNumberish,
       guessYtOut: ApproxParamsStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -2546,6 +2655,7 @@ export interface IPAllAction extends BaseContract {
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
       input: TokenInputStruct,
+      limit: LimitOrderDataStruct,
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -2555,6 +2665,7 @@ export interface IPAllAction extends BaseContract {
       minYtOut: BigNumberish,
       guessYtOut: ApproxParamsStruct,
       input: TokenInputStruct,
+      limit: LimitOrderDataStruct,
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -2572,48 +2683,16 @@ export interface IPAllAction extends BaseContract {
       market: string,
       exactYtIn: BigNumberish,
       minSyOut: BigNumberish,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     swapExactYtForToken(
       receiver: string,
       market: string,
-      netYtIn: BigNumberish,
+      exactYtIn: BigNumberish,
       output: TokenOutputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    swapPtForExactSy(
-      receiver: string,
-      market: string,
-      exactSyOut: BigNumberish,
-      maxPtIn: BigNumberish,
-      guessPtIn: ApproxParamsStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    swapSyForExactPt(
-      receiver: string,
-      market: string,
-      exactPtOut: BigNumberish,
-      maxSyIn: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    swapSyForExactYt(
-      receiver: string,
-      market: string,
-      exactYtOut: BigNumberish,
-      maxSyIn: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    swapYtForExactSy(
-      receiver: string,
-      market: string,
-      exactSyOut: BigNumberish,
-      maxYtIn: BigNumberish,
-      guessYtIn: ApproxParamsStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
   };
@@ -2643,6 +2722,7 @@ export interface IPAllAction extends BaseContract {
       netPtIn: BigNumberish,
       minLpOut: BigNumberish,
       guessPtSwapToSy: ApproxParamsStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -2652,6 +2732,7 @@ export interface IPAllAction extends BaseContract {
       netSyIn: BigNumberish,
       minLpOut: BigNumberish,
       guessPtReceivedFromSy: ApproxParamsStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -2670,6 +2751,7 @@ export interface IPAllAction extends BaseContract {
       minLpOut: BigNumberish,
       guessPtReceivedFromSy: ApproxParamsStruct,
       input: TokenInputStruct,
+      limit: LimitOrderDataStruct,
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -2687,9 +2769,10 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    batchExec(
-      calls: IPActionMisc.Call3Struct[],
-      overrides?: Overrides & { from?: string | Promise<string> }
+    callThenRevert(
+      target: string,
+      callData: BytesLike,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     facetAddress(
@@ -2730,6 +2813,17 @@ export interface IPAllAction extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
+    multicall(
+      calls: IPActionMisc.Call3Struct[],
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    multicallRevert(
+      gasLimit: BigNumberish,
+      calls: IPActionMisc.Call3Struct[],
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
     redeemDueInterestAndRewards(
       user: string,
       sys: string[],
@@ -2786,6 +2880,7 @@ export interface IPAllAction extends BaseContract {
       netLpToRemove: BigNumberish,
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -2794,6 +2889,7 @@ export interface IPAllAction extends BaseContract {
       market: string,
       netLpToRemove: BigNumberish,
       minSyOut: BigNumberish,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -2802,6 +2898,7 @@ export interface IPAllAction extends BaseContract {
       market: string,
       netLpToRemove: BigNumberish,
       output: TokenOutputStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -2817,6 +2914,7 @@ export interface IPAllAction extends BaseContract {
       market: string,
       exactPtIn: BigNumberish,
       minSyOut: BigNumberish,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -2825,6 +2923,7 @@ export interface IPAllAction extends BaseContract {
       market: string,
       exactPtIn: BigNumberish,
       output: TokenOutputStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -2843,6 +2942,7 @@ export interface IPAllAction extends BaseContract {
       exactSyIn: BigNumberish,
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -2852,6 +2952,7 @@ export interface IPAllAction extends BaseContract {
       exactSyIn: BigNumberish,
       minYtOut: BigNumberish,
       guessYtOut: ApproxParamsStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -2861,6 +2962,7 @@ export interface IPAllAction extends BaseContract {
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
       input: TokenInputStruct,
+      limit: LimitOrderDataStruct,
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -2870,6 +2972,7 @@ export interface IPAllAction extends BaseContract {
       minYtOut: BigNumberish,
       guessYtOut: ApproxParamsStruct,
       input: TokenInputStruct,
+      limit: LimitOrderDataStruct,
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -2887,48 +2990,16 @@ export interface IPAllAction extends BaseContract {
       market: string,
       exactYtIn: BigNumberish,
       minSyOut: BigNumberish,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     swapExactYtForToken(
       receiver: string,
       market: string,
-      netYtIn: BigNumberish,
+      exactYtIn: BigNumberish,
       output: TokenOutputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    swapPtForExactSy(
-      receiver: string,
-      market: string,
-      exactSyOut: BigNumberish,
-      maxPtIn: BigNumberish,
-      guessPtIn: ApproxParamsStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    swapSyForExactPt(
-      receiver: string,
-      market: string,
-      exactPtOut: BigNumberish,
-      maxSyIn: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    swapSyForExactYt(
-      receiver: string,
-      market: string,
-      exactYtOut: BigNumberish,
-      maxSyIn: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    swapYtForExactSy(
-      receiver: string,
-      market: string,
-      exactSyOut: BigNumberish,
-      maxYtIn: BigNumberish,
-      guessYtIn: ApproxParamsStruct,
+      limit: LimitOrderDataStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
   };