@pendle/core-v2 0.8.1-gamma → 0.9.2-beta

package/typechain-types/ActionCore.ts

@@ -44,127 +44,151 @@ 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 ActionCoreInterface extends utils.Interface {
   contractName: "ActionCore";
   functions: {
-    "addLiquidity(address,address,uint256,uint256,uint256)": FunctionFragment;
+    "addLiquidityDualIbTokenAndPt(address,address,uint256,uint256,uint256)": FunctionFragment;
+    "addLiquidityDualScyAndPt(address,address,uint256,uint256,uint256)": FunctionFragment;
     "addLiquiditySinglePt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
-    "addLiquiditySingleRawToken(address,address,uint256,uint256,address[],(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
     "addLiquiditySingleScy(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
-    "joeFactory()": FunctionFragment;
-    "mintPyFromRawToken(address,address,uint256,uint256,address[])": FunctionFragment;
+    "addLiquiditySingleToken(address,address,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,address,bytes))": FunctionFragment;
+    "kyberSwapRouter()": 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;
-    "removeLiquidity(address,address,uint256,uint256,uint256)": FunctionFragment;
+    "redeemPyToToken(address,address,uint256,(address,uint256,address,bytes))": FunctionFragment;
+    "redeemScyToToken(address,address,uint256,(address,uint256,address,bytes))": FunctionFragment;
+    "removeLiquidityDualIbTokenAndPt(address,address,uint256,uint256,uint256)": FunctionFragment;
+    "removeLiquidityDualScyAndPt(address,address,uint256,uint256,uint256)": FunctionFragment;
     "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;
+    "swapExactPtForToken(address,address,uint256,(address,uint256,address,bytes))": FunctionFragment;
     "swapExactScyForPt(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
+    "swapExactTokenForPt(address,address,uint256,(uint256,uint256,uint256,uint256,uint256),(address,uint256,address,bytes))": FunctionFragment;
     "swapPtForExactScy(address,address,uint256,uint256,(uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
     "swapScyForExactPt(address,address,uint256,uint256)": FunctionFragment;
   };
 
   encodeFunctionData(
-    functionFragment: "addLiquidity",
+    functionFragment: "addLiquidityDualIbTokenAndPt",
     values: [string, string, BigNumberish, BigNumberish, BigNumberish]
   ): string;
   encodeFunctionData(
-    functionFragment: "addLiquiditySinglePt",
-    values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
+    functionFragment: "addLiquidityDualScyAndPt",
+    values: [string, string, BigNumberish, BigNumberish, BigNumberish]
   ): string;
   encodeFunctionData(
-    functionFragment: "addLiquiditySingleRawToken",
-    values: [
-      string,
-      string,
-      BigNumberish,
-      BigNumberish,
-      string[],
-      ApproxParamsStruct
-    ]
+    functionFragment: "addLiquiditySinglePt",
+    values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "addLiquiditySingleScy",
     values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
   ): string;
   encodeFunctionData(
-    functionFragment: "joeFactory",
-    values?: undefined
+    functionFragment: "addLiquiditySingleToken",
+    values: [string, string, BigNumberish, ApproxParamsStruct, TokenInputStruct]
   ): string;
   encodeFunctionData(
-    functionFragment: "mintPyFromRawToken",
-    values: [string, string, BigNumberish, BigNumberish, string[]]
+    functionFragment: "kyberSwapRouter",
+    values?: undefined
   ): 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: "removeLiquidity",
+    functionFragment: "redeemScyToToken",
+    values: [string, string, BigNumberish, TokenOutputStruct]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "removeLiquidityDualIbTokenAndPt",
     values: [string, string, BigNumberish, BigNumberish, BigNumberish]
   ): string;
   encodeFunctionData(
-    functionFragment: "removeLiquiditySinglePt",
-    values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
+    functionFragment: "removeLiquidityDualScyAndPt",
+    values: [string, string, BigNumberish, BigNumberish, BigNumberish]
   ): string;
   encodeFunctionData(
-    functionFragment: "removeLiquiditySingleRawToken",
-    values: [string, string, BigNumberish, BigNumberish, string[]]
+    functionFragment: "removeLiquiditySinglePt",
+    values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
   ): 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
