@pendle/core-v2 0.6.9 → 0.7.0

package/typechain-types/IPAllAction.ts

@@ -48,24 +48,24 @@ export interface IPAllActionInterface extends utils.Interface {
   contractName: "IPAllAction";
   functions: {
     "addLiquidity(address,address,uint256,uint256,uint256)": FunctionFragment;
-    "mintPyFromRawToken(uint256,address,uint256,address,address[])": FunctionFragment;
-    "mintScyFromRawToken(uint256,address,uint256,address,address[])": FunctionFragment;
+    "mintPyFromRawToken(address,address,uint256,uint256,address[])": FunctionFragment;
+    "mintScyFromRawToken(address,address,uint256,uint256,address[])": FunctionFragment;
     "redeemDueIncome(address,address[],address[],address[])": FunctionFragment;
-    "redeemPyToRawToken(address,uint256,uint256,address,address[])": FunctionFragment;
-    "redeemScyToRawToken(address,uint256,uint256,address,address[])": FunctionFragment;
+    "redeemPyToRawToken(address,address,uint256,uint256,address[])": FunctionFragment;
+    "redeemScyToRawToken(address,address,uint256,uint256,address[])": FunctionFragment;
     "removeLiquidity(address,address,uint256,uint256,uint256)": FunctionFragment;
-    "swapExactPtForRawToken(uint256,address,address[],address,uint256)": FunctionFragment;
+    "swapExactPtForRawToken(address,address,uint256,uint256,address[])": FunctionFragment;
     "swapExactPtForScy(address,address,uint256,uint256)": FunctionFragment;
-    "swapExactRawTokenForPt(uint256,address,address[],address,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
-    "swapExactRawTokenForYt(uint256,address,address[],address,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
-    "swapExactScyForPt(address,address,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
-    "swapExactScyForYt(address,address,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
-    "swapExactYtForRawToken(uint256,address,address[],address,uint256)": FunctionFragment;
+    "swapExactRawTokenForPt(address,address,uint256,uint256,address[],(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
+    "swapExactRawTokenForYt(address,address,uint256,uint256,address[],(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
+    "swapExactScyForPt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
+    "swapExactScyForYt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
+    "swapExactYtForRawToken(address,address,uint256,uint256,address[])": FunctionFragment;
     "swapExactYtForScy(address,address,uint256,uint256)": FunctionFragment;
-    "swapPtForExactScy(address,address,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
+    "swapPtForExactScy(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
     "swapScyForExactPt(address,address,uint256,uint256)": FunctionFragment;
     "swapScyForExactYt(address,address,uint256,uint256)": FunctionFragment;
-    "swapYtForExactScy(address,address,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
+    "swapYtForExactScy(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
   };
 
   encodeFunctionData(
@@ -74,11 +74,11 @@ export interface IPAllActionInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "mintPyFromRawToken",
-    values: [BigNumberish, string, BigNumberish, string, string[]]
+    values: [string, string, BigNumberish, BigNumberish, string[]]
   ): string;
   encodeFunctionData(
     functionFragment: "mintScyFromRawToken",
-    values: [BigNumberish, string, BigNumberish, string, string[]]
+    values: [string, string, BigNumberish, BigNumberish, string[]]
   ): string;
   encodeFunctionData(
     functionFragment: "redeemDueIncome",
@@ -86,11 +86,11 @@ export interface IPAllActionInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "redeemPyToRawToken",
-    values: [string, BigNumberish, BigNumberish, string, string[]]
+    values: [string, string, BigNumberish, BigNumberish, string[]]
   ): string;
   encodeFunctionData(
     functionFragment: "redeemScyToRawToken",
-    values: [string, BigNumberish, BigNumberish, string, string[]]
+    values: [string, string, BigNumberish, BigNumberish, string[]]
   ): string;
   encodeFunctionData(
     functionFragment: "removeLiquidity",
@@ -98,7 +98,7 @@ export interface IPAllActionInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactPtForRawToken",
-    values: [BigNumberish, string, string[], string, BigNumberish]
+    values: [string, string, BigNumberish, BigNumberish, string[]]
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactPtForScy",
@@ -106,23 +106,37 @@ export interface IPAllActionInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactRawTokenForPt",
-    values: [BigNumberish, string, string[], string, ApproxParamsStruct]
+    values: [
+      string,
+      string,
+      BigNumberish,
+      BigNumberish,
+      string[],
+      ApproxParamsStruct
+    ]
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactRawTokenForYt",
-    values: [BigNumberish, string, string[], string, ApproxParamsStruct]
+    values: [
+      string,
+      string,
+      BigNumberish,
+      BigNumberish,
+      string[],
+      ApproxParamsStruct
+    ]
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactScyForPt",
-    values: [string, string, BigNumberish, ApproxParamsStruct]
+    values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactScyForYt",
-    values: [string, string, BigNumberish, ApproxParamsStruct]
+    values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactYtForRawToken",
-    values: [BigNumberish, string, string[], string, BigNumberish]
+    values: [string, string, BigNumberish, BigNumberish, string[]]
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactYtForScy",
@@ -130,7 +144,7 @@ export interface IPAllActionInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "swapPtForExactScy",
-    values: [string, string, BigNumberish, ApproxParamsStruct]
+    values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "swapScyForExactPt",
@@ -142,7 +156,7 @@ export interface IPAllActionInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "swapYtForExactScy",
-    values: [string, string, BigNumberish, ApproxParamsStruct]
+    values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
   ): string;
 
   decodeFunctionResult(
@@ -263,19 +277,19 @@ export interface IPAllAction extends BaseContract {
     ): Promise<ContractTransaction>;
 
     mintPyFromRawToken(
-      netRawTokenIn: BigNumberish,
+      receiver: string,
       YT: string,
+      netRawTokenIn: BigNumberish,
       minPyOut: BigNumberish,
-      receiver: string,
       path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     mintScyFromRawToken(
-      netRawTokenIn: BigNumberish,
+      receiver: string,
       SCY: string,
+      netRawTokenIn: BigNumberish,
       minScyOut: BigNumberish,
-      receiver: string,
       path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
@@ -283,25 +297,25 @@ export interface IPAllAction extends BaseContract {
     redeemDueIncome(
       user: string,
       scys: string[],
-      yieldTokens: string[],
-      arg3: string[],
+      yts: string[],
+      markets: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     redeemPyToRawToken(
+      receiver: string,
       YT: string,
       netPyIn: BigNumberish,
       minRawTokenOut: BigNumberish,
-      receiver: string,
       path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     redeemScyToRawToken(
+      receiver: string,
       SCY: string,
       netScyIn: BigNumberish,
       minRawTokenOut: BigNumberish,
-      receiver: string,
       path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
@@ -316,11 +330,11 @@ export interface IPAllAction extends BaseContract {
     ): Promise<ContractTransaction>;
 
     swapExactPtForRawToken(
-      exactPtIn: BigNumberish,
       receiver: string,
-      path: string[],
       market: string,
+      exactPtIn: BigNumberish,
       minRawTokenOut: BigNumberish,
+      path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -333,20 +347,22 @@ export interface IPAllAction extends BaseContract {
     ): Promise<ContractTransaction>;
 
     swapExactRawTokenForPt(
-      exactRawTokenIn: BigNumberish,
       receiver: string,
-      path: string[],
       market: string,
-      approx: ApproxParamsStruct,
+      exactRawTokenIn: BigNumberish,
+      minPtOut: BigNumberish,
+      path: string[],
+      guessPtOut: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     swapExactRawTokenForYt(
-      exactRawTokenIn: BigNumberish,
       receiver: string,
-      path: string[],
       market: string,
-      approx: ApproxParamsStruct,
+      exactRawTokenIn: BigNumberish,
+      minYtOut: BigNumberish,
+      path: string[],
+      guessYtOut: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -354,7 +370,8 @@ export interface IPAllAction extends BaseContract {
       receiver: string,
       market: string,
       exactScyIn: BigNumberish,
-      approx: ApproxParamsStruct,
+      minPtOut: BigNumberish,
+      guessPtOut: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -362,16 +379,17 @@ export interface IPAllAction extends BaseContract {
       receiver: string,
       market: string,
       exactScyIn: BigNumberish,
-      approx: ApproxParamsStruct,
+      minYtOut: BigNumberish,
+      guessYtOut: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     swapExactYtForRawToken(
-      exactYtIn: BigNumberish,
       receiver: string,
-      path: string[],
       market: string,
+      exactYtIn: BigNumberish,
       minRawTokenOut: BigNumberish,
+      path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -387,7 +405,8 @@ export interface IPAllAction extends BaseContract {
       receiver: string,
       market: string,
       exactScyOut: BigNumberish,
-      approx: ApproxParamsStruct,
+      maxPtIn: BigNumberish,
+      guessPtIn: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -411,7 +430,8 @@ export interface IPAllAction extends BaseContract {
       receiver: string,
       market: string,
       exactScyOut: BigNumberish,
-      approx: ApproxParamsStruct,
+      maxYtIn: BigNumberish,
+      guessYtIn: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
   };
@@ -426,19 +446,19 @@ export interface IPAllAction extends BaseContract {
   ): Promise<ContractTransaction>;
 
   mintPyFromRawToken(
-    netRawTokenIn: BigNumberish,
+    receiver: string,
     YT: string,
+    netRawTokenIn: BigNumberish,
     minPyOut: BigNumberish,
-    receiver: string,
     path: string[],
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   mintScyFromRawToken(
-    netRawTokenIn: BigNumberish,
+    receiver: string,
     SCY: string,
+    netRawTokenIn: BigNumberish,
     minScyOut: BigNumberish,
-    receiver: string,
     path: string[],
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
@@ -446,25 +466,25 @@ export interface IPAllAction extends BaseContract {
   redeemDueIncome(
     user: string,
     scys: string[],
-    yieldTokens: string[],
-    arg3: string[],
+    yts: string[],
+    markets: string[],
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   redeemPyToRawToken(
+    receiver: string,
     YT: string,
     netPyIn: BigNumberish,
     minRawTokenOut: BigNumberish,
-    receiver: string,
     path: string[],
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   redeemScyToRawToken(
+    receiver: string,
     SCY: string,
     netScyIn: BigNumberish,
     minRawTokenOut: BigNumberish,
-    receiver: string,
     path: string[],
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
@@ -479,11 +499,11 @@ export interface IPAllAction extends BaseContract {
   ): Promise<ContractTransaction>;
 
   swapExactPtForRawToken(
-    exactPtIn: BigNumberish,
     receiver: string,
-    path: string[],
     market: string,
+    exactPtIn: BigNumberish,
     minRawTokenOut: BigNumberish,
+    path: string[],
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -496,20 +516,22 @@ export interface IPAllAction extends BaseContract {
   ): Promise<ContractTransaction>;
 
   swapExactRawTokenForPt(
-    exactRawTokenIn: BigNumberish,
     receiver: string,
-    path: string[],
     market: string,
-    approx: ApproxParamsStruct,
+    exactRawTokenIn: BigNumberish,
+    minPtOut: BigNumberish,
+    path: string[],
+    guessPtOut: ApproxParamsStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   swapExactRawTokenForYt(
-    exactRawTokenIn: BigNumberish,
     receiver: string,
-    path: string[],
     market: string,
-    approx: ApproxParamsStruct,
+    exactRawTokenIn: BigNumberish,
+    minYtOut: BigNumberish,
+    path: string[],
+    guessYtOut: ApproxParamsStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -517,7 +539,8 @@ export interface IPAllAction extends BaseContract {
     receiver: string,
     market: string,
     exactScyIn: BigNumberish,
-    approx: ApproxParamsStruct,
+    minPtOut: BigNumberish,
+    guessPtOut: ApproxParamsStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -525,16 +548,17 @@ export interface IPAllAction extends BaseContract {
     receiver: string,
     market: string,
     exactScyIn: BigNumberish,
-    approx: ApproxParamsStruct,
+    minYtOut: BigNumberish,
+    guessYtOut: ApproxParamsStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   swapExactYtForRawToken(
-    exactYtIn: BigNumberish,
     receiver: string,
-    path: string[],
     market: string,
+    exactYtIn: BigNumberish,
     minRawTokenOut: BigNumberish,
+    path: string[],
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -550,7 +574,8 @@ export interface IPAllAction extends BaseContract {
     receiver: string,
     market: string,
     exactScyOut: BigNumberish,
-    approx: ApproxParamsStruct,
+    maxPtIn: BigNumberish,
+    guessPtIn: ApproxParamsStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -574,7 +599,8 @@ export interface IPAllAction extends BaseContract {
     receiver: string,
     market: string,
     exactScyOut: BigNumberish,
-    approx: ApproxParamsStruct,
+    maxYtIn: BigNumberish,
+    guessYtIn: ApproxParamsStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -586,22 +612,28 @@ export interface IPAllAction extends BaseContract {
       ptDesired: BigNumberish,
       minLpOut: BigNumberish,
       overrides?: CallOverrides
-    ): Promise<[BigNumber, BigNumber, BigNumber]>;
+    ): Promise<
+      [BigNumber, BigNumber, BigNumber] & {
+        netLpOut: BigNumber;
+        scyUsed: BigNumber;
+        ptUsed: BigNumber;
+      }
+    >;
 
     mintPyFromRawToken(
-      netRawTokenIn: BigNumberish,
+      receiver: string,
       YT: string,
+      netRawTokenIn: BigNumberish,
       minPyOut: BigNumberish,
-      receiver: string,
       path: string[],
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
     mintScyFromRawToken(
-      netRawTokenIn: BigNumberish,
+      receiver: string,
       SCY: string,
+      netRawTokenIn: BigNumberish,
       minScyOut: BigNumberish,
-      receiver: string,
       path: string[],
       overrides?: CallOverrides
     ): Promise<BigNumber>;
@@ -609,31 +641,32 @@ export interface IPAllAction extends BaseContract {
     redeemDueIncome(
       user: string,
       scys: string[],
-      yieldTokens: string[],
-      arg3: string[],
+      yts: string[],
+      markets: string[],
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber[][], BigNumber[], BigNumber[][]] & {
+      [BigNumber[][], BigNumber[], BigNumber[][], BigNumber[][]] & {
         scyRewards: BigNumber[][];
         ytInterests: BigNumber[];
         ytRewards: BigNumber[][];
+        marketRewards: BigNumber[][];
       }
     >;
 
     redeemPyToRawToken(
+      receiver: string,
       YT: string,
       netPyIn: BigNumberish,
       minRawTokenOut: BigNumberish,
-      receiver: string,
       path: string[],
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
     redeemScyToRawToken(
+      receiver: string,
       SCY: string,
       netScyIn: BigNumberish,
       minRawTokenOut: BigNumberish,
-      receiver: string,
       path: string[],
       overrides?: CallOverrides
     ): Promise<BigNumber>;
@@ -645,14 +678,16 @@ export interface IPAllAction extends BaseContract {
       scyOutMin: BigNumberish,
       ptOutMin: BigNumberish,
       overrides?: CallOverrides
-    ): Promise<[BigNumber, BigNumber]>;
+    ): Promise<
+      [BigNumber, BigNumber] & { netScyOut: BigNumber; netPtOut: BigNumber }
+    >;
 
     swapExactPtForRawToken(
-      exactPtIn: BigNumberish,
       receiver: string,
-      path: string[],
       market: string,
+      exactPtIn: BigNumberish,
       minRawTokenOut: BigNumberish,
+      path: string[],
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
@@ -665,20 +700,22 @@ export interface IPAllAction extends BaseContract {
     ): Promise<BigNumber>;
 
     swapExactRawTokenForPt(
-      exactRawTokenIn: BigNumberish,
       receiver: string,
-      path: string[],
       market: string,
-      approx: ApproxParamsStruct,
+      exactRawTokenIn: BigNumberish,
+      minPtOut: BigNumberish,
+      path: string[],
+      guessPtOut: ApproxParamsStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
     swapExactRawTokenForYt(
-      exactRawTokenIn: BigNumberish,
       receiver: string,
-      path: string[],
       market: string,
-      approx: ApproxParamsStruct,
+      exactRawTokenIn: BigNumberish,
+      minYtOut: BigNumberish,
+      path: string[],
+      guessYtOut: ApproxParamsStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
@@ -686,7 +723,8 @@ export interface IPAllAction extends BaseContract {
       receiver: string,
       market: string,
       exactScyIn: BigNumberish,
-      approx: ApproxParamsStruct,
+      minPtOut: BigNumberish,
+      guessPtOut: ApproxParamsStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
@@ -694,16 +732,17 @@ export interface IPAllAction extends BaseContract {
       receiver: string,
       market: string,
       exactScyIn: BigNumberish,
-      approx: ApproxParamsStruct,
+      minYtOut: BigNumberish,
+      guessYtOut: ApproxParamsStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
     swapExactYtForRawToken(
-      exactYtIn: BigNumberish,
       receiver: string,
-      path: string[],
       market: string,
+      exactYtIn: BigNumberish,
       minRawTokenOut: BigNumberish,
+      path: string[],
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
@@ -719,7 +758,8 @@ export interface IPAllAction extends BaseContract {
       receiver: string,
       market: string,
       exactScyOut: BigNumberish,
-      approx: ApproxParamsStruct,
+      maxPtIn: BigNumberish,
+      guessPtIn: ApproxParamsStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
@@ -743,7 +783,8 @@ export interface IPAllAction extends BaseContract {
       receiver: string,
       market: string,
       exactScyOut: BigNumberish,
-      approx: ApproxParamsStruct,
+      maxYtIn: BigNumberish,
+      guessYtIn: ApproxParamsStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
   };
@@ -761,19 +802,19 @@ export interface IPAllAction extends BaseContract {
     ): Promise<BigNumber>;
 
     mintPyFromRawToken(
-      netRawTokenIn: BigNumberish,
+      receiver: string,
       YT: string,
+      netRawTokenIn: BigNumberish,
       minPyOut: BigNumberish,
-      receiver: string,
       path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     mintScyFromRawToken(
-      netRawTokenIn: BigNumberish,
+      receiver: string,
       SCY: string,
+      netRawTokenIn: BigNumberish,
       minScyOut: BigNumberish,
-      receiver: string,
       path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
@@ -781,25 +822,25 @@ export interface IPAllAction extends BaseContract {
     redeemDueIncome(
       user: string,
       scys: string[],
-      yieldTokens: string[],
-      arg3: string[],
+      yts: string[],
+      markets: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     redeemPyToRawToken(
+      receiver: string,
       YT: string,
       netPyIn: BigNumberish,
       minRawTokenOut: BigNumberish,
-      receiver: string,
       path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     redeemScyToRawToken(
+      receiver: string,
       SCY: string,
       netScyIn: BigNumberish,
       minRawTokenOut: BigNumberish,
-      receiver: string,
       path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
@@ -814,11 +855,11 @@ export interface IPAllAction extends BaseContract {
     ): Promise<BigNumber>;
 
     swapExactPtForRawToken(
-      exactPtIn: BigNumberish,
       receiver: string,
-      path: string[],
       market: string,
+      exactPtIn: BigNumberish,
       minRawTokenOut: BigNumberish,
+      path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -831,20 +872,22 @@ export interface IPAllAction extends BaseContract {
     ): Promise<BigNumber>;
 
     swapExactRawTokenForPt(
-      exactRawTokenIn: BigNumberish,
       receiver: string,
-      path: string[],
       market: string,
-      approx: ApproxParamsStruct,
+      exactRawTokenIn: BigNumberish,
+      minPtOut: BigNumberish,
+      path: string[],
+      guessPtOut: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     swapExactRawTokenForYt(
-      exactRawTokenIn: BigNumberish,
       receiver: string,
-      path: string[],
       market: string,
-      approx: ApproxParamsStruct,
+      exactRawTokenIn: BigNumberish,
+      minYtOut: BigNumberish,
+      path: string[],
+      guessYtOut: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -852,7 +895,8 @@ export interface IPAllAction extends BaseContract {
       receiver: string,
       market: string,
       exactScyIn: BigNumberish,
-      approx: ApproxParamsStruct,
+      minPtOut: BigNumberish,
+      guessPtOut: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -860,16 +904,17 @@ export interface IPAllAction extends BaseContract {
       receiver: string,
       market: string,
       exactScyIn: BigNumberish,
-      approx: ApproxParamsStruct,
+      minYtOut: BigNumberish,
+      guessYtOut: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     swapExactYtForRawToken(
-      exactYtIn: BigNumberish,
       receiver: string,
-      path: string[],
       market: string,
+      exactYtIn: BigNumberish,
       minRawTokenOut: BigNumberish,
+      path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -885,7 +930,8 @@ export interface IPAllAction extends BaseContract {
       receiver: string,
       market: string,
       exactScyOut: BigNumberish,
-      approx: ApproxParamsStruct,
+      maxPtIn: BigNumberish,
+      guessPtIn: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -909,7 +955,8 @@ export interface IPAllAction extends BaseContract {
       receiver: string,
       market: string,
       exactScyOut: BigNumberish,
-      approx: ApproxParamsStruct,
+      maxYtIn: BigNumberish,
+      guessYtIn: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
   };
@@ -925,19 +972,19 @@ export interface IPAllAction extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     mintPyFromRawToken(
-      netRawTokenIn: BigNumberish,
+      receiver: string,
       YT: string,
+      netRawTokenIn: BigNumberish,
       minPyOut: BigNumberish,
-      receiver: string,
       path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     mintScyFromRawToken(
-      netRawTokenIn: BigNumberish,
+      receiver: string,
       SCY: string,
+      netRawTokenIn: BigNumberish,
       minScyOut: BigNumberish,
-      receiver: string,
       path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
@@ -945,25 +992,25 @@ export interface IPAllAction extends BaseContract {
     redeemDueIncome(
       user: string,
       scys: string[],
-      yieldTokens: string[],
-      arg3: string[],
+      yts: string[],
+      markets: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     redeemPyToRawToken(
+      receiver: string,
       YT: string,
       netPyIn: BigNumberish,
       minRawTokenOut: BigNumberish,
-      receiver: string,
       path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     redeemScyToRawToken(
+      receiver: string,
       SCY: string,
       netScyIn: BigNumberish,
       minRawTokenOut: BigNumberish,
-      receiver: string,
       path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
@@ -978,11 +1025,11 @@ export interface IPAllAction extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     swapExactPtForRawToken(
-      exactPtIn: BigNumberish,
       receiver: string,
-      path: string[],
       market: string,
+      exactPtIn: BigNumberish,
       minRawTokenOut: BigNumberish,
+      path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -995,20 +1042,22 @@ export interface IPAllAction extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     swapExactRawTokenForPt(
-      exactRawTokenIn: BigNumberish,
       receiver: string,
-      path: string[],
       market: string,
-      approx: ApproxParamsStruct,
+      exactRawTokenIn: BigNumberish,
+      minPtOut: BigNumberish,
+      path: string[],
+      guessPtOut: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     swapExactRawTokenForYt(
-      exactRawTokenIn: BigNumberish,
       receiver: string,
-      path: string[],
       market: string,
-      approx: ApproxParamsStruct,
+      exactRawTokenIn: BigNumberish,
+      minYtOut: BigNumberish,
+      path: string[],
+      guessYtOut: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -1016,7 +1065,8 @@ export interface IPAllAction extends BaseContract {
       receiver: string,
       market: string,
       exactScyIn: BigNumberish,
-      approx: ApproxParamsStruct,
+      minPtOut: BigNumberish,
+      guessPtOut: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -1024,16 +1074,17 @@ export interface IPAllAction extends BaseContract {
       receiver: string,
       market: string,
       exactScyIn: BigNumberish,
-      approx: ApproxParamsStruct,
+      minYtOut: BigNumberish,
+      guessYtOut: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     swapExactYtForRawToken(
-      exactYtIn: BigNumberish,
       receiver: string,
-      path: string[],
       market: string,
+      exactYtIn: BigNumberish,
       minRawTokenOut: BigNumberish,
+      path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -1049,7 +1100,8 @@ export interface IPAllAction extends BaseContract {
       receiver: string,
       market: string,
       exactScyOut: BigNumberish,
-      approx: ApproxParamsStruct,
+      maxPtIn: BigNumberish,
+      guessPtIn: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -1073,7 +1125,8 @@ export interface IPAllAction extends BaseContract {
       receiver: string,
       market: string,
       exactScyOut: BigNumberish,
-      approx: ApproxParamsStruct,
+      maxYtIn: BigNumberish,
+      guessYtIn: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
   };