@pendle/core-v2 2.20.0 → 2.21.0-tradingbot

package/typechain-types/ILongYieldTradingBot.ts

@@ -9,7 +9,6 @@ import {
   CallOverrides,
   ContractTransaction,
   Overrides,
-  PayableOverrides,
   PopulatedTransaction,
   Signer,
   utils,
@@ -84,23 +83,26 @@ export type TokenInputStructOutput = [
   swapData: SwapDataStructOutput;
 };
 
-export type TokenAmountStruct = { token: string; amount: BigNumberish };
-
-export type TokenAmountStructOutput = [string, BigNumber] & {
-  token: string;
-  amount: BigNumber;
-};
-
 export type BotStateStruct = {
   lpBalance: BigNumberish;
   ytBalance: BigNumberish;
+  ptBalance: BigNumberish;
   syBalance: BigNumberish;
+  buyBins: BigNumberish;
 };
 
-export type BotStateStructOutput = [BigNumber, BigNumber, BigNumber] & {
+export type BotStateStructOutput = [
+  BigNumber,
+  BigNumber,
+  BigNumber,
+  BigNumber,
+  BigNumber
+] & {
   lpBalance: BigNumber;
   ytBalance: BigNumber;
+  ptBalance: BigNumber;
   syBalance: BigNumber;
+  buyBins: BigNumber;
 };
 
 export type MarketStateStruct = {
@@ -149,16 +151,16 @@ export type MarketExtStateStructOutput = [
   BigNumber
 ] & { state: MarketStateStructOutput; index: BigNumber; blockTime: BigNumber };
 
-export type LongTradingSpecsStruct = {
-  lowerIyLimit: BigNumberish;
-  upperIyLimit: BigNumberish;
-  floatingSyRatioLimit: BigNumberish;
-  floatingSyRatioTarget: BigNumberish;
-  ytPtRatioLimit: BigNumberish;
-  ytPtRatioTarget: BigNumberish;
+export type TradingSpecsStruct = {
+  buyYtIy: BigNumberish;
+  sellYtIy: BigNumberish;
+  targetSyRatio: BigNumberish;
+  bufferSyRatio: BigNumberish;
+  minYtPtRatio: BigNumberish;
+  numOfBins: BigNumberish;
 };
 
-export type LongTradingSpecsStructOutput = [
+export type TradingSpecsStructOutput = [
   BigNumber,
   BigNumber,
   BigNumber,
@@ -166,109 +168,119 @@ export type LongTradingSpecsStructOutput = [
   BigNumber,
   BigNumber
 ] & {
-  lowerIyLimit: BigNumber;
-  upperIyLimit: BigNumber;
-  floatingSyRatioLimit: BigNumber;
-  floatingSyRatioTarget: BigNumber;
-  ytPtRatioLimit: BigNumber;
-  ytPtRatioTarget: BigNumber;
+  buyYtIy: BigNumber;
+  sellYtIy: BigNumber;
+  targetSyRatio: BigNumber;
+  bufferSyRatio: BigNumber;
+  minYtPtRatio: BigNumber;
+  numOfBins: BigNumber;
+};
+
+export type StrategyDataStruct = {
+  botState: BotStateStruct;
+  marketExt: MarketExtStateStruct;
+  specs: TradingSpecsStruct;
+};
+
+export type StrategyDataStructOutput = [
+  BotStateStructOutput,
+  MarketExtStateStructOutput,
+  TradingSpecsStructOutput
+] & {
+  botState: BotStateStructOutput;
+  marketExt: MarketExtStateStructOutput;
+  specs: TradingSpecsStructOutput;
 };
 
-export declare namespace ITradingBotBase {
-  export type MultiApprovalStruct = { tokens: string[]; spender: string };
+export declare namespace ILongYieldTradingBot {
+  export type AddLiqFromYtInputStruct = {
+    botParams: ApproxParamsStruct;
+    minLpOut: BigNumberish;
+    targetIy: BigNumberish;
+    currentBin: BigNumberish;
+  };
 
-  export type MultiApprovalStructOutput = [string[], string] & {
-    tokens: string[];
-    spender: string;
+  export type AddLiqFromYtInputStructOutput = [
+    ApproxParamsStructOutput,
+    BigNumber,
+    BigNumber,
+    BigNumber
+  ] & {
+    botParams: ApproxParamsStructOutput;
+    minLpOut: BigNumber;
+    targetIy: BigNumber;
+    currentBin: BigNumber;
+  };
+
+  export type RemoveLiqToYtInputStruct = {
+    botParams: ApproxParamsStruct;
+    guessTotalPtToSwap: ApproxParamsStruct;
+    minYtOut: BigNumberish;
+    targetIy: BigNumberish;
+    currentBin: BigNumberish;
+  };
+
+  export type RemoveLiqToYtInputStructOutput = [
+    ApproxParamsStructOutput,
+    ApproxParamsStructOutput,
+    BigNumber,
+    BigNumber,
+    BigNumber
+  ] & {
+    botParams: ApproxParamsStructOutput;
+    guessTotalPtToSwap: ApproxParamsStructOutput;
+    minYtOut: BigNumber;
+    targetIy: BigNumber;
+    currentBin: BigNumber;
   };
 }
 
 export interface ILongYieldTradingBotInterface extends utils.Interface {
   contractName: "ILongYieldTradingBot";
   functions: {
-    "addLiqFromSy((uint256,uint256,uint256,uint256,uint256),uint256,uint256)": FunctionFragment;
-    "addLiqFromYt((uint256,uint256,uint256,uint256,uint256),uint256,uint256)": FunctionFragment;
-    "addLiqKeepYt(address,(uint256,uint256,uint256,uint256,uint256),uint256,uint256,uint256)": FunctionFragment;
-    "approveInf((address[],address)[])": FunctionFragment;
-    "claimAndCompound(address,(address,uint256,address,address,address,(uint8,address,bytes,bool))[],uint256)": FunctionFragment;
-    "claimWithoutCompound()": FunctionFragment;
-    "depositSy(uint256)": FunctionFragment;
-    "depositToken(address,(address,uint256,address,address,address,(uint8,address,bytes,bool)),uint256)": FunctionFragment;
-    "readBotState()": FunctionFragment;
-    "readMarketExtState(address)": FunctionFragment;
-    "removeLiqToYt((uint256,uint256,uint256,uint256,uint256),(uint256,uint256,uint256,uint256,uint256),uint256,uint256)": FunctionFragment;
+    "addLiqFromYt(((uint256,uint256,uint256,uint256,uint256),uint256,uint256,int256))": FunctionFragment;
+    "addLiqKeepYt(uint256,uint256,uint256)": FunctionFragment;
+    "compound((address,uint256,address,address,address,(uint8,address,bytes,bool)),uint256)": FunctionFragment;
+    "readStrategyData()": FunctionFragment;
+    "removeLiqToYt(((uint256,uint256,uint256,uint256,uint256),(uint256,uint256,uint256,uint256,uint256),uint256,uint256,int256))": FunctionFragment;
+    "removeLiquidityToSy(uint256,uint256)": FunctionFragment;
     "setSpecs((uint256,uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
-    "swapSyToYt(address,(uint256,uint256,uint256,uint256,uint256),uint256,uint256)": FunctionFragment;
-    "withdrawFunds(address,uint256)": FunctionFragment;
+    "swapYtToSy(uint256,uint256)": FunctionFragment;
   };
 
-  encodeFunctionData(
-    functionFragment: "addLiqFromSy",
-    values: [ApproxParamsStruct, BigNumberish, BigNumberish]
-  ): string;
   encodeFunctionData(
     functionFragment: "addLiqFromYt",
-    values: [ApproxParamsStruct, BigNumberish, BigNumberish]
+    values: [ILongYieldTradingBot.AddLiqFromYtInputStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "addLiqKeepYt",
-    values: [
-      string,
-      ApproxParamsStruct,
-      BigNumberish,
-      BigNumberish,
-      BigNumberish
-    ]
+    values: [BigNumberish, BigNumberish, BigNumberish]
   ): string;
   encodeFunctionData(
-    functionFragment: "approveInf",
-    values: [ITradingBotBase.MultiApprovalStruct[]]
+    functionFragment: "compound",
+    values: [TokenInputStruct, BigNumberish]
   ): string;
   encodeFunctionData(
-    functionFragment: "claimAndCompound",
-    values: [string, TokenInputStruct[], BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "claimWithoutCompound",
+    functionFragment: "readStrategyData",
     values?: undefined
   ): string;
-  encodeFunctionData(
-    functionFragment: "depositSy",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "depositToken",
-    values: [string, TokenInputStruct, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "readBotState",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "readMarketExtState",
-    values: [string]
-  ): string;
   encodeFunctionData(
     functionFragment: "removeLiqToYt",
-    values: [ApproxParamsStruct, ApproxParamsStruct, BigNumberish, BigNumberish]
+    values: [ILongYieldTradingBot.RemoveLiqToYtInputStruct]
   ): string;
   encodeFunctionData(
-    functionFragment: "setSpecs",
-    values: [LongTradingSpecsStruct]
+    functionFragment: "removeLiquidityToSy",
+    values: [BigNumberish, BigNumberish]
   ): string;
   encodeFunctionData(
-    functionFragment: "swapSyToYt",
-    values: [string, ApproxParamsStruct, BigNumberish, BigNumberish]
+    functionFragment: "setSpecs",
+    values: [TradingSpecsStruct]
   ): string;
   encodeFunctionData(
-    functionFragment: "withdrawFunds",
-    values: [string, BigNumberish]
+    functionFragment: "swapYtToSy",
+    values: [BigNumberish, BigNumberish]
   ): string;
 
-  decodeFunctionResult(
-    functionFragment: "addLiqFromSy",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "addLiqFromYt",
     data: BytesLike
@@ -277,79 +289,45 @@ export interface ILongYieldTradingBotInterface extends utils.Interface {
     functionFragment: "addLiqKeepYt",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(functionFragment: "approveInf", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "claimAndCompound",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "claimWithoutCompound",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "depositSy", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "depositToken",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "readBotState",
-    data: BytesLike
-  ): Result;
+  decodeFunctionResult(functionFragment: "compound", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "readMarketExtState",
+    functionFragment: "readStrategyData",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
     functionFragment: "removeLiqToYt",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(functionFragment: "setSpecs", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "swapSyToYt", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "withdrawFunds",
+    functionFragment: "removeLiquidityToSy",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(functionFragment: "setSpecs", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "swapYtToSy", data: BytesLike): Result;
 
   events: {
-    "AddLiqFromSy(tuple,uint256,uint256,uint256)": EventFragment;
-    "AddLiqFromYt(tuple,uint256,uint256,uint256)": EventFragment;
-    "AddLiqKeepYt(tuple,uint256,uint256,uint256,uint256)": EventFragment;
-    "ClaimAndCompound(uint256,uint256)": EventFragment;
+    "AddLiqFromYt(tuple,uint256,uint256)": EventFragment;
+    "AddLiqKeepYt(uint256,uint256,uint256)": EventFragment;
+    "ClaimAndCompound(uint256)": EventFragment;
     "DepositSy(uint256)": EventFragment;
     "DepositToken(address,uint256)": EventFragment;
-    "RemoveLiqToYt(tuple,uint256,uint256,uint256)": EventFragment;
-    "SwapSyToYt(tuple,uint256,uint256,uint256)": EventFragment;
+    "RemoveLiqToYt(tuple,uint256,uint256)": EventFragment;
     "WithdrawFunds(address,uint256)": EventFragment;
   };
 
-  getEvent(nameOrSignatureOrTopic: "AddLiqFromSy"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "AddLiqFromYt"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "AddLiqKeepYt"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "ClaimAndCompound"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "DepositSy"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "DepositToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "RemoveLiqToYt"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "SwapSyToYt"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "WithdrawFunds"): EventFragment;
 }
 
-export type AddLiqFromSyEvent = TypedEvent<
-  [ApproxParamsStructOutput, BigNumber, BigNumber, BigNumber],
-  {
-    botParams: ApproxParamsStructOutput;
-    maxSyIn: BigNumber;
-    netSyIn: BigNumber;
-    netLpOut: BigNumber;
-  }
->;
-
-export type AddLiqFromSyEventFilter = TypedEventFilter<AddLiqFromSyEvent>;
-
 export type AddLiqFromYtEvent = TypedEvent<
-  [ApproxParamsStructOutput, BigNumber, BigNumber, BigNumber],
+  [ApproxParamsStructOutput, BigNumber, BigNumber],
   {
     botParams: ApproxParamsStructOutput;
-    maxYtIn: BigNumber;
     netYtIn: BigNumber;
     netLpOut: BigNumber;
   }
@@ -358,21 +336,15 @@ export type AddLiqFromYtEvent = TypedEvent<
 export type AddLiqFromYtEventFilter = TypedEventFilter<AddLiqFromYtEvent>;
 
 export type AddLiqKeepYtEvent = TypedEvent<
-  [ApproxParamsStructOutput, BigNumber, BigNumber, BigNumber, BigNumber],
-  {
-    botParams: ApproxParamsStructOutput;
-    maxSyIn: BigNumber;
-    netSyIn: BigNumber;
-    netLpOut: BigNumber;
-    netYtOut: BigNumber;
-  }
+  [BigNumber, BigNumber, BigNumber],
+  { netSyIn: BigNumber; netLpOut: BigNumber; netYtOut: BigNumber }
 >;
 
 export type AddLiqKeepYtEventFilter = TypedEventFilter<AddLiqKeepYtEvent>;
 
 export type ClaimAndCompoundEvent = TypedEvent<
-  [BigNumber, BigNumber],
-  { netSyOut: BigNumber; netPendleOut: BigNumber }
+  [BigNumber],
+  { netSyOut: BigNumber }
 >;
 
 export type ClaimAndCompoundEventFilter =
@@ -390,10 +362,9 @@ export type DepositTokenEvent = TypedEvent<
 export type DepositTokenEventFilter = TypedEventFilter<DepositTokenEvent>;
 
 export type RemoveLiqToYtEvent = TypedEvent<
-  [ApproxParamsStructOutput, BigNumber, BigNumber, BigNumber],
+  [ApproxParamsStructOutput, BigNumber, BigNumber],
   {
     botParams: ApproxParamsStructOutput;
-    maxLpRemoved: BigNumber;
     netLpIn: BigNumber;
     netYtOut: BigNumber;
   }
@@ -401,18 +372,6 @@ export type RemoveLiqToYtEvent = TypedEvent<
 
 export type RemoveLiqToYtEventFilter = TypedEventFilter<RemoveLiqToYtEvent>;
 
-export type SwapSyToYtEvent = TypedEvent<
-  [ApproxParamsStructOutput, BigNumber, BigNumber, BigNumber],
-  {
-    botParams: ApproxParamsStructOutput;
-    maxSyIn: BigNumber;
-    exactYtOut: BigNumber;
-    netSyIn: BigNumber;
-  }
->;
-
-export type SwapSyToYtEventFilter = TypedEventFilter<SwapSyToYtEvent>;
-
 export type WithdrawFundsEvent = TypedEvent<
   [string, BigNumber],
   { token: string; amount: BigNumber }
@@ -448,197 +407,100 @@ export interface ILongYieldTradingBot extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
-    addLiqFromSy(
-      botParams: ApproxParamsStruct,
-      minLpOut: BigNumberish,
-      maxSyIn: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
     addLiqFromYt(
-      botParams: ApproxParamsStruct,
-      minLpOut: BigNumberish,
-      maxYtIn: BigNumberish,
+      inputParams: ILongYieldTradingBot.AddLiqFromYtInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     addLiqKeepYt(
-      router: string,
-      botParams: ApproxParamsStruct,
-      maxSyIn: BigNumberish,
+      netSyIn: BigNumberish,
       minLpOut: BigNumberish,
       minYtOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    approveInf(
-      arr: ITradingBotBase.MultiApprovalStruct[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    claimAndCompound(
-      router: string,
-      inps: TokenInputStruct[],
-      minSyOut: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    claimWithoutCompound(
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    depositSy(
-      netSyIn: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    depositToken(
-      router: string,
+    compound(
       inp: TokenInputStruct,
       minSyOut: BigNumberish,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    readBotState(
+    readStrategyData(
       overrides?: CallOverrides
-    ): Promise<[BotStateStructOutput] & { botState: BotStateStructOutput }>;
-
-    readMarketExtState(
-      router: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
+    ): Promise<
+      [StrategyDataStructOutput] & { strategyData: StrategyDataStructOutput }
+    >;
 
     removeLiqToYt(
-      botParams: ApproxParamsStruct,
-      guessTotalPtToSwap: ApproxParamsStruct,
-      maxLpRemoved: BigNumberish,
-      minYtOut: BigNumberish,
+      inputParams: ILongYieldTradingBot.RemoveLiqToYtInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    setSpecs(
-      _specs: LongTradingSpecsStruct,
+    removeLiquidityToSy(
+      netLpToRemove: BigNumberish,
+      minSyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    swapSyToYt(
-      router: string,
-      botParams: ApproxParamsStruct,
-      minYtOut: BigNumberish,
-      maxSyIn: BigNumberish,
+    setSpecs(
+      _specs: TradingSpecsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    withdrawFunds(
-      token: string,
-      amount: BigNumberish,
+    swapYtToSy(
+      netYtToSell: BigNumberish,
+      minSyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
   };
 
-  addLiqFromSy(
-    botParams: ApproxParamsStruct,
-    minLpOut: BigNumberish,
-    maxSyIn: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
   addLiqFromYt(
-    botParams: ApproxParamsStruct,
-    minLpOut: BigNumberish,
-    maxYtIn: BigNumberish,
+    inputParams: ILongYieldTradingBot.AddLiqFromYtInputStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   addLiqKeepYt(
-    router: string,
-    botParams: ApproxParamsStruct,
-    maxSyIn: BigNumberish,
+    netSyIn: BigNumberish,
     minLpOut: BigNumberish,
     minYtOut: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  approveInf(
-    arr: ITradingBotBase.MultiApprovalStruct[],
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  claimAndCompound(
-    router: string,
-    inps: TokenInputStruct[],
+  compound(
+    inp: TokenInputStruct,
     minSyOut: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  claimWithoutCompound(
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
+  readStrategyData(
+    overrides?: CallOverrides
+  ): Promise<StrategyDataStructOutput>;
 
-  depositSy(
-    netSyIn: BigNumberish,
+  removeLiqToYt(
+    inputParams: ILongYieldTradingBot.RemoveLiqToYtInputStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  depositToken(
-    router: string,
-    inp: TokenInputStruct,
+  removeLiquidityToSy(
+    netLpToRemove: BigNumberish,
     minSyOut: BigNumberish,
-    overrides?: PayableOverrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  readBotState(overrides?: CallOverrides): Promise<BotStateStructOutput>;
-
-  readMarketExtState(
-    router: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  removeLiqToYt(
-    botParams: ApproxParamsStruct,
-    guessTotalPtToSwap: ApproxParamsStruct,
-    maxLpRemoved: BigNumberish,
-    minYtOut: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   setSpecs(
-    _specs: LongTradingSpecsStruct,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  swapSyToYt(
-    router: string,
-    botParams: ApproxParamsStruct,
-    minYtOut: BigNumberish,
-    maxSyIn: BigNumberish,
+    _specs: TradingSpecsStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  withdrawFunds(
-    token: string,
-    amount: BigNumberish,
+  swapYtToSy(
+    netYtToSell: BigNumberish,
+    minSyOut: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   callStatic: {
-    addLiqFromSy(
-      botParams: ApproxParamsStruct,
-      minLpOut: BigNumberish,
-      maxSyIn: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber, BigNumber] & {
-        netPtFromSwap: BigNumber;
-        netLpOut: BigNumber;
-        netSyIn: BigNumber;
-      }
-    >;
-
     addLiqFromYt(
-      botParams: ApproxParamsStruct,
-      minLpOut: BigNumberish,
-      maxYtIn: BigNumberish,
+      inputParams: ILongYieldTradingBot.AddLiqFromYtInputStruct,
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber, BigNumber] & {
@@ -649,140 +511,74 @@ export interface ILongYieldTradingBot extends BaseContract {
     >;
 
     addLiqKeepYt(
-      router: string,
-      botParams: ApproxParamsStruct,
-      maxSyIn: BigNumberish,
+      netSyIn: BigNumberish,
       minLpOut: BigNumberish,
       minYtOut: BigNumberish,
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, BigNumber, BigNumber] & {
-        netSyIn: BigNumber;
-        netLpOut: BigNumber;
-        netYtOut: BigNumber;
-      }
+      [BigNumber, BigNumber] & { netLpOut: BigNumber; netYtOut: BigNumber }
     >;
 
-    approveInf(
-      arr: ITradingBotBase.MultiApprovalStruct[],
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    claimAndCompound(
-      router: string,
-      inps: TokenInputStruct[],
-      minSyOut: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & { netSyOut: BigNumber; netPendleOut: BigNumber }
-    >;
-
-    claimWithoutCompound(
-      overrides?: CallOverrides
-    ): Promise<TokenAmountStructOutput[]>;
-
-    depositSy(netSyIn: BigNumberish, overrides?: CallOverrides): Promise<void>;
-
-    depositToken(
-      router: string,
+    compound(
       inp: TokenInputStruct,
       minSyOut: BigNumberish,
       overrides?: CallOverrides
-    ): Promise<void>;
-
-    readBotState(overrides?: CallOverrides): Promise<BotStateStructOutput>;
+    ): Promise<BigNumber>;
 
-    readMarketExtState(
-      router: string,
+    readStrategyData(
       overrides?: CallOverrides
-    ): Promise<MarketExtStateStructOutput>;
+    ): Promise<StrategyDataStructOutput>;
 
     removeLiqToYt(
-      botParams: ApproxParamsStruct,
-      guessTotalPtToSwap: ApproxParamsStruct,
-      maxLpRemoved: BigNumberish,
-      minYtOut: BigNumberish,
+      inputParams: ILongYieldTradingBot.RemoveLiqToYtInputStruct,
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, BigNumber, BigNumber] & {
-        netLpRemoved: BigNumber;
-        netYtOut: BigNumber;
-        totalPtToSwap: BigNumber;
-      }
+      [BigNumber, BigNumber] & { netLpRemoved: BigNumber; netYtOut: BigNumber }
     >;
 
-    setSpecs(
-      _specs: LongTradingSpecsStruct,
+    removeLiquidityToSy(
+      netLpToRemove: BigNumberish,
+      minSyOut: BigNumberish,
       overrides?: CallOverrides
-    ): Promise<void>;
+    ): Promise<BigNumber>;
 
-    swapSyToYt(
-      router: string,
-      botParams: ApproxParamsStruct,
-      minYtOut: BigNumberish,
-      maxSyIn: BigNumberish,
+    setSpecs(
+      _specs: TradingSpecsStruct,
       overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & { exactYtOut: BigNumber; netSyIn: BigNumber }
-    >;
+    ): Promise<void>;
 
-    withdrawFunds(
-      token: string,
-      amount: BigNumberish,
+    swapYtToSy(
+      netYtToSell: BigNumberish,
+      minSyOut: BigNumberish,
       overrides?: CallOverrides
-    ): Promise<void>;
+    ): Promise<BigNumber>;
   };
 
   filters: {
-    "AddLiqFromSy(tuple,uint256,uint256,uint256)"(
+    "AddLiqFromYt(tuple,uint256,uint256)"(
       botParams?: null,
-      maxSyIn?: null,
-      netSyIn?: null,
-      netLpOut?: null
-    ): AddLiqFromSyEventFilter;
-    AddLiqFromSy(
-      botParams?: null,
-      maxSyIn?: null,
-      netSyIn?: null,
-      netLpOut?: null
-    ): AddLiqFromSyEventFilter;
-
-    "AddLiqFromYt(tuple,uint256,uint256,uint256)"(
-      botParams?: null,
-      maxYtIn?: null,
       netYtIn?: null,
       netLpOut?: null
     ): AddLiqFromYtEventFilter;
     AddLiqFromYt(
       botParams?: null,
-      maxYtIn?: null,
       netYtIn?: null,
       netLpOut?: null
     ): AddLiqFromYtEventFilter;
 
-    "AddLiqKeepYt(tuple,uint256,uint256,uint256,uint256)"(
-      botParams?: null,
-      maxSyIn?: null,
+    "AddLiqKeepYt(uint256,uint256,uint256)"(
       netSyIn?: null,
       netLpOut?: null,
       netYtOut?: null
     ): AddLiqKeepYtEventFilter;
     AddLiqKeepYt(
-      botParams?: null,
-      maxSyIn?: null,
       netSyIn?: null,
       netLpOut?: null,
       netYtOut?: null
     ): AddLiqKeepYtEventFilter;
 
-    "ClaimAndCompound(uint256,uint256)"(
-      netSyOut?: null,
-      netPendleOut?: null
-    ): ClaimAndCompoundEventFilter;
-    ClaimAndCompound(
-      netSyOut?: null,
-      netPendleOut?: null
-    ): ClaimAndCompoundEventFilter;
+    "ClaimAndCompound(uint256)"(netSyOut?: null): ClaimAndCompoundEventFilter;
+    ClaimAndCompound(netSyOut?: null): ClaimAndCompoundEventFilter;
 
     "DepositSy(uint256)"(netSyIn?: null): DepositSyEventFilter;
     DepositSy(netSyIn?: null): DepositSyEventFilter;
@@ -796,32 +592,17 @@ export interface ILongYieldTradingBot extends BaseContract {
       netTokenIn?: null
     ): DepositTokenEventFilter;
 
-    "RemoveLiqToYt(tuple,uint256,uint256,uint256)"(
+    "RemoveLiqToYt(tuple,uint256,uint256)"(
       botParams?: null,
-      maxLpRemoved?: null,
       netLpIn?: null,
       netYtOut?: null
     ): RemoveLiqToYtEventFilter;
     RemoveLiqToYt(
       botParams?: null,
-      maxLpRemoved?: null,
       netLpIn?: null,
       netYtOut?: null
     ): RemoveLiqToYtEventFilter;
 
-    "SwapSyToYt(tuple,uint256,uint256,uint256)"(
-      botParams?: null,
-      maxSyIn?: null,
-      exactYtOut?: null,
-      netSyIn?: null
-    ): SwapSyToYtEventFilter;
-    SwapSyToYt(
-      botParams?: null,
-      maxSyIn?: null,
-      exactYtOut?: null,
-      netSyIn?: null
-    ): SwapSyToYtEventFilter;
-
     "WithdrawFunds(address,uint256)"(
       token?: string | null,
       amount?: null
@@ -833,175 +614,89 @@ export interface ILongYieldTradingBot extends BaseContract {
   };
 
   estimateGas: {
-    addLiqFromSy(
-      botParams: ApproxParamsStruct,
-      minLpOut: BigNumberish,
-      maxSyIn: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
     addLiqFromYt(
-      botParams: ApproxParamsStruct,
-      minLpOut: BigNumberish,
-      maxYtIn: BigNumberish,
+      inputParams: ILongYieldTradingBot.AddLiqFromYtInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     addLiqKeepYt(
-      router: string,
-      botParams: ApproxParamsStruct,
-      maxSyIn: BigNumberish,
+      netSyIn: BigNumberish,
       minLpOut: BigNumberish,
       minYtOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    approveInf(
-      arr: ITradingBotBase.MultiApprovalStruct[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    claimAndCompound(
-      router: string,
-      inps: TokenInputStruct[],
+    compound(
+      inp: TokenInputStruct,
       minSyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    claimWithoutCompound(
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
+    readStrategyData(overrides?: CallOverrides): Promise<BigNumber>;
 
-    depositSy(
-      netSyIn: BigNumberish,
+    removeLiqToYt(
+      inputParams: ILongYieldTradingBot.RemoveLiqToYtInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    depositToken(
-      router: string,
-      inp: TokenInputStruct,
+    removeLiquidityToSy(
+      netLpToRemove: BigNumberish,
       minSyOut: BigNumberish,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    readBotState(overrides?: CallOverrides): Promise<BigNumber>;
-
-    readMarketExtState(
-      router: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    removeLiqToYt(
-      botParams: ApproxParamsStruct,
-      guessTotalPtToSwap: ApproxParamsStruct,
-      maxLpRemoved: BigNumberish,
-      minYtOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     setSpecs(
-      _specs: LongTradingSpecsStruct,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    swapSyToYt(
-      router: string,
-      botParams: ApproxParamsStruct,
-      minYtOut: BigNumberish,
-      maxSyIn: BigNumberish,
+      _specs: TradingSpecsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    withdrawFunds(
-      token: string,
-      amount: BigNumberish,
+    swapYtToSy(
+      netYtToSell: BigNumberish,
+      minSyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
   };
 
   populateTransaction: {
-    addLiqFromSy(
-      botParams: ApproxParamsStruct,
-      minLpOut: BigNumberish,
-      maxSyIn: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
     addLiqFromYt(
-      botParams: ApproxParamsStruct,
-      minLpOut: BigNumberish,
-      maxYtIn: BigNumberish,
+      inputParams: ILongYieldTradingBot.AddLiqFromYtInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     addLiqKeepYt(
-      router: string,
-      botParams: ApproxParamsStruct,
-      maxSyIn: BigNumberish,
+      netSyIn: BigNumberish,
       minLpOut: BigNumberish,
       minYtOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    approveInf(
-      arr: ITradingBotBase.MultiApprovalStruct[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    claimAndCompound(
-      router: string,
-      inps: TokenInputStruct[],
+    compound(
+      inp: TokenInputStruct,
       minSyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    claimWithoutCompound(
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
+    readStrategyData(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    depositSy(
-      netSyIn: BigNumberish,
+    removeLiqToYt(
+      inputParams: ILongYieldTradingBot.RemoveLiqToYtInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    depositToken(
-      router: string,
-      inp: TokenInputStruct,
+    removeLiquidityToSy(
+      netLpToRemove: BigNumberish,
       minSyOut: BigNumberish,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    readBotState(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    readMarketExtState(
-      router: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    removeLiqToYt(
-      botParams: ApproxParamsStruct,
-      guessTotalPtToSwap: ApproxParamsStruct,
-      maxLpRemoved: BigNumberish,
-      minYtOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     setSpecs(
-      _specs: LongTradingSpecsStruct,
+      _specs: TradingSpecsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    swapSyToYt(
-      router: string,
-      botParams: ApproxParamsStruct,
-      minYtOut: BigNumberish,
-      maxSyIn: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    withdrawFunds(
-      token: string,
-      amount: BigNumberish,
+    swapYtToSy(
+      netYtToSell: BigNumberish,
+      minSyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
   };