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

package/typechain-types/LongYieldTradingBot.ts

@@ -23,16 +23,6 @@ import type {
   OnEvent,
 } from "./common";
 
-export type StrategyStateStruct = {
-  iyFlag: BigNumberish;
-  syRatioFlag: BigNumberish;
-};
-
-export type StrategyStateStructOutput = [number, number] & {
-  iyFlag: number;
-  syRatioFlag: number;
-};
-
 export type ApproxParamsStruct = {
   guessMin: BigNumberish;
   guessMax: BigNumberish;
@@ -94,35 +84,55 @@ export type TokenInputStructOutput = [
   swapData: SwapDataStructOutput;
 };
 
+export type TokenAmountStruct = { token: string; amount: BigNumberish };
+
+export type TokenAmountStructOutput = [string, BigNumber] & {
+  token: string;
+  amount: BigNumber;
+};
+
 export type LongTradingSpecsStruct = {
-  lowerIyLimit: BigNumberish;
-  upperIyLimit: BigNumberish;
-  floatingSyRatioLimit: BigNumberish;
-  ytPtRatioLimit: BigNumberish;
+  buyYtIy: BigNumberish;
+  sellYtIy: BigNumberish;
+  targetSyRatio: BigNumberish;
+  maxSyRatio: BigNumberish;
+  minYtPtRatio: BigNumberish;
+  numOfBins: BigNumberish;
 };
 
 export type LongTradingSpecsStructOutput = [
+  BigNumber,
+  BigNumber,
   BigNumber,
   BigNumber,
   BigNumber,
   BigNumber
 ] & {
-  lowerIyLimit: BigNumber;
-  upperIyLimit: BigNumber;
-  floatingSyRatioLimit: BigNumber;
-  ytPtRatioLimit: BigNumber;
+  buyYtIy: BigNumber;
+  sellYtIy: BigNumber;
+  targetSyRatio: BigNumber;
+  maxSyRatio: BigNumber;
+  minYtPtRatio: BigNumber;
+  numOfBins: BigNumber;
 };
 
 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 = {
@@ -171,6 +181,65 @@ export type MarketExtStateStructOutput = [
   BigNumber
 ] & { state: MarketStateStructOutput; index: BigNumber; blockTime: 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 };
 
@@ -187,27 +256,29 @@ export interface LongYieldTradingBotInterface extends utils.Interface {
     "PT()": FunctionFragment;
     "SY()": FunctionFragment;
     "YT()": FunctionFragment;
-    "addLiqFromSy((uint8,uint8),(uint256,uint256,uint256,uint256,uint256),uint256,uint256)": FunctionFragment;
-    "addLiqFromYt((uint8,uint8),(uint256,uint256,uint256,uint256,uint256),uint256,uint256)": FunctionFragment;
-    "addLiqKeepYt(address,(uint8,uint8),(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;
+    "buyBins()": FunctionFragment;
+    "claimAndCompound((address,uint256,address,address,address,(uint8,address,bytes,bool))[],uint256)": FunctionFragment;
     "claimOwnership()": FunctionFragment;
-    "decisionLib()": FunctionFragment;
+    "claimWithoutCompound()": FunctionFragment;
+    "decisionHelper()": FunctionFragment;
     "depositSy(uint256)": FunctionFragment;
-    "depositToken(address,(address,uint256,address,address,address,(uint8,address,bytes,bool)),uint256)": FunctionFragment;
-    "initialize((uint256,uint256,uint256,uint256))": FunctionFragment;
+    "depositToken((address,uint256,address,address,address,(uint8,address,bytes,bool)),uint256)": FunctionFragment;
+    "initialize((uint256,uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
     "market()": FunctionFragment;
     "owner()": FunctionFragment;
     "pendingOwner()": FunctionFragment;
     "proxiableUUID()": FunctionFragment;
     "readBotState()": FunctionFragment;
-    "readMarketExtState(address)": FunctionFragment;
-    "removeLiqToYt((uint8,uint8),(uint256,uint256,uint256,uint256,uint256),(uint256,uint256,uint256,uint256,uint256),uint256,uint256)": FunctionFragment;
-    "setSpecs((uint256,uint256,uint256,uint256))": FunctionFragment;
+    "readMarketExtState()": FunctionFragment;
+    "readStrategyData()": FunctionFragment;
+    "removeLiqToYt(((uint256,uint256,uint256,uint256,uint256),(uint256,uint256,uint256,uint256,uint256),uint256,uint256,int256))": FunctionFragment;
+    "router()": FunctionFragment;
+    "setSpecs((uint256,uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
     "specs()": FunctionFragment;
     "swapCallback(int256,int256,bytes)": FunctionFragment;
-    "swapSyToYt(address,(uint8,uint8),(uint256,uint256,uint256,uint256,uint256),uint256,uint256)": FunctionFragment;
     "transferOwnership(address,bool,bool)": FunctionFragment;
     "upgradeTo(address)": FunctionFragment;
     "upgradeToAndCall(address,bytes)": FunctionFragment;
@@ -218,49 +289,33 @@ export interface LongYieldTradingBotInterface extends utils.Interface {
   encodeFunctionData(functionFragment: "PT", values?: undefined): string;
   encodeFunctionData(functionFragment: "SY", values?: undefined): string;
   encodeFunctionData(functionFragment: "YT", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "addLiqFromSy",
-    values: [
-      StrategyStateStruct,
-      ApproxParamsStruct,
-      BigNumberish,
-      BigNumberish
-    ]
-  ): string;
   encodeFunctionData(
     functionFragment: "addLiqFromYt",
-    values: [
-      StrategyStateStruct,
-      ApproxParamsStruct,
-      BigNumberish,
-      BigNumberish
-    ]
+    values: [ILongYieldTradingBot.AddLiqFromYtInputStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "addLiqKeepYt",
-    values: [
-      string,
-      StrategyStateStruct,
-      ApproxParamsStruct,
-      BigNumberish,
-      BigNumberish,
-      BigNumberish
-    ]
+    values: [BigNumberish, BigNumberish, BigNumberish]
   ): string;
   encodeFunctionData(
     functionFragment: "approveInf",
     values: [ITradingBotBase.MultiApprovalStruct[]]
   ): string;
+  encodeFunctionData(functionFragment: "buyBins", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "claimAndCompound",
-    values: [string, TokenInputStruct[], BigNumberish]
+    values: [TokenInputStruct[], BigNumberish]
   ): string;
   encodeFunctionData(
     functionFragment: "claimOwnership",
     values?: undefined
   ): string;
   encodeFunctionData(
-    functionFragment: "decisionLib",
+    functionFragment: "claimWithoutCompound",
+    values?: undefined
+  ): string;
+  encodeFunctionData(
+    functionFragment: "decisionHelper",
     values?: undefined
   ): string;
   encodeFunctionData(
@@ -269,7 +324,7 @@ export interface LongYieldTradingBotInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "depositToken",
-    values: [string, TokenInputStruct, BigNumberish]
+    values: [TokenInputStruct, BigNumberish]
   ): string;
   encodeFunctionData(
     functionFragment: "initialize",
@@ -291,18 +346,17 @@ export interface LongYieldTradingBotInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "readMarketExtState",
-    values: [string]
+    values?: undefined
+  ): string;
+  encodeFunctionData(
+    functionFragment: "readStrategyData",
+    values?: undefined
   ): string;
   encodeFunctionData(
     functionFragment: "removeLiqToYt",
-    values: [
-      StrategyStateStruct,
-      ApproxParamsStruct,
-      ApproxParamsStruct,
-      BigNumberish,
-      BigNumberish
-    ]
+    values: [ILongYieldTradingBot.RemoveLiqToYtInputStruct]
   ): string;
+  encodeFunctionData(functionFragment: "router", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "setSpecs",
     values: [LongTradingSpecsStruct]
@@ -312,16 +366,6 @@ export interface LongYieldTradingBotInterface extends utils.Interface {
     functionFragment: "swapCallback",
     values: [BigNumberish, BigNumberish, BytesLike]
   ): string;
-  encodeFunctionData(
-    functionFragment: "swapSyToYt",
-    values: [
-      string,
-      StrategyStateStruct,
-      ApproxParamsStruct,
-      BigNumberish,
-      BigNumberish
-    ]
-  ): string;
   encodeFunctionData(
     functionFragment: "transferOwnership",
     values: [string, boolean, boolean]
@@ -340,10 +384,6 @@ export interface LongYieldTradingBotInterface extends utils.Interface {
   decodeFunctionResult(functionFragment: "PT", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "SY", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "YT", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "addLiqFromSy",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "addLiqFromYt",
     data: BytesLike
@@ -353,6 +393,7 @@ export interface LongYieldTradingBotInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "approveInf", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "buyBins", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "claimAndCompound",
     data: BytesLike
@@ -362,7 +403,11 @@ export interface LongYieldTradingBotInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "decisionLib",
+    functionFragment: "claimWithoutCompound",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "decisionHelper",
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "depositSy", data: BytesLike): Result;
@@ -389,17 +434,21 @@ export interface LongYieldTradingBotInterface extends utils.Interface {
     functionFragment: "readMarketExtState",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "readStrategyData",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "removeLiqToYt",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(functionFragment: "router", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "setSpecs", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "specs", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "swapCallback",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(functionFragment: "swapSyToYt", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "transferOwnership",
     data: BytesLike
@@ -415,9 +464,9 @@ export interface LongYieldTradingBotInterface extends utils.Interface {
   ): Result;
 
   events: {
-    "AddLiqFromSy(tuple,tuple,uint256,uint256,uint256)": EventFragment;
-    "AddLiqFromYt(tuple,tuple,uint256,uint256,uint256)": EventFragment;
-    "AddLiqKeepYt(tuple,tuple,uint256,uint256,uint256,uint256)": EventFragment;
+    "AddLiqFromSy(tuple,uint256,uint256,uint256)": EventFragment;
+    "AddLiqFromYt(tuple,uint256,uint256)": EventFragment;
+    "AddLiqKeepYt(uint256,uint256,uint256)": EventFragment;
     "AdminChanged(address,address)": EventFragment;
     "BeaconUpgraded(address)": EventFragment;
     "ClaimAndCompound(uint256,uint256)": EventFragment;
@@ -425,8 +474,8 @@ export interface LongYieldTradingBotInterface extends utils.Interface {
     "DepositToken(address,uint256)": EventFragment;
     "Initialized(uint8)": EventFragment;
     "OwnershipTransferred(address,address)": EventFragment;
-    "RemoveLiqToYt(tuple,tuple,uint256,uint256,uint256)": EventFragment;
-    "SwapSyToYt(tuple,tuple,uint256,uint256,uint256)": EventFragment;
+    "RemoveLiqToYt(tuple,uint256,uint256)": EventFragment;
+    "SwapSyToYt(tuple,uint256,uint256,uint256)": EventFragment;
     "Upgraded(address)": EventFragment;
     "WithdrawFunds(address,uint256)": EventFragment;
   };
@@ -448,15 +497,8 @@ export interface LongYieldTradingBotInterface extends utils.Interface {
 }
 
 export type AddLiqFromSyEvent = TypedEvent<
-  [
-    StrategyStateStructOutput,
-    ApproxParamsStructOutput,
-    BigNumber,
-    BigNumber,
-    BigNumber
-  ],
+  [ApproxParamsStructOutput, BigNumber, BigNumber, BigNumber],
   {
-    state: StrategyStateStructOutput;
     botParams: ApproxParamsStructOutput;
     maxSyIn: BigNumber;
     netSyIn: BigNumber;
@@ -467,17 +509,9 @@ export type AddLiqFromSyEvent = TypedEvent<
 export type AddLiqFromSyEventFilter = TypedEventFilter<AddLiqFromSyEvent>;
 
 export type AddLiqFromYtEvent = TypedEvent<
-  [
-    StrategyStateStructOutput,
-    ApproxParamsStructOutput,
-    BigNumber,
-    BigNumber,
-    BigNumber
-  ],
+  [ApproxParamsStructOutput, BigNumber, BigNumber],
   {
-    state: StrategyStateStructOutput;
     botParams: ApproxParamsStructOutput;
-    maxYtIn: BigNumber;
     netYtIn: BigNumber;
     netLpOut: BigNumber;
   }
@@ -486,22 +520,8 @@ export type AddLiqFromYtEvent = TypedEvent<
 export type AddLiqFromYtEventFilter = TypedEventFilter<AddLiqFromYtEvent>;
 
 export type AddLiqKeepYtEvent = TypedEvent<
-  [
-    StrategyStateStructOutput,
-    ApproxParamsStructOutput,
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    BigNumber
-  ],
-  {
-    state: StrategyStateStructOutput;
-    botParams: ApproxParamsStructOutput;
-    maxSyIn: BigNumber;
-    netSyIn: BigNumber;
-    netLpOut: BigNumber;
-    netYtOut: BigNumber;
-  }
+  [BigNumber, BigNumber, BigNumber],
+  { netSyIn: BigNumber; netLpOut: BigNumber; netYtOut: BigNumber }
 >;
 
 export type AddLiqKeepYtEventFilter = TypedEventFilter<AddLiqKeepYtEvent>;
@@ -549,17 +569,9 @@ export type OwnershipTransferredEventFilter =
   TypedEventFilter<OwnershipTransferredEvent>;
 
 export type RemoveLiqToYtEvent = TypedEvent<
-  [
-    StrategyStateStructOutput,
-    ApproxParamsStructOutput,
-    BigNumber,
-    BigNumber,
-    BigNumber
-  ],
+  [ApproxParamsStructOutput, BigNumber, BigNumber],
   {
-    state: StrategyStateStructOutput;
     botParams: ApproxParamsStructOutput;
-    maxLpRemoved: BigNumber;
     netLpIn: BigNumber;
     netYtOut: BigNumber;
   }
@@ -568,15 +580,8 @@ export type RemoveLiqToYtEvent = TypedEvent<
 export type RemoveLiqToYtEventFilter = TypedEventFilter<RemoveLiqToYtEvent>;
 
 export type SwapSyToYtEvent = TypedEvent<
-  [
-    StrategyStateStructOutput,
-    ApproxParamsStructOutput,
-    BigNumber,
-    BigNumber,
-    BigNumber
-  ],
+  [ApproxParamsStructOutput, BigNumber, BigNumber, BigNumber],
   {
-    state: StrategyStateStructOutput;
     botParams: ApproxParamsStructOutput;
     maxSyIn: BigNumber;
     exactYtOut: BigNumber;
@@ -633,27 +638,13 @@ export interface LongYieldTradingBot extends BaseContract {
 
     YT(overrides?: CallOverrides): Promise<[string]>;
 
-    addLiqFromSy(
-      oldState: StrategyStateStruct,
-      botParams: ApproxParamsStruct,
-      minLpOut: BigNumberish,
-      maxSyIn: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
     addLiqFromYt(
-      oldState: StrategyStateStruct,
-      botParams: ApproxParamsStruct,
-      minLpOut: BigNumberish,
-      maxYtIn: BigNumberish,
+      inputParams: ILongYieldTradingBot.AddLiqFromYtInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     addLiqKeepYt(
-      router: string,
-      oldState: StrategyStateStruct,
-      botParams: ApproxParamsStruct,
-      maxSyIn: BigNumberish,
+      netSyIn: BigNumberish,
       minLpOut: BigNumberish,
       minYtOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -664,8 +655,9 @@ export interface LongYieldTradingBot extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
+    buyBins(overrides?: CallOverrides): Promise<[BigNumber]>;
+
     claimAndCompound(
-      router: string,
       inps: TokenInputStruct[],
       minSyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -675,7 +667,11 @@ export interface LongYieldTradingBot extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    decisionLib(overrides?: CallOverrides): Promise<[string]>;
+    claimWithoutCompound(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    decisionHelper(overrides?: CallOverrides): Promise<[string]>;
 
     depositSy(
       netSyIn: BigNumberish,
@@ -683,7 +679,6 @@ export interface LongYieldTradingBot extends BaseContract {
     ): Promise<ContractTransaction>;
 
     depositToken(
-      router: string,
       inp: TokenInputStruct,
       minSyOut: BigNumberish,
       overrides?: PayableOverrides & { from?: string | Promise<string> }
@@ -707,19 +702,20 @@ export interface LongYieldTradingBot extends BaseContract {
     ): Promise<[BotStateStructOutput] & { botState: BotStateStructOutput }>;
 
     readMarketExtState(
-      router: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    readStrategyData(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     removeLiqToYt(
-      oldState: StrategyStateStruct,
-      botParams: ApproxParamsStruct,
-      guessTotalPtToSwap: ApproxParamsStruct,
-      maxLpRemoved: BigNumberish,
-      minYtOut: BigNumberish,
+      inputParams: ILongYieldTradingBot.RemoveLiqToYtInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
+    router(overrides?: CallOverrides): Promise<[string]>;
+
     setSpecs(
       _specs: LongTradingSpecsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -728,11 +724,13 @@ export interface LongYieldTradingBot extends BaseContract {
     specs(
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, BigNumber, BigNumber, BigNumber] & {
-        lowerIyLimit: BigNumber;
-        upperIyLimit: BigNumber;
-        floatingSyRatioLimit: BigNumber;
-        ytPtRatioLimit: BigNumber;
+      [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, BigNumber] & {
+        buyYtIy: BigNumber;
+        sellYtIy: BigNumber;
+        targetSyRatio: BigNumber;
+        maxSyRatio: BigNumber;
+        minYtPtRatio: BigNumber;
+        numOfBins: BigNumber;
       }
     >;
 
@@ -743,15 +741,6 @@ export interface LongYieldTradingBot extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    swapSyToYt(
-      router: string,
-      oldState: StrategyStateStruct,
-      botParams: ApproxParamsStruct,
-      minYtOut: BigNumberish,
-      maxSyIn: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
     transferOwnership(
       newOwner: string,
       direct: boolean,
@@ -785,27 +774,13 @@ export interface LongYieldTradingBot extends BaseContract {
 
   YT(overrides?: CallOverrides): Promise<string>;
 
-  addLiqFromSy(
-    oldState: StrategyStateStruct,
-    botParams: ApproxParamsStruct,
-    minLpOut: BigNumberish,
-    maxSyIn: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
   addLiqFromYt(
-    oldState: StrategyStateStruct,
-    botParams: ApproxParamsStruct,
-    minLpOut: BigNumberish,
-    maxYtIn: BigNumberish,
+    inputParams: ILongYieldTradingBot.AddLiqFromYtInputStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   addLiqKeepYt(
-    router: string,
-    oldState: StrategyStateStruct,
-    botParams: ApproxParamsStruct,
-    maxSyIn: BigNumberish,
+    netSyIn: BigNumberish,
     minLpOut: BigNumberish,
     minYtOut: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
@@ -816,8 +791,9 @@ export interface LongYieldTradingBot extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  buyBins(overrides?: CallOverrides): Promise<BigNumber>;
+
   claimAndCompound(
-    router: string,
     inps: TokenInputStruct[],
     minSyOut: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
@@ -827,7 +803,11 @@ export interface LongYieldTradingBot extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  decisionLib(overrides?: CallOverrides): Promise<string>;
+  claimWithoutCompound(
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  decisionHelper(overrides?: CallOverrides): Promise<string>;
 
   depositSy(
     netSyIn: BigNumberish,
@@ -835,7 +815,6 @@ export interface LongYieldTradingBot extends BaseContract {
   ): Promise<ContractTransaction>;
 
   depositToken(
-    router: string,
     inp: TokenInputStruct,
     minSyOut: BigNumberish,
     overrides?: PayableOverrides & { from?: string | Promise<string> }
@@ -857,19 +836,20 @@ export interface LongYieldTradingBot extends BaseContract {
   readBotState(overrides?: CallOverrides): Promise<BotStateStructOutput>;
 
   readMarketExtState(
-    router: string,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  readStrategyData(
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   removeLiqToYt(
-    oldState: StrategyStateStruct,
-    botParams: ApproxParamsStruct,
-    guessTotalPtToSwap: ApproxParamsStruct,
-    maxLpRemoved: BigNumberish,
-    minYtOut: BigNumberish,
+    inputParams: ILongYieldTradingBot.RemoveLiqToYtInputStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  router(overrides?: CallOverrides): Promise<string>;
+
   setSpecs(
     _specs: LongTradingSpecsStruct,
     overrides?: Overrides & { from?: string | Promise<string> }
@@ -878,11 +858,13 @@ export interface LongYieldTradingBot extends BaseContract {
   specs(
     overrides?: CallOverrides
   ): Promise<
-    [BigNumber, BigNumber, BigNumber, BigNumber] & {
-      lowerIyLimit: BigNumber;
-      upperIyLimit: BigNumber;
-      floatingSyRatioLimit: BigNumber;
-      ytPtRatioLimit: BigNumber;
+    [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, BigNumber] & {
+      buyYtIy: BigNumber;
+      sellYtIy: BigNumber;
+      targetSyRatio: BigNumber;
+      maxSyRatio: BigNumber;
+      minYtPtRatio: BigNumber;
+      numOfBins: BigNumber;
     }
   >;
 
@@ -893,15 +875,6 @@ export interface LongYieldTradingBot extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  swapSyToYt(
-    router: string,
-    oldState: StrategyStateStruct,
-    botParams: ApproxParamsStruct,
-    minYtOut: BigNumberish,
-    maxSyIn: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
   transferOwnership(
     newOwner: string,
     direct: boolean,
@@ -935,25 +908,8 @@ export interface LongYieldTradingBot extends BaseContract {
 
     YT(overrides?: CallOverrides): Promise<string>;
 
-    addLiqFromSy(
-      oldState: StrategyStateStruct,
-      botParams: ApproxParamsStruct,
-      minLpOut: BigNumberish,
-      maxSyIn: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber, BigNumber] & {
-        netPtFromSwap: BigNumber;
-        netLpOut: BigNumber;
-        netSyIn: BigNumber;
-      }
-    >;
-
     addLiqFromYt(
-      oldState: StrategyStateStruct,
-      botParams: ApproxParamsStruct,
-      minLpOut: BigNumberish,
-      maxYtIn: BigNumberish,
+      inputParams: ILongYieldTradingBot.AddLiqFromYtInputStruct,
       overrides?: CallOverrides
     ): Promise<
       [BigNumber, BigNumber, BigNumber] & {
@@ -964,19 +920,12 @@ export interface LongYieldTradingBot extends BaseContract {
     >;
 
     addLiqKeepYt(
-      router: string,
-      oldState: StrategyStateStruct,
-      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(
@@ -984,8 +933,9 @@ export interface LongYieldTradingBot extends BaseContract {
       overrides?: CallOverrides
     ): Promise<void>;
 
+    buyBins(overrides?: CallOverrides): Promise<BigNumber>;
+
     claimAndCompound(
-      router: string,
       inps: TokenInputStruct[],
       minSyOut: BigNumberish,
       overrides?: CallOverrides
@@ -995,12 +945,15 @@ export interface LongYieldTradingBot extends BaseContract {
 
     claimOwnership(overrides?: CallOverrides): Promise<void>;
 
-    decisionLib(overrides?: CallOverrides): Promise<string>;
+    claimWithoutCompound(
+      overrides?: CallOverrides
+    ): Promise<TokenAmountStructOutput[]>;
+
+    decisionHelper(overrides?: CallOverrides): Promise<string>;
 
     depositSy(netSyIn: BigNumberish, overrides?: CallOverrides): Promise<void>;
 
     depositToken(
-      router: string,
       inp: TokenInputStruct,
       minSyOut: BigNumberish,
       overrides?: CallOverrides
@@ -1022,25 +975,22 @@ export interface LongYieldTradingBot extends BaseContract {
     readBotState(overrides?: CallOverrides): Promise<BotStateStructOutput>;
 
     readMarketExtState(
-      router: string,
       overrides?: CallOverrides
     ): Promise<MarketExtStateStructOutput>;
 
+    readStrategyData(
+      overrides?: CallOverrides
+    ): Promise<StrategyDataStructOutput>;
+
     removeLiqToYt(
-      oldState: StrategyStateStruct,
-      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 }
     >;
 
+    router(overrides?: CallOverrides): Promise<string>;
+
     setSpecs(
       _specs: LongTradingSpecsStruct,
       overrides?: CallOverrides
@@ -1049,11 +999,13 @@ export interface LongYieldTradingBot extends BaseContract {
     specs(
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, BigNumber, BigNumber, BigNumber] & {
-        lowerIyLimit: BigNumber;
-        upperIyLimit: BigNumber;
-        floatingSyRatioLimit: BigNumber;
-        ytPtRatioLimit: BigNumber;
+      [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, BigNumber] & {
+        buyYtIy: BigNumber;
+        sellYtIy: BigNumber;
+        targetSyRatio: BigNumber;
+        maxSyRatio: BigNumber;
+        minYtPtRatio: BigNumber;
+        numOfBins: BigNumber;
       }
     >;
 
@@ -1064,17 +1016,6 @@ export interface LongYieldTradingBot extends BaseContract {
       overrides?: CallOverrides
     ): Promise<void>;
 
-    swapSyToYt(
-      router: string,
-      oldState: StrategyStateStruct,
-      botParams: ApproxParamsStruct,
-      minYtOut: BigNumberish,
-      maxSyIn: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & { exactYtOut: BigNumber; netSyIn: BigNumber }
-    >;
-
     transferOwnership(
       newOwner: string,
       direct: boolean,
@@ -1101,48 +1042,36 @@ export interface LongYieldTradingBot extends BaseContract {
   };
 
   filters: {
-    "AddLiqFromSy(tuple,tuple,uint256,uint256,uint256)"(
-      state?: null,
+    "AddLiqFromSy(tuple,uint256,uint256,uint256)"(
       botParams?: null,
       maxSyIn?: null,
       netSyIn?: null,
       netLpOut?: null
     ): AddLiqFromSyEventFilter;
     AddLiqFromSy(
-      state?: null,
       botParams?: null,
       maxSyIn?: null,
       netSyIn?: null,
       netLpOut?: null
     ): AddLiqFromSyEventFilter;
 
-    "AddLiqFromYt(tuple,tuple,uint256,uint256,uint256)"(
-      state?: null,
+    "AddLiqFromYt(tuple,uint256,uint256)"(
       botParams?: null,
-      maxYtIn?: null,
       netYtIn?: null,
       netLpOut?: null
     ): AddLiqFromYtEventFilter;
     AddLiqFromYt(
-      state?: null,
       botParams?: null,
-      maxYtIn?: null,
       netYtIn?: null,
       netLpOut?: null
     ): AddLiqFromYtEventFilter;
 
-    "AddLiqKeepYt(tuple,tuple,uint256,uint256,uint256,uint256)"(
-      state?: null,
-      botParams?: null,
-      maxSyIn?: null,
+    "AddLiqKeepYt(uint256,uint256,uint256)"(
       netSyIn?: null,
       netLpOut?: null,
       netYtOut?: null
     ): AddLiqKeepYtEventFilter;
     AddLiqKeepYt(
-      state?: null,
-      botParams?: null,
-      maxSyIn?: null,
       netSyIn?: null,
       netLpOut?: null,
       netYtOut?: null
@@ -1195,30 +1124,24 @@ export interface LongYieldTradingBot extends BaseContract {
       newOwner?: string | null
     ): OwnershipTransferredEventFilter;
 
-    "RemoveLiqToYt(tuple,tuple,uint256,uint256,uint256)"(
-      state?: null,
+    "RemoveLiqToYt(tuple,uint256,uint256)"(
       botParams?: null,
-      maxLpRemoved?: null,
       netLpIn?: null,
       netYtOut?: null
     ): RemoveLiqToYtEventFilter;
     RemoveLiqToYt(
-      state?: null,
       botParams?: null,
-      maxLpRemoved?: null,
       netLpIn?: null,
       netYtOut?: null
     ): RemoveLiqToYtEventFilter;
 
-    "SwapSyToYt(tuple,tuple,uint256,uint256,uint256)"(
-      state?: null,
+    "SwapSyToYt(tuple,uint256,uint256,uint256)"(
       botParams?: null,
       maxSyIn?: null,
       exactYtOut?: null,
       netSyIn?: null
     ): SwapSyToYtEventFilter;
     SwapSyToYt(
-      state?: null,
       botParams?: null,
       maxSyIn?: null,
       exactYtOut?: null,
@@ -1247,27 +1170,13 @@ export interface LongYieldTradingBot extends BaseContract {
 
     YT(overrides?: CallOverrides): Promise<BigNumber>;
 
-    addLiqFromSy(
-      oldState: StrategyStateStruct,
-      botParams: ApproxParamsStruct,
-      minLpOut: BigNumberish,
-      maxSyIn: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
     addLiqFromYt(
-      oldState: StrategyStateStruct,
-      botParams: ApproxParamsStruct,
-      minLpOut: BigNumberish,
-      maxYtIn: BigNumberish,
+      inputParams: ILongYieldTradingBot.AddLiqFromYtInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     addLiqKeepYt(
-      router: string,
-      oldState: StrategyStateStruct,
-      botParams: ApproxParamsStruct,
-      maxSyIn: BigNumberish,
+      netSyIn: BigNumberish,
       minLpOut: BigNumberish,
       minYtOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -1278,8 +1187,9 @@ export interface LongYieldTradingBot extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
+    buyBins(overrides?: CallOverrides): Promise<BigNumber>;
+
     claimAndCompound(
-      router: string,
       inps: TokenInputStruct[],
       minSyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -1289,7 +1199,11 @@ export interface LongYieldTradingBot extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    decisionLib(overrides?: CallOverrides): Promise<BigNumber>;
+    claimWithoutCompound(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    decisionHelper(overrides?: CallOverrides): Promise<BigNumber>;
 
     depositSy(
       netSyIn: BigNumberish,
@@ -1297,7 +1211,6 @@ export interface LongYieldTradingBot extends BaseContract {
     ): Promise<BigNumber>;
 
     depositToken(
-      router: string,
       inp: TokenInputStruct,
       minSyOut: BigNumberish,
       overrides?: PayableOverrides & { from?: string | Promise<string> }
@@ -1319,19 +1232,20 @@ export interface LongYieldTradingBot extends BaseContract {
     readBotState(overrides?: CallOverrides): Promise<BigNumber>;
 
     readMarketExtState(
-      router: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    readStrategyData(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     removeLiqToYt(
-      oldState: StrategyStateStruct,
-      botParams: ApproxParamsStruct,
-      guessTotalPtToSwap: ApproxParamsStruct,
-      maxLpRemoved: BigNumberish,
-      minYtOut: BigNumberish,
+      inputParams: ILongYieldTradingBot.RemoveLiqToYtInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
+    router(overrides?: CallOverrides): Promise<BigNumber>;
+
     setSpecs(
       _specs: LongTradingSpecsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -1346,15 +1260,6 @@ export interface LongYieldTradingBot extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    swapSyToYt(
-      router: string,
-      oldState: StrategyStateStruct,
-      botParams: ApproxParamsStruct,
-      minYtOut: BigNumberish,
-      maxSyIn: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
     transferOwnership(
       newOwner: string,
       direct: boolean,
@@ -1389,27 +1294,13 @@ export interface LongYieldTradingBot extends BaseContract {
 
     YT(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
-    addLiqFromSy(
-      oldState: StrategyStateStruct,
-      botParams: ApproxParamsStruct,
-      minLpOut: BigNumberish,
-      maxSyIn: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
     addLiqFromYt(
-      oldState: StrategyStateStruct,
-      botParams: ApproxParamsStruct,
-      minLpOut: BigNumberish,
-      maxYtIn: BigNumberish,
+      inputParams: ILongYieldTradingBot.AddLiqFromYtInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     addLiqKeepYt(
-      router: string,
-      oldState: StrategyStateStruct,
-      botParams: ApproxParamsStruct,
-      maxSyIn: BigNumberish,
+      netSyIn: BigNumberish,
       minLpOut: BigNumberish,
       minYtOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -1420,8 +1311,9 @@ export interface LongYieldTradingBot extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
+    buyBins(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
     claimAndCompound(
-      router: string,
       inps: TokenInputStruct[],
       minSyOut: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -1431,7 +1323,11 @@ export interface LongYieldTradingBot extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    decisionLib(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+    claimWithoutCompound(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    decisionHelper(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     depositSy(
       netSyIn: BigNumberish,
@@ -1439,7 +1335,6 @@ export interface LongYieldTradingBot extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     depositToken(
-      router: string,
       inp: TokenInputStruct,
       minSyOut: BigNumberish,
       overrides?: PayableOverrides & { from?: string | Promise<string> }
@@ -1461,19 +1356,20 @@ export interface LongYieldTradingBot extends BaseContract {
     readBotState(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     readMarketExtState(
-      router: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    readStrategyData(
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     removeLiqToYt(
-      oldState: StrategyStateStruct,
-      botParams: ApproxParamsStruct,
-      guessTotalPtToSwap: ApproxParamsStruct,
-      maxLpRemoved: BigNumberish,
-      minYtOut: BigNumberish,
+      inputParams: ILongYieldTradingBot.RemoveLiqToYtInputStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
+    router(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
     setSpecs(
       _specs: LongTradingSpecsStruct,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -1488,15 +1384,6 @@ export interface LongYieldTradingBot extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    swapSyToYt(
-      router: string,
-      oldState: StrategyStateStruct,
-      botParams: ApproxParamsStruct,
-      minYtOut: BigNumberish,
-      maxSyIn: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
     transferOwnership(
       newOwner: string,
       direct: boolean,