-    ]
+    functionFragment: "swapExactPtForToken",
+    values: [string, string, BigNumberish, TokenOutputStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactScyForPt",
     values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
   ): string;
+  encodeFunctionData(
+    functionFragment: "swapExactTokenForPt",
+    values: [string, string, BigNumberish, ApproxParamsStruct, TokenInputStruct]
+  ): string;
   encodeFunctionData(
     functionFragment: "swapPtForExactScy",
     values: [string, string, BigNumberish, BigNumberish, ApproxParamsStruct]
@@ -175,24 +199,27 @@ export interface ActionCoreInterface extends utils.Interface {
   ): string;
 
   decodeFunctionResult(
-    functionFragment: "addLiquidity",
+    functionFragment: "addLiquidityDualIbTokenAndPt",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "addLiquiditySinglePt",
+    functionFragment: "addLiquidityDualScyAndPt",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "addLiquiditySingleRawToken",
+    functionFragment: "addLiquiditySinglePt",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
     functionFragment: "addLiquiditySingleScy",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(functionFragment: "joeFactory", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "mintPyFromRawToken",
+    functionFragment: "addLiquiditySingleToken",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "kyberSwapRouter",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -200,15 +227,15 @@ export interface ActionCoreInterface 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(
@@ -216,19 +243,23 @@ export interface ActionCoreInterface 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: "removeLiquidityDualIbTokenAndPt",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "removeLiquidityDualScyAndPt",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "removeLiquiditySingleRawToken",
+    functionFragment: "removeLiquiditySinglePt",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -236,7 +267,7 @@ export interface ActionCoreInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "swapExactPtForRawToken",
+    functionFragment: "removeLiquiditySingleToken",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -244,13 +275,17 @@ export interface ActionCoreInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "swapExactRawTokenForPt",
+    functionFragment: "swapExactPtForToken",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
     functionFragment: "swapExactScyForPt",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "swapExactTokenForPt",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "swapPtForExactScy",
     data: BytesLike
@@ -261,58 +296,69 @@ export interface ActionCoreInterface extends utils.Interface {
   ): Result;
 
   events: {
-    "AddLiquidity(address,address,address,uint256,uint256,uint256)": EventFragment;
-    "MintPyFromRawToken(address,address,address,address,uint256,uint256)": EventFragment;
+    "AddLiquidityDualIbTokenAndPt(address,address,address,uint256,uint256,uint256)": EventFragment;
+    "AddLiquidityDualScyAndPt(address,address,address,uint256,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;
-    "RemoveLiquidity(address,address,address,uint256,uint256,uint256)": EventFragment;
-    "SwapPtAndRawToken(address,address,address,address,int256,int256)": EventFragment;
+    "RedeemPyToToken(address,address,address,uint256,address,uint256)": EventFragment;
+    "RedeemScyToToken(address,address,address,uint256,address,uint256)": EventFragment;
+    "RemoveLiquidityDualIbTokenAndPt(address,address,address,uint256,uint256,uint256)": EventFragment;
+    "RemoveLiquidityDualScyAndPt(address,address,address,uint256,uint256,uint256)": EventFragment;
     "SwapPtAndScy(address,address,address,int256,int256)": EventFragment;
+    "SwapPtAndToken(address,address,address,address,int256,int256)": EventFragment;
   };
 
-  getEvent(nameOrSignatureOrTopic: "AddLiquidity"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "MintPyFromRawToken"): EventFragment;
+  getEvent(
+    nameOrSignatureOrTopic: "AddLiquidityDualIbTokenAndPt"
+  ): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "AddLiquidityDualScyAndPt"): 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: "RemoveLiquidity"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "SwapPtAndRawToken"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "RedeemPyToToken"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "RedeemScyToToken"): EventFragment;
+  getEvent(
+    nameOrSignatureOrTopic: "RemoveLiquidityDualIbTokenAndPt"
+  ): EventFragment;
+  getEvent(
+    nameOrSignatureOrTopic: "RemoveLiquidityDualScyAndPt"
+  ): EventFragment;
   getEvent(nameOrSignatureOrTopic: "SwapPtAndScy"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "SwapPtAndToken"): EventFragment;
 }
 
-export type AddLiquidityEvent = TypedEvent<
+export type AddLiquidityDualIbTokenAndPtEvent = TypedEvent<
   [string, string, string, BigNumber, BigNumber, BigNumber],
   {
     caller: string;
     market: string;
     receiver: string;
-    scyUsed: BigNumber;
+    ibTokenUsed: BigNumber;
     ptUsed: BigNumber;
     lpOut: BigNumber;
   }
 >;
 
-export type AddLiquidityEventFilter = TypedEventFilter<AddLiquidityEvent>;
+export type AddLiquidityDualIbTokenAndPtEventFilter =
+  TypedEventFilter<AddLiquidityDualIbTokenAndPtEvent>;
 
-export type MintPyFromRawTokenEvent = TypedEvent<
-  [string, string, string, string, BigNumber, BigNumber],
+export type AddLiquidityDualScyAndPtEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber, BigNumber],
   {
     caller: string;
+    market: string;
     receiver: string;
-    YT: string;
-    rawTokenIn: string;
-    netRawTokenIn: BigNumber;
-    netPyOut: BigNumber;
+    scyUsed: BigNumber;
+    ptUsed: BigNumber;
+    lpOut: BigNumber;
   }
 >;
 
