@pendle/core-v2 0.8.1-beta → 0.9.0-gamma-2

package/typechain-types/IPAllAction.ts

@@ -44,32 +44,60 @@ export type ApproxParamsStructOutput = [
   eps: BigNumber;
 };
 
+export type TokenInputStruct = {
+  tokenIn: string;
+  netTokenIn: BigNumberish;
+  tokenMintScy: string;
+  kybercall: BytesLike;
+};
+
+export type TokenInputStructOutput = [string, BigNumber, string, string] & {
+  tokenIn: string;
+  netTokenIn: BigNumber;
+  tokenMintScy: string;
+  kybercall: string;
+};
+
+export type TokenOutputStruct = {
+  tokenOut: string;
+  minTokenOut: BigNumberish;
+  tokenRedeemScy: string;
+  kybercall: BytesLike;
+};
+
+export type TokenOutputStructOutput = [string, BigNumber, string, string] & {
+  tokenOut: string;
+  minTokenOut: BigNumber;
+  tokenRedeemScy: string;
+  kybercall: string;
+};
+
 export interface IPAllActionInterface extends utils.Interface {
   contractName: "IPAllAction";
   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;
-    "mintPyFromRawToken(address,address,uint256,uint256,address[])": FunctionFragment;
+    "addLiquiditySingleToken(address,address,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,address,bytes))": FunctionFragment;
     "mintPyFromScy(address,address,uint256,uint256)": FunctionFragment;
-    "mintScyFromRawToken(address,address,uint256,uint256,address[])": FunctionFragment;
+    "mintPyFromToken(address,address,uint256,(address,uint256,address,bytes))": FunctionFragment;
+    "mintScyFromToken(address,address,uint256,(address,uint256,address,bytes))": 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;
+    "redeemPyToToken(address,address,uint256,(address,uint256,address,bytes))": FunctionFragment;
+    "redeemScyToToken(address,address,uint256,(address,uint256,address,bytes))": 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;
+    "removeLiquiditySingleToken(address,address,uint256,(address,uint256,address,bytes))": FunctionFragment;
     "swapExactPtForScy(address,address,uint256,uint256)": FunctionFragment;
-    "swapExactRawTokenForPt(address,address,uint256,uint256,address[],(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
-    "swapExactRawTokenForYt(address,address,uint256,uint256,address[],(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
+    "swapExactPtForToken(address,address,uint256,(address,uint256,address,bytes))": FunctionFragment;
     "swapExactScyForPt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
     "swapExactScyForYt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
-    "swapExactYtForRawToken(address,address,uint256,uint256,address[])": FunctionFragment;
+    "swapExactTokenForPt(address,address,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,address,bytes))": FunctionFragment;
+    "swapExactTokenForYt(address,address,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,address,bytes))": FunctionFragment;
     "swapExactYtForScy(address,address,uint256,uint256)": FunctionFragment;
+    "swapExactYtForToken(address,address,uint256,(address,uint256,address,bytes))": FunctionFragment;
     "swapPtForExactScy(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
     "swapScyForExactPt(address,address,uint256,uint256)": FunctionFragment;
     "swapScyForExactYt(address,address,uint256,uint256)": FunctionFragment;
@@ -84,48 +112,41 @@ export interface IPAllActionInterface extends utils.Interface {
     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: "mintPyFromRawToken",
-    values: [string, string, BigNumberish, BigNumberish, string[]]
+    functionFragment: "addLiquiditySingleToken",
+    values: [string, string, BigNumberish, ApproxParamsStruct, TokenInputStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "mintPyFromScy",
     values: [string, string, BigNumberish, BigNumberish]
   ): string;
   encodeFunctionData(
-    functionFragment: "mintScyFromRawToken",
-    values: [string, string, BigNumberish, BigNumberish, string[]]
+    functionFragment: "mintPyFromToken",
+    values: [string, string, BigNumberish, TokenInputStruct]
   ): string;
   encodeFunctionData(
-    functionFragment: "redeemDueInterestAndRewards",
-    values: [string, string[], string[], string[]]
+    functionFragment: "mintScyFromToken",
+    values: [string, string, BigNumberish, TokenInputStruct]
   ): string;
   encodeFunctionData(
-    functionFragment: "redeemPyToRawToken",
-    values: [string, string, BigNumberish, BigNumberish, string[]]
+    functionFragment: "redeemDueInterestAndRewards",
+    values: [string, string[], string[], string[]]
   ): string;
   encodeFunctionData(
     functionFragment: "redeemPyToScy",
     values: [string, string, BigNumberish, BigNumberish]
   ): string;
   encodeFunctionData(
-    functionFragment: "redeemScyToRawToken",
-    values: [string, string, BigNumberish, BigNumberish, string[]]
+    functionFragment: "redeemPyToToken",
+    values: [string, string, BigNumberish, TokenOutputStruct]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "redeemScyToToken",
+    values: [string, string, BigNumberish, TokenOutputStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "removeLiquidity",
@@ -135,43 +156,21 @@ export interface IPAllActionInterface extends utils.Interface {
     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[]]
+    functionFragment: "removeLiquiditySingleToken",
+    values: [string, string, BigNumberish, TokenOutputStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactPtForScy",
     values: [string, string, BigNumberish, BigNumberish]
   ): string;
   encodeFunctionData(
-    functionFragment: "swapExactRawTokenForPt",
-    values: [
-      string,
-      string,
-      BigNumberish,
-      BigNumberish,
-      string[],
-      ApproxParamsStruct
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "swapExactRawTokenForYt",
-    values: [
-      string,
-      string,
-      BigNumberish,
-      BigNumberish,
-      string[],
-      ApproxParamsStruct
-    ]
+    functionFragment: "swapExactPtForToken",
+    values: [string, string, BigNumberish, TokenOutputStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactScyForPt",
@@ -182,13 +181,21 @@ export interface IPAllActionInterface extends utils.Interface {
     values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
   ): string;
   encodeFunctionData(
-    functionFragment: "swapExactYtForRawToken",
-    values: [string, string, BigNumberish, BigNumberish, string[]]
+    functionFragment: "swapExactTokenForPt",
+    values: [string, string, BigNumberish, ApproxParamsStruct, TokenInputStruct]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "swapExactTokenForYt",
+    values: [string, string, BigNumberish, ApproxParamsStruct, TokenInputStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactYtForScy",
     values: [string, string, BigNumberish, BigNumberish]
   ): string;
+  encodeFunctionData(
+    functionFragment: "swapExactYtForToken",
+    values: [string, string, BigNumberish, TokenOutputStruct]
+  ): string;
   encodeFunctionData(
     functionFragment: "swapPtForExactScy",
     values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
@@ -214,16 +221,12 @@ export interface IPAllActionInterface extends utils.Interface {
     functionFragment: "addLiquiditySinglePt",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "addLiquiditySingleRawToken",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "addLiquiditySingleScy",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "mintPyFromRawToken",
+    functionFragment: "addLiquiditySingleToken",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -231,15 +234,15 @@ export interface IPAllActionInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "mintScyFromRawToken",
+    functionFragment: "mintPyFromToken",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "redeemDueInterestAndRewards",
+    functionFragment: "mintScyFromToken",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "redeemPyToRawToken",
+    functionFragment: "redeemDueInterestAndRewards",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -247,19 +250,19 @@ export interface IPAllActionInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "redeemScyToRawToken",
+    functionFragment: "redeemPyToToken",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "removeLiquidity",
+    functionFragment: "redeemScyToToken",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "removeLiquiditySinglePt",
+    functionFragment: "removeLiquidity",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "removeLiquiditySingleRawToken",
+    functionFragment: "removeLiquiditySinglePt",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -267,7 +270,7 @@ export interface IPAllActionInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "swapExactPtForRawToken",
+    functionFragment: "removeLiquiditySingleToken",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -275,29 +278,33 @@ export interface IPAllActionInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "swapExactRawTokenForPt",
+    functionFragment: "swapExactPtForToken",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "swapExactRawTokenForYt",
+    functionFragment: "swapExactScyForPt",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "swapExactScyForPt",
+    functionFragment: "swapExactScyForYt",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "swapExactScyForYt",
+    functionFragment: "swapExactTokenForPt",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "swapExactYtForRawToken",
+    functionFragment: "swapExactTokenForYt",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
     functionFragment: "swapExactYtForScy",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "swapExactYtForToken",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "swapPtForExactScy",
     data: BytesLike
@@ -317,31 +324,31 @@ export interface IPAllActionInterface extends utils.Interface {
 
   events: {
     "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;
+    "MintPyFromToken(address,address,address,address,uint256,uint256)": EventFragment;
+    "MintScyFromToken(address,address,address,address,uint256,uint256)": EventFragment;
     "RedeemPyToScy(address,address,address,uint256,uint256)": EventFragment;
-    "RedeemScyToRawToken(address,address,address,uint256,address,uint256)": EventFragment;
+    "RedeemPyToToken(address,address,address,uint256,address,uint256)": EventFragment;
+    "RedeemScyToToken(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;
-    "SwapYTAndRawToken(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;
   };
 
   getEvent(nameOrSignatureOrTopic: "AddLiquidity"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "MintPyFromRawToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "MintPyFromScy"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "MintScyFromRawToken"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "RedeemPyToRawToken"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "MintPyFromToken"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "MintScyFromToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "RedeemPyToScy"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "RedeemScyToRawToken"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "RedeemPyToToken"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "RedeemScyToToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "RemoveLiquidity"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "SwapPtAndRawToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "SwapPtAndScy"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "SwapYTAndRawToken"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "SwapPtAndToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "SwapYTAndSCY"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "SwapYTAndToken"): EventFragment;
 }
 
 export type AddLiquidityEvent = TypedEvent<
@@ -358,91 +365,89 @@ export type AddLiquidityEvent = TypedEvent<
 
 export type AddLiquidityEventFilter = TypedEventFilter<AddLiquidityEvent>;
 
-export type MintPyFromRawTokenEvent = TypedEvent<
-  [string, string, string, string, BigNumber, BigNumber],
+export type MintPyFromScyEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber],
   {
     caller: string;
     receiver: string;
     YT: string;
-    rawTokenIn: string;
-    netRawTokenIn: BigNumber;
+    netScyIn: BigNumber;
     netPyOut: BigNumber;
   }
 >;
 
-export type MintPyFromRawTokenEventFilter =
-  TypedEventFilter<MintPyFromRawTokenEvent>;
+export type MintPyFromScyEventFilter = TypedEventFilter<MintPyFromScyEvent>;
 
-export type MintPyFromScyEvent = TypedEvent<
-  [string, string, string, BigNumber, BigNumber],
+export type MintPyFromTokenEvent = TypedEvent<
+  [string, string, string, string, BigNumber, BigNumber],
   {
     caller: string;
     receiver: string;
     YT: string;
-    netScyIn: BigNumber;
+    tokenIn: string;
+    netTokenIn: BigNumber;
     netPyOut: BigNumber;
   }
 >;
 
-export type MintPyFromScyEventFilter = TypedEventFilter<MintPyFromScyEvent>;
+export type MintPyFromTokenEventFilter = TypedEventFilter<MintPyFromTokenEvent>;
 
-export type MintScyFromRawTokenEvent = TypedEvent<
+export type MintScyFromTokenEvent = TypedEvent<
   [string, string, string, string, BigNumber, BigNumber],
   {
     caller: string;
     receiver: string;
     SCY: string;
-    rawTokenIn: string;
-    netRawTokenIn: BigNumber;
+    tokenIn: string;
+    netTokenIn: BigNumber;
     netScyOut: BigNumber;
   }
 >;
 
-export type MintScyFromRawTokenEventFilter =
-  TypedEventFilter<MintScyFromRawTokenEvent>;
+export type MintScyFromTokenEventFilter =
+  TypedEventFilter<MintScyFromTokenEvent>;
 
-export type RedeemPyToRawTokenEvent = TypedEvent<
-  [string, string, string, BigNumber, string, BigNumber],
+export type RedeemPyToScyEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber],
   {
     caller: string;
     receiver: string;
     YT: string;
     netPyIn: BigNumber;
-    rawTokenOut: string;
-    netRawTokenOut: BigNumber;
+    netScyOut: BigNumber;
   }
 >;
 
-export type RedeemPyToRawTokenEventFilter =
-  TypedEventFilter<RedeemPyToRawTokenEvent>;
+export type RedeemPyToScyEventFilter = TypedEventFilter<RedeemPyToScyEvent>;
 
-export type RedeemPyToScyEvent = TypedEvent<
-  [string, string, string, BigNumber, BigNumber],
+export type RedeemPyToTokenEvent = TypedEvent<
+  [string, string, string, BigNumber, string, BigNumber],
   {
     caller: string;
     receiver: string;
     YT: string;
     netPyIn: BigNumber;
-    netScyOut: BigNumber;
+    tokenOut: string;
+    netTokenOut: BigNumber;
   }
 >;
 
-export type RedeemPyToScyEventFilter = TypedEventFilter<RedeemPyToScyEvent>;
+export type RedeemPyToTokenEventFilter = TypedEventFilter<RedeemPyToTokenEvent>;
 
-export type RedeemScyToRawTokenEvent = TypedEvent<
+export type RedeemScyToTokenEvent = TypedEvent<
   [string, string, string, BigNumber, string, BigNumber],
   {
     caller: string;
     receiver: string;
     SCY: string;
     netScyIn: BigNumber;
-    rawTokenOut: string;
-    netRawTokenOut: BigNumber;
+    tokenOut: string;
+    netTokenOut: BigNumber;
   }
 >;
 
-export type RedeemScyToRawTokenEventFilter =
-  TypedEventFilter<RedeemScyToRawTokenEvent>;
+export type RedeemScyToTokenEventFilter =
+  TypedEventFilter<RedeemScyToTokenEvent>;
 
 export type RemoveLiquidityEvent = TypedEvent<
   [string, string, string, BigNumber, BigNumber, BigNumber],
@@ -458,59 +463,57 @@ export type RemoveLiquidityEvent = TypedEvent<
 
 export type RemoveLiquidityEventFilter = TypedEventFilter<RemoveLiquidityEvent>;
 
-export type SwapPtAndRawTokenEvent = TypedEvent<
-  [string, string, string, string, BigNumber, BigNumber],
+export type SwapPtAndScyEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber],
   {
     caller: string;
     market: string;
-    rawToken: string;
     receiver: string;
     amountPtToAccount: BigNumber;
-    amountRawTokenToAccount: BigNumber;
+    amountScyToAccount: BigNumber;
   }
 >;
 
-export type SwapPtAndRawTokenEventFilter =
-  TypedEventFilter<SwapPtAndRawTokenEvent>;
+export type SwapPtAndScyEventFilter = TypedEventFilter<SwapPtAndScyEvent>;
 
-export type SwapPtAndScyEvent = TypedEvent<
-  [string, string, string, BigNumber, BigNumber],
+export type SwapPtAndTokenEvent = TypedEvent<
+  [string, string, string, string, BigNumber, BigNumber],
   {
     caller: string;
     market: string;
+    token: string;
     receiver: string;
     amountPtToAccount: BigNumber;
-    amountScyToAccount: BigNumber;
+    amountTokenToAccount: BigNumber;
   }
 >;
 
-export type SwapPtAndScyEventFilter = TypedEventFilter<SwapPtAndScyEvent>;
+export type SwapPtAndTokenEventFilter = TypedEventFilter<SwapPtAndTokenEvent>;
 
-export type SwapYTAndRawTokenEvent = TypedEvent<
-  [string, string, string, BigNumber, BigNumber],
+export type SwapYTAndSCYEvent = TypedEvent<
+  [string, string, BigNumber, BigNumber],
   {
     user: string;
     market: string;
-    rawToken: string;
     ytToAccount: BigNumber;
-    rawTokenToAccount: BigNumber;
+    scyToAccount: BigNumber;
   }
 >;
 
-export type SwapYTAndRawTokenEventFilter =
-  TypedEventFilter<SwapYTAndRawTokenEvent>;
+export type SwapYTAndSCYEventFilter = TypedEventFilter<SwapYTAndSCYEvent>;
 
-export type SwapYTAndSCYEvent = TypedEvent<
-  [string, string, BigNumber, BigNumber],
+export type SwapYTAndTokenEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber],
   {
     user: string;
     market: string;
+    token: string;
     ytToAccount: BigNumber;
-    scyToAccount: BigNumber;
+    tokenToAccount: BigNumber;
   }
 >;
 
-export type SwapYTAndSCYEventFilter = TypedEventFilter<SwapYTAndSCYEvent>;
+export type SwapYTAndTokenEventFilter = TypedEventFilter<SwapYTAndTokenEvent>;
 
 export interface IPAllAction extends BaseContract {
   contractName: "IPAllAction";
@@ -558,48 +561,45 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    addLiquiditySingleRawToken(
+    addLiquiditySingleScy(
       receiver: string,
       market: string,
-      netRawTokenIn: BigNumberish,
+      netScyIn: BigNumberish,
       minLpOut: BigNumberish,
-      path: string[],
       guessPtReceivedFromScy: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    addLiquiditySingleScy(
+    addLiquiditySingleToken(
       receiver: string,
       market: string,
-      netScyIn: BigNumberish,
       minLpOut: BigNumberish,
       guessPtReceivedFromScy: ApproxParamsStruct,
+      input: TokenInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    mintPyFromRawToken(
+    mintPyFromScy(
       receiver: string,
       YT: string,
-      netRawTokenIn: BigNumberish,
+      netScyIn: BigNumberish,
       minPyOut: BigNumberish,
-      path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    mintPyFromScy(
+    mintPyFromToken(
       receiver: string,
       YT: string,
-      netScyIn: BigNumberish,
       minPyOut: BigNumberish,
+      input: TokenInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    mintScyFromRawToken(
+    mintScyFromToken(
       receiver: string,
       SCY: string,
-      netRawTokenIn: BigNumberish,
       minScyOut: BigNumberish,
-      path: string[],
+      input: TokenInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -611,29 +611,27 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    redeemPyToRawToken(
+    redeemPyToScy(
       receiver: string,
       YT: string,
       netPyIn: BigNumberish,
-      minRawTokenOut: BigNumberish,
-      path: string[],
+      minScyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    redeemPyToScy(
+    redeemPyToToken(
       receiver: string,
       YT: string,
       netPyIn: BigNumberish,
-      minScyOut: BigNumberish,
+      output: TokenOutputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    redeemScyToRawToken(
+    redeemScyToToken(
       receiver: string,
       SCY: string,
       netScyIn: BigNumberish,
-      minRawTokenOut: BigNumberish,
-      path: string[],
+      output: TokenOutputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -655,92 +653,87 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    removeLiquiditySingleRawToken(
+    removeLiquiditySingleScy(
       receiver: string,
       market: string,
       lpToRemove: BigNumberish,
-      minRawTokenOut: BigNumberish,
-      path: string[],
+      minScyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    removeLiquiditySingleScy(
+    removeLiquiditySingleToken(
       receiver: string,
       market: string,
       lpToRemove: BigNumberish,
-      minScyOut: BigNumberish,
+      output: TokenOutputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    swapExactPtForRawToken(
+    swapExactPtForScy(
       receiver: string,
       market: string,
       exactPtIn: BigNumberish,
-      minRawTokenOut: BigNumberish,
-      path: string[],
+      minScyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    swapExactPtForScy(
+    swapExactPtForToken(
       receiver: string,
       market: string,
       exactPtIn: BigNumberish,
-      minScyOut: BigNumberish,
+      output: TokenOutputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    swapExactRawTokenForPt(
+    swapExactScyForPt(
       receiver: string,
       market: string,
-      exactRawTokenIn: BigNumberish,
+      exactScyIn: BigNumberish,
       minPtOut: BigNumberish,
-      path: string[],
       guessPtOut: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    swapExactRawTokenForYt(
+    swapExactScyForYt(
       receiver: string,
       market: string,
-      exactRawTokenIn: BigNumberish,
+      exactScyIn: BigNumberish,
       minYtOut: BigNumberish,
-      path: string[],
       guessYtOut: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    swapExactScyForPt(
+    swapExactTokenForPt(
       receiver: string,
       market: string,
-      exactScyIn: BigNumberish,
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
+      input: TokenInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    swapExactScyForYt(
+    swapExactTokenForYt(
       receiver: string,
       market: string,
-      exactScyIn: BigNumberish,
       minYtOut: BigNumberish,
       guessYtOut: ApproxParamsStruct,
+      input: TokenInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    swapExactYtForRawToken(
+    swapExactYtForScy(
       receiver: string,
       market: string,
       exactYtIn: BigNumberish,
-      minRawTokenOut: BigNumberish,
-      path: string[],
+      minScyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    swapExactYtForScy(
+    swapExactYtForToken(
       receiver: string,
       market: string,
-      exactYtIn: BigNumberish,
-      minScyOut: BigNumberish,
+      netYtIn: BigNumberish,
+      output: TokenOutputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -797,48 +790,45 @@ export interface IPAllAction extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  addLiquiditySingleRawToken(
+  addLiquiditySingleScy(
     receiver: string,
     market: string,
-    netRawTokenIn: BigNumberish,
+    netScyIn: BigNumberish,
     minLpOut: BigNumberish,
-    path: string[],
     guessPtReceivedFromScy: ApproxParamsStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  addLiquiditySingleScy(
+  addLiquiditySingleToken(
     receiver: string,
     market: string,
-    netScyIn: BigNumberish,
     minLpOut: BigNumberish,
     guessPtReceivedFromScy: ApproxParamsStruct,
+    input: TokenInputStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  mintPyFromRawToken(
+  mintPyFromScy(
     receiver: string,
     YT: string,
-    netRawTokenIn: BigNumberish,
+    netScyIn: BigNumberish,
     minPyOut: BigNumberish,
-    path: string[],
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  mintPyFromScy(
+  mintPyFromToken(
     receiver: string,
     YT: string,
-    netScyIn: BigNumberish,
     minPyOut: BigNumberish,
+    input: TokenInputStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  mintScyFromRawToken(
+  mintScyFromToken(
     receiver: string,
     SCY: string,
-    netRawTokenIn: BigNumberish,
     minScyOut: BigNumberish,
-    path: string[],
+    input: TokenInputStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -850,29 +840,27 @@ export interface IPAllAction extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  redeemPyToRawToken(
+  redeemPyToScy(
     receiver: string,
     YT: string,
     netPyIn: BigNumberish,
-    minRawTokenOut: BigNumberish,
-    path: string[],
+    minScyOut: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  redeemPyToScy(
+  redeemPyToToken(
     receiver: string,
     YT: string,
     netPyIn: BigNumberish,
-    minScyOut: BigNumberish,
+    output: TokenOutputStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  redeemScyToRawToken(
+  redeemScyToToken(
     receiver: string,
     SCY: string,
     netScyIn: BigNumberish,
-    minRawTokenOut: BigNumberish,
-    path: string[],
+    output: TokenOutputStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -894,92 +882,87 @@ export interface IPAllAction extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  removeLiquiditySingleRawToken(
+  removeLiquiditySingleScy(
     receiver: string,
     market: string,
     lpToRemove: BigNumberish,
-    minRawTokenOut: BigNumberish,
-    path: string[],
+    minScyOut: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  removeLiquiditySingleScy(
+  removeLiquiditySingleToken(
     receiver: string,
     market: string,
     lpToRemove: BigNumberish,
-    minScyOut: BigNumberish,
+    output: TokenOutputStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  swapExactPtForRawToken(
+  swapExactPtForScy(
     receiver: string,
     market: string,
     exactPtIn: BigNumberish,
-    minRawTokenOut: BigNumberish,
-    path: string[],
+    minScyOut: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  swapExactPtForScy(
+  swapExactPtForToken(
     receiver: string,
     market: string,
     exactPtIn: BigNumberish,
-    minScyOut: BigNumberish,
+    output: TokenOutputStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  swapExactRawTokenForPt(
+  swapExactScyForPt(
     receiver: string,
     market: string,
-    exactRawTokenIn: BigNumberish,
+    exactScyIn: BigNumberish,
     minPtOut: BigNumberish,
-    path: string[],
     guessPtOut: ApproxParamsStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  swapExactRawTokenForYt(
+  swapExactScyForYt(
     receiver: string,
     market: string,
-    exactRawTokenIn: BigNumberish,
+    exactScyIn: BigNumberish,
     minYtOut: BigNumberish,
-    path: string[],
     guessYtOut: ApproxParamsStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  swapExactScyForPt(
+  swapExactTokenForPt(
     receiver: string,
     market: string,
-    exactScyIn: BigNumberish,
     minPtOut: BigNumberish,
     guessPtOut: ApproxParamsStruct,
+    input: TokenInputStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  swapExactScyForYt(
+  swapExactTokenForYt(
     receiver: string,
     market: string,
-    exactScyIn: BigNumberish,
     minYtOut: BigNumberish,
     guessYtOut: ApproxParamsStruct,
+    input: TokenInputStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  swapExactYtForRawToken(
+  swapExactYtForScy(
     receiver: string,
     market: string,
     exactYtIn: BigNumberish,
-    minRawTokenOut: BigNumberish,
-    path: string[],
+    minScyOut: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  swapExactYtForScy(
+  swapExactYtForToken(
     receiver: string,
     market: string,
-    exactYtIn: BigNumberish,
-    minScyOut: BigNumberish,
+    netYtIn: BigNumberish,
+    output: TokenOutputStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -1042,48 +1025,45 @@ export interface IPAllAction extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    addLiquiditySingleRawToken(
+    addLiquiditySingleScy(
       receiver: string,
       market: string,
-      netRawTokenIn: BigNumberish,
+      netScyIn: BigNumberish,
       minLpOut: BigNumberish,
-      path: string[],
       guessPtReceivedFromScy: ApproxParamsStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    addLiquiditySingleScy(
+    addLiquiditySingleToken(
       receiver: string,
       market: string,
-      netScyIn: BigNumberish,
       minLpOut: BigNumberish,
       guessPtReceivedFromScy: ApproxParamsStruct,
+      input: TokenInputStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    mintPyFromRawToken(
+    mintPyFromScy(
       receiver: string,
       YT: string,
-      netRawTokenIn: BigNumberish,
+      netScyIn: BigNumberish,
       minPyOut: BigNumberish,
-      path: string[],
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    mintPyFromScy(
+    mintPyFromToken(
       receiver: string,
       YT: string,
-      netScyIn: BigNumberish,
       minPyOut: BigNumberish,
+      input: TokenInputStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    mintScyFromRawToken(
+    mintScyFromToken(
       receiver: string,
       SCY: string,
-      netRawTokenIn: BigNumberish,
       minScyOut: BigNumberish,
-      path: string[],
+      input: TokenInputStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
@@ -1102,29 +1082,27 @@ export interface IPAllAction extends BaseContract {
       }
     >;
 
-    redeemPyToRawToken(
+    redeemPyToScy(
       receiver: string,
       YT: string,
       netPyIn: BigNumberish,
-      minRawTokenOut: BigNumberish,
-      path: string[],
+      minScyOut: BigNumberish,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    redeemPyToScy(
+    redeemPyToToken(
       receiver: string,
       YT: string,
       netPyIn: BigNumberish,
-      minScyOut: BigNumberish,
+      output: TokenOutputStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    redeemScyToRawToken(
+    redeemScyToToken(
       receiver: string,
       SCY: string,
       netScyIn: BigNumberish,
-      minRawTokenOut: BigNumberish,
-      path: string[],
+      output: TokenOutputStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
@@ -1148,92 +1126,87 @@ export interface IPAllAction extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    removeLiquiditySingleRawToken(
+    removeLiquiditySingleScy(
       receiver: string,
       market: string,
       lpToRemove: BigNumberish,
-      minRawTokenOut: BigNumberish,
-      path: string[],
+      minScyOut: BigNumberish,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    removeLiquiditySingleScy(
+    removeLiquiditySingleToken(
       receiver: string,
       market: string,
       lpToRemove: BigNumberish,
-      minScyOut: BigNumberish,
+      output: TokenOutputStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    swapExactPtForRawToken(
+    swapExactPtForScy(
       receiver: string,
       market: string,
       exactPtIn: BigNumberish,
-      minRawTokenOut: BigNumberish,
-      path: string[],
+      minScyOut: BigNumberish,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    swapExactPtForScy(
+    swapExactPtForToken(
       receiver: string,
       market: string,
       exactPtIn: BigNumberish,
-      minScyOut: BigNumberish,
+      output: TokenOutputStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    swapExactRawTokenForPt(
+    swapExactScyForPt(
       receiver: string,
       market: string,
-      exactRawTokenIn: BigNumberish,
+      exactScyIn: BigNumberish,
       minPtOut: BigNumberish,
-      path: string[],
       guessPtOut: ApproxParamsStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    swapExactRawTokenForYt(
+    swapExactScyForYt(
       receiver: string,
       market: string,
-      exactRawTokenIn: BigNumberish,
+      exactScyIn: BigNumberish,
       minYtOut: BigNumberish,
-      path: string[],
       guessYtOut: ApproxParamsStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    swapExactScyForPt(
+    swapExactTokenForPt(
       receiver: string,
       market: string,
-      exactScyIn: BigNumberish,
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
+      input: TokenInputStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    swapExactScyForYt(
+    swapExactTokenForYt(
       receiver: string,
       market: string,
-      exactScyIn: BigNumberish,
       minYtOut: BigNumberish,
       guessYtOut: ApproxParamsStruct,
+      input: TokenInputStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    swapExactYtForRawToken(
+    swapExactYtForScy(
       receiver: string,
       market: string,
       exactYtIn: BigNumberish,
-      minRawTokenOut: BigNumberish,
-      path: string[],
+      minScyOut: BigNumberish,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    swapExactYtForScy(
+    swapExactYtForToken(
       receiver: string,
       market: string,
-      exactYtIn: BigNumberish,
-      minScyOut: BigNumberish,
+      netYtIn: BigNumberish,
+      output: TokenOutputStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
@@ -1290,103 +1263,103 @@ export interface IPAllAction extends BaseContract {
       lpOut?: null
     ): AddLiquidityEventFilter;
 
-    "MintPyFromRawToken(address,address,address,address,uint256,uint256)"(
+    "MintPyFromScy(address,address,address,uint256,uint256)"(
       caller?: string | null,
       receiver?: string | null,
       YT?: string | null,
-      rawTokenIn?: null,
-      netRawTokenIn?: null,
+      netScyIn?: null,
       netPyOut?: null
-    ): MintPyFromRawTokenEventFilter;
-    MintPyFromRawToken(
+    ): MintPyFromScyEventFilter;
+    MintPyFromScy(
       caller?: string | null,
       receiver?: string | null,
       YT?: string | null,
-      rawTokenIn?: null,
-      netRawTokenIn?: null,
+      netScyIn?: null,
       netPyOut?: null
-    ): MintPyFromRawTokenEventFilter;
+    ): MintPyFromScyEventFilter;
 
-    "MintPyFromScy(address,address,address,uint256,uint256)"(
+    "MintPyFromToken(address,address,address,address,uint256,uint256)"(
       caller?: string | null,
       receiver?: string | null,
       YT?: string | null,
-      netScyIn?: null,
+      tokenIn?: null,
+      netTokenIn?: null,
       netPyOut?: null
-    ): MintPyFromScyEventFilter;
-    MintPyFromScy(
+    ): MintPyFromTokenEventFilter;
+    MintPyFromToken(
       caller?: string | null,
       receiver?: string | null,
       YT?: string | null,
-      netScyIn?: null,
+      tokenIn?: null,
+      netTokenIn?: null,
       netPyOut?: null
-    ): MintPyFromScyEventFilter;
+    ): MintPyFromTokenEventFilter;
 
-    "MintScyFromRawToken(address,address,address,address,uint256,uint256)"(
+    "MintScyFromToken(address,address,address,address,uint256,uint256)"(
       caller?: string | null,
       receiver?: string | null,
       SCY?: string | null,
-      rawTokenIn?: null,
-      netRawTokenIn?: null,
+      tokenIn?: null,
+      netTokenIn?: null,
       netScyOut?: null
-    ): MintScyFromRawTokenEventFilter;
-    MintScyFromRawToken(
+    ): MintScyFromTokenEventFilter;
+    MintScyFromToken(
       caller?: string | null,
       receiver?: string | null,
       SCY?: string | null,
-      rawTokenIn?: null,
-      netRawTokenIn?: null,
+      tokenIn?: null,
+      netTokenIn?: null,
       netScyOut?: null
-    ): MintScyFromRawTokenEventFilter;
+    ): MintScyFromTokenEventFilter;
 
-    "RedeemPyToRawToken(address,address,address,uint256,address,uint256)"(
+    "RedeemPyToScy(address,address,address,uint256,uint256)"(
       caller?: string | null,
       receiver?: string | null,
       YT?: string | null,
       netPyIn?: null,
-      rawTokenOut?: null,
-      netRawTokenOut?: null
-    ): RedeemPyToRawTokenEventFilter;
-    RedeemPyToRawToken(
+      netScyOut?: null
+    ): RedeemPyToScyEventFilter;
+    RedeemPyToScy(
       caller?: string | null,
       receiver?: string | null,
       YT?: string | null,
       netPyIn?: null,
-      rawTokenOut?: null,
-      netRawTokenOut?: null
-    ): RedeemPyToRawTokenEventFilter;
+      netScyOut?: null
+    ): RedeemPyToScyEventFilter;
 
-    "RedeemPyToScy(address,address,address,uint256,uint256)"(
+    "RedeemPyToToken(address,address,address,uint256,address,uint256)"(
       caller?: string | null,
       receiver?: string | null,
       YT?: string | null,
       netPyIn?: null,
-      netScyOut?: null
-    ): RedeemPyToScyEventFilter;
-    RedeemPyToScy(
+      tokenOut?: null,
+      netTokenOut?: null
+    ): RedeemPyToTokenEventFilter;
+    RedeemPyToToken(
       caller?: string | null,
       receiver?: string | null,
       YT?: string | null,
       netPyIn?: null,
-      netScyOut?: null
-    ): RedeemPyToScyEventFilter;
+      tokenOut?: null,
+      netTokenOut?: null
+    ): RedeemPyToTokenEventFilter;
 
-    "RedeemScyToRawToken(address,address,address,uint256,address,uint256)"(
+    "RedeemScyToToken(address,address,address,uint256,address,uint256)"(
       caller?: string | null,
       receiver?: string | null,
       SCY?: string | null,
       netScyIn?: null,
-      rawTokenOut?: null,
-      netRawTokenOut?: null
-    ): RedeemScyToRawTokenEventFilter;
-    RedeemScyToRawToken(
+      tokenOut?: null,
+      netTokenOut?: null
+    ): RedeemScyToTokenEventFilter;
+    RedeemScyToToken(
       caller?: string | null,
       receiver?: string | null,
       SCY?: string | null,
       netScyIn?: null,
-      rawTokenOut?: null,
-      netRawTokenOut?: null
-    ): RedeemScyToRawTokenEventFilter;
+      tokenOut?: null,
+      netTokenOut?: null
+    ): RedeemScyToTokenEventFilter;
 
     "RemoveLiquidity(address,address,address,uint256,uint256,uint256)"(
       caller?: string | null,
@@ -1405,23 +1378,6 @@ export interface IPAllAction extends BaseContract {
       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,
@@ -1437,20 +1393,22 @@ export interface IPAllAction extends BaseContract {
       amountScyToAccount?: null
     ): SwapPtAndScyEventFilter;
 
-    "SwapYTAndRawToken(address,address,address,int256,int256)"(
-      user?: string | null,
+    "SwapPtAndToken(address,address,address,address,int256,int256)"(
+      caller?: string | null,
       market?: string | null,
-      rawToken?: string | null,
-      ytToAccount?: null,
-      rawTokenToAccount?: null
-    ): SwapYTAndRawTokenEventFilter;
-    SwapYTAndRawToken(
-      user?: string | null,
+      token?: string | null,
+      receiver?: null,
+      amountPtToAccount?: null,
+      amountTokenToAccount?: null
+    ): SwapPtAndTokenEventFilter;
+    SwapPtAndToken(
+      caller?: string | null,
       market?: string | null,
-      rawToken?: string | null,
-      ytToAccount?: null,
-      rawTokenToAccount?: null
-    ): SwapYTAndRawTokenEventFilter;
+      token?: string | null,
+      receiver?: null,
+      amountPtToAccount?: null,
+      amountTokenToAccount?: null
+    ): SwapPtAndTokenEventFilter;
 
     "SwapYTAndSCY(address,address,int256,int256)"(
       user?: string | null,
@@ -1464,6 +1422,21 @@ export interface IPAllAction extends BaseContract {
       ytToAccount?: null,
       scyToAccount?: null
     ): SwapYTAndSCYEventFilter;
+
+    "SwapYTAndToken(address,address,address,int256,int256)"(
+      user?: string | null,
+      market?: string | null,
+      token?: string | null,
+      ytToAccount?: null,
+      tokenToAccount?: null
+    ): SwapYTAndTokenEventFilter;
+    SwapYTAndToken(
+      user?: string | null,
+      market?: string | null,
+      token?: string | null,
+      ytToAccount?: null,
+      tokenToAccount?: null
+    ): SwapYTAndTokenEventFilter;
   };
 
   estimateGas: {
@@ -1485,48 +1458,45 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    addLiquiditySingleRawToken(
+    addLiquiditySingleScy(
       receiver: string,
       market: string,
-      netRawTokenIn: BigNumberish,
+      netScyIn: BigNumberish,
       minLpOut: BigNumberish,
-      path: string[],
       guessPtReceivedFromScy: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    addLiquiditySingleScy(
+    addLiquiditySingleToken(
       receiver: string,
       market: string,
-      netScyIn: BigNumberish,
       minLpOut: BigNumberish,
       guessPtReceivedFromScy: ApproxParamsStruct,
+      input: TokenInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    mintPyFromRawToken(
+    mintPyFromScy(
       receiver: string,
       YT: string,
-      netRawTokenIn: BigNumberish,
+      netScyIn: BigNumberish,
       minPyOut: BigNumberish,
-      path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    mintPyFromScy(
+    mintPyFromToken(
       receiver: string,
       YT: string,
-      netScyIn: BigNumberish,
       minPyOut: BigNumberish,
+      input: TokenInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    mintScyFromRawToken(
+    mintScyFromToken(
       receiver: string,
       SCY: string,
-      netRawTokenIn: BigNumberish,
       minScyOut: BigNumberish,
-      path: string[],
+      input: TokenInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -1538,29 +1508,27 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    redeemPyToRawToken(
+    redeemPyToScy(
       receiver: string,
       YT: string,
       netPyIn: BigNumberish,
-      minRawTokenOut: BigNumberish,
-      path: string[],
+      minScyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    redeemPyToScy(
+    redeemPyToToken(
       receiver: string,
       YT: string,
       netPyIn: BigNumberish,
-      minScyOut: BigNumberish,
+      output: TokenOutputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    redeemScyToRawToken(
+    redeemScyToToken(
       receiver: string,
       SCY: string,
       netScyIn: BigNumberish,
-      minRawTokenOut: BigNumberish,
-      path: string[],
+      output: TokenOutputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -1582,92 +1550,87 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    removeLiquiditySingleRawToken(
+    removeLiquiditySingleScy(
       receiver: string,
       market: string,
       lpToRemove: BigNumberish,
-      minRawTokenOut: BigNumberish,
-      path: string[],
+      minScyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    removeLiquiditySingleScy(
+    removeLiquiditySingleToken(
       receiver: string,
       market: string,
       lpToRemove: BigNumberish,
-      minScyOut: BigNumberish,
+      output: TokenOutputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    swapExactPtForRawToken(
+    swapExactPtForScy(
       receiver: string,
       market: string,
       exactPtIn: BigNumberish,
-      minRawTokenOut: BigNumberish,
-      path: string[],
+      minScyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    swapExactPtForScy(
+    swapExactPtForToken(
       receiver: string,
       market: string,
       exactPtIn: BigNumberish,
-      minScyOut: BigNumberish,
+      output: TokenOutputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    swapExactRawTokenForPt(
+    swapExactScyForPt(
       receiver: string,
       market: string,
-      exactRawTokenIn: BigNumberish,
+      exactScyIn: BigNumberish,
       minPtOut: BigNumberish,
-      path: string[],
       guessPtOut: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    swapExactRawTokenForYt(
+    swapExactScyForYt(
       receiver: string,
       market: string,
-      exactRawTokenIn: BigNumberish,
+      exactScyIn: BigNumberish,
       minYtOut: BigNumberish,
-      path: string[],
       guessYtOut: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    swapExactScyForPt(
+    swapExactTokenForPt(
       receiver: string,
       market: string,
-      exactScyIn: BigNumberish,
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
+      input: TokenInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    swapExactScyForYt(
+    swapExactTokenForYt(
       receiver: string,
       market: string,
-      exactScyIn: BigNumberish,
       minYtOut: BigNumberish,
       guessYtOut: ApproxParamsStruct,
+      input: TokenInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    swapExactYtForRawToken(
+    swapExactYtForScy(
       receiver: string,
       market: string,
       exactYtIn: BigNumberish,
-      minRawTokenOut: BigNumberish,
-      path: string[],
+      minScyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    swapExactYtForScy(
+    swapExactYtForToken(
       receiver: string,
       market: string,
-      exactYtIn: BigNumberish,
-      minScyOut: BigNumberish,
+      netYtIn: BigNumberish,
+      output: TokenOutputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -1725,48 +1688,45 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    addLiquiditySingleRawToken(
+    addLiquiditySingleScy(
       receiver: string,
       market: string,
-      netRawTokenIn: BigNumberish,
+      netScyIn: BigNumberish,
       minLpOut: BigNumberish,
-      path: string[],
       guessPtReceivedFromScy: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    addLiquiditySingleScy(
+    addLiquiditySingleToken(
       receiver: string,
       market: string,
-      netScyIn: BigNumberish,
       minLpOut: BigNumberish,
       guessPtReceivedFromScy: ApproxParamsStruct,
+      input: TokenInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    mintPyFromRawToken(
+    mintPyFromScy(
       receiver: string,
       YT: string,
-      netRawTokenIn: BigNumberish,
+      netScyIn: BigNumberish,
       minPyOut: BigNumberish,
-      path: string[],
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    mintPyFromScy(
+    mintPyFromToken(
       receiver: string,
       YT: string,
-      netScyIn: BigNumberish,
       minPyOut: BigNumberish,
+      input: TokenInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    mintScyFromRawToken(
+    mintScyFromToken(
       receiver: string,
       SCY: string,
-      netRawTokenIn: BigNumberish,
       minScyOut: BigNumberish,
-      path: string[],
+      input: TokenInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -1778,29 +1738,27 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    redeemPyToRawToken(
+    redeemPyToScy(
       receiver: string,
       YT: string,
       netPyIn: BigNumberish,
-      minRawTokenOut: BigNumberish,
-      path: string[],
+      minScyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    redeemPyToScy(
+    redeemPyToToken(
       receiver: string,
       YT: string,
       netPyIn: BigNumberish,
-      minScyOut: BigNumberish,
+      output: TokenOutputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    redeemScyToRawToken(
+    redeemScyToToken(
       receiver: string,
       SCY: string,
       netScyIn: BigNumberish,
-      minRawTokenOut: BigNumberish,
-      path: string[],
+      output: TokenOutputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -1822,92 +1780,87 @@ export interface IPAllAction extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    removeLiquiditySingleRawToken(
+    removeLiquiditySingleScy(
       receiver: string,
       market: string,
       lpToRemove: BigNumberish,
-      minRawTokenOut: BigNumberish,
-      path: string[],
+      minScyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    removeLiquiditySingleScy(
+    removeLiquiditySingleToken(
       receiver: string,
       market: string,
       lpToRemove: BigNumberish,
-      minScyOut: BigNumberish,
+      output: TokenOutputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    swapExactPtForRawToken(
+    swapExactPtForScy(
       receiver: string,
       market: string,
       exactPtIn: BigNumberish,
-      minRawTokenOut: BigNumberish,
-      path: string[],
+      minScyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    swapExactPtForScy(
+    swapExactPtForToken(
       receiver: string,
       market: string,
       exactPtIn: BigNumberish,
-      minScyOut: BigNumberish,
+      output: TokenOutputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    swapExactRawTokenForPt(
+    swapExactScyForPt(
       receiver: string,
       market: string,
-      exactRawTokenIn: BigNumberish,
+      exactScyIn: BigNumberish,
       minPtOut: BigNumberish,
-      path: string[],
       guessPtOut: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    swapExactRawTokenForYt(
+    swapExactScyForYt(
       receiver: string,
       market: string,
-      exactRawTokenIn: BigNumberish,
+      exactScyIn: BigNumberish,
       minYtOut: BigNumberish,
-      path: string[],
       guessYtOut: ApproxParamsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    swapExactScyForPt(
+    swapExactTokenForPt(
       receiver: string,
       market: string,
-      exactScyIn: BigNumberish,
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
+      input: TokenInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    swapExactScyForYt(
+    swapExactTokenForYt(
       receiver: string,
       market: string,
-      exactScyIn: BigNumberish,
       minYtOut: BigNumberish,
       guessYtOut: ApproxParamsStruct,
+      input: TokenInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    swapExactYtForRawToken(
+    swapExactYtForScy(
       receiver: string,
       market: string,
       exactYtIn: BigNumberish,
-      minRawTokenOut: BigNumberish,
-      path: string[],
+      minScyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    swapExactYtForScy(
+    swapExactYtForToken(
       receiver: string,
       market: string,
-      exactYtIn: BigNumberish,
-      minScyOut: BigNumberish,
+      netYtIn: BigNumberish,
+      output: TokenOutputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;