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

package/typechain-types/IPAllAction.ts

@@ -9,6 +9,7 @@ import {
   CallOverrides,
   ContractTransaction,
   Overrides,
+  PayableOverrides,
   PopulatedTransaction,
   Signer,
   utils,
@@ -75,11 +76,12 @@ export type TokenOutputStructOutput = [string, BigNumber, string, string] & {
 export interface IPAllActionInterface extends utils.Interface {
   contractName: "IPAllAction";
   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;
+    "consult(address,uint32)": FunctionFragment;
     "mintPyFromScy(address,address,uint256,uint256)": FunctionFragment;
     "mintPyFromToken(address,address,uint256,(address,uint256,address,bytes))": FunctionFragment;
     "mintScyFromToken(address,address,uint256,(address,uint256,address,bytes))": FunctionFragment;
@@ -87,8 +89,8 @@ export interface IPAllActionInterface 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;
@@ -107,12 +109,12 @@ export interface IPAllActionInterface 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",
@@ -126,6 +128,10 @@ export interface IPAllActionInterface extends utils.Interface {
     functionFragment: "addLiquiditySingleToken",
     values: [string, string, BigNumberish, ApproxParamsStruct, TokenInputStruct]
   ): string;
+  encodeFunctionData(
+    functionFragment: "consult",
+    values: [string, BigNumberish]
+  ): string;
   encodeFunctionData(
     functionFragment: "mintPyFromScy",
     values: [string, string, BigNumberish, BigNumberish]
@@ -155,12 +161,12 @@ export interface IPAllActionInterface 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",
@@ -224,11 +230,11 @@ export interface IPAllActionInterface extends utils.Interface {
   ): string;
 
   decodeFunctionResult(
-    functionFragment: "addLiquidityDualIbTokenAndPt",
+    functionFragment: "addLiquidityDualScyAndPt",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "addLiquidityDualScyAndPt",
+    functionFragment: "addLiquidityDualTokenAndPt",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -243,6 +249,7 @@ export interface IPAllActionInterface extends utils.Interface {
     functionFragment: "addLiquiditySingleToken",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(functionFragment: "consult", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "mintPyFromScy",
     data: BytesLike
@@ -272,11 +279,11 @@ export interface IPAllActionInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "removeLiquidityDualIbTokenAndPt",
+    functionFragment: "removeLiquidityDualScyAndPt",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "removeLiquidityDualScyAndPt",
+    functionFragment: "removeLiquidityDualTokenAndPt",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -341,26 +348,33 @@ export interface IPAllActionInterface 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;
+    "AddLiquiditySinglePt(address,address,address,uint256,uint256)": EventFragment;
+    "AddLiquiditySingleScy(address,address,address,uint256,uint256)": EventFragment;
+    "AddLiquiditySingleToken(address,address,address,address,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;
     "RedeemPyToScy(address,address,address,uint256,uint256)": EventFragment;
     "RedeemPyToToken(address,address,address,uint256,address,uint256)": EventFragment;
     "RedeemScyToToken(address,address,address,uint256,address,uint256)": EventFragment;
-    "RemoveLiquidityDualIbTokenAndPt(address,address,address,uint256,uint256,uint256)": EventFragment;
     "RemoveLiquidityDualScyAndPt(address,address,address,uint256,uint256,uint256)": EventFragment;
+    "RemoveLiquidityDualTokenAndPt(address,address,address,uint256,uint256,address,uint256)": EventFragment;
+    "RemoveLiquiditySinglePt(address,address,address,uint256,uint256)": EventFragment;
+    "RemoveLiquiditySingleScy(address,address,address,uint256,uint256)": EventFragment;
+    "RemoveLiquiditySingleToken(address,address,address,address,uint256,uint256)": EventFragment;
     "SwapPtAndScy(address,address,address,int256,int256)": EventFragment;
     "SwapPtAndToken(address,address,address,address,int256,int256)": EventFragment;
-    "SwapYTAndSCY(address,address,int256,int256)": EventFragment;
-    "SwapYTAndToken(address,address,address,int256,int256)": EventFragment;
+    "SwapYtAndScy(address,address,address,int256,int256)": EventFragment;
+    "SwapYtAndToken(address,address,address,address,int256,int256)": EventFragment;
   };
 
-  getEvent(
-    nameOrSignatureOrTopic: "AddLiquidityDualIbTokenAndPt"
-  ): EventFragment;
   getEvent(nameOrSignatureOrTopic: "AddLiquidityDualScyAndPt"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "AddLiquidityDualTokenAndPt"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "AddLiquiditySinglePt"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "AddLiquiditySingleScy"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "AddLiquiditySingleToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "MintPyFromScy"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "MintPyFromToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "MintScyFromToken"): EventFragment;
@@ -368,46 +382,93 @@ export interface IPAllActionInterface extends utils.Interface {
   getEvent(nameOrSignatureOrTopic: "RedeemPyToToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "RedeemScyToToken"): EventFragment;
   getEvent(
-    nameOrSignatureOrTopic: "RemoveLiquidityDualIbTokenAndPt"
+    nameOrSignatureOrTopic: "RemoveLiquidityDualScyAndPt"
   ): EventFragment;
   getEvent(
-    nameOrSignatureOrTopic: "RemoveLiquidityDualScyAndPt"
+    nameOrSignatureOrTopic: "RemoveLiquidityDualTokenAndPt"
   ): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "RemoveLiquiditySinglePt"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "RemoveLiquiditySingleScy"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "RemoveLiquiditySingleToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "SwapPtAndScy"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "SwapPtAndToken"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "SwapYTAndSCY"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "SwapYTAndToken"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "SwapYtAndScy"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "SwapYtAndToken"): EventFragment;
 }
 
-export type AddLiquidityDualIbTokenAndPtEvent = TypedEvent<
+export type AddLiquidityDualScyAndPtEvent = TypedEvent<
   [string, string, string, BigNumber, BigNumber, BigNumber],
   {
     caller: string;
     market: string;
     receiver: string;
-    ibTokenUsed: BigNumber;
-    ptUsed: BigNumber;
-    lpOut: BigNumber;
+    netScyUsed: BigNumber;
+    netPtUsed: BigNumber;
+    netLpOut: 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;
-    ptUsed: BigNumber;
-    lpOut: BigNumber;
+    tokenIn: string;
+    tokenUsed: BigNumber;
+    netPtUsed: BigNumber;
+    netLpOut: BigNumber;
   }
 >;
 
-export type AddLiquidityDualScyAndPtEventFilter =
-  TypedEventFilter<AddLiquidityDualScyAndPtEvent>;
+export type AddLiquidityDualTokenAndPtEventFilter =
+  TypedEventFilter<AddLiquidityDualTokenAndPtEvent>;
+
+export type AddLiquiditySinglePtEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber],
+  {
+    caller: string;
+    market: string;
+    receiver: string;
+    netPtIn: BigNumber;
+    netLpOut: BigNumber;
+  }
+>;
+
+export type AddLiquiditySinglePtEventFilter =
+  TypedEventFilter<AddLiquiditySinglePtEvent>;
+
+export type AddLiquiditySingleScyEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber],
+  {
+    caller: string;
+    market: string;
+    receiver: string;
+    netScyIn: BigNumber;
+    netLpOut: BigNumber;
+  }
+>;
+
+export type AddLiquiditySingleScyEventFilter =
+  TypedEventFilter<AddLiquiditySingleScyEvent>;
+
+export type AddLiquiditySingleTokenEvent = TypedEvent<
+  [string, string, string, string, BigNumber, BigNumber],
+  {
+    caller: string;
+    market: string;
+    token: string;
+    receiver: string;
+    netTokenIn: BigNumber;
+    netLpOut: BigNumber;
+  }
+>;
+
+export type AddLiquiditySingleTokenEventFilter =
+  TypedEventFilter<AddLiquiditySingleTokenEvent>;
 
 export type MintPyFromScyEvent = TypedEvent<
   [string, string, string, BigNumber, BigNumber],
@@ -493,35 +554,79 @@ export type RedeemScyToTokenEvent = TypedEvent<
 export type RedeemScyToTokenEventFilter =
   TypedEventFilter<RedeemScyToTokenEvent>;
 
-export type RemoveLiquidityDualIbTokenAndPtEvent = TypedEvent<
+export type RemoveLiquidityDualScyAndPtEvent = TypedEvent<
   [string, string, string, BigNumber, BigNumber, BigNumber],
   {
     caller: string;
     market: string;
     receiver: string;
-    lpIn: BigNumber;
-    amountPTOut: BigNumber;
-    amountIbTokenOut: BigNumber;
+    netLpToRemove: BigNumber;
+    netPtOut: BigNumber;
+    netScyOut: BigNumber;
   }
 >;
 
-export type RemoveLiquidityDualIbTokenAndPtEventFilter =
-  TypedEventFilter<RemoveLiquidityDualIbTokenAndPtEvent>;
+export type RemoveLiquidityDualScyAndPtEventFilter =
+  TypedEventFilter<RemoveLiquidityDualScyAndPtEvent>;
 
-export type RemoveLiquidityDualScyAndPtEvent = TypedEvent<
-  [string, string, string, BigNumber, BigNumber, BigNumber],
+export type RemoveLiquidityDualTokenAndPtEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber, string, BigNumber],
   {
     caller: string;
     market: string;
     receiver: string;
-    lpIn: BigNumber;
-    amountPTOut: BigNumber;
-    amountSCYOut: BigNumber;
+    netLpToRemove: BigNumber;
+    netPtOut: BigNumber;
+    tokenOut: string;
+    netTokenOut: BigNumber;
   }
 >;
 
-export type RemoveLiquidityDualScyAndPtEventFilter =
-  TypedEventFilter<RemoveLiquidityDualScyAndPtEvent>;
+export type RemoveLiquidityDualTokenAndPtEventFilter =
+  TypedEventFilter<RemoveLiquidityDualTokenAndPtEvent>;
+
+export type RemoveLiquiditySinglePtEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber],
+  {
+    caller: string;
+    market: string;
+    receiver: string;
+    netLpToRemove: BigNumber;
+    netPtOut: BigNumber;
+  }
+>;
+
+export type RemoveLiquiditySinglePtEventFilter =
+  TypedEventFilter<RemoveLiquiditySinglePtEvent>;
+
+export type RemoveLiquiditySingleScyEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber],
+  {
+    caller: string;
+    market: string;
+    receiver: string;
+    netLpToRemove: BigNumber;
+    netScyOut: BigNumber;
+  }
+>;
+
+export type RemoveLiquiditySingleScyEventFilter =
+  TypedEventFilter<RemoveLiquiditySingleScyEvent>;
+
+export type RemoveLiquiditySingleTokenEvent = TypedEvent<
+  [string, string, string, string, BigNumber, BigNumber],
+  {
+    caller: string;
+    market: string;
+    token: string;
+    receiver: string;
+    netLpToRemove: BigNumber;
+    netTokenOut: BigNumber;
+  }
+>;
+
+export type RemoveLiquiditySingleTokenEventFilter =
+  TypedEventFilter<RemoveLiquiditySingleTokenEvent>;
 
 export type SwapPtAndScyEvent = TypedEvent<
   [string, string, string, BigNumber, BigNumber],
@@ -529,8 +634,8 @@ export type SwapPtAndScyEvent = TypedEvent<
     caller: string;
     market: string;
     receiver: string;
-    amountPtToAccount: BigNumber;
-    amountScyToAccount: BigNumber;
+    netPtToAccount: BigNumber;
+    netScyToAccount: BigNumber;
   }
 >;
 
@@ -543,37 +648,39 @@ export type SwapPtAndTokenEvent = TypedEvent<
     market: string;
     token: string;
     receiver: string;
-    amountPtToAccount: BigNumber;
-    amountTokenToAccount: BigNumber;
+    netPtToAccount: BigNumber;
+    netTokenToAccount: BigNumber;
   }
 >;
 
 export type SwapPtAndTokenEventFilter = TypedEventFilter<SwapPtAndTokenEvent>;
 
