@pendle/core-v2 0.6.5 → 0.6.7

package/typechain-types/ActionCore.ts

@@ -22,23 +22,45 @@ import type {
   OnEvent,
 } from "./common";
 
+export type ApproxParamsStruct = {
+  guessMin: BigNumberish;
+  guessMax: BigNumberish;
+  guessOffchain: BigNumberish;
+  maxIteration: BigNumberish;
+  eps: BigNumberish;
+};
+
+export type ApproxParamsStructOutput = [
+  BigNumber,
+  BigNumber,
+  BigNumber,
+  BigNumber,
+  BigNumber
+] & {
+  guessMin: BigNumber;
+  guessMax: BigNumber;
+  guessOffchain: BigNumber;
+  maxIteration: BigNumber;
+  eps: BigNumber;
+};
+
 export interface ActionCoreInterface extends utils.Interface {
   contractName: "ActionCore";
   functions: {
     "addLiquidity(address,address,uint256,uint256,uint256)": FunctionFragment;
     "joeFactory()": FunctionFragment;
     "joeRouter()": FunctionFragment;
+    "mintPyFromRawToken(uint256,address,uint256,address,address[])": FunctionFragment;
     "mintScyFromRawToken(uint256,address,uint256,address,address[])": FunctionFragment;
-    "mintYoFromRawToken(uint256,address,uint256,address,address[])": FunctionFragment;
+    "redeemPyToRawToken(address,uint256,uint256,address,address[])": FunctionFragment;
     "redeemScyToRawToken(address,uint256,uint256,address,address[])": FunctionFragment;
-    "redeemYoToRawToken(address,uint256,uint256,address,address[])": FunctionFragment;
     "removeLiquidity(address,address,uint256,uint256,uint256)": FunctionFragment;
-    "swapExactOtForRawToken(uint256,address,address[],address,uint256)": FunctionFragment;
-    "swapExactOtForScy(address,address,uint256,uint256)": FunctionFragment;
-    "swapExactRawTokenForOt(uint256,address,address[],address,uint256,uint256,uint256,uint256)": FunctionFragment;
-    "swapExactScyForOt(address,address,uint256,uint256,uint256,uint256,uint256)": FunctionFragment;
-    "swapOtForExactScy(address,address,uint256,uint256,uint256,uint256,uint256)": FunctionFragment;
-    "swapScyForExactOt(address,address,uint256,uint256)": FunctionFragment;
+    "swapExactPtForRawToken(uint256,address,address[],address,uint256)": FunctionFragment;
+    "swapExactPtForScy(address,address,uint256,uint256)": FunctionFragment;
+    "swapExactRawTokenForPt(uint256,address,address[],address,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
+    "swapExactScyForPt(address,address,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
+    "swapPtForExactScy(address,address,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
+    "swapScyForExactPt(address,address,uint256,uint256)": FunctionFragment;
   };
 
   encodeFunctionData(
@@ -51,19 +73,19 @@ export interface ActionCoreInterface extends utils.Interface {
   ): string;
   encodeFunctionData(functionFragment: "joeRouter", values?: undefined): string;
   encodeFunctionData(
-    functionFragment: "mintScyFromRawToken",
+    functionFragment: "mintPyFromRawToken",
     values: [BigNumberish, string, BigNumberish, string, string[]]
   ): string;
   encodeFunctionData(
-    functionFragment: "mintYoFromRawToken",
+    functionFragment: "mintScyFromRawToken",
     values: [BigNumberish, string, BigNumberish, string, string[]]
   ): string;
   encodeFunctionData(
-    functionFragment: "redeemScyToRawToken",
+    functionFragment: "redeemPyToRawToken",
     values: [string, BigNumberish, BigNumberish, string, string[]]
   ): string;
   encodeFunctionData(
-    functionFragment: "redeemYoToRawToken",
+    functionFragment: "redeemScyToRawToken",
     values: [string, BigNumberish, BigNumberish, string, string[]]
   ): string;
   encodeFunctionData(
@@ -71,52 +93,27 @@ export interface ActionCoreInterface extends utils.Interface {
     values: [string, string, BigNumberish, BigNumberish, BigNumberish]
   ): string;
   encodeFunctionData(
-    functionFragment: "swapExactOtForRawToken",
+    functionFragment: "swapExactPtForRawToken",
     values: [BigNumberish, string, string[], string, BigNumberish]
   ): string;
   encodeFunctionData(
-    functionFragment: "swapExactOtForScy",
+    functionFragment: "swapExactPtForScy",
     values: [string, string, BigNumberish, BigNumberish]
   ): string;
   encodeFunctionData(
-    functionFragment: "swapExactRawTokenForOt",
-    values: [
-      BigNumberish,
-      string,
-      string[],
-      string,
-      BigNumberish,
-      BigNumberish,
-      BigNumberish,
-      BigNumberish
-    ]
+    functionFragment: "swapExactRawTokenForPt",
+    values: [BigNumberish, string, string[], string, ApproxParamsStruct]
   ): string;
   encodeFunctionData(
-    functionFragment: "swapExactScyForOt",
-    values: [
-      string,
-      string,
-      BigNumberish,
-      BigNumberish,
-      BigNumberish,
-      BigNumberish,
-      BigNumberish
-    ]
+    functionFragment: "swapExactScyForPt",
+    values: [string, string, BigNumberish, ApproxParamsStruct]
   ): string;
   encodeFunctionData(
-    functionFragment: "swapOtForExactScy",
-    values: [
-      string,
-      string,
-      BigNumberish,
-      BigNumberish,
-      BigNumberish,
-      BigNumberish,
-      BigNumberish
-    ]
+    functionFragment: "swapPtForExactScy",
+    values: [string, string, BigNumberish, ApproxParamsStruct]
   ): string;
   encodeFunctionData(
-    functionFragment: "swapScyForExactOt",
+    functionFragment: "swapScyForExactPt",
     values: [string, string, BigNumberish, BigNumberish]
   ): string;
 
@@ -127,19 +124,19 @@ export interface ActionCoreInterface extends utils.Interface {
   decodeFunctionResult(functionFragment: "joeFactory", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "joeRouter", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "mintScyFromRawToken",
+    functionFragment: "mintPyFromRawToken",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "mintYoFromRawToken",
+    functionFragment: "mintScyFromRawToken",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "redeemScyToRawToken",
+    functionFragment: "redeemPyToRawToken",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "redeemYoToRawToken",
+    functionFragment: "redeemScyToRawToken",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -147,98 +144,98 @@ export interface ActionCoreInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "swapExactOtForRawToken",
+    functionFragment: "swapExactPtForRawToken",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "swapExactOtForScy",
+    functionFragment: "swapExactPtForScy",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "swapExactRawTokenForOt",
+    functionFragment: "swapExactRawTokenForPt",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "swapExactScyForOt",
+    functionFragment: "swapExactScyForPt",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "swapOtForExactScy",
+    functionFragment: "swapPtForExactScy",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "swapScyForExactOt",
+    functionFragment: "swapScyForExactPt",
     data: BytesLike
   ): Result;
 
   events: {
+    "MintPyFromRawToken(address,address,uint256,address,uint256)": EventFragment;
     "MintScyFromRawToken(address,address,uint256,address,uint256)": EventFragment;
-    "MintYoFromRawToken(address,address,uint256,address,uint256)": EventFragment;
+    "RedeemPyToRawToken(address,address,uint256,address,uint256)": EventFragment;
     "RedeemScyToRawToken(address,address,uint256,address,uint256)": EventFragment;
-    "RedeemYoToRawToken(address,address,uint256,address,uint256)": EventFragment;
   };
 
+  getEvent(nameOrSignatureOrTopic: "MintPyFromRawToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "MintScyFromRawToken"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "MintYoFromRawToken"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "RedeemPyToRawToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "RedeemScyToRawToken"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "RedeemYoToRawToken"): EventFragment;
 }
 
-export type MintScyFromRawTokenEvent = TypedEvent<
+export type MintPyFromRawTokenEvent = TypedEvent<
   [string, string, BigNumber, string, BigNumber],
   {
     user: string;
     rawTokenIn: string;
     netRawTokenIn: BigNumber;
-    SCY: string;
-    netScyOut: BigNumber;
+    YT: string;
+    netPyOut: BigNumber;
   }
 >;
 
-export type MintScyFromRawTokenEventFilter =
-  TypedEventFilter<MintScyFromRawTokenEvent>;
+export type MintPyFromRawTokenEventFilter =
+  TypedEventFilter<MintPyFromRawTokenEvent>;
 
-export type MintYoFromRawTokenEvent = TypedEvent<
+export type MintScyFromRawTokenEvent = TypedEvent<
   [string, string, BigNumber, string, BigNumber],
   {
     user: string;
     rawTokenIn: string;
     netRawTokenIn: BigNumber;
-    YT: string;
-    netYoOut: BigNumber;
+    SCY: string;
+    netScyOut: BigNumber;
   }
 >;
 
-export type MintYoFromRawTokenEventFilter =
-  TypedEventFilter<MintYoFromRawTokenEvent>;
+export type MintScyFromRawTokenEventFilter =
+  TypedEventFilter<MintScyFromRawTokenEvent>;
 
-export type RedeemScyToRawTokenEvent = TypedEvent<
+export type RedeemPyToRawTokenEvent = TypedEvent<
   [string, string, BigNumber, string, BigNumber],
   {
     user: string;
-    SCY: string;
-    netScyIn: BigNumber;
+    YT: string;
+    netPyIn: BigNumber;
     rawTokenOut: string;
     netRawTokenOut: BigNumber;
   }
 >;
 
-export type RedeemScyToRawTokenEventFilter =
-  TypedEventFilter<RedeemScyToRawTokenEvent>;
+export type RedeemPyToRawTokenEventFilter =
+  TypedEventFilter<RedeemPyToRawTokenEvent>;
 
-export type RedeemYoToRawTokenEvent = TypedEvent<
+export type RedeemScyToRawTokenEvent = TypedEvent<
   [string, string, BigNumber, string, BigNumber],
   {
     user: string;
-    YT: string;
-    netYoIn: BigNumber;
+    SCY: string;
+    netScyIn: BigNumber;
     rawTokenOut: string;
     netRawTokenOut: BigNumber;
   }
 >;
 
-export type RedeemYoToRawTokenEventFilter =
-  TypedEventFilter<RedeemYoToRawTokenEvent>;
+export type RedeemScyToRawTokenEventFilter =
+  TypedEventFilter<RedeemScyToRawTokenEvent>;
 
 export interface ActionCore extends BaseContract {
   contractName: "ActionCore";
@@ -272,7 +269,7 @@ export interface ActionCore extends BaseContract {
       receiver: string,
       market: string,
       scyDesired: BigNumberish,
-      otDesired: BigNumberish,
+      ptDesired: BigNumberish,
       minLpOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
@@ -281,36 +278,36 @@ export interface ActionCore extends BaseContract {
 
     joeRouter(overrides?: CallOverrides): Promise<[string]>;
 
-    mintScyFromRawToken(
+    mintPyFromRawToken(
       netRawTokenIn: BigNumberish,
-      SCY: string,
-      minScyOut: BigNumberish,
+      YT: string,
+      minPyOut: BigNumberish,
       receiver: string,
       path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    mintYoFromRawToken(
+    mintScyFromRawToken(
       netRawTokenIn: BigNumberish,
-      YT: string,
-      minYoOut: BigNumberish,
+      SCY: string,
+      minScyOut: BigNumberish,
       receiver: string,
       path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    redeemScyToRawToken(
-      SCY: string,
-      netScyIn: BigNumberish,
+    redeemPyToRawToken(
+      YT: string,
+      netPyIn: BigNumberish,
       minRawTokenOut: BigNumberish,
       receiver: string,
       path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    redeemYoToRawToken(
-      YT: string,
-      netYoIn: BigNumberish,
+    redeemScyToRawToken(
+      SCY: string,
+      netScyIn: BigNumberish,
       minRawTokenOut: BigNumberish,
       receiver: string,
       path: string[],
@@ -322,12 +319,12 @@ export interface ActionCore extends BaseContract {
       market: string,
       lpToRemove: BigNumberish,
       scyOutMin: BigNumberish,
-      otOutMin: BigNumberish,
+      ptOutMin: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    swapExactOtForRawToken(
-      exactOtIn: BigNumberish,
+    swapExactPtForRawToken(
+      exactPtIn: BigNumberish,
       receiver: string,
       path: string[],
       market: string,
@@ -335,52 +332,43 @@ export interface ActionCore extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    swapExactOtForScy(
+    swapExactPtForScy(
       receiver: string,
       market: string,
-      exactOtIn: BigNumberish,
+      exactPtIn: BigNumberish,
       minScyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    swapExactRawTokenForOt(
+    swapExactRawTokenForPt(
       exactRawTokenIn: BigNumberish,
       receiver: string,
       path: string[],
       market: string,
-      otOutguessMin: BigNumberish,
-      otOutguessMax: BigNumberish,
-      maxIteration: BigNumberish,
-      eps: BigNumberish,
+      approx: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    swapExactScyForOt(
+    swapExactScyForPt(
       receiver: string,
       market: string,
       exactScyIn: BigNumberish,
-      otOutguessMin: BigNumberish,
-      otOutguessMax: BigNumberish,
-      maxIteration: BigNumberish,
-      eps: BigNumberish,
+      approx: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    swapOtForExactScy(
+    swapPtForExactScy(
       receiver: string,
       market: string,
       exactScyOut: BigNumberish,
-      otInGuessMin: BigNumberish,
-      otInGuessMax: BigNumberish,
-      maxIteration: BigNumberish,
-      eps: BigNumberish,
+      approx: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    swapScyForExactOt(
+    swapScyForExactPt(
       receiver: string,
       market: string,
-      exactOtOut: BigNumberish,
+      exactPtOut: BigNumberish,
       maxScyIn: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
@@ -390,7 +378,7 @@ export interface ActionCore extends BaseContract {
     receiver: string,
     market: string,
     scyDesired: BigNumberish,
-    otDesired: BigNumberish,
+    ptDesired: BigNumberish,
     minLpOut: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
@@ -399,36 +387,36 @@ export interface ActionCore extends BaseContract {
 
   joeRouter(overrides?: CallOverrides): Promise<string>;
 
-  mintScyFromRawToken(
+  mintPyFromRawToken(
     netRawTokenIn: BigNumberish,
-    SCY: string,
-    minScyOut: BigNumberish,
+    YT: string,
+    minPyOut: BigNumberish,
     receiver: string,
     path: string[],
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  mintYoFromRawToken(
+  mintScyFromRawToken(
     netRawTokenIn: BigNumberish,
-    YT: string,
-    minYoOut: BigNumberish,
+    SCY: string,
+    minScyOut: BigNumberish,
     receiver: string,
     path: string[],
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  redeemScyToRawToken(
-    SCY: string,
-    netScyIn: BigNumberish,
+  redeemPyToRawToken(
+    YT: string,
+    netPyIn: BigNumberish,
     minRawTokenOut: BigNumberish,
     receiver: string,
     path: string[],
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  redeemYoToRawToken(
-    YT: string,
-    netYoIn: BigNumberish,
+  redeemScyToRawToken(
+    SCY: string,
+    netScyIn: BigNumberish,
     minRawTokenOut: BigNumberish,
     receiver: string,
     path: string[],
@@ -440,12 +428,12 @@ export interface ActionCore extends BaseContract {
     market: string,
     lpToRemove: BigNumberish,
     scyOutMin: BigNumberish,
-    otOutMin: BigNumberish,
+    ptOutMin: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  swapExactOtForRawToken(
-    exactOtIn: BigNumberish,
+  swapExactPtForRawToken(
+    exactPtIn: BigNumberish,
     receiver: string,
     path: string[],
     market: string,
@@ -453,52 +441,43 @@ export interface ActionCore extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  swapExactOtForScy(
+  swapExactPtForScy(
     receiver: string,
     market: string,
-    exactOtIn: BigNumberish,
+    exactPtIn: BigNumberish,
     minScyOut: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  swapExactRawTokenForOt(
+  swapExactRawTokenForPt(
     exactRawTokenIn: BigNumberish,
     receiver: string,
     path: string[],
     market: string,
-    otOutguessMin: BigNumberish,
-    otOutguessMax: BigNumberish,
-    maxIteration: BigNumberish,
-    eps: BigNumberish,
+    approx: ApproxParamsStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  swapExactScyForOt(
+  swapExactScyForPt(
     receiver: string,
     market: string,
     exactScyIn: BigNumberish,
-    otOutguessMin: BigNumberish,
-    otOutguessMax: BigNumberish,
-    maxIteration: BigNumberish,
-    eps: BigNumberish,
+    approx: ApproxParamsStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  swapOtForExactScy(
+  swapPtForExactScy(
     receiver: string,
     market: string,
     exactScyOut: BigNumberish,
-    otInGuessMin: BigNumberish,
-    otInGuessMax: BigNumberish,
-    maxIteration: BigNumberish,
-    eps: BigNumberish,
+    approx: ApproxParamsStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  swapScyForExactOt(
+  swapScyForExactPt(
     receiver: string,
     market: string,
-    exactOtOut: BigNumberish,
+    exactPtOut: BigNumberish,
     maxScyIn: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
@@ -508,7 +487,7 @@ export interface ActionCore extends BaseContract {
       receiver: string,
       market: string,
       scyDesired: BigNumberish,
-      otDesired: BigNumberish,
+      ptDesired: BigNumberish,
       minLpOut: BigNumberish,
       overrides?: CallOverrides
     ): Promise<[BigNumber, BigNumber, BigNumber]>;
@@ -517,36 +496,36 @@ export interface ActionCore extends BaseContract {
 
     joeRouter(overrides?: CallOverrides): Promise<string>;
 
-    mintScyFromRawToken(
+    mintPyFromRawToken(
       netRawTokenIn: BigNumberish,
-      SCY: string,
-      minScyOut: BigNumberish,
+      YT: string,
+      minPyOut: BigNumberish,
       receiver: string,
       path: string[],
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    mintYoFromRawToken(
+    mintScyFromRawToken(
       netRawTokenIn: BigNumberish,
-      YT: string,
-      minYoOut: BigNumberish,
+      SCY: string,
+      minScyOut: BigNumberish,
       receiver: string,
       path: string[],
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    redeemScyToRawToken(
-      SCY: string,
-      netScyIn: BigNumberish,
+    redeemPyToRawToken(
+      YT: string,
+      netPyIn: BigNumberish,
       minRawTokenOut: BigNumberish,
       receiver: string,
       path: string[],
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    redeemYoToRawToken(
-      YT: string,
-      netYoIn: BigNumberish,
+    redeemScyToRawToken(
+      SCY: string,
+      netScyIn: BigNumberish,
       minRawTokenOut: BigNumberish,
       receiver: string,
       path: string[],
@@ -558,12 +537,12 @@ export interface ActionCore extends BaseContract {
       market: string,
       lpToRemove: BigNumberish,
       scyOutMin: BigNumberish,
-      otOutMin: BigNumberish,
+      ptOutMin: BigNumberish,
       overrides?: CallOverrides
     ): Promise<[BigNumber, BigNumber]>;
 
-    swapExactOtForRawToken(
-      exactOtIn: BigNumberish,
+    swapExactPtForRawToken(
+      exactPtIn: BigNumberish,
       receiver: string,
       path: string[],
       market: string,
@@ -571,58 +550,64 @@ export interface ActionCore extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    swapExactOtForScy(
+    swapExactPtForScy(
       receiver: string,
       market: string,
-      exactOtIn: BigNumberish,
+      exactPtIn: BigNumberish,
       minScyOut: BigNumberish,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    swapExactRawTokenForOt(
+    swapExactRawTokenForPt(
       exactRawTokenIn: BigNumberish,
       receiver: string,
       path: string[],
       market: string,
-      otOutguessMin: BigNumberish,
-      otOutguessMax: BigNumberish,
-      maxIteration: BigNumberish,
-      eps: BigNumberish,
+      approx: ApproxParamsStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    swapExactScyForOt(
+    swapExactScyForPt(
       receiver: string,
       market: string,
       exactScyIn: BigNumberish,
-      otOutguessMin: BigNumberish,
-      otOutguessMax: BigNumberish,
-      maxIteration: BigNumberish,
-      eps: BigNumberish,
+      approx: ApproxParamsStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    swapOtForExactScy(
+    swapPtForExactScy(
       receiver: string,
       market: string,
       exactScyOut: BigNumberish,
-      otInGuessMin: BigNumberish,
-      otInGuessMax: BigNumberish,
-      maxIteration: BigNumberish,
-      eps: BigNumberish,
+      approx: ApproxParamsStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    swapScyForExactOt(
+    swapScyForExactPt(
       receiver: string,
       market: string,
-      exactOtOut: BigNumberish,
+      exactPtOut: BigNumberish,
       maxScyIn: BigNumberish,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
   };
 
   filters: {
+    "MintPyFromRawToken(address,address,uint256,address,uint256)"(
+      user?: string | null,
+      rawTokenIn?: string | null,
+      netRawTokenIn?: null,
+      YT?: string | null,
+      netPyOut?: null
+    ): MintPyFromRawTokenEventFilter;
+    MintPyFromRawToken(
+      user?: string | null,
+      rawTokenIn?: string | null,
+      netRawTokenIn?: null,
+      YT?: string | null,
+      netPyOut?: null
+    ): MintPyFromRawTokenEventFilter;
+
     "MintScyFromRawToken(address,address,uint256,address,uint256)"(
       user?: string | null,
       rawTokenIn?: string | null,
@@ -638,20 +623,20 @@ export interface ActionCore extends BaseContract {
       netScyOut?: null
     ): MintScyFromRawTokenEventFilter;
 
-    "MintYoFromRawToken(address,address,uint256,address,uint256)"(
+    "RedeemPyToRawToken(address,address,uint256,address,uint256)"(
       user?: string | null,
-      rawTokenIn?: string | null,
-      netRawTokenIn?: null,
       YT?: string | null,
-      netYoOut?: null
-    ): MintYoFromRawTokenEventFilter;
-    MintYoFromRawToken(
+      netPyIn?: null,
+      rawTokenOut?: string | null,
+      netRawTokenOut?: null
+    ): RedeemPyToRawTokenEventFilter;
+    RedeemPyToRawToken(
       user?: string | null,
-      rawTokenIn?: string | null,
-      netRawTokenIn?: null,
       YT?: string | null,
-      netYoOut?: null
-    ): MintYoFromRawTokenEventFilter;
+      netPyIn?: null,
+      rawTokenOut?: string | null,
+      netRawTokenOut?: null
+    ): RedeemPyToRawTokenEventFilter;
 
     "RedeemScyToRawToken(address,address,uint256,address,uint256)"(
       user?: string | null,
@@ -667,21 +652,6 @@ export interface ActionCore extends BaseContract {
       rawTokenOut?: string | null,
       netRawTokenOut?: null
     ): RedeemScyToRawTokenEventFilter;
-
-    "RedeemYoToRawToken(address,address,uint256,address,uint256)"(
-      user?: string | null,
-      YT?: string | null,
-      netYoIn?: null,
-      rawTokenOut?: string | null,
-      netRawTokenOut?: null
-    ): RedeemYoToRawTokenEventFilter;
-    RedeemYoToRawToken(
-      user?: string | null,
-      YT?: string | null,
-      netYoIn?: null,
-      rawTokenOut?: string | null,
-      netRawTokenOut?: null
-    ): RedeemYoToRawTokenEventFilter;
   };
 
   estimateGas: {
@@ -689,7 +659,7 @@ export interface ActionCore extends BaseContract {
       receiver: string,
       market: string,
       scyDesired: BigNumberish,
-      otDesired: BigNumberish,
+      ptDesired: BigNumberish,
       minLpOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
@@ -698,36 +668,36 @@ export interface ActionCore extends BaseContract {
 
     joeRouter(overrides?: CallOverrides): Promise<BigNumber>;
 
-    mintScyFromRawToken(
+    mintPyFromRawToken(
       netRawTokenIn: BigNumberish,
-      SCY: string,
-      minScyOut: BigNumberish,
+      YT: string,
+      minPyOut: BigNumberish,
       receiver: string,
       path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    mintYoFromRawToken(
+    mintScyFromRawToken(
       netRawTokenIn: BigNumberish,
-      YT: string,
-      minYoOut: BigNumberish,
+      SCY: string,
+      minScyOut: BigNumberish,
       receiver: string,
       path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    redeemScyToRawToken(
-      SCY: string,
-      netScyIn: BigNumberish,
+    redeemPyToRawToken(
+      YT: string,
+      netPyIn: BigNumberish,
       minRawTokenOut: BigNumberish,
       receiver: string,
       path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    redeemYoToRawToken(
-      YT: string,
-      netYoIn: BigNumberish,
+    redeemScyToRawToken(
+      SCY: string,
+      netScyIn: BigNumberish,
       minRawTokenOut: BigNumberish,
       receiver: string,
       path: string[],
@@ -739,12 +709,12 @@ export interface ActionCore extends BaseContract {
       market: string,
       lpToRemove: BigNumberish,
       scyOutMin: BigNumberish,
-      otOutMin: BigNumberish,
+      ptOutMin: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    swapExactOtForRawToken(
-      exactOtIn: BigNumberish,
+    swapExactPtForRawToken(
+      exactPtIn: BigNumberish,
       receiver: string,
       path: string[],
       market: string,
@@ -752,52 +722,43 @@ export interface ActionCore extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    swapExactOtForScy(
+    swapExactPtForScy(
       receiver: string,
       market: string,
-      exactOtIn: BigNumberish,
+      exactPtIn: BigNumberish,
       minScyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    swapExactRawTokenForOt(
+    swapExactRawTokenForPt(
       exactRawTokenIn: BigNumberish,
       receiver: string,
       path: string[],
       market: string,
-      otOutguessMin: BigNumberish,
-      otOutguessMax: BigNumberish,
-      maxIteration: BigNumberish,
-      eps: BigNumberish,
+      approx: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    swapExactScyForOt(
+    swapExactScyForPt(
       receiver: string,
       market: string,
       exactScyIn: BigNumberish,
-      otOutguessMin: BigNumberish,
-      otOutguessMax: BigNumberish,
-      maxIteration: BigNumberish,
-      eps: BigNumberish,
+      approx: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    swapOtForExactScy(
+    swapPtForExactScy(
       receiver: string,
       market: string,
       exactScyOut: BigNumberish,
-      otInGuessMin: BigNumberish,
-      otInGuessMax: BigNumberish,
-      maxIteration: BigNumberish,
-      eps: BigNumberish,
+      approx: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    swapScyForExactOt(
+    swapScyForExactPt(
       receiver: string,
       market: string,
-      exactOtOut: BigNumberish,
+      exactPtOut: BigNumberish,
       maxScyIn: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
@@ -808,7 +769,7 @@ export interface ActionCore extends BaseContract {
       receiver: string,
       market: string,
       scyDesired: BigNumberish,
-      otDesired: BigNumberish,
+      ptDesired: BigNumberish,
       minLpOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
@@ -817,36 +778,36 @@ export interface ActionCore extends BaseContract {
 
     joeRouter(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    mintScyFromRawToken(
+    mintPyFromRawToken(
       netRawTokenIn: BigNumberish,
-      SCY: string,
-      minScyOut: BigNumberish,
+      YT: string,
+      minPyOut: BigNumberish,
       receiver: string,
       path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    mintYoFromRawToken(
+    mintScyFromRawToken(
       netRawTokenIn: BigNumberish,
-      YT: string,
-      minYoOut: BigNumberish,
+      SCY: string,
+      minScyOut: BigNumberish,
       receiver: string,
       path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    redeemScyToRawToken(
-      SCY: string,
-      netScyIn: BigNumberish,
+    redeemPyToRawToken(
+      YT: string,
+      netPyIn: BigNumberish,
       minRawTokenOut: BigNumberish,
       receiver: string,
       path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    redeemYoToRawToken(
-      YT: string,
-      netYoIn: BigNumberish,
+    redeemScyToRawToken(
+      SCY: string,
+      netScyIn: BigNumberish,
       minRawTokenOut: BigNumberish,
       receiver: string,
       path: string[],
@@ -858,12 +819,12 @@ export interface ActionCore extends BaseContract {
       market: string,
       lpToRemove: BigNumberish,
       scyOutMin: BigNumberish,
-      otOutMin: BigNumberish,
+      ptOutMin: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    swapExactOtForRawToken(
-      exactOtIn: BigNumberish,
+    swapExactPtForRawToken(
+      exactPtIn: BigNumberish,
       receiver: string,
       path: string[],
       market: string,
@@ -871,52 +832,43 @@ export interface ActionCore extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    swapExactOtForScy(
+    swapExactPtForScy(
       receiver: string,
       market: string,
-      exactOtIn: BigNumberish,
+      exactPtIn: BigNumberish,
       minScyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    swapExactRawTokenForOt(
+    swapExactRawTokenForPt(
       exactRawTokenIn: BigNumberish,
       receiver: string,
       path: string[],
       market: string,
-      otOutguessMin: BigNumberish,
-      otOutguessMax: BigNumberish,
-      maxIteration: BigNumberish,
-      eps: BigNumberish,
+      approx: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    swapExactScyForOt(
+    swapExactScyForPt(
       receiver: string,
       market: string,
       exactScyIn: BigNumberish,
-      otOutguessMin: BigNumberish,
-      otOutguessMax: BigNumberish,
-      maxIteration: BigNumberish,
-      eps: BigNumberish,
+      approx: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    swapOtForExactScy(
+    swapPtForExactScy(
       receiver: string,
       market: string,
       exactScyOut: BigNumberish,
-      otInGuessMin: BigNumberish,
-      otInGuessMax: BigNumberish,
-      maxIteration: BigNumberish,
-      eps: BigNumberish,
+      approx: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    swapScyForExactOt(
+    swapScyForExactPt(
       receiver: string,
       market: string,
-      exactOtOut: BigNumberish,
+      exactPtOut: BigNumberish,
       maxScyIn: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;