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

package/typechain-types/ILongYieldTradingBot.ts

@@ -9,6 +9,7 @@ import {
   CallOverrides,
   ContractTransaction,
   Overrides,
+  PayableOverrides,
   PopulatedTransaction,
   Signer,
   utils,
@@ -22,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;
@@ -54,100 +45,313 @@ export type ApproxParamsStructOutput = [
   eps: BigNumber;
 };
 
+export type SwapDataStruct = {
+  swapType: BigNumberish;
+  extRouter: string;
+  extCalldata: BytesLike;
+  needScale: boolean;
+};
+
+export type SwapDataStructOutput = [number, string, string, boolean] & {
+  swapType: number;
+  extRouter: string;
+  extCalldata: string;
+  needScale: boolean;
+};
+
+export type TokenInputStruct = {
+  tokenIn: string;
+  netTokenIn: BigNumberish;
+  tokenMintSy: string;
+  bulk: string;
+  pendleSwap: string;
+  swapData: SwapDataStruct;
+};
+
+export type TokenInputStructOutput = [
+  string,
+  BigNumber,
+  string,
+  string,
+  string,
+  SwapDataStructOutput
+] & {
+  tokenIn: string;
+  netTokenIn: BigNumber;
+  tokenMintSy: string;
+  bulk: string;
+  pendleSwap: string;
+  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;
+  syBalance: BigNumberish;
+  buyBins: BigNumberish;
+};
+
+export type BotStateStructOutput = [
+  BigNumber,
+  BigNumber,
+  BigNumber,
+  BigNumber
+] & {
+  lpBalance: BigNumber;
+  ytBalance: BigNumber;
+  syBalance: BigNumber;
+  buyBins: BigNumber;
+};
+
+export type MarketStateStruct = {
+  totalPt: BigNumberish;
+  totalSy: BigNumberish;
+  totalLp: BigNumberish;
+  treasury: string;
+  scalarRoot: BigNumberish;
+  expiry: BigNumberish;
+  lnFeeRateRoot: BigNumberish;
+  reserveFeePercent: BigNumberish;
+  lastLnImpliedRate: BigNumberish;
+};
+
+export type MarketStateStructOutput = [
+  BigNumber,
+  BigNumber,
+  BigNumber,
+  string,
+  BigNumber,
+  BigNumber,
+  BigNumber,
+  BigNumber,
+  BigNumber
+] & {
+  totalPt: BigNumber;
+  totalSy: BigNumber;
+  totalLp: BigNumber;
+  treasury: string;
+  scalarRoot: BigNumber;
+  expiry: BigNumber;
+  lnFeeRateRoot: BigNumber;
+  reserveFeePercent: BigNumber;
+  lastLnImpliedRate: BigNumber;
+};
+
+export type MarketExtStateStruct = {
+  state: MarketStateStruct;
+  index: BigNumberish;
+  blockTime: BigNumberish;
+};
+
+export type MarketExtStateStructOutput = [
+  MarketStateStructOutput,
+  BigNumber,
+  BigNumber
+] & { state: MarketStateStructOutput; index: BigNumber; blockTime: 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 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 };
+
+  export type MultiApprovalStructOutput = [string[], string] & {
+    tokens: string[];
+    spender: string;
+  };
+}
+
 export interface ILongYieldTradingBotInterface extends utils.Interface {
   contractName: "ILongYieldTradingBot";
   functions: {
-    "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;
-    "removeLiqToYt((uint8,uint8),(uint256,uint256,uint256,uint256,uint256),(uint256,uint256,uint256,uint256,uint256),uint256,uint256)": FunctionFragment;
-    "setSpecs((uint256,uint256,uint256,uint256))": FunctionFragment;
-    "swapSyToYt(address,(uint8,uint8),(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,uint256,address,address,address,(uint8,address,bytes,bool))[],uint256)": FunctionFragment;
+    "claimWithoutCompound()": FunctionFragment;
+    "depositSy(uint256)": FunctionFragment;
+    "depositToken((address,uint256,address,address,address,(uint8,address,bytes,bool)),uint256)": FunctionFragment;
+    "readBotState()": 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;
+    "withdrawFunds(address,uint256)": FunctionFragment;
   };
 
-  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: "claimAndCompound",
+    values: [TokenInputStruct[], BigNumberish]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "claimWithoutCompound",
+    values?: undefined
+  ): string;
+  encodeFunctionData(
+    functionFragment: "depositSy",
+    values: [BigNumberish]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "depositToken",
+    values: [TokenInputStruct, BigNumberish]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "readBotState",
+    values?: undefined
+  ): string;
+  encodeFunctionData(
+    functionFragment: "readMarketExtState",
+    values?: undefined
+  ): string;
+  encodeFunctionData(
+    functionFragment: "readStrategyData",
+    values?: undefined
   ): string;
   encodeFunctionData(
     functionFragment: "removeLiqToYt",
-    values: [
-      StrategyStateStruct,
-      ApproxParamsStruct,
-      ApproxParamsStruct,
-      BigNumberish,
-      BigNumberish
-    ]
+    values: [ILongYieldTradingBot.RemoveLiqToYtInputStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "setSpecs",
     values: [LongTradingSpecsStruct]
   ): string;
   encodeFunctionData(
-    functionFragment: "swapSyToYt",
-    values: [
-      string,
-      StrategyStateStruct,
-      ApproxParamsStruct,
-      BigNumberish,
-      BigNumberish
-    ]
+    functionFragment: "withdrawFunds",
+    values: [string, BigNumberish]
   ): string;
 
   decodeFunctionResult(
-    functionFragment: "addLiqFromSy",
+    functionFragment: "addLiqFromYt",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "addLiqFromYt",
+    functionFragment: "addLiqKeepYt",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(functionFragment: "approveInf", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "addLiqKeepYt",
+    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: "readMarketExtState",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "readStrategyData",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -155,33 +359,37 @@ export interface ILongYieldTradingBotInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "setSpecs", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "swapSyToYt", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "withdrawFunds",
+    data: BytesLike
+  ): Result;
 
   events: {
-    "AddLiqFromSy(tuple,tuple,uint256,uint256,uint256)": EventFragment;
-    "AddLiqFromYt(tuple,tuple,uint256,uint256,uint256)": EventFragment;
-    "AddLiqKeepYt(tuple,tuple,uint256,uint256,uint256,uint256)": EventFragment;
-    "RemoveLiqToYt(tuple,tuple,uint256,uint256,uint256)": EventFragment;
-    "SwapSyToYt(tuple,tuple,uint256,uint256,uint256)": EventFragment;
+    "AddLiqFromSy(tuple,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)": EventFragment;
+    "SwapSyToYt(tuple,uint256,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<
-  [
-    StrategyStateStructOutput,
-    ApproxParamsStructOutput,
-    BigNumber,
-    BigNumber,
-    BigNumber
-  ],
+  [ApproxParamsStructOutput, BigNumber, BigNumber, BigNumber],
   {
-    state: StrategyStateStructOutput;
     botParams: ApproxParamsStructOutput;
     maxSyIn: BigNumber;
     netSyIn: BigNumber;
@@ -192,17 +400,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;
   }
@@ -211,38 +411,35 @@ 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>;
 
+export type ClaimAndCompoundEvent = TypedEvent<
+  [BigNumber, BigNumber],
+  { netSyOut: BigNumber; netPendleOut: BigNumber }
+>;
+
+export type ClaimAndCompoundEventFilter =
+  TypedEventFilter<ClaimAndCompoundEvent>;
+
+export type DepositSyEvent = TypedEvent<[BigNumber], { netSyIn: BigNumber }>;
+
+export type DepositSyEventFilter = TypedEventFilter<DepositSyEvent>;
+
+export type DepositTokenEvent = TypedEvent<
+  [string, BigNumber],
+  { token: string; netTokenIn: BigNumber }
+>;
+
+export type DepositTokenEventFilter = TypedEventFilter<DepositTokenEvent>;
+
 export type RemoveLiqToYtEvent = TypedEvent<
-  [
-    StrategyStateStructOutput,
-    ApproxParamsStructOutput,
-    BigNumber,
-    BigNumber,
-    BigNumber
-  ],
+  [ApproxParamsStructOutput, BigNumber, BigNumber],
   {
-    state: StrategyStateStructOutput;
     botParams: ApproxParamsStructOutput;
-    maxLpRemoved: BigNumber;
     netLpIn: BigNumber;
     netYtOut: BigNumber;
   }
@@ -251,15 +448,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;
@@ -269,6 +459,13 @@ export type SwapSyToYtEvent = TypedEvent<
 
 export type SwapSyToYtEventFilter = TypedEventFilter<SwapSyToYtEvent>;
 
+export type WithdrawFundsEvent = TypedEvent<
+  [string, BigNumber],
+  { token: string; amount: BigNumber }
+>;
+
+export type WithdrawFundsEventFilter = TypedEventFilter<WithdrawFundsEvent>;
+
 export interface ILongYieldTradingBot extends BaseContract {
   contractName: "ILongYieldTradingBot";
   connect(signerOrProvider: Signer | Provider | string): this;
@@ -297,38 +494,58 @@ export interface ILongYieldTradingBot extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
-    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> }
     ): Promise<ContractTransaction>;
 
+    approveInf(
+      arr: ITradingBotBase.MultiApprovalStruct[],
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    claimAndCompound(
+      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(
+      inp: TokenInputStruct,
+      minSyOut: BigNumberish,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    readBotState(
+      overrides?: CallOverrides
+    ): Promise<[BotStateStructOutput] & { botState: BotStateStructOutput }>;
+
+    readMarketExtState(
+      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>;
 
@@ -337,48 +554,63 @@ export interface ILongYieldTradingBot extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    swapSyToYt(
-      router: string,
-      oldState: StrategyStateStruct,
-      botParams: ApproxParamsStruct,
-      minYtOut: BigNumberish,
-      maxSyIn: BigNumberish,
+    withdrawFunds(
+      token: string,
+      amount: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
   };
 
-  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> }
   ): Promise<ContractTransaction>;
 
+  approveInf(
+    arr: ITradingBotBase.MultiApprovalStruct[],
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  claimAndCompound(
+    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(
+    inp: TokenInputStruct,
+    minSyOut: BigNumberish,
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  readBotState(overrides?: CallOverrides): Promise<BotStateStructOutput>;
+
+  readMarketExtState(
+    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>;
 
@@ -387,35 +619,15 @@ export interface ILongYieldTradingBot extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  swapSyToYt(
-    router: string,
-    oldState: StrategyStateStruct,
-    botParams: ApproxParamsStruct,
-    minYtOut: BigNumberish,
-    maxSyIn: BigNumberish,
+  withdrawFunds(
+    token: string,
+    amount: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   callStatic: {
-    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] & {
@@ -426,34 +638,54 @@ export interface ILongYieldTradingBot 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(
+      arr: ITradingBotBase.MultiApprovalStruct[],
+      overrides?: CallOverrides
+    ): Promise<void>;
+
+    claimAndCompound(
+      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(
+      inp: TokenInputStruct,
+      minSyOut: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<void>;
+
+    readBotState(overrides?: CallOverrides): Promise<BotStateStructOutput>;
+
+    readMarketExtState(
+      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 }
     >;
 
     setSpecs(
@@ -461,130 +693,155 @@ export interface ILongYieldTradingBot extends BaseContract {
       overrides?: CallOverrides
     ): Promise<void>;
 
-    swapSyToYt(
-      router: string,
-      oldState: StrategyStateStruct,
-      botParams: ApproxParamsStruct,
-      minYtOut: BigNumberish,
-      maxSyIn: BigNumberish,
+    withdrawFunds(
+      token: string,
+      amount: BigNumberish,
       overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & { exactYtOut: BigNumber; netSyIn: BigNumber }
-    >;
+    ): Promise<void>;
   };
 
   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
     ): AddLiqKeepYtEventFilter;
 
-    "RemoveLiqToYt(tuple,tuple,uint256,uint256,uint256)"(
-      state?: null,
+    "ClaimAndCompound(uint256,uint256)"(
+      netSyOut?: null,
+      netPendleOut?: null
+    ): ClaimAndCompoundEventFilter;
+    ClaimAndCompound(
+      netSyOut?: null,
+      netPendleOut?: null
+    ): ClaimAndCompoundEventFilter;
+
+    "DepositSy(uint256)"(netSyIn?: null): DepositSyEventFilter;
+    DepositSy(netSyIn?: null): DepositSyEventFilter;
+
+    "DepositToken(address,uint256)"(
+      token?: string | null,
+      netTokenIn?: null
+    ): DepositTokenEventFilter;
+    DepositToken(
+      token?: string | null,
+      netTokenIn?: null
+    ): DepositTokenEventFilter;
+
+    "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,
       netSyIn?: null
     ): SwapSyToYtEventFilter;
+
+    "WithdrawFunds(address,uint256)"(
+      token?: string | null,
+      amount?: null
+    ): WithdrawFundsEventFilter;
+    WithdrawFunds(
+      token?: string | null,
+      amount?: null
+    ): WithdrawFundsEventFilter;
   };
 
   estimateGas: {
-    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> }
     ): Promise<BigNumber>;
 
+    approveInf(
+      arr: ITradingBotBase.MultiApprovalStruct[],
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    claimAndCompound(
+      inps: TokenInputStruct[],
+      minSyOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    claimWithoutCompound(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    depositSy(
+      netSyIn: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    depositToken(
+      inp: TokenInputStruct,
+      minSyOut: BigNumberish,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    readBotState(overrides?: CallOverrides): Promise<BigNumber>;
+
+    readMarketExtState(
+      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>;
 
@@ -593,49 +850,64 @@ export interface ILongYieldTradingBot extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    swapSyToYt(
-      router: string,
-      oldState: StrategyStateStruct,
-      botParams: ApproxParamsStruct,
-      minYtOut: BigNumberish,
-      maxSyIn: BigNumberish,
+    withdrawFunds(
+      token: string,
+      amount: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
   };
 
   populateTransaction: {
-    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> }
     ): Promise<PopulatedTransaction>;
 
+    approveInf(
+      arr: ITradingBotBase.MultiApprovalStruct[],
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    claimAndCompound(
+      inps: TokenInputStruct[],
+      minSyOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    claimWithoutCompound(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    depositSy(
+      netSyIn: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    depositToken(
+      inp: TokenInputStruct,
+      minSyOut: BigNumberish,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    readBotState(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    readMarketExtState(
+      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>;
 
@@ -644,12 +916,9 @@ export interface ILongYieldTradingBot extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    swapSyToYt(
-      router: string,
-      oldState: StrategyStateStruct,
-      botParams: ApproxParamsStruct,
-      minYtOut: BigNumberish,
-      maxSyIn: BigNumberish,
+    withdrawFunds(
+      token: string,
+      amount: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
   };