-export type MintPyFromRawTokenEventFilter =
-  TypedEventFilter<MintPyFromRawTokenEvent>;
+export type AddLiquidityDualScyAndPtEventFilter =
+  TypedEventFilter<AddLiquidityDualScyAndPtEvent>;
 
 export type MintPyFromScyEvent = TypedEvent<
   [string, string, string, BigNumber, BigNumber],
@@ -327,35 +373,34 @@ export type MintPyFromScyEvent = TypedEvent<
 
 export type MintPyFromScyEventFilter = TypedEventFilter<MintPyFromScyEvent>;
 
-export type MintScyFromRawTokenEvent = TypedEvent<
+export type MintPyFromTokenEvent = TypedEvent<
   [string, string, string, string, BigNumber, BigNumber],
   {
     caller: string;
     receiver: string;
-    SCY: string;
-    rawTokenIn: string;
-    netRawTokenIn: BigNumber;
-    netScyOut: BigNumber;
+    YT: string;
+    tokenIn: string;
+    netTokenIn: BigNumber;
+    netPyOut: BigNumber;
   }
 >;
 
-export type MintScyFromRawTokenEventFilter =
-  TypedEventFilter<MintScyFromRawTokenEvent>;
+export type MintPyFromTokenEventFilter = TypedEventFilter<MintPyFromTokenEvent>;
 
-export type RedeemPyToRawTokenEvent = TypedEvent<
-  [string, string, string, BigNumber, string, BigNumber],
+export type MintScyFromTokenEvent = TypedEvent<
+  [string, string, string, string, BigNumber, BigNumber],
   {
     caller: string;
     receiver: string;
-    YT: string;
-    netPyIn: BigNumber;
-    rawTokenOut: string;
-    netRawTokenOut: BigNumber;
+    SCY: string;
+    tokenIn: string;
+    netTokenIn: BigNumber;
+    netScyOut: BigNumber;
   }
 >;
 
-export type RedeemPyToRawTokenEventFilter =
-  TypedEventFilter<RedeemPyToRawTokenEvent>;
+export type MintScyFromTokenEventFilter =
+  TypedEventFilter<MintScyFromTokenEvent>;
 
 export type RedeemPyToScyEvent = TypedEvent<
   [string, string, string, BigNumber, BigNumber],
@@ -370,22 +415,36 @@ export type RedeemPyToScyEvent = TypedEvent<
 
 export type RedeemPyToScyEventFilter = TypedEventFilter<RedeemPyToScyEvent>;
 
