@pendle/core-v2 0.9.3-beta → 0.10.1-beta

package/typechain-types/IPActionCore.ts

@@ -9,6 +9,7 @@ import {
   CallOverrides,
   ContractTransaction,
   Overrides,
+  PayableOverrides,
   PopulatedTransaction,
   Signer,
   utils,
@@ -75,8 +76,8 @@ export type TokenOutputStructOutput = [string, BigNumber, string, string] & {
 export interface IPActionCoreInterface extends utils.Interface {
   contractName: "IPActionCore";
   functions: {
-    "addLiquidityDualIbTokenAndPt(address,address,uint256,uint256,uint256)": FunctionFragment;
     "addLiquidityDualScyAndPt(address,address,uint256,uint256,uint256)": FunctionFragment;
+    "addLiquidityDualTokenAndPt(address,address,address,uint256,uint256,uint256)": FunctionFragment;
     "addLiquiditySinglePt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
     "addLiquiditySingleScy(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
     "addLiquiditySingleToken(address,address,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,address,bytes))": FunctionFragment;
@@ -87,8 +88,8 @@ export interface IPActionCoreInterface extends utils.Interface {
     "redeemPyToScy(address,address,uint256,uint256)": FunctionFragment;
     "redeemPyToToken(address,address,uint256,(address,uint256,address,bytes))": FunctionFragment;
     "redeemScyToToken(address,address,uint256,(address,uint256,address,bytes))": FunctionFragment;
-    "removeLiquidityDualIbTokenAndPt(address,address,uint256,uint256,uint256)": FunctionFragment;
     "removeLiquidityDualScyAndPt(address,address,uint256,uint256,uint256)": FunctionFragment;
+    "removeLiquidityDualTokenAndPt(address,address,uint256,address,uint256,uint256)": FunctionFragment;
     "removeLiquiditySinglePt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
     "removeLiquiditySingleScy(address,address,uint256,uint256)": FunctionFragment;
     "removeLiquiditySingleToken(address,address,uint256,(address,uint256,address,bytes))": FunctionFragment;
@@ -101,12 +102,12 @@ export interface IPActionCoreInterface extends utils.Interface {
   };
 
   encodeFunctionData(
-    functionFragment: "addLiquidityDualIbTokenAndPt",
+    functionFragment: "addLiquidityDualScyAndPt",
     values: [string, string, BigNumberish, BigNumberish, BigNumberish]
   ): string;
   encodeFunctionData(
-    functionFragment: "addLiquidityDualScyAndPt",
-    values: [string, string, BigNumberish, BigNumberish, BigNumberish]
+    functionFragment: "addLiquidityDualTokenAndPt",
+    values: [string, string, string, BigNumberish, BigNumberish, BigNumberish]
   ): string;
   encodeFunctionData(
     functionFragment: "addLiquiditySinglePt",
@@ -149,12 +150,12 @@ export interface IPActionCoreInterface extends utils.Interface {
     values: [string, string, BigNumberish, TokenOutputStruct]
   ): string;
   encodeFunctionData(
-    functionFragment: "removeLiquidityDualIbTokenAndPt",
+    functionFragment: "removeLiquidityDualScyAndPt",
     values: [string, string, BigNumberish, BigNumberish, BigNumberish]
   ): string;
   encodeFunctionData(
-    functionFragment: "removeLiquidityDualScyAndPt",
-    values: [string, string, BigNumberish, BigNumberish, BigNumberish]
+    functionFragment: "removeLiquidityDualTokenAndPt",
+    values: [string, string, BigNumberish, string, BigNumberish, BigNumberish]
   ): string;
   encodeFunctionData(
     functionFragment: "removeLiquiditySinglePt",
@@ -194,11 +195,11 @@ export interface IPActionCoreInterface extends utils.Interface {
   ): string;
 
   decodeFunctionResult(
-    functionFragment: "addLiquidityDualIbTokenAndPt",
+    functionFragment: "addLiquidityDualScyAndPt",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "addLiquidityDualScyAndPt",
+    functionFragment: "addLiquidityDualTokenAndPt",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -242,11 +243,11 @@ export interface IPActionCoreInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "removeLiquidityDualIbTokenAndPt",
+    functionFragment: "removeLiquidityDualScyAndPt",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "removeLiquidityDualScyAndPt",
+    functionFragment: "removeLiquidityDualTokenAndPt",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -287,8 +288,8 @@ export interface IPActionCoreInterface extends utils.Interface {
   ): Result;
 
   events: {
-    "AddLiquidityDualIbTokenAndPt(address,address,address,uint256,uint256,uint256)": EventFragment;
     "AddLiquidityDualScyAndPt(address,address,address,uint256,uint256,uint256)": EventFragment;
+    "AddLiquidityDualTokenAndPt(address,address,address,address,uint256,uint256,uint256)": EventFragment;
     "MintPyFromScy(address,address,address,uint256,uint256)": EventFragment;
     "MintPyFromToken(address,address,address,address,uint256,uint256)": EventFragment;
     "MintScyFromToken(address,address,address,address,uint256,uint256)": EventFragment;
@@ -301,10 +302,8 @@ export interface IPActionCoreInterface extends utils.Interface {
     "SwapPtAndToken(address,address,address,address,int256,int256)": EventFragment;
   };
 
-  getEvent(
-    nameOrSignatureOrTopic: "AddLiquidityDualIbTokenAndPt"
-  ): EventFragment;
   getEvent(nameOrSignatureOrTopic: "AddLiquidityDualScyAndPt"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "AddLiquidityDualTokenAndPt"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "MintPyFromScy"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "MintPyFromToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "MintScyFromToken"): EventFragment;
@@ -321,35 +320,36 @@ export interface IPActionCoreInterface extends utils.Interface {
   getEvent(nameOrSignatureOrTopic: "SwapPtAndToken"): EventFragment;
 }
 
-export type AddLiquidityDualIbTokenAndPtEvent = TypedEvent<
+export type AddLiquidityDualScyAndPtEvent = TypedEvent<
   [string, string, string, BigNumber, BigNumber, BigNumber],
   {
     caller: string;
     market: string;
     receiver: string;
-    ibTokenUsed: BigNumber;
+    scyUsed: BigNumber;
     ptUsed: BigNumber;
     lpOut: BigNumber;
   }
 >;
 
-export type AddLiquidityDualIbTokenAndPtEventFilter =
-  TypedEventFilter<AddLiquidityDualIbTokenAndPtEvent>;
+export type AddLiquidityDualScyAndPtEventFilter =
+  TypedEventFilter<AddLiquidityDualScyAndPtEvent>;
 
-export type AddLiquidityDualScyAndPtEvent = TypedEvent<
-  [string, string, string, BigNumber, BigNumber, BigNumber],
+export type AddLiquidityDualTokenAndPtEvent = TypedEvent<
+  [string, string, string, string, BigNumber, BigNumber, BigNumber],
   {
     caller: string;
     market: string;
     receiver: string;
-    scyUsed: BigNumber;
+    tokenIn: string;
+    tokenUsed: BigNumber;
     ptUsed: BigNumber;
     lpOut: BigNumber;
   }
 >;
 
-export type AddLiquidityDualScyAndPtEventFilter =
-  TypedEventFilter<AddLiquidityDualScyAndPtEvent>;
+export type AddLiquidityDualTokenAndPtEventFilter =
+  TypedEventFilter<AddLiquidityDualTokenAndPtEvent>;
 
 export type MintPyFromScyEvent = TypedEvent<
   [string, string, string, BigNumber, BigNumber],
@@ -456,7 +456,7 @@ export type RemoveLiquidityDualScyAndPtEvent = TypedEvent<
     caller: string;
     market: string;
     receiver: string;
-    lpIn: BigNumber;
+    netlpIn: BigNumber;
     amountPTOut: BigNumber;
     amountSCYOut: BigNumber;
   }
@@ -520,22 +520,23 @@ export interface IPActionCore extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
-    addLiquidityDualIbTokenAndPt(
+    addLiquidityDualScyAndPt(
       receiver: string,
       market: string,
-      ibTokenDesired: BigNumberish,
+      scyDesired: BigNumberish,
       ptDesired: BigNumberish,
       minLpOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    addLiquidityDualScyAndPt(
+    addLiquidityDualTokenAndPt(
       receiver: string,
       market: string,
-      scyDesired: BigNumberish,
+      tokenIn: string,
+      tokenDesired: BigNumberish,
       ptDesired: BigNumberish,
       minLpOut: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     addLiquiditySinglePt(
@@ -562,7 +563,7 @@ export interface IPActionCore extends BaseContract {
       minLpOut: BigNumberish,
       guessPtReceivedFromScy: ApproxParamsStruct,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     mintPyFromScy(
@@ -578,7 +579,7 @@ export interface IPActionCore extends BaseContract {
       YT: string,
       minPyOut: BigNumberish,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     mintScyFromToken(
@@ -586,7 +587,7 @@ export interface IPActionCore extends BaseContract {
       SCY: string,
       minScyOut: BigNumberish,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     redeemDueInterestAndRewards(
@@ -621,20 +622,21 @@ export interface IPActionCore extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    removeLiquidityDualIbTokenAndPt(
+    removeLiquidityDualScyAndPt(
       receiver: string,
       market: string,
       lpToRemove: BigNumberish,
-      ibTokenMin: BigNumberish,
+      scyOutMin: BigNumberish,
       ptOutMin: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    removeLiquidityDualScyAndPt(
+    removeLiquidityDualTokenAndPt(
       receiver: string,
       market: string,
       lpToRemove: BigNumberish,
-      scyOutMin: BigNumberish,
+      tokenOut: string,
+      tokenOutMin: BigNumberish,
       ptOutMin: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
@@ -695,7 +697,7 @@ export interface IPActionCore extends BaseContract {
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     swapPtForExactScy(
@@ -716,22 +718,23 @@ export interface IPActionCore extends BaseContract {
     ): Promise<ContractTransaction>;
   };
 
-  addLiquidityDualIbTokenAndPt(
+  addLiquidityDualScyAndPt(
     receiver: string,
     market: string,
-    ibTokenDesired: BigNumberish,
+    scyDesired: BigNumberish,
     ptDesired: BigNumberish,
     minLpOut: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  addLiquidityDualScyAndPt(
+  addLiquidityDualTokenAndPt(
     receiver: string,
     market: string,
-    scyDesired: BigNumberish,
+    tokenIn: string,
+    tokenDesired: BigNumberish,
     ptDesired: BigNumberish,
     minLpOut: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   addLiquiditySinglePt(
@@ -758,7 +761,7 @@ export interface IPActionCore extends BaseContract {
     minLpOut: BigNumberish,
     guessPtReceivedFromScy: ApproxParamsStruct,
     input: TokenInputStruct,
-    overrides?: Overrides & { from?: string | Promise<string> }
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   mintPyFromScy(
@@ -774,7 +777,7 @@ export interface IPActionCore extends BaseContract {
     YT: string,
     minPyOut: BigNumberish,
     input: TokenInputStruct,
-    overrides?: Overrides & { from?: string | Promise<string> }
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   mintScyFromToken(
@@ -782,7 +785,7 @@ export interface IPActionCore extends BaseContract {
     SCY: string,
     minScyOut: BigNumberish,
     input: TokenInputStruct,
-    overrides?: Overrides & { from?: string | Promise<string> }
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   redeemDueInterestAndRewards(
@@ -817,20 +820,21 @@ export interface IPActionCore extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  removeLiquidityDualIbTokenAndPt(
+  removeLiquidityDualScyAndPt(
     receiver: string,
     market: string,
     lpToRemove: BigNumberish,
-    ibTokenMin: BigNumberish,
+    scyOutMin: BigNumberish,
     ptOutMin: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  removeLiquidityDualScyAndPt(
+  removeLiquidityDualTokenAndPt(
     receiver: string,
     market: string,
     lpToRemove: BigNumberish,
-    scyOutMin: BigNumberish,
+    tokenOut: string,
+    tokenOutMin: BigNumberish,
     ptOutMin: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
@@ -891,7 +895,7 @@ export interface IPActionCore extends BaseContract {
     minPtOut: BigNumberish,
     guessPtOut: ApproxParamsStruct,
     input: TokenInputStruct,
-    overrides?: Overrides & { from?: string | Promise<string> }
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   swapPtForExactScy(
@@ -912,32 +916,33 @@ export interface IPActionCore extends BaseContract {
   ): Promise<ContractTransaction>;
 
   callStatic: {
-    addLiquidityDualIbTokenAndPt(
+    addLiquidityDualScyAndPt(
       receiver: string,
       market: string,
-      ibTokenDesired: BigNumberish,
+      scyDesired: BigNumberish,
       ptDesired: BigNumberish,
       minLpOut: BigNumberish,
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber, BigNumber] & {
         netLpOut: BigNumber;
-        ibTokenUsed: BigNumber;
+        scyUsed: BigNumber;
         ptUsed: BigNumber;
       }
     >;
 
-    addLiquidityDualScyAndPt(
+    addLiquidityDualTokenAndPt(
       receiver: string,
       market: string,
-      scyDesired: BigNumberish,
+      tokenIn: string,
+      tokenDesired: BigNumberish,
       ptDesired: BigNumberish,
       minLpOut: BigNumberish,
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber, BigNumber] & {
         netLpOut: BigNumber;
-        scyUsed: BigNumber;
+        tokenUsed: BigNumber;
         ptUsed: BigNumber;
       }
     >;
@@ -1032,26 +1037,27 @@ export interface IPActionCore extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    removeLiquidityDualIbTokenAndPt(
+    removeLiquidityDualScyAndPt(
       receiver: string,
       market: string,
       lpToRemove: BigNumberish,
-      ibTokenMin: BigNumberish,
+      scyOutMin: BigNumberish,
       ptOutMin: BigNumberish,
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, BigNumber] & { netIbTokenOut: BigNumber; netPtOut: BigNumber }
+      [BigNumber, BigNumber] & { netScyOut: BigNumber; netPtOut: BigNumber }
     >;
 
-    removeLiquidityDualScyAndPt(
+    removeLiquidityDualTokenAndPt(
       receiver: string,
       market: string,
       lpToRemove: BigNumberish,
-      scyOutMin: BigNumberish,
+      tokenOut: string,
+      tokenOutMin: BigNumberish,
       ptOutMin: BigNumberish,
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, BigNumber] & { netScyOut: BigNumber; netPtOut: BigNumber }
+      [BigNumber, BigNumber] & { netTokenOut: BigNumber; netPtOut: BigNumber }
     >;
 
     removeLiquiditySinglePt(
@@ -1132,39 +1138,41 @@ export interface IPActionCore extends BaseContract {
   };
 
   filters: {
-    "AddLiquidityDualIbTokenAndPt(address,address,address,uint256,uint256,uint256)"(
+    "AddLiquidityDualScyAndPt(address,address,address,uint256,uint256,uint256)"(
       caller?: string | null,
       market?: string | null,
       receiver?: string | null,
-      ibTokenUsed?: null,
+      scyUsed?: null,
       ptUsed?: null,
       lpOut?: null
-    ): AddLiquidityDualIbTokenAndPtEventFilter;
-    AddLiquidityDualIbTokenAndPt(
+    ): AddLiquidityDualScyAndPtEventFilter;
+    AddLiquidityDualScyAndPt(
       caller?: string | null,
       market?: string | null,
       receiver?: string | null,
-      ibTokenUsed?: null,
+      scyUsed?: null,
       ptUsed?: null,
       lpOut?: null
-    ): AddLiquidityDualIbTokenAndPtEventFilter;
+    ): AddLiquidityDualScyAndPtEventFilter;
 
-    "AddLiquidityDualScyAndPt(address,address,address,uint256,uint256,uint256)"(
+    "AddLiquidityDualTokenAndPt(address,address,address,address,uint256,uint256,uint256)"(
       caller?: string | null,
       market?: string | null,
       receiver?: string | null,
-      scyUsed?: null,
+      tokenIn?: null,
+      tokenUsed?: null,
       ptUsed?: null,
       lpOut?: null
-    ): AddLiquidityDualScyAndPtEventFilter;
-    AddLiquidityDualScyAndPt(
+    ): AddLiquidityDualTokenAndPtEventFilter;
+    AddLiquidityDualTokenAndPt(
       caller?: string | null,
       market?: string | null,
       receiver?: string | null,
-      scyUsed?: null,
+      tokenIn?: null,
+      tokenUsed?: null,
       ptUsed?: null,
       lpOut?: null
-    ): AddLiquidityDualScyAndPtEventFilter;
+    ): AddLiquidityDualTokenAndPtEventFilter;
 
     "MintPyFromScy(address,address,address,uint256,uint256)"(
       caller?: string | null,
@@ -1285,7 +1293,7 @@ export interface IPActionCore extends BaseContract {
       caller?: string | null,
       market?: string | null,
       receiver?: null,
-      lpIn?: null,
+      netlpIn?: null,
       amountPTOut?: null,
       amountSCYOut?: null
     ): RemoveLiquidityDualScyAndPtEventFilter;
@@ -1293,7 +1301,7 @@ export interface IPActionCore extends BaseContract {
       caller?: string | null,
       market?: string | null,
       receiver?: null,
-      lpIn?: null,
+      netlpIn?: null,
       amountPTOut?: null,
       amountSCYOut?: null
     ): RemoveLiquidityDualScyAndPtEventFilter;
@@ -1332,22 +1340,23 @@ export interface IPActionCore extends BaseContract {
   };
 
   estimateGas: {
-    addLiquidityDualIbTokenAndPt(
+    addLiquidityDualScyAndPt(
       receiver: string,
       market: string,
-      ibTokenDesired: BigNumberish,
+      scyDesired: BigNumberish,
       ptDesired: BigNumberish,
       minLpOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    addLiquidityDualScyAndPt(
+    addLiquidityDualTokenAndPt(
       receiver: string,
       market: string,
-      scyDesired: BigNumberish,
+      tokenIn: string,
+      tokenDesired: BigNumberish,
       ptDesired: BigNumberish,
       minLpOut: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     addLiquiditySinglePt(
@@ -1374,7 +1383,7 @@ export interface IPActionCore extends BaseContract {
       minLpOut: BigNumberish,
       guessPtReceivedFromScy: ApproxParamsStruct,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     mintPyFromScy(
@@ -1390,7 +1399,7 @@ export interface IPActionCore extends BaseContract {
       YT: string,
       minPyOut: BigNumberish,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     mintScyFromToken(
@@ -1398,7 +1407,7 @@ export interface IPActionCore extends BaseContract {
       SCY: string,
       minScyOut: BigNumberish,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     redeemDueInterestAndRewards(
@@ -1433,20 +1442,21 @@ export interface IPActionCore extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    removeLiquidityDualIbTokenAndPt(
+    removeLiquidityDualScyAndPt(
       receiver: string,
       market: string,
       lpToRemove: BigNumberish,
-      ibTokenMin: BigNumberish,
+      scyOutMin: BigNumberish,
       ptOutMin: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    removeLiquidityDualScyAndPt(
+    removeLiquidityDualTokenAndPt(
       receiver: string,
       market: string,
       lpToRemove: BigNumberish,
-      scyOutMin: BigNumberish,
+      tokenOut: string,
+      tokenOutMin: BigNumberish,
       ptOutMin: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
@@ -1507,7 +1517,7 @@ export interface IPActionCore extends BaseContract {
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     swapPtForExactScy(
@@ -1529,22 +1539,23 @@ export interface IPActionCore extends BaseContract {
   };
 
   populateTransaction: {
-    addLiquidityDualIbTokenAndPt(
+    addLiquidityDualScyAndPt(
       receiver: string,
       market: string,
-      ibTokenDesired: BigNumberish,
+      scyDesired: BigNumberish,
       ptDesired: BigNumberish,
       minLpOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    addLiquidityDualScyAndPt(
+    addLiquidityDualTokenAndPt(
       receiver: string,
       market: string,
-      scyDesired: BigNumberish,
+      tokenIn: string,
+      tokenDesired: BigNumberish,
       ptDesired: BigNumberish,
       minLpOut: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     addLiquiditySinglePt(
@@ -1571,7 +1582,7 @@ export interface IPActionCore extends BaseContract {
       minLpOut: BigNumberish,
       guessPtReceivedFromScy: ApproxParamsStruct,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     mintPyFromScy(
@@ -1587,7 +1598,7 @@ export interface IPActionCore extends BaseContract {
       YT: string,
       minPyOut: BigNumberish,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     mintScyFromToken(
@@ -1595,7 +1606,7 @@ export interface IPActionCore extends BaseContract {
       SCY: string,
       minScyOut: BigNumberish,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     redeemDueInterestAndRewards(
@@ -1630,20 +1641,21 @@ export interface IPActionCore extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    removeLiquidityDualIbTokenAndPt(
+    removeLiquidityDualScyAndPt(
       receiver: string,
       market: string,
       lpToRemove: BigNumberish,
-      ibTokenMin: BigNumberish,
+      scyOutMin: BigNumberish,
       ptOutMin: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    removeLiquidityDualScyAndPt(
+    removeLiquidityDualTokenAndPt(
       receiver: string,
       market: string,
       lpToRemove: BigNumberish,
-      scyOutMin: BigNumberish,
+      tokenOut: string,
+      tokenOutMin: BigNumberish,
       ptOutMin: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
@@ -1704,7 +1716,7 @@ export interface IPActionCore extends BaseContract {
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     swapPtForExactScy(