@pendle/core-v2 2.17.7-tradingbot → 2.18.0-tradingbot

package/typechain-types/ILongYieldTradingBot.ts

@@ -95,12 +95,19 @@ export type BotStateStruct = {
   lpBalance: BigNumberish;
   ytBalance: BigNumberish;
   syBalance: BigNumberish;
+  buyBins: BigNumberish;
 };
 
-export type BotStateStructOutput = [BigNumber, BigNumber, BigNumber] & {
+export type BotStateStructOutput = [
+  BigNumber,
+  BigNumber,
+  BigNumber,
+  BigNumber
+] & {
   lpBalance: BigNumber;
   ytBalance: BigNumber;
   syBalance: BigNumber;
+  buyBins: BigNumber;
 };
 
 export type MarketStateStruct = {
@@ -150,12 +157,12 @@ export type MarketExtStateStructOutput = [
 ] & { state: MarketStateStructOutput; index: BigNumber; blockTime: BigNumber };
 
 export type LongTradingSpecsStruct = {
-  lowerIyLimit: BigNumberish;
-  upperIyLimit: BigNumberish;
-  floatingSyRatioLimit: BigNumberish;
-  floatingSyRatioTarget: BigNumberish;
-  ytPtRatioLimit: BigNumberish;
-  ytPtRatioTarget: BigNumberish;
+  buyYtIy: BigNumberish;
+  sellYtIy: BigNumberish;
+  targetSyRatio: BigNumberish;
+  maxSyRatio: BigNumberish;
+  minYtPtRatio: BigNumberish;
+  numOfBins: BigNumberish;
 };
 
 export type LongTradingSpecsStructOutput = [
@@ -166,14 +173,73 @@ export type LongTradingSpecsStructOutput = [
   BigNumber,
   BigNumber
 ] & {
-  lowerIyLimit: BigNumber;
-  upperIyLimit: BigNumber;
-  floatingSyRatioLimit: BigNumber;
-  floatingSyRatioTarget: BigNumber;
-  ytPtRatioLimit: BigNumber;
-  ytPtRatioTarget: BigNumber;
+  buyYtIy: BigNumber;
+  sellYtIy: BigNumber;
+  targetSyRatio: BigNumber;
+  maxSyRatio: BigNumber;
+  minYtPtRatio: BigNumber;
+  numOfBins: BigNumber;
+};
+
+export type StrategyDataStruct = {
+  botState: BotStateStruct;
+  marketExt: MarketExtStateStruct;
+  specs: LongTradingSpecsStruct;
+};
+
+export type StrategyDataStructOutput = [
+  BotStateStructOutput,
+  MarketExtStateStructOutput,
+  LongTradingSpecsStructOutput
+] & {
+  botState: BotStateStructOutput;
+  marketExt: MarketExtStateStructOutput;
+  specs: LongTradingSpecsStructOutput;
 };
 
+export declare namespace ILongYieldTradingBot {
+  export type AddLiqFromYtInputStruct = {
+    botParams: ApproxParamsStruct;
+    minLpOut: BigNumberish;
+    targetIy: BigNumberish;
+    currentBin: BigNumberish;
+  };
+
+  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 declare namespace ITradingBotBase {
   export type MultiApprovalStruct = { tokens: string[]; spender: string };
 
@@ -186,39 +252,28 @@ export declare namespace ITradingBotBase {
 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;
+    "addLiqFromYt(((uint256,uint256,uint256,uint256,uint256),uint256,uint256,int256))": FunctionFragment;
+    "addLiqKeepYt(uint256,uint256,uint256)": FunctionFragment;
     "approveInf((address[],address)[])": FunctionFragment;
-    "claimAndCompound(address,(address,uint256,address,address,address,(uint8,address,bytes,bool))[],uint256)": FunctionFragment;
+    "claimAndCompound((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;
+    "depositToken((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;
+    "readMarketExtState()": FunctionFragment;
+    "readStrategyData()": FunctionFragment;
+    "removeLiqToYt(((uint256,uint256,uint256,uint256,uint256),(uint256,uint256,uint256,uint256,uint256),uint256,uint256,int256))": FunctionFragment;
     "setSpecs((uint256,uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
-    "swapSyToYt(address,(uint256,uint256,uint256,uint256,uint256),uint256,uint256)": FunctionFragment;
     "withdrawFunds(address,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",
@@ -226,7 +281,7 @@ export interface ILongYieldTradingBotInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "claimAndCompound",
-    values: [string, TokenInputStruct[], BigNumberish]
+    values: [TokenInputStruct[], BigNumberish]
   ): string;
   encodeFunctionData(
     functionFragment: "claimWithoutCompound",
@@ -238,7 +293,7 @@ export interface ILongYieldTradingBotInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "depositToken",
-    values: [string, TokenInputStruct, BigNumberish]
+    values: [TokenInputStruct, BigNumberish]
   ): string;
   encodeFunctionData(
     functionFragment: "readBotState",
@@ -246,29 +301,25 @@ export interface ILongYieldTradingBotInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "readMarketExtState",
-    values: [string]
+    values?: undefined
+  ): string;
+  encodeFunctionData(
+    functionFragment: "readStrategyData",
+    values?: undefined
   ): string;
   encodeFunctionData(
     functionFragment: "removeLiqToYt",
-    values: [ApproxParamsStruct, ApproxParamsStruct, BigNumberish, BigNumberish]
+    values: [ILongYieldTradingBot.RemoveLiqToYtInputStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "setSpecs",
     values: [LongTradingSpecsStruct]
   ): string;
-  encodeFunctionData(
-    functionFragment: "swapSyToYt",
-    values: [string, ApproxParamsStruct, BigNumberish, BigNumberish]
-  ): string;
   encodeFunctionData(
     functionFragment: "withdrawFunds",
     values: [string, BigNumberish]
   ): string;
 
-  decodeFunctionResult(
-    functionFragment: "addLiqFromSy",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "addLiqFromYt",
     data: BytesLike
@@ -299,12 +350,15 @@ export interface ILongYieldTradingBotInterface extends utils.Interface {
     functionFragment: "readMarketExtState",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    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",
     data: BytesLike
@@ -312,12 +366,12 @@ export interface ILongYieldTradingBotInterface extends utils.Interface {
 
   events: {
     "AddLiqFromSy(tuple,uint256,uint256,uint256)": EventFragment;
-    "AddLiqFromYt(tuple,uint256,uint256,uint256)": EventFragment;
-    "AddLiqKeepYt(tuple,uint256,uint256,uint256,uint256)": EventFragment;
+    "AddLiqFromYt(tuple,uint256,uint256)": EventFragment;
+    "AddLiqKeepYt(uint256,uint256,uint256)": EventFragment;
     "ClaimAndCompound(uint256,uint256)": EventFragment;
     "DepositSy(uint256)": EventFragment;
     "DepositToken(address,uint256)": EventFragment;
-    "RemoveLiqToYt(tuple,uint256,uint256,uint256)": EventFragment;
+    "RemoveLiqToYt(tuple,uint256,uint256)": EventFragment;
     "SwapSyToYt(tuple,uint256,uint256,uint256)": EventFragment;
     "WithdrawFunds(address,uint256)": EventFragment;
   };
@@ -346,10 +400,9 @@ export type AddLiqFromSyEvent = TypedEvent<
 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,14 +411,8 @@ 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>;
@@ -390,10 +437,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;
   }
@@ -448,24 +494,13 @@ 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> }
@@ -477,7 +512,6 @@ export interface ILongYieldTradingBot extends BaseContract {
     ): Promise<ContractTransaction>;
 
     claimAndCompound(
-      router: string,
       inps: TokenInputStruct[],
       minSyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -493,7 +527,6 @@ export interface ILongYieldTradingBot extends BaseContract {
     ): Promise<ContractTransaction>;
 
     depositToken(
-      router: string,
       inp: TokenInputStruct,
       minSyOut: BigNumberish,
       overrides?: PayableOverrides & { from?: string | Promise<string> }
@@ -504,28 +537,20 @@ export interface ILongYieldTradingBot extends BaseContract {
     ): Promise<[BotStateStructOutput] & { botState: BotStateStructOutput }>;
 
     readMarketExtState(
-      router: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    removeLiqToYt(
-      botParams: ApproxParamsStruct,
-      guessTotalPtToSwap: ApproxParamsStruct,
-      maxLpRemoved: BigNumberish,
-      minYtOut: BigNumberish,
+    readStrategyData(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    setSpecs(
-      _specs: LongTradingSpecsStruct,
+    removeLiqToYt(
+      inputParams: ILongYieldTradingBot.RemoveLiqToYtInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    swapSyToYt(
-      router: string,
-      botParams: ApproxParamsStruct,
-      minYtOut: BigNumberish,
-      maxSyIn: BigNumberish,
+    setSpecs(
+      _specs: LongTradingSpecsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -536,24 +561,13 @@ export interface ILongYieldTradingBot extends BaseContract {
     ): 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> }
@@ -565,7 +579,6 @@ export interface ILongYieldTradingBot extends BaseContract {
   ): Promise<ContractTransaction>;
 
   claimAndCompound(
-    router: string,
     inps: TokenInputStruct[],
     minSyOut: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
@@ -581,7 +594,6 @@ export interface ILongYieldTradingBot extends BaseContract {
   ): Promise<ContractTransaction>;
 
   depositToken(
-    router: string,
     inp: TokenInputStruct,
     minSyOut: BigNumberish,
     overrides?: PayableOverrides & { from?: string | Promise<string> }
@@ -590,28 +602,20 @@ export interface ILongYieldTradingBot extends BaseContract {
   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,
+  readStrategyData(
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  setSpecs(
-    _specs: LongTradingSpecsStruct,
+  removeLiqToYt(
+    inputParams: ILongYieldTradingBot.RemoveLiqToYtInputStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  swapSyToYt(
-    router: string,
-    botParams: ApproxParamsStruct,
-    minYtOut: BigNumberish,
-    maxSyIn: BigNumberish,
+  setSpecs(
+    _specs: LongTradingSpecsStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -622,23 +626,8 @@ export interface ILongYieldTradingBot extends BaseContract {
   ): 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,18 +638,12 @@ 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(
@@ -669,7 +652,6 @@ export interface ILongYieldTradingBot extends BaseContract {
     ): Promise<void>;
 
     claimAndCompound(
-      router: string,
       inps: TokenInputStruct[],
       minSyOut: BigNumberish,
       overrides?: CallOverrides
@@ -684,7 +666,6 @@ export interface ILongYieldTradingBot extends BaseContract {
     depositSy(netSyIn: BigNumberish, overrides?: CallOverrides): Promise<void>;
 
     depositToken(
-      router: string,
       inp: TokenInputStruct,
       minSyOut: BigNumberish,
       overrides?: CallOverrides
@@ -693,22 +674,18 @@ export interface ILongYieldTradingBot extends BaseContract {
     readBotState(overrides?: CallOverrides): Promise<BotStateStructOutput>;
 
     readMarketExtState(
-      router: string,
       overrides?: CallOverrides
     ): Promise<MarketExtStateStructOutput>;
 
+    readStrategyData(
+      overrides?: CallOverrides
+    ): 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(
@@ -716,16 +693,6 @@ export interface ILongYieldTradingBot extends BaseContract {
       overrides?: CallOverrides
     ): Promise<void>;
 
-    swapSyToYt(
-      router: string,
-      botParams: ApproxParamsStruct,
-      minYtOut: BigNumberish,
-      maxSyIn: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & { exactYtOut: BigNumber; netSyIn: BigNumber }
-    >;
-
     withdrawFunds(
       token: string,
       amount: BigNumberish,
@@ -747,29 +714,23 @@ export interface ILongYieldTradingBot extends BaseContract {
       netLpOut?: null
     ): AddLiqFromSyEventFilter;
 
-    "AddLiqFromYt(tuple,uint256,uint256,uint256)"(
+    "AddLiqFromYt(tuple,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
@@ -796,15 +757,13 @@ 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;
@@ -833,24 +792,13 @@ 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> }
@@ -862,7 +810,6 @@ export interface ILongYieldTradingBot extends BaseContract {
     ): Promise<BigNumber>;
 
     claimAndCompound(
-      router: string,
       inps: TokenInputStruct[],
       minSyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -878,7 +825,6 @@ export interface ILongYieldTradingBot extends BaseContract {
     ): Promise<BigNumber>;
 
     depositToken(
-      router: string,
       inp: TokenInputStruct,
       minSyOut: BigNumberish,
       overrides?: PayableOverrides & { from?: string | Promise<string> }
@@ -887,28 +833,20 @@ export interface ILongYieldTradingBot extends BaseContract {
     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,
+    readStrategyData(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    setSpecs(
-      _specs: LongTradingSpecsStruct,
+    removeLiqToYt(
+      inputParams: ILongYieldTradingBot.RemoveLiqToYtInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    swapSyToYt(
-      router: string,
-      botParams: ApproxParamsStruct,
-      minYtOut: BigNumberish,
-      maxSyIn: BigNumberish,
+    setSpecs(
+      _specs: LongTradingSpecsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -920,24 +858,13 @@ export interface ILongYieldTradingBot extends BaseContract {
   };
 
   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> }
@@ -949,7 +876,6 @@ export interface ILongYieldTradingBot extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     claimAndCompound(
-      router: string,
       inps: TokenInputStruct[],
       minSyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -965,7 +891,6 @@ export interface ILongYieldTradingBot extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     depositToken(
-      router: string,
       inp: TokenInputStruct,
       minSyOut: BigNumberish,
       overrides?: PayableOverrides & { from?: string | Promise<string> }
@@ -974,28 +899,20 @@ export interface ILongYieldTradingBot extends BaseContract {
     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,
+    readStrategyData(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    setSpecs(
-      _specs: LongTradingSpecsStruct,
+    removeLiqToYt(
+      inputParams: ILongYieldTradingBot.RemoveLiqToYtInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    swapSyToYt(
-      router: string,
-      botParams: ApproxParamsStruct,
-      minYtOut: BigNumberish,
-      maxSyIn: BigNumberish,
+    setSpecs(
+      _specs: LongTradingSpecsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;