-export type SwapYTAndSCYEvent = TypedEvent<
-  [string, string, BigNumber, BigNumber],
+export type SwapYtAndScyEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber],
   {
-    user: string;
+    caller: string;
     market: string;
-    ytToAccount: BigNumber;
-    scyToAccount: BigNumber;
+    receiver: string;
+    netYtToAccount: BigNumber;
+    netScyToAccount: BigNumber;
   }
 >;
 
-export type SwapYTAndSCYEventFilter = TypedEventFilter<SwapYTAndSCYEvent>;
+export type SwapYtAndScyEventFilter = TypedEventFilter<SwapYtAndScyEvent>;
 
-export type SwapYTAndTokenEvent = TypedEvent<
-  [string, string, string, BigNumber, BigNumber],
+export type SwapYtAndTokenEvent = TypedEvent<
+  [string, string, string, string, BigNumber, BigNumber],
   {
-    user: string;
+    caller: string;
     market: string;
     token: string;
-    ytToAccount: BigNumber;
-    tokenToAccount: BigNumber;
+    receiver: string;
+    netYtToAccount: BigNumber;
+    netTokenToAccount: BigNumber;
   }
 >;
 
-export type SwapYTAndTokenEventFilter = TypedEventFilter<SwapYTAndTokenEvent>;
+export type SwapYtAndTokenEventFilter = TypedEventFilter<SwapYtAndTokenEvent>;
 
 export interface IPAllAction extends BaseContract {
   contractName: "IPAllAction";
@@ -603,22 +710,23 @@ export interface IPAllAction extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
-    addLiquidityDualIbTokenAndPt(
+    addLiquidityDualScyAndPt(
       receiver: string,
       market: string,
-      ibTokenDesired: BigNumberish,
-      ptDesired: BigNumberish,
+      netScyDesired: BigNumberish,
+      netPtDesired: BigNumberish,
       minLpOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    addLiquidityDualScyAndPt(
+    addLiquidityDualTokenAndPt(
       receiver: string,
       market: string,
-      scyDesired: BigNumberish,
-      ptDesired: BigNumberish,
+      tokenIn: string,
+      netTokenDesired: BigNumberish,
+      netPtDesired: BigNumberish,
       minLpOut: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     addLiquiditySinglePt(
@@ -645,9 +753,15 @@ export interface IPAllAction extends BaseContract {
       minLpOut: BigNumberish,
       guessPtReceivedFromScy: ApproxParamsStruct,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
+    consult(
+      market: string,
+      secondsAgo: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber] & { lnImpliedRateMean: BigNumber }>;
+
     mintPyFromScy(
       receiver: string,
       YT: string,
@@ -661,7 +775,7 @@ export interface IPAllAction extends BaseContract {
       YT: string,
       minPyOut: BigNumberish,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     mintScyFromToken(
@@ -669,7 +783,7 @@ export interface IPAllAction extends BaseContract {
       SCY: string,
       minScyOut: BigNumberish,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     redeemDueInterestAndRewards(
@@ -704,28 +818,29 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    removeLiquidityDualIbTokenAndPt(
+    removeLiquidityDualScyAndPt(
       receiver: string,
       market: string,
-      lpToRemove: BigNumberish,
-      ibTokenMin: BigNumberish,
-      ptOutMin: BigNumberish,
+      netLpToRemove: BigNumberish,
+      minScyOut: BigNumberish,
+      minPtOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    removeLiquidityDualScyAndPt(
+    removeLiquidityDualTokenAndPt(
       receiver: string,
       market: string,
-      lpToRemove: BigNumberish,
-      scyOutMin: BigNumberish,
-      ptOutMin: BigNumberish,
+      netLpToRemove: BigNumberish,
+      tokenOut: string,
+      minTokenOut: BigNumberish,
+      minPtOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     removeLiquiditySinglePt(
       receiver: string,
       market: string,
-      lpToRemove: BigNumberish,
+      netLpToRemove: BigNumberish,
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -734,7 +849,7 @@ export interface IPAllAction extends BaseContract {
     removeLiquiditySingleScy(
       receiver: string,
       market: string,
-      lpToRemove: BigNumberish,
+      netLpToRemove: BigNumberish,
       minScyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
@@ -742,7 +857,7 @@ export interface IPAllAction extends BaseContract {
     removeLiquiditySingleToken(
       receiver: string,
       market: string,
-      lpToRemove: BigNumberish,
+      netLpToRemove: BigNumberish,
       output: TokenOutputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
@@ -787,7 +902,7 @@ export interface IPAllAction extends BaseContract {
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     swapExactTokenForYt(
@@ -796,7 +911,7 @@ export interface IPAllAction extends BaseContract {
       minYtOut: BigNumberish,
       guessYtOut: ApproxParamsStruct,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     swapExactYtForScy(
@@ -850,22 +965,23 @@ export interface IPAllAction extends BaseContract {
     ): Promise<ContractTransaction>;
   };
 
-  addLiquidityDualIbTokenAndPt(
+  addLiquidityDualScyAndPt(
     receiver: string,
     market: string,
-    ibTokenDesired: BigNumberish,
-    ptDesired: BigNumberish,
+    netScyDesired: BigNumberish,
+    netPtDesired: BigNumberish,
     minLpOut: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  addLiquidityDualScyAndPt(
+  addLiquidityDualTokenAndPt(
     receiver: string,
     market: string,
-    scyDesired: BigNumberish,
-    ptDesired: BigNumberish,
+    tokenIn: string,
+    netTokenDesired: BigNumberish,
+    netPtDesired: BigNumberish,
     minLpOut: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   addLiquiditySinglePt(
@@ -892,9 +1008,15 @@ export interface IPAllAction extends BaseContract {
     minLpOut: BigNumberish,
     guessPtReceivedFromScy: ApproxParamsStruct,
     input: TokenInputStruct,
-    overrides?: Overrides & { from?: string | Promise<string> }
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  consult(
+    market: string,
+    secondsAgo: BigNumberish,
+    overrides?: CallOverrides
+  ): Promise<BigNumber>;
+
   mintPyFromScy(
     receiver: string,
     YT: string,
@@ -908,7 +1030,7 @@ export interface IPAllAction extends BaseContract {
     YT: string,
     minPyOut: BigNumberish,
     input: TokenInputStruct,
-    overrides?: Overrides & { from?: string | Promise<string> }
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   mintScyFromToken(
@@ -916,7 +1038,7 @@ export interface IPAllAction extends BaseContract {
     SCY: string,
     minScyOut: BigNumberish,
     input: TokenInputStruct,
-    overrides?: Overrides & { from?: string | Promise<string> }
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   redeemDueInterestAndRewards(
@@ -951,28 +1073,29 @@ export interface IPAllAction extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  removeLiquidityDualIbTokenAndPt(
+  removeLiquidityDualScyAndPt(
     receiver: string,
     market: string,
-    lpToRemove: BigNumberish,
-    ibTokenMin: BigNumberish,
-    ptOutMin: BigNumberish,
+    netLpToRemove: BigNumberish,
+    minScyOut: BigNumberish,
+    minPtOut: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  removeLiquidityDualScyAndPt(
+  removeLiquidityDualTokenAndPt(
     receiver: string,
     market: string,
-    lpToRemove: BigNumberish,
-    scyOutMin: BigNumberish,
-    ptOutMin: BigNumberish,
+    netLpToRemove: BigNumberish,
+    tokenOut: string,
+    minTokenOut: BigNumberish,
+    minPtOut: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   removeLiquiditySinglePt(
     receiver: string,
     market: string,
-    lpToRemove: BigNumberish,
+    netLpToRemove: BigNumberish,
     minPtOut: BigNumberish,
     guessPtOut: ApproxParamsStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
@@ -981,7 +1104,7 @@ export interface IPAllAction extends BaseContract {
   removeLiquiditySingleScy(
     receiver: string,
     market: string,
-    lpToRemove: BigNumberish,
+    netLpToRemove: BigNumberish,
     minScyOut: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
@@ -989,7 +1112,7 @@ export interface IPAllAction extends BaseContract {
   removeLiquiditySingleToken(
     receiver: string,
     market: string,
-    lpToRemove: BigNumberish,
+    netLpToRemove: BigNumberish,
     output: TokenOutputStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
@@ -1034,7 +1157,7 @@ export interface IPAllAction extends BaseContract {
     minPtOut: BigNumberish,
     guessPtOut: ApproxParamsStruct,
     input: TokenInputStruct,
-    overrides?: Overrides & { from?: string | Promise<string> }
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   swapExactTokenForYt(
@@ -1043,7 +1166,7 @@ export interface IPAllAction extends BaseContract {
     minYtOut: BigNumberish,
     guessYtOut: ApproxParamsStruct,
     input: TokenInputStruct,
-    overrides?: Overrides & { from?: string | Promise<string> }
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   swapExactYtForScy(
@@ -1097,33 +1220,34 @@ export interface IPAllAction extends BaseContract {
   ): Promise<ContractTransaction>;
 
   callStatic: {
-    addLiquidityDualIbTokenAndPt(
+    addLiquidityDualScyAndPt(
       receiver: string,
       market: string,
-      ibTokenDesired: BigNumberish,
-      ptDesired: BigNumberish,
+      netScyDesired: BigNumberish,
+      netPtDesired: BigNumberish,
       minLpOut: BigNumberish,
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber, BigNumber] & {
         netLpOut: BigNumber;
-        ibTokenUsed: BigNumber;
-        ptUsed: BigNumber;
+        scyUsed: BigNumber;
+        netPtUsed: BigNumber;
       }
     >;
 
-    addLiquidityDualScyAndPt(
+    addLiquidityDualTokenAndPt(
       receiver: string,
       market: string,
-      scyDesired: BigNumberish,
-      ptDesired: BigNumberish,
+      tokenIn: string,
+      netTokenDesired: BigNumberish,
+      netPtDesired: BigNumberish,
       minLpOut: BigNumberish,
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber, BigNumber] & {
         netLpOut: BigNumber;
-        scyUsed: BigNumber;
-        ptUsed: BigNumber;
+        netTokenUsed: BigNumber;
+        netPtUsed: BigNumber;
       }
     >;
 
@@ -1154,6 +1278,12 @@ export interface IPAllAction extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
+    consult(
+      market: string,
+      secondsAgo: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     mintPyFromScy(
       receiver: string,
       YT: string,
@@ -1217,32 +1347,33 @@ export interface IPAllAction extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    removeLiquidityDualIbTokenAndPt(
+    removeLiquidityDualScyAndPt(
       receiver: string,
       market: string,
-      lpToRemove: BigNumberish,
-      ibTokenMin: BigNumberish,
-      ptOutMin: BigNumberish,
+      netLpToRemove: BigNumberish,
+      minScyOut: BigNumberish,
+      minPtOut: 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,
-      ptOutMin: BigNumberish,
+      netLpToRemove: BigNumberish,
+      tokenOut: string,
+      minTokenOut: BigNumberish,
+      minPtOut: BigNumberish,
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, BigNumber] & { netScyOut: BigNumber; netPtOut: BigNumber }
+      [BigNumber, BigNumber] & { netTokenOut: BigNumber; netPtOut: BigNumber }
     >;
 
     removeLiquiditySinglePt(
       receiver: string,
       market: string,
-      lpToRemove: BigNumberish,
+      netLpToRemove: BigNumberish,
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
       overrides?: CallOverrides
@@ -1251,7 +1382,7 @@ export interface IPAllAction extends BaseContract {
     removeLiquiditySingleScy(
       receiver: string,
       market: string,
-      lpToRemove: BigNumberish,
+      netLpToRemove: BigNumberish,
       minScyOut: BigNumberish,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
@@ -1259,7 +1390,7 @@ export interface IPAllAction extends BaseContract {
     removeLiquiditySingleToken(
       receiver: string,
       market: string,
-      lpToRemove: BigNumberish,
+      netLpToRemove: BigNumberish,
       output: TokenOutputStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
@@ -1368,39 +1499,88 @@ export interface IPAllAction 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,
-      ptUsed?: null,
-      lpOut?: null
-    ): AddLiquidityDualIbTokenAndPtEventFilter;
-    AddLiquidityDualIbTokenAndPt(
+      netScyUsed?: null,
+      netPtUsed?: null,
+      netLpOut?: null
+    ): AddLiquidityDualScyAndPtEventFilter;
+    AddLiquidityDualScyAndPt(
       caller?: string | null,
       market?: string | null,
       receiver?: string | null,
-      ibTokenUsed?: null,
-      ptUsed?: null,
-      lpOut?: null
-    ): AddLiquidityDualIbTokenAndPtEventFilter;
+      netScyUsed?: null,
+      netPtUsed?: null,
+      netLpOut?: null
+    ): 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,
-      ptUsed?: null,
-      lpOut?: null
-    ): AddLiquidityDualScyAndPtEventFilter;
-    AddLiquidityDualScyAndPt(
+      tokenIn?: null,
+      tokenUsed?: null,
+      netPtUsed?: null,
+      netLpOut?: null
+    ): AddLiquidityDualTokenAndPtEventFilter;
+    AddLiquidityDualTokenAndPt(
       caller?: string | null,
       market?: string | null,
       receiver?: string | null,
-      scyUsed?: null,
-      ptUsed?: null,
-      lpOut?: null
-    ): AddLiquidityDualScyAndPtEventFilter;
+      tokenIn?: null,
+      tokenUsed?: null,
+      netPtUsed?: null,
+      netLpOut?: null
+    ): AddLiquidityDualTokenAndPtEventFilter;
+
+    "AddLiquiditySinglePt(address,address,address,uint256,uint256)"(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      netPtIn?: null,
+      netLpOut?: null
+    ): AddLiquiditySinglePtEventFilter;
+    AddLiquiditySinglePt(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      netPtIn?: null,
+      netLpOut?: null
+    ): AddLiquiditySinglePtEventFilter;
+
+    "AddLiquiditySingleScy(address,address,address,uint256,uint256)"(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      netScyIn?: null,
+      netLpOut?: null
+    ): AddLiquiditySingleScyEventFilter;
+    AddLiquiditySingleScy(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      netScyIn?: null,
+      netLpOut?: null
+    ): AddLiquiditySingleScyEventFilter;
+
+    "AddLiquiditySingleToken(address,address,address,address,uint256,uint256)"(
+      caller?: string | null,
+      market?: string | null,
+      token?: string | null,
+      receiver?: null,
+      netTokenIn?: null,
+      netLpOut?: null
+    ): AddLiquiditySingleTokenEventFilter;
+    AddLiquiditySingleToken(
+      caller?: string | null,
+      market?: string | null,
+      token?: string | null,
+      receiver?: null,
+      netTokenIn?: null,
+      netLpOut?: null
+    ): AddLiquiditySingleTokenEventFilter;
 
     "MintPyFromScy(address,address,address,uint256,uint256)"(
       caller?: string | null,
@@ -1500,53 +1680,102 @@ export interface IPAllAction extends BaseContract {
       netTokenOut?: null
     ): RedeemScyToTokenEventFilter;
 
-    "RemoveLiquidityDualIbTokenAndPt(address,address,address,uint256,uint256,uint256)"(
+    "RemoveLiquidityDualScyAndPt(address,address,address,uint256,uint256,uint256)"(
       caller?: string | null,
       market?: string | null,
-      receiver?: null,
-      lpIn?: null,
-      amountPTOut?: null,
-      amountIbTokenOut?: null
-    ): RemoveLiquidityDualIbTokenAndPtEventFilter;
-    RemoveLiquidityDualIbTokenAndPt(
+      receiver?: string | null,
+      netLpToRemove?: null,
+      netPtOut?: null,
+      netScyOut?: null
+    ): RemoveLiquidityDualScyAndPtEventFilter;
+    RemoveLiquidityDualScyAndPt(
       caller?: string | null,
       market?: string | null,
-      receiver?: null,
-      lpIn?: null,
-      amountPTOut?: null,
-      amountIbTokenOut?: null
-    ): RemoveLiquidityDualIbTokenAndPtEventFilter;
+      receiver?: string | null,
+      netLpToRemove?: null,
+      netPtOut?: null,
+      netScyOut?: null
+    ): RemoveLiquidityDualScyAndPtEventFilter;
 
-    "RemoveLiquidityDualScyAndPt(address,address,address,uint256,uint256,uint256)"(
+    "RemoveLiquidityDualTokenAndPt(address,address,address,uint256,uint256,address,uint256)"(
       caller?: string | null,
       market?: string | null,
+      receiver?: string | null,
+      netLpToRemove?: null,
+      netPtOut?: null,
+      tokenOut?: null,
+      netTokenOut?: null
+    ): RemoveLiquidityDualTokenAndPtEventFilter;
+    RemoveLiquidityDualTokenAndPt(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      netLpToRemove?: null,
+      netPtOut?: null,
+      tokenOut?: null,
+      netTokenOut?: null
+    ): RemoveLiquidityDualTokenAndPtEventFilter;
+
+    "RemoveLiquiditySinglePt(address,address,address,uint256,uint256)"(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      netLpToRemove?: null,
+      netPtOut?: null
+    ): RemoveLiquiditySinglePtEventFilter;
+    RemoveLiquiditySinglePt(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      netLpToRemove?: null,
+      netPtOut?: null
+    ): RemoveLiquiditySinglePtEventFilter;
+
+    "RemoveLiquiditySingleScy(address,address,address,uint256,uint256)"(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      netLpToRemove?: null,
+      netScyOut?: null
+    ): RemoveLiquiditySingleScyEventFilter;
+    RemoveLiquiditySingleScy(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      netLpToRemove?: null,
+      netScyOut?: null
+    ): RemoveLiquiditySingleScyEventFilter;
+
+    "RemoveLiquiditySingleToken(address,address,address,address,uint256,uint256)"(
+      caller?: string | null,
+      market?: string | null,
+      token?: string | null,
       receiver?: null,
-      lpIn?: null,
-      amountPTOut?: null,
-      amountSCYOut?: null
-    ): RemoveLiquidityDualScyAndPtEventFilter;
-    RemoveLiquidityDualScyAndPt(
+      netLpToRemove?: null,
+      netTokenOut?: null
+    ): RemoveLiquiditySingleTokenEventFilter;
+    RemoveLiquiditySingleToken(
       caller?: string | null,
       market?: string | null,
+      token?: string | null,
       receiver?: null,
-      lpIn?: null,
-      amountPTOut?: null,
-      amountSCYOut?: null
-    ): RemoveLiquidityDualScyAndPtEventFilter;
+      netLpToRemove?: null,
+      netTokenOut?: null
+    ): RemoveLiquiditySingleTokenEventFilter;
 
     "SwapPtAndScy(address,address,address,int256,int256)"(
       caller?: string | null,
       market?: string | null,
       receiver?: string | null,
-      amountPtToAccount?: null,
-      amountScyToAccount?: null
+      netPtToAccount?: null,
+      netScyToAccount?: null
     ): SwapPtAndScyEventFilter;
     SwapPtAndScy(
       caller?: string | null,
       market?: string | null,
       receiver?: string | null,
-      amountPtToAccount?: null,
-      amountScyToAccount?: null
+      netPtToAccount?: null,
+      netScyToAccount?: null
     ): SwapPtAndScyEventFilter;
 
     "SwapPtAndToken(address,address,address,address,int256,int256)"(
@@ -1554,64 +1783,69 @@ export interface IPAllAction extends BaseContract {
       market?: string | null,
       token?: string | null,
       receiver?: null,
-      amountPtToAccount?: null,
-      amountTokenToAccount?: null
+      netPtToAccount?: null,
+      netTokenToAccount?: null
     ): SwapPtAndTokenEventFilter;
     SwapPtAndToken(
       caller?: string | null,
       market?: string | null,
       token?: string | null,
       receiver?: null,
-      amountPtToAccount?: null,
-      amountTokenToAccount?: null
+      netPtToAccount?: null,
+      netTokenToAccount?: null
     ): SwapPtAndTokenEventFilter;
 
-    "SwapYTAndSCY(address,address,int256,int256)"(
-      user?: string | null,
+    "SwapYtAndScy(address,address,address,int256,int256)"(
+      caller?: string | null,
       market?: string | null,
-      ytToAccount?: null,
-      scyToAccount?: null
-    ): SwapYTAndSCYEventFilter;
-    SwapYTAndSCY(
-      user?: string | null,
+      receiver?: string | null,
+      netYtToAccount?: null,
+      netScyToAccount?: null
+    ): SwapYtAndScyEventFilter;
+    SwapYtAndScy(
+      caller?: string | null,
       market?: string | null,
-      ytToAccount?: null,
-      scyToAccount?: null
-    ): SwapYTAndSCYEventFilter;
+      receiver?: string | null,
+      netYtToAccount?: null,
+      netScyToAccount?: null
+    ): SwapYtAndScyEventFilter;
 
-    "SwapYTAndToken(address,address,address,int256,int256)"(
-      user?: string | null,
+    "SwapYtAndToken(address,address,address,address,int256,int256)"(
+      caller?: string | null,
       market?: string | null,
       token?: string | null,
-      ytToAccount?: null,
-      tokenToAccount?: null
-    ): SwapYTAndTokenEventFilter;
-    SwapYTAndToken(
-      user?: string | null,
+      receiver?: null,
+      netYtToAccount?: null,
+      netTokenToAccount?: null
+    ): SwapYtAndTokenEventFilter;
+    SwapYtAndToken(
+      caller?: string | null,
       market?: string | null,
       token?: string | null,
-      ytToAccount?: null,
-      tokenToAccount?: null
-    ): SwapYTAndTokenEventFilter;
+      receiver?: null,
+      netYtToAccount?: null,
+      netTokenToAccount?: null
+    ): SwapYtAndTokenEventFilter;
   };
 
   estimateGas: {
-    addLiquidityDualIbTokenAndPt(
+    addLiquidityDualScyAndPt(
       receiver: string,
       market: string,
-      ibTokenDesired: BigNumberish,
-      ptDesired: BigNumberish,
+      netScyDesired: BigNumberish,
+      netPtDesired: BigNumberish,
       minLpOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    addLiquidityDualScyAndPt(
+    addLiquidityDualTokenAndPt(
       receiver: string,
       market: string,
-      scyDesired: BigNumberish,
-      ptDesired: BigNumberish,
+      tokenIn: string,
+      netTokenDesired: BigNumberish,
+      netPtDesired: BigNumberish,
       minLpOut: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     addLiquiditySinglePt(
@@ -1638,7 +1872,13 @@ export interface IPAllAction extends BaseContract {
       minLpOut: BigNumberish,
       guessPtReceivedFromScy: ApproxParamsStruct,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    consult(
+      market: string,
+      secondsAgo: BigNumberish,
+      overrides?: CallOverrides
     ): Promise<BigNumber>;
 
     mintPyFromScy(
@@ -1654,7 +1894,7 @@ export interface IPAllAction extends BaseContract {
       YT: string,
       minPyOut: BigNumberish,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     mintScyFromToken(
@@ -1662,7 +1902,7 @@ export interface IPAllAction extends BaseContract {
       SCY: string,
       minScyOut: BigNumberish,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     redeemDueInterestAndRewards(
@@ -1697,28 +1937,29 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    removeLiquidityDualIbTokenAndPt(
+    removeLiquidityDualScyAndPt(
       receiver: string,
       market: string,
-      lpToRemove: BigNumberish,
-      ibTokenMin: BigNumberish,
-      ptOutMin: BigNumberish,
+      netLpToRemove: BigNumberish,
+      minScyOut: BigNumberish,
+      minPtOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    removeLiquidityDualScyAndPt(
+    removeLiquidityDualTokenAndPt(
       receiver: string,
       market: string,
-      lpToRemove: BigNumberish,
-      scyOutMin: BigNumberish,
-      ptOutMin: BigNumberish,
+      netLpToRemove: BigNumberish,
+      tokenOut: string,
+      minTokenOut: BigNumberish,
+      minPtOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     removeLiquiditySinglePt(
       receiver: string,
       market: string,
-      lpToRemove: BigNumberish,
+      netLpToRemove: BigNumberish,
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -1727,7 +1968,7 @@ export interface IPAllAction extends BaseContract {
     removeLiquiditySingleScy(
       receiver: string,
       market: string,
-      lpToRemove: BigNumberish,
+      netLpToRemove: BigNumberish,
       minScyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
@@ -1735,7 +1976,7 @@ export interface IPAllAction extends BaseContract {
     removeLiquiditySingleToken(
       receiver: string,
       market: string,
-      lpToRemove: BigNumberish,
+      netLpToRemove: BigNumberish,
       output: TokenOutputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
@@ -1780,7 +2021,7 @@ export interface IPAllAction extends BaseContract {
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     swapExactTokenForYt(
@@ -1789,7 +2030,7 @@ export interface IPAllAction extends BaseContract {
       minYtOut: BigNumberish,
       guessYtOut: ApproxParamsStruct,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     swapExactYtForScy(
@@ -1844,22 +2085,23 @@ export interface IPAllAction extends BaseContract {
   };
 
   populateTransaction: {
-    addLiquidityDualIbTokenAndPt(
+    addLiquidityDualScyAndPt(
       receiver: string,
       market: string,
-      ibTokenDesired: BigNumberish,
-      ptDesired: BigNumberish,
+      netScyDesired: BigNumberish,
+      netPtDesired: BigNumberish,
       minLpOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    addLiquidityDualScyAndPt(
+    addLiquidityDualTokenAndPt(
       receiver: string,
       market: string,
-      scyDesired: BigNumberish,
-      ptDesired: BigNumberish,
+      tokenIn: string,
+      netTokenDesired: BigNumberish,
+      netPtDesired: BigNumberish,
       minLpOut: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     addLiquiditySinglePt(
@@ -1886,7 +2128,13 @@ export interface IPAllAction extends BaseContract {
       minLpOut: BigNumberish,
       guessPtReceivedFromScy: ApproxParamsStruct,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    consult(
+      market: string,
+      secondsAgo: BigNumberish,
+      overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
     mintPyFromScy(
@@ -1902,7 +2150,7 @@ export interface IPAllAction extends BaseContract {
       YT: string,
       minPyOut: BigNumberish,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     mintScyFromToken(
@@ -1910,7 +2158,7 @@ export interface IPAllAction extends BaseContract {
       SCY: string,
       minScyOut: BigNumberish,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     redeemDueInterestAndRewards(
@@ -1945,28 +2193,29 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    removeLiquidityDualIbTokenAndPt(
+    removeLiquidityDualScyAndPt(
       receiver: string,
       market: string,
-      lpToRemove: BigNumberish,
-      ibTokenMin: BigNumberish,
-      ptOutMin: BigNumberish,
+      netLpToRemove: BigNumberish,
+      minScyOut: BigNumberish,
+      minPtOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    removeLiquidityDualScyAndPt(
+    removeLiquidityDualTokenAndPt(
       receiver: string,
       market: string,
-      lpToRemove: BigNumberish,
-      scyOutMin: BigNumberish,
-      ptOutMin: BigNumberish,
+      netLpToRemove: BigNumberish,
+      tokenOut: string,
+      minTokenOut: BigNumberish,
+      minPtOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     removeLiquiditySinglePt(
       receiver: string,
       market: string,
-      lpToRemove: BigNumberish,
+      netLpToRemove: BigNumberish,
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -1975,7 +2224,7 @@ export interface IPAllAction extends BaseContract {
     removeLiquiditySingleScy(
       receiver: string,
       market: string,
-      lpToRemove: BigNumberish,
+      netLpToRemove: BigNumberish,
       minScyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
@@ -1983,7 +2232,7 @@ export interface IPAllAction extends BaseContract {
     removeLiquiditySingleToken(
       receiver: string,
       market: string,
-      lpToRemove: BigNumberish,
+      netLpToRemove: BigNumberish,
       output: TokenOutputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
@@ -2028,7 +2277,7 @@ export interface IPAllAction extends BaseContract {
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     swapExactTokenForYt(
@@ -2037,7 +2286,7 @@ export interface IPAllAction extends BaseContract {
       minYtOut: BigNumberish,
       guessYtOut: ApproxParamsStruct,
       input: TokenInputStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     swapExactYtForScy(