@pendle/core-v2 0.8.0-beta-11 → 0.8.1-beta

package/typechain-types/ActionCore.ts

@@ -48,13 +48,21 @@ export interface ActionCoreInterface extends utils.Interface {
   contractName: "ActionCore";
   functions: {
     "addLiquidity(address,address,uint256,uint256,uint256)": FunctionFragment;
+    "addLiquiditySinglePt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
+    "addLiquiditySingleRawToken(address,address,uint256,uint256,address[],(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
+    "addLiquiditySingleScy(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
     "joeFactory()": FunctionFragment;
     "mintPyFromRawToken(address,address,uint256,uint256,address[])": FunctionFragment;
+    "mintPyFromScy(address,address,uint256,uint256)": FunctionFragment;
     "mintScyFromRawToken(address,address,uint256,uint256,address[])": FunctionFragment;
     "redeemDueInterestAndRewards(address,address[],address[],address[])": FunctionFragment;
     "redeemPyToRawToken(address,address,uint256,uint256,address[])": FunctionFragment;
+    "redeemPyToScy(address,address,uint256,uint256)": FunctionFragment;
     "redeemScyToRawToken(address,address,uint256,uint256,address[])": FunctionFragment;
     "removeLiquidity(address,address,uint256,uint256,uint256)": FunctionFragment;
+    "removeLiquiditySinglePt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
+    "removeLiquiditySingleRawToken(address,address,uint256,uint256,address[])": FunctionFragment;
+    "removeLiquiditySingleScy(address,address,uint256,uint256)": FunctionFragment;
     "swapExactPtForRawToken(address,address,uint256,uint256,address[])": FunctionFragment;
     "swapExactPtForScy(address,address,uint256,uint256)": FunctionFragment;
     "swapExactRawTokenForPt(address,address,uint256,uint256,address[],(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
@@ -67,6 +75,25 @@ export interface ActionCoreInterface extends utils.Interface {
     functionFragment: "addLiquidity",
     values: [string, string, BigNumberish, BigNumberish, BigNumberish]
   ): string;
+  encodeFunctionData(
+    functionFragment: "addLiquiditySinglePt",
+    values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "addLiquiditySingleRawToken",
+    values: [
+      string,
+      string,
+      BigNumberish,
+      BigNumberish,
+      string[],
+      ApproxParamsStruct
+    ]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "addLiquiditySingleScy",
+    values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
+  ): string;
   encodeFunctionData(
     functionFragment: "joeFactory",
     values?: undefined
@@ -75,6 +102,10 @@ export interface ActionCoreInterface extends utils.Interface {
     functionFragment: "mintPyFromRawToken",
     values: [string, string, BigNumberish, BigNumberish, string[]]
   ): string;
+  encodeFunctionData(
+    functionFragment: "mintPyFromScy",
+    values: [string, string, BigNumberish, BigNumberish]
+  ): string;
   encodeFunctionData(
     functionFragment: "mintScyFromRawToken",
     values: [string, string, BigNumberish, BigNumberish, string[]]
@@ -87,6 +118,10 @@ export interface ActionCoreInterface extends utils.Interface {
     functionFragment: "redeemPyToRawToken",
     values: [string, string, BigNumberish, BigNumberish, string[]]
   ): string;
+  encodeFunctionData(
+    functionFragment: "redeemPyToScy",
+    values: [string, string, BigNumberish, BigNumberish]
+  ): string;
   encodeFunctionData(
     functionFragment: "redeemScyToRawToken",
     values: [string, string, BigNumberish, BigNumberish, string[]]
@@ -95,6 +130,18 @@ export interface ActionCoreInterface extends utils.Interface {
     functionFragment: "removeLiquidity",
     values: [string, string, BigNumberish, BigNumberish, BigNumberish]
   ): string;
+  encodeFunctionData(
+    functionFragment: "removeLiquiditySinglePt",
+    values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "removeLiquiditySingleRawToken",
+    values: [string, string, BigNumberish, BigNumberish, string[]]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "removeLiquiditySingleScy",
+    values: [string, string, BigNumberish, BigNumberish]
+  ): string;
   encodeFunctionData(
     functionFragment: "swapExactPtForRawToken",
     values: [string, string, BigNumberish, BigNumberish, string[]]
@@ -131,11 +178,27 @@ export interface ActionCoreInterface extends utils.Interface {
     functionFragment: "addLiquidity",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "addLiquiditySinglePt",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "addLiquiditySingleRawToken",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "addLiquiditySingleScy",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(functionFragment: "joeFactory", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "mintPyFromRawToken",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "mintPyFromScy",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "mintScyFromRawToken",
     data: BytesLike
@@ -148,6 +211,10 @@ export interface ActionCoreInterface extends utils.Interface {
     functionFragment: "redeemPyToRawToken",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "redeemPyToScy",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "redeemScyToRawToken",
     data: BytesLike
@@ -156,6 +223,18 @@ export interface ActionCoreInterface extends utils.Interface {
     functionFragment: "removeLiquidity",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "removeLiquiditySinglePt",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "removeLiquiditySingleRawToken",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "removeLiquiditySingleScy",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "swapExactPtForRawToken",
     data: BytesLike
@@ -182,25 +261,52 @@ export interface ActionCoreInterface extends utils.Interface {
   ): Result;
 
   events: {
-    "MintPyFromRawToken(address,address,uint256,address,uint256)": EventFragment;
-    "MintScyFromRawToken(address,address,uint256,address,uint256)": EventFragment;
-    "RedeemPyToRawToken(address,address,uint256,address,uint256)": EventFragment;
-    "RedeemScyToRawToken(address,address,uint256,address,uint256)": EventFragment;
+    "AddLiquidity(address,address,address,uint256,uint256,uint256)": EventFragment;
+    "MintPyFromRawToken(address,address,address,address,uint256,uint256)": EventFragment;
+    "MintPyFromScy(address,address,address,uint256,uint256)": EventFragment;
+    "MintScyFromRawToken(address,address,address,address,uint256,uint256)": EventFragment;
+    "RedeemPyToRawToken(address,address,address,uint256,address,uint256)": EventFragment;
+    "RedeemPyToScy(address,address,address,uint256,uint256)": EventFragment;
+    "RedeemScyToRawToken(address,address,address,uint256,address,uint256)": EventFragment;
+    "RemoveLiquidity(address,address,address,uint256,uint256,uint256)": EventFragment;
+    "SwapPtAndRawToken(address,address,address,address,int256,int256)": EventFragment;
+    "SwapPtAndScy(address,address,address,int256,int256)": EventFragment;
   };
 
+  getEvent(nameOrSignatureOrTopic: "AddLiquidity"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "MintPyFromRawToken"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "MintPyFromScy"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "MintScyFromRawToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "RedeemPyToRawToken"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "RedeemPyToScy"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "RedeemScyToRawToken"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "RemoveLiquidity"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "SwapPtAndRawToken"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "SwapPtAndScy"): EventFragment;
 }
 
+export type AddLiquidityEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber, BigNumber],
+  {
+    caller: string;
+    market: string;
+    receiver: string;
+    scyUsed: BigNumber;
+    ptUsed: BigNumber;
+    lpOut: BigNumber;
+  }
+>;
+
+export type AddLiquidityEventFilter = TypedEventFilter<AddLiquidityEvent>;
+
 export type MintPyFromRawTokenEvent = TypedEvent<
-  [string, string, BigNumber, string, BigNumber],
+  [string, string, string, string, BigNumber, BigNumber],
   {
-    user: string;
+    caller: string;
+    receiver: string;
+    YT: string;
     rawTokenIn: string;
     netRawTokenIn: BigNumber;
-    YT: string;
     netPyOut: BigNumber;
   }
 >;
@@ -208,13 +314,27 @@ export type MintPyFromRawTokenEvent = TypedEvent<
 export type MintPyFromRawTokenEventFilter =
   TypedEventFilter<MintPyFromRawTokenEvent>;
 
+export type MintPyFromScyEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber],
+  {
+    caller: string;
+    receiver: string;
+    YT: string;
+    netScyIn: BigNumber;
+    netPyOut: BigNumber;
+  }
+>;
+
+export type MintPyFromScyEventFilter = TypedEventFilter<MintPyFromScyEvent>;
+
 export type MintScyFromRawTokenEvent = TypedEvent<
-  [string, string, BigNumber, string, BigNumber],
+  [string, string, string, string, BigNumber, BigNumber],
   {
-    user: string;
+    caller: string;
+    receiver: string;
+    SCY: string;
     rawTokenIn: string;
     netRawTokenIn: BigNumber;
-    SCY: string;
     netScyOut: BigNumber;
   }
 >;
@@ -223,9 +343,10 @@ export type MintScyFromRawTokenEventFilter =
   TypedEventFilter<MintScyFromRawTokenEvent>;
 
 export type RedeemPyToRawTokenEvent = TypedEvent<
-  [string, string, BigNumber, string, BigNumber],
+  [string, string, string, BigNumber, string, BigNumber],
   {
-    user: string;
+    caller: string;
+    receiver: string;
     YT: string;
     netPyIn: BigNumber;
     rawTokenOut: string;
@@ -236,10 +357,24 @@ export type RedeemPyToRawTokenEvent = TypedEvent<
 export type RedeemPyToRawTokenEventFilter =
   TypedEventFilter<RedeemPyToRawTokenEvent>;
 
+export type RedeemPyToScyEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber],
+  {
+    caller: string;
+    receiver: string;
+    YT: string;
+    netPyIn: BigNumber;
+    netScyOut: BigNumber;
+  }
+>;
+
+export type RedeemPyToScyEventFilter = TypedEventFilter<RedeemPyToScyEvent>;
+
 export type RedeemScyToRawTokenEvent = TypedEvent<
-  [string, string, BigNumber, string, BigNumber],
+  [string, string, string, BigNumber, string, BigNumber],
   {
-    user: string;
+    caller: string;
+    receiver: string;
     SCY: string;
     netScyIn: BigNumber;
     rawTokenOut: string;
@@ -250,6 +385,48 @@ export type RedeemScyToRawTokenEvent = TypedEvent<
 export type RedeemScyToRawTokenEventFilter =
   TypedEventFilter<RedeemScyToRawTokenEvent>;
 
+export type RemoveLiquidityEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber, BigNumber],
+  {
+    caller: string;
+    market: string;
+    receiver: string;
+    lpIn: BigNumber;
+    amountPTOut: BigNumber;
+    amountSCYOut: BigNumber;
+  }
+>;
+
+export type RemoveLiquidityEventFilter = TypedEventFilter<RemoveLiquidityEvent>;
+
+export type SwapPtAndRawTokenEvent = TypedEvent<
+  [string, string, string, string, BigNumber, BigNumber],
+  {
+    caller: string;
+    market: string;
+    rawToken: string;
+    receiver: string;
+    amountPtToAccount: BigNumber;
+    amountRawTokenToAccount: BigNumber;
+  }
+>;
+
+export type SwapPtAndRawTokenEventFilter =
+  TypedEventFilter<SwapPtAndRawTokenEvent>;
+
+export type SwapPtAndScyEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber],
+  {
+    caller: string;
+    market: string;
+    receiver: string;
+    amountPtToAccount: BigNumber;
+    amountScyToAccount: BigNumber;
+  }
+>;
+
+export type SwapPtAndScyEventFilter = TypedEventFilter<SwapPtAndScyEvent>;
+
 export interface ActionCore extends BaseContract {
   contractName: "ActionCore";
   connect(signerOrProvider: Signer | Provider | string): this;
@@ -287,6 +464,34 @@ export interface ActionCore extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
+    addLiquiditySinglePt(
+      receiver: string,
+      market: string,
+      netPtIn: BigNumberish,
+      minLpOut: BigNumberish,
+      guessPtSwapToScy: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    addLiquiditySingleRawToken(
+      receiver: string,
+      market: string,
+      netRawTokenIn: BigNumberish,
+      minLpOut: BigNumberish,
+      path: string[],
+      guessPtReceivedFromScy: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    addLiquiditySingleScy(
+      receiver: string,
+      market: string,
+      netScyIn: BigNumberish,
+      minLpOut: BigNumberish,
+      guessPtReceivedFromScy: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
     joeFactory(overrides?: CallOverrides): Promise<[string]>;
 
     mintPyFromRawToken(
@@ -298,6 +503,14 @@ export interface ActionCore extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
+    mintPyFromScy(
+      receiver: string,
+      YT: string,
+      netScyIn: BigNumberish,
+      minPyOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
     mintScyFromRawToken(
       receiver: string,
       SCY: string,
@@ -324,6 +537,14 @@ export interface ActionCore extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
+    redeemPyToScy(
+      receiver: string,
+      YT: string,
+      netPyIn: BigNumberish,
+      minScyOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
     redeemScyToRawToken(
       receiver: string,
       SCY: string,
@@ -342,6 +563,32 @@ export interface ActionCore extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
+    removeLiquiditySinglePt(
+      receiver: string,
+      market: string,
+      lpToRemove: BigNumberish,
+      minPtOut: BigNumberish,
+      guessPtOut: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    removeLiquiditySingleRawToken(
+      receiver: string,
+      market: string,
+      lpToRemove: BigNumberish,
+      minRawTokenOut: BigNumberish,
+      path: string[],
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    removeLiquiditySingleScy(
+      receiver: string,
+      market: string,
+      lpToRemove: BigNumberish,
+      minScyOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
     swapExactPtForRawToken(
       receiver: string,
       market: string,
@@ -405,6 +652,34 @@ export interface ActionCore extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  addLiquiditySinglePt(
+    receiver: string,
+    market: string,
+    netPtIn: BigNumberish,
+    minLpOut: BigNumberish,
+    guessPtSwapToScy: ApproxParamsStruct,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  addLiquiditySingleRawToken(
+    receiver: string,
+    market: string,
+    netRawTokenIn: BigNumberish,
+    minLpOut: BigNumberish,
+    path: string[],
+    guessPtReceivedFromScy: ApproxParamsStruct,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  addLiquiditySingleScy(
+    receiver: string,
+    market: string,
+    netScyIn: BigNumberish,
+    minLpOut: BigNumberish,
+    guessPtReceivedFromScy: ApproxParamsStruct,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   joeFactory(overrides?: CallOverrides): Promise<string>;
 
   mintPyFromRawToken(
@@ -416,6 +691,14 @@ export interface ActionCore extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  mintPyFromScy(
+    receiver: string,
+    YT: string,
+    netScyIn: BigNumberish,
+    minPyOut: BigNumberish,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   mintScyFromRawToken(
     receiver: string,
     SCY: string,
@@ -442,6 +725,14 @@ export interface ActionCore extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  redeemPyToScy(
+    receiver: string,
+    YT: string,
+    netPyIn: BigNumberish,
+    minScyOut: BigNumberish,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   redeemScyToRawToken(
     receiver: string,
     SCY: string,
@@ -460,6 +751,32 @@ export interface ActionCore extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  removeLiquiditySinglePt(
+    receiver: string,
+    market: string,
+    lpToRemove: BigNumberish,
+    minPtOut: BigNumberish,
+    guessPtOut: ApproxParamsStruct,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  removeLiquiditySingleRawToken(
+    receiver: string,
+    market: string,
+    lpToRemove: BigNumberish,
+    minRawTokenOut: BigNumberish,
+    path: string[],
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  removeLiquiditySingleScy(
+    receiver: string,
+    market: string,
+    lpToRemove: BigNumberish,
+    minScyOut: BigNumberish,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   swapExactPtForRawToken(
     receiver: string,
     market: string,
@@ -529,6 +846,34 @@ export interface ActionCore extends BaseContract {
       }
     >;
 
+    addLiquiditySinglePt(
+      receiver: string,
+      market: string,
+      netPtIn: BigNumberish,
+      minLpOut: BigNumberish,
+      guessPtSwapToScy: ApproxParamsStruct,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    addLiquiditySingleRawToken(
+      receiver: string,
+      market: string,
+      netRawTokenIn: BigNumberish,
+      minLpOut: BigNumberish,
+      path: string[],
+      guessPtReceivedFromScy: ApproxParamsStruct,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    addLiquiditySingleScy(
+      receiver: string,
+      market: string,
+      netScyIn: BigNumberish,
+      minLpOut: BigNumberish,
+      guessPtReceivedFromScy: ApproxParamsStruct,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     joeFactory(overrides?: CallOverrides): Promise<string>;
 
     mintPyFromRawToken(
@@ -540,6 +885,14 @@ export interface ActionCore extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
+    mintPyFromScy(
+      receiver: string,
+      YT: string,
+      netScyIn: BigNumberish,
+      minPyOut: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     mintScyFromRawToken(
       receiver: string,
       SCY: string,
@@ -573,6 +926,14 @@ export interface ActionCore extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
+    redeemPyToScy(
+      receiver: string,
+      YT: string,
+      netPyIn: BigNumberish,
+      minScyOut: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     redeemScyToRawToken(
       receiver: string,
       SCY: string,
@@ -593,6 +954,32 @@ export interface ActionCore extends BaseContract {
       [BigNumber, BigNumber] & { netScyOut: BigNumber; netPtOut: BigNumber }
     >;
 
+    removeLiquiditySinglePt(
+      receiver: string,
+      market: string,
+      lpToRemove: BigNumberish,
+      minPtOut: BigNumberish,
+      guessPtOut: ApproxParamsStruct,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    removeLiquiditySingleRawToken(
+      receiver: string,
+      market: string,
+      lpToRemove: BigNumberish,
+      minRawTokenOut: BigNumberish,
+      path: string[],
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    removeLiquiditySingleScy(
+      receiver: string,
+      market: string,
+      lpToRemove: BigNumberish,
+      minScyOut: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     swapExactPtForRawToken(
       receiver: string,
       market: string,
@@ -648,65 +1035,169 @@ export interface ActionCore extends BaseContract {
   };
 
   filters: {
-    "MintPyFromRawToken(address,address,uint256,address,uint256)"(
-      user?: string | null,
-      rawTokenIn?: string | null,
-      netRawTokenIn?: null,
+    "AddLiquidity(address,address,address,uint256,uint256,uint256)"(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      scyUsed?: null,
+      ptUsed?: null,
+      lpOut?: null
+    ): AddLiquidityEventFilter;
+    AddLiquidity(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      scyUsed?: null,
+      ptUsed?: null,
+      lpOut?: null
+    ): AddLiquidityEventFilter;
+
+    "MintPyFromRawToken(address,address,address,address,uint256,uint256)"(
+      caller?: string | null,
+      receiver?: string | null,
       YT?: string | null,
+      rawTokenIn?: null,
+      netRawTokenIn?: null,
       netPyOut?: null
     ): MintPyFromRawTokenEventFilter;
     MintPyFromRawToken(
-      user?: string | null,
-      rawTokenIn?: string | null,
-      netRawTokenIn?: null,
+      caller?: string | null,
+      receiver?: string | null,
       YT?: string | null,
+      rawTokenIn?: null,
+      netRawTokenIn?: null,
       netPyOut?: null
     ): MintPyFromRawTokenEventFilter;
 
-    "MintScyFromRawToken(address,address,uint256,address,uint256)"(
-      user?: string | null,
-      rawTokenIn?: string | null,
-      netRawTokenIn?: null,
+    "MintPyFromScy(address,address,address,uint256,uint256)"(
+      caller?: string | null,
+      receiver?: string | null,
+      YT?: string | null,
+      netScyIn?: null,
+      netPyOut?: null
+    ): MintPyFromScyEventFilter;
+    MintPyFromScy(
+      caller?: string | null,
+      receiver?: string | null,
+      YT?: string | null,
+      netScyIn?: null,
+      netPyOut?: null
+    ): MintPyFromScyEventFilter;
+
+    "MintScyFromRawToken(address,address,address,address,uint256,uint256)"(
+      caller?: string | null,
+      receiver?: string | null,
       SCY?: string | null,
+      rawTokenIn?: null,
+      netRawTokenIn?: null,
       netScyOut?: null
     ): MintScyFromRawTokenEventFilter;
     MintScyFromRawToken(
-      user?: string | null,
-      rawTokenIn?: string | null,
-      netRawTokenIn?: null,
+      caller?: string | null,
+      receiver?: string | null,
       SCY?: string | null,
+      rawTokenIn?: null,
+      netRawTokenIn?: null,
       netScyOut?: null
     ): MintScyFromRawTokenEventFilter;
 
-    "RedeemPyToRawToken(address,address,uint256,address,uint256)"(
-      user?: string | null,
+    "RedeemPyToRawToken(address,address,address,uint256,address,uint256)"(
+      caller?: string | null,
+      receiver?: string | null,
       YT?: string | null,
       netPyIn?: null,
-      rawTokenOut?: string | null,
+      rawTokenOut?: null,
       netRawTokenOut?: null
     ): RedeemPyToRawTokenEventFilter;
     RedeemPyToRawToken(
-      user?: string | null,
+      caller?: string | null,
+      receiver?: string | null,
       YT?: string | null,
       netPyIn?: null,
-      rawTokenOut?: string | null,
+      rawTokenOut?: null,
       netRawTokenOut?: null
     ): RedeemPyToRawTokenEventFilter;
 
-    "RedeemScyToRawToken(address,address,uint256,address,uint256)"(
-      user?: string | null,
+    "RedeemPyToScy(address,address,address,uint256,uint256)"(
+      caller?: string | null,
+      receiver?: string | null,
+      YT?: string | null,
+      netPyIn?: null,
+      netScyOut?: null
+    ): RedeemPyToScyEventFilter;
+    RedeemPyToScy(
+      caller?: string | null,
+      receiver?: string | null,
+      YT?: string | null,
+      netPyIn?: null,
+      netScyOut?: null
+    ): RedeemPyToScyEventFilter;
+
+    "RedeemScyToRawToken(address,address,address,uint256,address,uint256)"(
+      caller?: string | null,
+      receiver?: string | null,
       SCY?: string | null,
       netScyIn?: null,
-      rawTokenOut?: string | null,
+      rawTokenOut?: null,
       netRawTokenOut?: null
     ): RedeemScyToRawTokenEventFilter;
     RedeemScyToRawToken(
-      user?: string | null,
+      caller?: string | null,
+      receiver?: string | null,
       SCY?: string | null,
       netScyIn?: null,
-      rawTokenOut?: string | null,
+      rawTokenOut?: null,
       netRawTokenOut?: null
     ): RedeemScyToRawTokenEventFilter;
+
+    "RemoveLiquidity(address,address,address,uint256,uint256,uint256)"(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: null,
+      lpIn?: null,
+      amountPTOut?: null,
+      amountSCYOut?: null
+    ): RemoveLiquidityEventFilter;
+    RemoveLiquidity(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: null,
+      lpIn?: null,
+      amountPTOut?: null,
+      amountSCYOut?: null
+    ): RemoveLiquidityEventFilter;
+
+    "SwapPtAndRawToken(address,address,address,address,int256,int256)"(
+      caller?: string | null,
+      market?: string | null,
+      rawToken?: string | null,
+      receiver?: null,
+      amountPtToAccount?: null,
+      amountRawTokenToAccount?: null
+    ): SwapPtAndRawTokenEventFilter;
+    SwapPtAndRawToken(
+      caller?: string | null,
+      market?: string | null,
+      rawToken?: string | null,
+      receiver?: null,
+      amountPtToAccount?: null,
+      amountRawTokenToAccount?: null
+    ): SwapPtAndRawTokenEventFilter;
+
+    "SwapPtAndScy(address,address,address,int256,int256)"(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      amountPtToAccount?: null,
+      amountScyToAccount?: null
+    ): SwapPtAndScyEventFilter;
+    SwapPtAndScy(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      amountPtToAccount?: null,
+      amountScyToAccount?: null
+    ): SwapPtAndScyEventFilter;
   };
 
   estimateGas: {
@@ -719,6 +1210,34 @@ export interface ActionCore extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
+    addLiquiditySinglePt(
+      receiver: string,
+      market: string,
+      netPtIn: BigNumberish,
+      minLpOut: BigNumberish,
+      guessPtSwapToScy: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    addLiquiditySingleRawToken(
+      receiver: string,
+      market: string,
+      netRawTokenIn: BigNumberish,
+      minLpOut: BigNumberish,
+      path: string[],
+      guessPtReceivedFromScy: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    addLiquiditySingleScy(
+      receiver: string,
+      market: string,
+      netScyIn: BigNumberish,
+      minLpOut: BigNumberish,
+      guessPtReceivedFromScy: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
     joeFactory(overrides?: CallOverrides): Promise<BigNumber>;
 
     mintPyFromRawToken(
@@ -730,6 +1249,14 @@ export interface ActionCore extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
+    mintPyFromScy(
+      receiver: string,
+      YT: string,
+      netScyIn: BigNumberish,
+      minPyOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
     mintScyFromRawToken(
       receiver: string,
       SCY: string,
@@ -756,6 +1283,14 @@ export interface ActionCore extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
+    redeemPyToScy(
+      receiver: string,
+      YT: string,
+      netPyIn: BigNumberish,
+      minScyOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
     redeemScyToRawToken(
       receiver: string,
       SCY: string,
@@ -774,6 +1309,32 @@ export interface ActionCore extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
+    removeLiquiditySinglePt(
+      receiver: string,
+      market: string,
+      lpToRemove: BigNumberish,
+      minPtOut: BigNumberish,
+      guessPtOut: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    removeLiquiditySingleRawToken(
+      receiver: string,
+      market: string,
+      lpToRemove: BigNumberish,
+      minRawTokenOut: BigNumberish,
+      path: string[],
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    removeLiquiditySingleScy(
+      receiver: string,
+      market: string,
+      lpToRemove: BigNumberish,
+      minScyOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
     swapExactPtForRawToken(
       receiver: string,
       market: string,
@@ -838,6 +1399,34 @@ export interface ActionCore extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
+    addLiquiditySinglePt(
+      receiver: string,
+      market: string,
+      netPtIn: BigNumberish,
+      minLpOut: BigNumberish,
+      guessPtSwapToScy: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    addLiquiditySingleRawToken(
+      receiver: string,
+      market: string,
+      netRawTokenIn: BigNumberish,
+      minLpOut: BigNumberish,
+      path: string[],
+      guessPtReceivedFromScy: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    addLiquiditySingleScy(
+      receiver: string,
+      market: string,
+      netScyIn: BigNumberish,
+      minLpOut: BigNumberish,
+      guessPtReceivedFromScy: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
     joeFactory(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     mintPyFromRawToken(
@@ -849,6 +1438,14 @@ export interface ActionCore extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
+    mintPyFromScy(
+      receiver: string,
+      YT: string,
+      netScyIn: BigNumberish,
+      minPyOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
     mintScyFromRawToken(
       receiver: string,
       SCY: string,
@@ -875,6 +1472,14 @@ export interface ActionCore extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
+    redeemPyToScy(
+      receiver: string,
+      YT: string,
+      netPyIn: BigNumberish,
+      minScyOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
     redeemScyToRawToken(
       receiver: string,
       SCY: string,
@@ -893,6 +1498,32 @@ export interface ActionCore extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
+    removeLiquiditySinglePt(
+      receiver: string,
+      market: string,
+      lpToRemove: BigNumberish,
+      minPtOut: BigNumberish,
+      guessPtOut: ApproxParamsStruct,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    removeLiquiditySingleRawToken(
+      receiver: string,
+      market: string,
+      lpToRemove: BigNumberish,
+      minRawTokenOut: BigNumberish,
+      path: string[],
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    removeLiquiditySingleScy(
+      receiver: string,
+      market: string,
+      lpToRemove: BigNumberish,
+      minScyOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
     swapExactPtForRawToken(
       receiver: string,
       market: string,