-export type RedeemScyToRawTokenEvent = TypedEvent<
+export type RedeemPyToTokenEvent = TypedEvent<
+  [string, string, string, BigNumber, string, BigNumber],
+  {
+    caller: string;
+    receiver: string;
+    YT: string;
+    netPyIn: BigNumber;
+    tokenOut: string;
+    netTokenOut: BigNumber;
+  }
+>;
+
+export type RedeemPyToTokenEventFilter = TypedEventFilter<RedeemPyToTokenEvent>;
+
+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<
+export type RemoveLiquidityDualIbTokenAndPtEvent = TypedEvent<
   [string, string, string, BigNumber, BigNumber, BigNumber],
   {
     caller: string;
@@ -393,26 +452,27 @@ export type RemoveLiquidityEvent = TypedEvent<
     receiver: string;
     lpIn: BigNumber;
     amountPTOut: BigNumber;
-    amountSCYOut: BigNumber;
+    amountIbTokenOut: BigNumber;
   }
 >;
 
-export type RemoveLiquidityEventFilter = TypedEventFilter<RemoveLiquidityEvent>;
+export type RemoveLiquidityDualIbTokenAndPtEventFilter =
+  TypedEventFilter<RemoveLiquidityDualIbTokenAndPtEvent>;
 
-export type SwapPtAndRawTokenEvent = TypedEvent<
-  [string, string, string, string, BigNumber, BigNumber],
+export type RemoveLiquidityDualScyAndPtEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber, BigNumber],
   {
     caller: string;
     market: string;
-    rawToken: string;
     receiver: string;
-    amountPtToAccount: BigNumber;
-    amountRawTokenToAccount: BigNumber;
+    lpIn: BigNumber;
+    amountPTOut: BigNumber;
+    amountSCYOut: BigNumber;
   }
 >;
 
-export type SwapPtAndRawTokenEventFilter =
-  TypedEventFilter<SwapPtAndRawTokenEvent>;
+export type RemoveLiquidityDualScyAndPtEventFilter =
+  TypedEventFilter<RemoveLiquidityDualScyAndPtEvent>;
 
 export type SwapPtAndScyEvent = TypedEvent<
   [string, string, string, BigNumber, BigNumber],
@@ -427,6 +487,20 @@ export type SwapPtAndScyEvent = TypedEvent<
 
 export type SwapPtAndScyEventFilter = TypedEventFilter<SwapPtAndScyEvent>;
 
