@pendle/core-v2 1.0.2-mainnet → 1.1.0-testnet

package/typechain-types/IPAllAction.ts

@@ -23,13 +23,27 @@ import type {
   OnEvent,
 } from "./common";
 
+export type SwapDataStruct = {
+  swapType: BigNumberish;
+  extRouter: string;
+  extCalldata: BytesLike;
+  needScale: boolean;
+};
+
+export type SwapDataStructOutput = [number, string, string, boolean] & {
+  swapType: number;
+  extRouter: string;
+  extCalldata: string;
+  needScale: boolean;
+};
+
 export type TokenInputStruct = {
   tokenIn: string;
   netTokenIn: BigNumberish;
   tokenMintSy: string;
   bulk: string;
-  kyberRouter: string;
-  kybercall: BytesLike;
+  pendleSwap: string;
+  swapData: SwapDataStruct;
 };
 
 export type TokenInputStructOutput = [
@@ -38,14 +52,14 @@ export type TokenInputStructOutput = [
   string,
   string,
   string,
-  string
+  SwapDataStructOutput
 ] & {
   tokenIn: string;
   netTokenIn: BigNumber;
   tokenMintSy: string;
   bulk: string;
-  kyberRouter: string;
-  kybercall: string;
+  pendleSwap: string;
+  swapData: SwapDataStructOutput;
 };
 
 export type ApproxParamsStruct = {
@@ -75,8 +89,8 @@ export type TokenOutputStruct = {
   minTokenOut: BigNumberish;
   tokenRedeemSy: string;
   bulk: string;
-  kyberRouter: string;
-  kybercall: BytesLike;
+  pendleSwap: string;
+  swapData: SwapDataStruct;
 };
 
 export type TokenOutputStructOutput = [
@@ -85,56 +99,48 @@ export type TokenOutputStructOutput = [
   string,
   string,
   string,
-  string
+  SwapDataStructOutput
 ] & {
   tokenOut: string;
   minTokenOut: BigNumber;
   tokenRedeemSy: string;
   bulk: string;
-  kyberRouter: string;
-  kybercall: string;
+  pendleSwap: string;
+  swapData: SwapDataStructOutput;
 };
 
-export declare namespace IPActionMintRedeem {
-  export type RouterYtRedeemStructStruct = {
-    yts: string[];
-    syAddrs: string[];
-    tokenRedeemSys: string[];
-    bulks: string[];
+export declare namespace IPActionMisc {
+  export type MultiApprovalStruct = { tokens: string[]; spender: string };
+
+  export type MultiApprovalStructOutput = [string[], string] & {
+    tokens: string[];
+    spender: string;
   };
 
-  export type RouterYtRedeemStructStructOutput = [
-    string[],
-    string[],
-    string[],
-    string[]
-  ] & {
-    yts: string[];
-    syAddrs: string[];
-    tokenRedeemSys: string[];
-    bulks: string[];
+  export type Call3Struct = { allowFailure: boolean; callData: BytesLike };
+
+  export type Call3StructOutput = [boolean, string] & {
+    allowFailure: boolean;
+    callData: string;
   };
 
-  export type RouterSwapAllStructStruct = {
-    tokens: string[];
-    kybercalls: BytesLike[];
-    kyberRouter: string;
-    outputToken: string;
-    minTokenOut: BigNumberish;
+  export type ResultStruct = { success: boolean; returnData: BytesLike };
+
+  export type ResultStructOutput = [boolean, string] & {
+    success: boolean;
+    returnData: string;
   };
+}
 
-  export type RouterSwapAllStructStructOutput = [
-    string[],
-    string[],
-    string,
-    string,
-    BigNumber
-  ] & {
-    tokens: string[];
-    kybercalls: string[];
-    kyberRouter: string;
-    outputToken: string;
-    minTokenOut: BigNumber;
+export declare namespace IDiamondLoupe {
+  export type FacetStruct = {
+    facetAddress: string;
+    functionSelectors: BytesLike[];
+  };
+
+  export type FacetStructOutput = [string, string[]] & {
+    facetAddress: string;
+    functionSelectors: string[];
   };
 }
 
@@ -142,34 +148,41 @@ export interface IPAllActionInterface extends utils.Interface {
   contractName: "IPAllAction";
   functions: {
     "addLiquidityDualSyAndPt(address,address,uint256,uint256,uint256)": FunctionFragment;
-    "addLiquidityDualTokenAndPt(address,address,(address,uint256,address,address,address,bytes),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;
-    "addLiquiditySingleToken(address,address,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,address,address,address,bytes))": FunctionFragment;
-    "consult(address,uint32)": 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;
+    "approveInf((address[],address)[])": FunctionFragment;
+    "batchExec((bool,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,bytes))": FunctionFragment;
-    "mintSyFromToken(address,address,uint256,(address,uint256,address,address,address,bytes))": 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;
     "redeemDueInterestAndRewards(address,address[],address[],address[])": FunctionFragment;
-    "redeemDueInterestAndRewardsThenSwapAll(address[],(address[],address[],address[],address[]),address[],(address[],bytes[],address,address,uint256))": FunctionFragment;
     "redeemPyToSy(address,address,uint256,uint256)": FunctionFragment;
-    "redeemPyToToken(address,address,uint256,(address,uint256,address,address,address,bytes))": FunctionFragment;
-    "redeemSyToToken(address,address,uint256,(address,uint256,address,address,address,bytes))": 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;
     "removeLiquidityDualSyAndPt(address,address,uint256,uint256,uint256)": FunctionFragment;
-    "removeLiquidityDualTokenAndPt(address,address,uint256,(address,uint256,address,address,address,bytes),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,bytes))": FunctionFragment;
+    "removeLiquiditySingleToken(address,address,uint256,(address,uint256,address,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
+    "swapCallback(int256,int256,bytes)": FunctionFragment;
     "swapExactPtForSy(address,address,uint256,uint256)": FunctionFragment;
-    "swapExactPtForToken(address,address,uint256,(address,uint256,address,address,address,bytes))": FunctionFragment;
+    "swapExactPtForToken(address,address,uint256,(address,uint256,address,address,address,(uint8,address,bytes,bool)))": 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,bytes))": FunctionFragment;
-    "swapExactTokenForYt(address,address,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,address,address,address,bytes))": 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;
     "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,bytes))": 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;
@@ -192,14 +205,39 @@ export interface IPAllActionInterface extends utils.Interface {
     functionFragment: "addLiquiditySingleSy",
     values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
   ): string;
+  encodeFunctionData(
+    functionFragment: "addLiquiditySingleSyKeepYt",
+    values: [string, string, BigNumberish, BigNumberish, BigNumberish]
+  ): string;
   encodeFunctionData(
     functionFragment: "addLiquiditySingleToken",
     values: [string, string, BigNumberish, ApproxParamsStruct, TokenInputStruct]
   ): string;
   encodeFunctionData(
-    functionFragment: "consult",
-    values: [string, BigNumberish]
+    functionFragment: "addLiquiditySingleTokenKeepYt",
+    values: [string, string, BigNumberish, BigNumberish, TokenInputStruct]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "approveInf",
+    values: [IPActionMisc.MultiApprovalStruct[]]
   ): string;
+  encodeFunctionData(
+    functionFragment: "batchExec",
+    values: [IPActionMisc.Call3Struct[]]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "facetAddress",
+    values: [BytesLike]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "facetAddresses",
+    values?: undefined
+  ): string;
+  encodeFunctionData(
+    functionFragment: "facetFunctionSelectors",
+    values: [string]
+  ): string;
+  encodeFunctionData(functionFragment: "facets", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "mintPyFromSy",
     values: [string, string, BigNumberish, BigNumberish]
@@ -216,15 +254,6 @@ export interface IPAllActionInterface extends utils.Interface {
     functionFragment: "redeemDueInterestAndRewards",
     values: [string, string[], string[], string[]]
   ): string;
-  encodeFunctionData(
-    functionFragment: "redeemDueInterestAndRewardsThenSwapAll",
-    values: [
-      string[],
-      IPActionMintRedeem.RouterYtRedeemStructStruct,
-      string[],
-      IPActionMintRedeem.RouterSwapAllStructStruct
-    ]
-  ): string;
   encodeFunctionData(
     functionFragment: "redeemPyToSy",
     values: [string, string, BigNumberish, BigNumberish]
@@ -257,6 +286,10 @@ export interface IPAllActionInterface extends utils.Interface {
     functionFragment: "removeLiquiditySingleToken",
     values: [string, string, BigNumberish, TokenOutputStruct]
   ): string;
+  encodeFunctionData(
+    functionFragment: "swapCallback",
+    values: [BigNumberish, BigNumberish, BytesLike]
+  ): string;
   encodeFunctionData(
     functionFragment: "swapExactPtForSy",
     values: [string, string, BigNumberish, BigNumberish]
@@ -330,11 +363,33 @@ export interface IPAllActionInterface extends utils.Interface {
     functionFragment: "addLiquiditySingleSy",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "addLiquiditySingleSyKeepYt",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "addLiquiditySingleToken",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(functionFragment: "consult", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "addLiquiditySingleTokenKeepYt",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(functionFragment: "approveInf", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "batchExec", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "facetAddress",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "facetAddresses",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "facetFunctionSelectors",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(functionFragment: "facets", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "mintPyFromSy",
     data: BytesLike
@@ -351,10 +406,6 @@ export interface IPAllActionInterface extends utils.Interface {
     functionFragment: "redeemDueInterestAndRewards",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "redeemDueInterestAndRewardsThenSwapAll",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "redeemPyToSy",
     data: BytesLike
@@ -387,6 +438,10 @@ export interface IPAllActionInterface extends utils.Interface {
     functionFragment: "removeLiquiditySingleToken",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "swapCallback",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "swapExactPtForSy",
     data: BytesLike
@@ -449,12 +504,12 @@ export interface IPAllActionInterface extends utils.Interface {
     "AddLiquidityDualTokenAndPt(address,address,address,address,uint256,uint256,uint256)": EventFragment;
     "AddLiquiditySinglePt(address,address,address,uint256,uint256)": EventFragment;
     "AddLiquiditySingleSy(address,address,address,uint256,uint256)": EventFragment;
+    "AddLiquiditySingleSyKeepYt(address,address,address,uint256,uint256,uint256)": EventFragment;
     "AddLiquiditySingleToken(address,address,address,address,uint256,uint256)": EventFragment;
+    "AddLiquiditySingleTokenKeepYt(address,address,address,address,uint256,uint256,uint256)": EventFragment;
     "MintPyFromSy(address,address,address,uint256,uint256)": EventFragment;
     "MintPyFromToken(address,address,address,address,uint256,uint256)": EventFragment;
     "MintSyFromToken(address,address,address,address,uint256,uint256)": EventFragment;
-    "RedeemDueInterestAndRewards(address,address[],address[],address[],uint256[][],uint256[],uint256[][],uint256[][])": EventFragment;
-    "RedeemDueInterestAndRewardsThenSwapAll(address,address[],address[],address[],address,uint256)": EventFragment;
     "RedeemPyToSy(address,address,address,uint256,uint256)": EventFragment;
     "RedeemPyToToken(address,address,address,address,uint256,uint256)": EventFragment;
     "RedeemSyToToken(address,address,address,address,uint256,uint256)": EventFragment;
@@ -474,16 +529,14 @@ export interface IPAllActionInterface extends utils.Interface {
   getEvent(nameOrSignatureOrTopic: "AddLiquidityDualTokenAndPt"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "AddLiquiditySinglePt"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "AddLiquiditySingleSy"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "AddLiquiditySingleSyKeepYt"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "AddLiquiditySingleToken"): EventFragment;
+  getEvent(
+    nameOrSignatureOrTopic: "AddLiquiditySingleTokenKeepYt"
+  ): EventFragment;
   getEvent(nameOrSignatureOrTopic: "MintPyFromSy"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "MintPyFromToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "MintSyFromToken"): EventFragment;
-  getEvent(
-    nameOrSignatureOrTopic: "RedeemDueInterestAndRewards"
-  ): EventFragment;
-  getEvent(
-    nameOrSignatureOrTopic: "RedeemDueInterestAndRewardsThenSwapAll"
-  ): EventFragment;
   getEvent(nameOrSignatureOrTopic: "RedeemPyToSy"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "RedeemPyToToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "RedeemSyToToken"): EventFragment;
@@ -560,6 +613,21 @@ export type AddLiquiditySingleSyEvent = TypedEvent<
 export type AddLiquiditySingleSyEventFilter =
   TypedEventFilter<AddLiquiditySingleSyEvent>;
 
+export type AddLiquiditySingleSyKeepYtEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber, BigNumber],
+  {
+    caller: string;
+    market: string;
+    receiver: string;
+    netSyIn: BigNumber;
+    netLpOut: BigNumber;
+    netYtOut: BigNumber;
+  }
+>;
+
+export type AddLiquiditySingleSyKeepYtEventFilter =
+  TypedEventFilter<AddLiquiditySingleSyKeepYtEvent>;
+
 export type AddLiquiditySingleTokenEvent = TypedEvent<
   [string, string, string, string, BigNumber, BigNumber],
   {
@@ -575,6 +643,22 @@ export type AddLiquiditySingleTokenEvent = TypedEvent<
 export type AddLiquiditySingleTokenEventFilter =
   TypedEventFilter<AddLiquiditySingleTokenEvent>;
 
+export type AddLiquiditySingleTokenKeepYtEvent = TypedEvent<
+  [string, string, string, string, BigNumber, BigNumber, BigNumber],
+  {
+    caller: string;
+    market: string;
+    token: string;
+    receiver: string;
+    netTokenIn: BigNumber;
+    netLpOut: BigNumber;
+    netYtOut: BigNumber;
+  }
+>;
+
+export type AddLiquiditySingleTokenKeepYtEventFilter =
+  TypedEventFilter<AddLiquiditySingleTokenKeepYtEvent>;
+
 export type MintPyFromSyEvent = TypedEvent<
   [string, string, string, BigNumber, BigNumber],
   {
@@ -616,47 +700,6 @@ export type MintSyFromTokenEvent = TypedEvent<
 
 export type MintSyFromTokenEventFilter = TypedEventFilter<MintSyFromTokenEvent>;
 
-export type RedeemDueInterestAndRewardsEvent = TypedEvent<
-  [
-    string,
-    string[],
-    string[],
-    string[],
-    BigNumber[][],
-    BigNumber[],
-    BigNumber[][],
-    BigNumber[][]
-  ],
-  {
-    user: string;
-    sys: string[];
-    yts: string[];
-    markets: string[];
-    syRewards: BigNumber[][];
-    ytInterests: BigNumber[];
-    ytRewards: BigNumber[][];
-    marketRewards: BigNumber[][];
-  }
->;
-
-export type RedeemDueInterestAndRewardsEventFilter =
-  TypedEventFilter<RedeemDueInterestAndRewardsEvent>;
-
-export type RedeemDueInterestAndRewardsThenSwapAllEvent = TypedEvent<
-  [string, string[], string[], string[], string, BigNumber],
-  {
-    user: string;
-    sys: string[];
-    yts: string[];
-    markets: string[];
-    tokenOut: string;
-    netTokenOut: BigNumber;
-  }
->;
-
-export type RedeemDueInterestAndRewardsThenSwapAllEventFilter =
-  TypedEventFilter<RedeemDueInterestAndRewardsThenSwapAllEvent>;
-
 export type RedeemPyToSyEvent = TypedEvent<
   [string, string, string, BigNumber, BigNumber],
   {
@@ -903,6 +946,15 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
+    addLiquiditySingleSyKeepYt(
+      receiver: string,
+      market: string,
+      netSyIn: BigNumberish,
+      minLpOut: BigNumberish,
+      minYtOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
     addLiquiditySingleToken(
       receiver: string,
       market: string,
@@ -912,11 +964,46 @@ export interface IPAllAction extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    consult(
+    addLiquiditySingleTokenKeepYt(
+      receiver: string,
       market: string,
-      secondsAgo: BigNumberish,
+      minLpOut: BigNumberish,
+      minYtOut: BigNumberish,
+      input: TokenInputStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    approveInf(
+      arg0: IPActionMisc.MultiApprovalStruct[],
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    batchExec(
+      calls: IPActionMisc.Call3Struct[],
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    facetAddress(
+      _functionSelector: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<[string] & { facetAddress_: string }>;
+
+    facetAddresses(
+      overrides?: CallOverrides
+    ): Promise<[string[]] & { facetAddresses_: string[] }>;
+
+    facetFunctionSelectors(
+      _facet: string,
       overrides?: CallOverrides
-    ): Promise<[BigNumber] & { lnImpliedRateMean: BigNumber }>;
+    ): Promise<[string[]] & { facetFunctionSelectors_: string[] }>;
+
+    facets(
+      overrides?: CallOverrides
+    ): Promise<
+      [IDiamondLoupe.FacetStructOutput[]] & {
+        facets_: IDiamondLoupe.FacetStructOutput[];
+      }
+    >;
 
     mintPyFromSy(
       receiver: string,
@@ -950,14 +1037,6 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    redeemDueInterestAndRewardsThenSwapAll(
-      sys: string[],
-      dataYT: IPActionMintRedeem.RouterYtRedeemStructStruct,
-      markets: string[],
-      dataSwap: IPActionMintRedeem.RouterSwapAllStructStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
     redeemPyToSy(
       receiver: string,
       YT: string,
@@ -1025,6 +1104,13 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
+    swapCallback(
+      ptToAccount: BigNumberish,
+      syToAccount: BigNumberish,
+      data: BytesLike,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
     swapExactPtForSy(
       receiver: string,
       market: string,
@@ -1182,6 +1268,15 @@ export interface IPAllAction extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  addLiquiditySingleSyKeepYt(
+    receiver: string,
+    market: string,
+    netSyIn: BigNumberish,
+    minLpOut: BigNumberish,
+    minYtOut: BigNumberish,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   addLiquiditySingleToken(
     receiver: string,
     market: string,
@@ -1191,11 +1286,38 @@ export interface IPAllAction extends BaseContract {
     overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  consult(
+  addLiquiditySingleTokenKeepYt(
+    receiver: string,
     market: string,
-    secondsAgo: BigNumberish,
+    minLpOut: BigNumberish,
+    minYtOut: BigNumberish,
+    input: TokenInputStruct,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  approveInf(
+    arg0: IPActionMisc.MultiApprovalStruct[],
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  batchExec(
+    calls: IPActionMisc.Call3Struct[],
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  facetAddress(
+    _functionSelector: BytesLike,
+    overrides?: CallOverrides
+  ): Promise<string>;
+
+  facetAddresses(overrides?: CallOverrides): Promise<string[]>;
+
+  facetFunctionSelectors(
+    _facet: string,
     overrides?: CallOverrides
-  ): Promise<BigNumber>;
+  ): Promise<string[]>;
+
+  facets(overrides?: CallOverrides): Promise<IDiamondLoupe.FacetStructOutput[]>;
 
   mintPyFromSy(
     receiver: string,
@@ -1229,14 +1351,6 @@ export interface IPAllAction extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  redeemDueInterestAndRewardsThenSwapAll(
-    sys: string[],
-    dataYT: IPActionMintRedeem.RouterYtRedeemStructStruct,
-    markets: string[],
-    dataSwap: IPActionMintRedeem.RouterSwapAllStructStruct,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
   redeemPyToSy(
     receiver: string,
     YT: string,
@@ -1304,6 +1418,13 @@ export interface IPAllAction extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  swapCallback(
+    ptToAccount: BigNumberish,
+    syToAccount: BigNumberish,
+    data: BytesLike,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   swapExactPtForSy(
     receiver: string,
     market: string,
@@ -1477,6 +1598,17 @@ export interface IPAllAction extends BaseContract {
       [BigNumber, BigNumber] & { netLpOut: BigNumber; netSyFee: BigNumber }
     >;
 
+    addLiquiditySingleSyKeepYt(
+      receiver: string,
+      market: string,
+      netSyIn: BigNumberish,
+      minLpOut: BigNumberish,
+      minYtOut: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<
+      [BigNumber, BigNumber] & { netLpOut: BigNumber; netYtOut: BigNumber }
+    >;
+
     addLiquiditySingleToken(
       receiver: string,
       market: string,
@@ -1488,11 +1620,42 @@ export interface IPAllAction extends BaseContract {
       [BigNumber, BigNumber] & { netLpOut: BigNumber; netSyFee: BigNumber }
     >;
 
-    consult(
+    addLiquiditySingleTokenKeepYt(
+      receiver: string,
       market: string,
-      secondsAgo: BigNumberish,
+      minLpOut: BigNumberish,
+      minYtOut: BigNumberish,
+      input: TokenInputStruct,
       overrides?: CallOverrides
-    ): Promise<BigNumber>;
+    ): Promise<
+      [BigNumber, BigNumber] & { netLpOut: BigNumber; netYtOut: BigNumber }
+    >;
+
+    approveInf(
+      arg0: IPActionMisc.MultiApprovalStruct[],
+      overrides?: CallOverrides
+    ): Promise<void>;
+
+    batchExec(
+      calls: IPActionMisc.Call3Struct[],
+      overrides?: CallOverrides
+    ): Promise<IPActionMisc.ResultStructOutput[]>;
+
+    facetAddress(
+      _functionSelector: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<string>;
+
+    facetAddresses(overrides?: CallOverrides): Promise<string[]>;
+
+    facetFunctionSelectors(
+      _facet: string,
+      overrides?: CallOverrides
+    ): Promise<string[]>;
+
+    facets(
+      overrides?: CallOverrides
+    ): Promise<IDiamondLoupe.FacetStructOutput[]>;
 
     mintPyFromSy(
       receiver: string,
@@ -1524,27 +1687,7 @@ export interface IPAllAction extends BaseContract {
       yts: string[],
       markets: string[],
       overrides?: CallOverrides
-    ): Promise<
-      [BigNumber[][], BigNumber[], BigNumber[][], BigNumber[][]] & {
-        syRewards: BigNumber[][];
-        ytInterests: BigNumber[];
-        ytRewards: BigNumber[][];
-        marketRewards: BigNumber[][];
-      }
-    >;
-
-    redeemDueInterestAndRewardsThenSwapAll(
-      sys: string[],
-      dataYT: IPActionMintRedeem.RouterYtRedeemStructStruct,
-      markets: string[],
-      dataSwap: IPActionMintRedeem.RouterSwapAllStructStruct,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber[]] & {
-        netTokenOut: BigNumber;
-        amountsSwapped: BigNumber[];
-      }
-    >;
+    ): Promise<void>;
 
     redeemPyToSy(
       receiver: string,
@@ -1623,6 +1766,13 @@ export interface IPAllAction extends BaseContract {
       [BigNumber, BigNumber] & { netTokenOut: BigNumber; netSyFee: BigNumber }
     >;
 
+    swapCallback(
+      ptToAccount: BigNumberish,
+      syToAccount: BigNumberish,
+      data: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<void>;
+
     swapExactPtForSy(
       receiver: string,
       market: string,
@@ -1839,6 +1989,23 @@ export interface IPAllAction extends BaseContract {
       netLpOut?: null
     ): AddLiquiditySingleSyEventFilter;
 
+    "AddLiquiditySingleSyKeepYt(address,address,address,uint256,uint256,uint256)"(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      netSyIn?: null,
+      netLpOut?: null,
+      netYtOut?: null
+    ): AddLiquiditySingleSyKeepYtEventFilter;
+    AddLiquiditySingleSyKeepYt(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      netSyIn?: null,
+      netLpOut?: null,
+      netYtOut?: null
+    ): AddLiquiditySingleSyKeepYtEventFilter;
+
     "AddLiquiditySingleToken(address,address,address,address,uint256,uint256)"(
       caller?: string | null,
       market?: string | null,
@@ -1856,6 +2023,25 @@ export interface IPAllAction extends BaseContract {
       netLpOut?: null
     ): AddLiquiditySingleTokenEventFilter;
 
+    "AddLiquiditySingleTokenKeepYt(address,address,address,address,uint256,uint256,uint256)"(
+      caller?: string | null,
+      market?: string | null,
+      token?: string | null,
+      receiver?: null,
+      netTokenIn?: null,
+      netLpOut?: null,
+      netYtOut?: null
+    ): AddLiquiditySingleTokenKeepYtEventFilter;
+    AddLiquiditySingleTokenKeepYt(
+      caller?: string | null,
+      market?: string | null,
+      token?: string | null,
+      receiver?: null,
+      netTokenIn?: null,
+      netLpOut?: null,
+      netYtOut?: null
+    ): AddLiquiditySingleTokenKeepYtEventFilter;
+
     "MintPyFromSy(address,address,address,uint256,uint256)"(
       caller?: string | null,
       receiver?: string | null,
@@ -1905,44 +2091,6 @@ export interface IPAllAction extends BaseContract {
       netSyOut?: null
     ): MintSyFromTokenEventFilter;
 
-    "RedeemDueInterestAndRewards(address,address[],address[],address[],uint256[][],uint256[],uint256[][],uint256[][])"(
-      user?: string | null,
-      sys?: null,
-      yts?: null,
-      markets?: null,
-      syRewards?: null,
-      ytInterests?: null,
-      ytRewards?: null,
-      marketRewards?: null
-    ): RedeemDueInterestAndRewardsEventFilter;
-    RedeemDueInterestAndRewards(
-      user?: string | null,
-      sys?: null,
-      yts?: null,
-      markets?: null,
-      syRewards?: null,
-      ytInterests?: null,
-      ytRewards?: null,
-      marketRewards?: null
-    ): RedeemDueInterestAndRewardsEventFilter;
-
-    "RedeemDueInterestAndRewardsThenSwapAll(address,address[],address[],address[],address,uint256)"(
-      user?: string | null,
-      sys?: null,
-      yts?: null,
-      markets?: null,
-      tokenOut?: string | null,
-      netTokenOut?: null
-    ): RedeemDueInterestAndRewardsThenSwapAllEventFilter;
-    RedeemDueInterestAndRewardsThenSwapAll(
-      user?: string | null,
-      sys?: null,
-      yts?: null,
-      markets?: null,
-      tokenOut?: string | null,
-      netTokenOut?: null
-    ): RedeemDueInterestAndRewardsThenSwapAllEventFilter;
-
     "RedeemPyToSy(address,address,address,uint256,uint256)"(
       caller?: string | null,
       receiver?: string | null,
@@ -2192,6 +2340,15 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
+    addLiquiditySingleSyKeepYt(
+      receiver: string,
+      market: string,
+      netSyIn: BigNumberish,
+      minLpOut: BigNumberish,
+      minYtOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
     addLiquiditySingleToken(
       receiver: string,
       market: string,
@@ -2201,12 +2358,39 @@ export interface IPAllAction extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    consult(
+    addLiquiditySingleTokenKeepYt(
+      receiver: string,
       market: string,
-      secondsAgo: BigNumberish,
+      minLpOut: BigNumberish,
+      minYtOut: BigNumberish,
+      input: TokenInputStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    approveInf(
+      arg0: IPActionMisc.MultiApprovalStruct[],
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    batchExec(
+      calls: IPActionMisc.Call3Struct[],
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    facetAddress(
+      _functionSelector: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    facetAddresses(overrides?: CallOverrides): Promise<BigNumber>;
+
+    facetFunctionSelectors(
+      _facet: string,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
+    facets(overrides?: CallOverrides): Promise<BigNumber>;
+
     mintPyFromSy(
       receiver: string,
       YT: string,
@@ -2239,14 +2423,6 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    redeemDueInterestAndRewardsThenSwapAll(
-      sys: string[],
-      dataYT: IPActionMintRedeem.RouterYtRedeemStructStruct,
-      markets: string[],
-      dataSwap: IPActionMintRedeem.RouterSwapAllStructStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
     redeemPyToSy(
       receiver: string,
       YT: string,
@@ -2314,6 +2490,13 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
+    swapCallback(
+      ptToAccount: BigNumberish,
+      syToAccount: BigNumberish,
+      data: BytesLike,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
     swapExactPtForSy(
       receiver: string,
       market: string,
@@ -2472,6 +2655,15 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
+    addLiquiditySingleSyKeepYt(
+      receiver: string,
+      market: string,
+      netSyIn: BigNumberish,
+      minLpOut: BigNumberish,
+      minYtOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
     addLiquiditySingleToken(
       receiver: string,
       market: string,
@@ -2481,12 +2673,39 @@ export interface IPAllAction extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    consult(
+    addLiquiditySingleTokenKeepYt(
+      receiver: string,
       market: string,
-      secondsAgo: BigNumberish,
+      minLpOut: BigNumberish,
+      minYtOut: BigNumberish,
+      input: TokenInputStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    approveInf(
+      arg0: IPActionMisc.MultiApprovalStruct[],
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    batchExec(
+      calls: IPActionMisc.Call3Struct[],
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    facetAddress(
+      _functionSelector: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
+    facetAddresses(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    facetFunctionSelectors(
+      _facet: string,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
+    facets(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
     mintPyFromSy(
       receiver: string,
       YT: string,
@@ -2519,14 +2738,6 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    redeemDueInterestAndRewardsThenSwapAll(
-      sys: string[],
-      dataYT: IPActionMintRedeem.RouterYtRedeemStructStruct,
-      markets: string[],
-      dataSwap: IPActionMintRedeem.RouterSwapAllStructStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
     redeemPyToSy(
       receiver: string,
       YT: string,
@@ -2594,6 +2805,13 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
+    swapCallback(
+      ptToAccount: BigNumberish,
+      syToAccount: BigNumberish,
+      data: BytesLike,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
     swapExactPtForSy(
       receiver: string,
       market: string,