+export type SwapPtAndTokenEvent = TypedEvent<
+  [string, string, string, string, BigNumber, BigNumber],
+  {
+    caller: string;
+    market: string;
+    token: string;
+    receiver: string;
+    amountPtToAccount: BigNumber;
+    amountTokenToAccount: BigNumber;
+  }
+>;
+
+export type SwapPtAndTokenEventFilter = TypedEventFilter<SwapPtAndTokenEvent>;
+
 export interface ActionCore extends BaseContract {
   contractName: "ActionCore";
   connect(signerOrProvider: Signer | Provider | string): this;
@@ -455,7 +529,16 @@ export interface ActionCore extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
-    addLiquidity(
+    addLiquidityDualIbTokenAndPt(
+      receiver: string,
+      market: string,
+      ibTokenDesired: BigNumberish,
+      ptDesired: BigNumberish,
+      minLpOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    addLiquidityDualScyAndPt(
       receiver: string,
       market: string,
       scyDesired: BigNumberish,
@@ -473,50 +556,47 @@ export interface ActionCore 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>;
 
-    joeFactory(overrides?: CallOverrides): Promise<[string]>;
+    kyberSwapRouter(overrides?: CallOverrides): Promise<[string]>;
 
-    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>;
 
@@ -528,33 +608,40 @@ export interface ActionCore 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>;
 
-    removeLiquidity(
+    removeLiquidityDualIbTokenAndPt(
+      receiver: string,
+      market: string,
+      lpToRemove: BigNumberish,
+      ibTokenMin: BigNumberish,
+      ptOutMin: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    removeLiquidityDualScyAndPt(
       receiver: string,
       market: string,
       lpToRemove: BigNumberish,
@@ -572,56 +659,53 @@ export interface ActionCore 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>;
 
-    swapExactScyForPt(
+    swapExactTokenForPt(
       receiver: string,
       market: string,
-      exactScyIn: BigNumberish,
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
+      input: TokenInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -643,7 +727,16 @@ export interface ActionCore extends BaseContract {
     ): Promise<ContractTransaction>;
   };
 
-  addLiquidity(
+  addLiquidityDualIbTokenAndPt(
+    receiver: string,
+    market: string,
+    ibTokenDesired: BigNumberish,
+    ptDesired: BigNumberish,
+    minLpOut: BigNumberish,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  addLiquidityDualScyAndPt(
     receiver: string,
     market: string,
     scyDesired: BigNumberish,
@@ -661,50 +754,47 @@ export interface ActionCore 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>;
 
-  joeFactory(overrides?: CallOverrides): Promise<string>;
+  kyberSwapRouter(overrides?: CallOverrides): Promise<string>;
 
-  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>;
 
@@ -716,33 +806,40 @@ export interface ActionCore 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>;
+
+  removeLiquidityDualIbTokenAndPt(
+    receiver: string,
+    market: string,
+    lpToRemove: BigNumberish,
+    ibTokenMin: BigNumberish,
+    ptOutMin: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  removeLiquidity(
+  removeLiquidityDualScyAndPt(
     receiver: string,
     market: string,
     lpToRemove: BigNumberish,
@@ -760,56 +857,53 @@ export interface ActionCore 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>;
 
-  swapExactScyForPt(
+  swapExactTokenForPt(
     receiver: string,
     market: string,
-    exactScyIn: BigNumberish,
     minPtOut: BigNumberish,
     guessPtOut: ApproxParamsStruct,
+    input: TokenInputStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -831,7 +925,22 @@ export interface ActionCore extends BaseContract {
   ): Promise<ContractTransaction>;
 
   callStatic: {
-    addLiquidity(
+    addLiquidityDualIbTokenAndPt(
+      receiver: string,
+      market: string,
+      ibTokenDesired: BigNumberish,
+      ptDesired: BigNumberish,
+      minLpOut: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<
+      [BigNumber, BigNumber, BigNumber] & {
+        netLpOut: BigNumber;
+        ibTokenUsed: BigNumber;
+        ptUsed: BigNumber;
+      }
+    >;
+
+    addLiquidityDualScyAndPt(
       receiver: string,
       market: string,
       scyDesired: BigNumberish,
@@ -855,50 +964,47 @@ export interface ActionCore 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>;
 
-    joeFactory(overrides?: CallOverrides): Promise<string>;
+    kyberSwapRouter(overrides?: CallOverrides): Promise<string>;
 
-    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>;
 
@@ -917,33 +1023,42 @@ export interface ActionCore 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>;
 
-    removeLiquidity(
+    removeLiquidityDualIbTokenAndPt(
+      receiver: string,
+      market: string,
+      lpToRemove: BigNumberish,
+      ibTokenMin: BigNumberish,
+      ptOutMin: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<
+      [BigNumber, BigNumber] & { netIbTokenOut: BigNumber; netPtOut: BigNumber }
+    >;
+
+    removeLiquidityDualScyAndPt(
       receiver: string,
       market: string,
       lpToRemove: BigNumberish,
@@ -963,56 +1078,53 @@ export interface ActionCore 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>;
 
-    swapExactScyForPt(
+    swapExactTokenForPt(
       receiver: string,
       market: string,
-      exactScyIn: BigNumberish,
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
+      input: TokenInputStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
@@ -1035,39 +1147,39 @@ export interface ActionCore extends BaseContract {
   };
 
   filters: {
-    "AddLiquidity(address,address,address,uint256,uint256,uint256)"(
+    "AddLiquidityDualIbTokenAndPt(address,address,address,uint256,uint256,uint256)"(
       caller?: string | null,
       market?: string | null,
       receiver?: string | null,
-      scyUsed?: null,
+      ibTokenUsed?: null,
       ptUsed?: null,
       lpOut?: null
-    ): AddLiquidityEventFilter;
-    AddLiquidity(
+    ): AddLiquidityDualIbTokenAndPtEventFilter;
+    AddLiquidityDualIbTokenAndPt(
       caller?: string | null,
       market?: string | null,
       receiver?: string | null,
-      scyUsed?: null,
+      ibTokenUsed?: null,
       ptUsed?: null,
       lpOut?: null
-    ): AddLiquidityEventFilter;
+    ): AddLiquidityDualIbTokenAndPtEventFilter;
 
-    "MintPyFromRawToken(address,address,address,address,uint256,uint256)"(
+    "AddLiquidityDualScyAndPt(address,address,address,uint256,uint256,uint256)"(
       caller?: string | null,
+      market?: string | null,
       receiver?: string | null,
-      YT?: string | null,
-      rawTokenIn?: null,
-      netRawTokenIn?: null,
-      netPyOut?: null
-    ): MintPyFromRawTokenEventFilter;
-    MintPyFromRawToken(
+      scyUsed?: null,
+      ptUsed?: null,
+      lpOut?: null
+    ): AddLiquidityDualScyAndPtEventFilter;
+    AddLiquidityDualScyAndPt(
       caller?: string | null,
+      market?: string | null,
       receiver?: string | null,
-      YT?: string | null,
-      rawTokenIn?: null,
-      netRawTokenIn?: null,
-      netPyOut?: null
-    ): MintPyFromRawTokenEventFilter;
+      scyUsed?: null,
+      ptUsed?: null,
+      lpOut?: null
+    ): AddLiquidityDualScyAndPtEventFilter;
 
     "MintPyFromScy(address,address,address,uint256,uint256)"(
       caller?: string | null,
@@ -1084,105 +1196,122 @@ export interface ActionCore extends BaseContract {
       netPyOut?: null
     ): MintPyFromScyEventFilter;
 
-    "MintScyFromRawToken(address,address,address,address,uint256,uint256)"(
+    "MintPyFromToken(address,address,address,address,uint256,uint256)"(
+      caller?: string | null,
+      receiver?: string | null,
+      YT?: string | null,
+      tokenIn?: null,
+      netTokenIn?: null,
+      netPyOut?: null
+    ): MintPyFromTokenEventFilter;
+    MintPyFromToken(
+      caller?: string | null,
+      receiver?: string | null,
+      YT?: string | null,
+      tokenIn?: null,
+      netTokenIn?: null,
+      netPyOut?: null
+    ): MintPyFromTokenEventFilter;
+
+    "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)"(
+    "RemoveLiquidityDualIbTokenAndPt(address,address,address,uint256,uint256,uint256)"(
       caller?: string | null,
       market?: string | null,
       receiver?: null,
       lpIn?: null,
       amountPTOut?: null,
-      amountSCYOut?: null
-    ): RemoveLiquidityEventFilter;
-    RemoveLiquidity(
+      amountIbTokenOut?: null
+    ): RemoveLiquidityDualIbTokenAndPtEventFilter;
+    RemoveLiquidityDualIbTokenAndPt(
       caller?: string | null,
       market?: string | null,
       receiver?: null,
       lpIn?: null,
       amountPTOut?: null,
-      amountSCYOut?: null
-    ): RemoveLiquidityEventFilter;
+      amountIbTokenOut?: null
+    ): RemoveLiquidityDualIbTokenAndPtEventFilter;
 
-    "SwapPtAndRawToken(address,address,address,address,int256,int256)"(
+    "RemoveLiquidityDualScyAndPt(address,address,address,uint256,uint256,uint256)"(
       caller?: string | null,
       market?: string | null,
-      rawToken?: string | null,
       receiver?: null,
-      amountPtToAccount?: null,
-      amountRawTokenToAccount?: null
-    ): SwapPtAndRawTokenEventFilter;
-    SwapPtAndRawToken(
+      lpIn?: null,
+      amountPTOut?: null,
+      amountSCYOut?: null
+    ): RemoveLiquidityDualScyAndPtEventFilter;
+    RemoveLiquidityDualScyAndPt(
       caller?: string | null,
       market?: string | null,
-      rawToken?: string | null,
       receiver?: null,
-      amountPtToAccount?: null,
-      amountRawTokenToAccount?: null
-    ): SwapPtAndRawTokenEventFilter;
+      lpIn?: null,
+      amountPTOut?: null,
+      amountSCYOut?: null
+    ): RemoveLiquidityDualScyAndPtEventFilter;
 
     "SwapPtAndScy(address,address,address,int256,int256)"(
       caller?: string | null,
@@ -1198,10 +1327,36 @@ export interface ActionCore extends BaseContract {
       amountPtToAccount?: null,
       amountScyToAccount?: null
     ): SwapPtAndScyEventFilter;
+
+    "SwapPtAndToken(address,address,address,address,int256,int256)"(
+      caller?: string | null,
+      market?: string | null,
+      token?: string | null,
+      receiver?: null,
+      amountPtToAccount?: null,
+      amountTokenToAccount?: null
+    ): SwapPtAndTokenEventFilter;
+    SwapPtAndToken(
+      caller?: string | null,
+      market?: string | null,
+      token?: string | null,
+      receiver?: null,
+      amountPtToAccount?: null,
+      amountTokenToAccount?: null
+    ): SwapPtAndTokenEventFilter;
   };
 
   estimateGas: {
-    addLiquidity(
+    addLiquidityDualIbTokenAndPt(
+      receiver: string,
+      market: string,
+      ibTokenDesired: BigNumberish,
+      ptDesired: BigNumberish,
+      minLpOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    addLiquidityDualScyAndPt(
       receiver: string,
       market: string,
       scyDesired: BigNumberish,
@@ -1219,50 +1374,47 @@ export interface ActionCore 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>;
 
-    joeFactory(overrides?: CallOverrides): Promise<BigNumber>;
+    kyberSwapRouter(overrides?: CallOverrides): 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>;
 
@@ -1274,33 +1426,40 @@ export interface ActionCore 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>;
 
-    removeLiquidity(
+    removeLiquidityDualIbTokenAndPt(
+      receiver: string,
+      market: string,
+      lpToRemove: BigNumberish,
+      ibTokenMin: BigNumberish,
+      ptOutMin: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    removeLiquidityDualScyAndPt(
       receiver: string,
       market: string,
       lpToRemove: BigNumberish,
@@ -1318,56 +1477,53 @@ export interface ActionCore 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>;
 
-    swapExactScyForPt(
+    swapExactTokenForPt(
       receiver: string,
       market: string,
-      exactScyIn: BigNumberish,
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
+      input: TokenInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -1390,7 +1546,16 @@ export interface ActionCore extends BaseContract {
   };
 
   populateTransaction: {
-    addLiquidity(
+    addLiquidityDualIbTokenAndPt(
+      receiver: string,
+      market: string,
+      ibTokenDesired: BigNumberish,
+      ptDesired: BigNumberish,
+      minLpOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    addLiquidityDualScyAndPt(
       receiver: string,
       market: string,
       scyDesired: BigNumberish,
@@ -1408,50 +1573,47 @@ export interface ActionCore 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>;
 
-    joeFactory(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+    kyberSwapRouter(overrides?: CallOverrides): 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>;
 
@@ -1463,33 +1625,40 @@ export interface ActionCore 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>;
 
-    removeLiquidity(
+    removeLiquidityDualIbTokenAndPt(
+      receiver: string,
+      market: string,
+      lpToRemove: BigNumberish,
+      ibTokenMin: BigNumberish,
+      ptOutMin: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    removeLiquidityDualScyAndPt(
       receiver: string,
       market: string,
       lpToRemove: BigNumberish,
@@ -1507,56 +1676,53 @@ export interface ActionCore 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>;
 
-    swapExactScyForPt(
+    swapExactTokenForPt(
       receiver: string,
       market: string,
-      exactScyIn: BigNumberish,
       minPtOut: BigNumberish,
       guessPtOut: ApproxParamsStruct,
+      input: TokenInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;