@pendle/core-v2 2.17.6-tradingbot → 2.17.7-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,14 +45,122 @@ 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;
+};
+
+export type BotStateStructOutput = [BigNumber, BigNumber, BigNumber] & {
+  lpBalance: BigNumber;
+  ytBalance: BigNumber;
+  syBalance: 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;
+  floatingSyRatioTarget: BigNumberish;
   ytPtRatioLimit: BigNumberish;
+  ytPtRatioTarget: BigNumberish;
 };
 
 export type LongTradingSpecsStructOutput = [
+  BigNumber,
+  BigNumber,
   BigNumber,
   BigNumber,
   BigNumber,
@@ -70,58 +169,88 @@ export type LongTradingSpecsStructOutput = [
   lowerIyLimit: BigNumber;
   upperIyLimit: BigNumber;
   floatingSyRatioLimit: BigNumber;
+  floatingSyRatioTarget: BigNumber;
   ytPtRatioLimit: BigNumber;
+  ytPtRatioTarget: 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;
+    "addLiqFromSy((uint256,uint256,uint256,uint256,uint256),uint256,uint256)": FunctionFragment;
+    "addLiqFromYt((uint256,uint256,uint256,uint256,uint256),uint256,uint256)": FunctionFragment;
+    "addLiqKeepYt(address,(uint256,uint256,uint256,uint256,uint256),uint256,uint256,uint256)": FunctionFragment;
+    "approveInf((address[],address)[])": FunctionFragment;
+    "claimAndCompound(address,(address,uint256,address,address,address,(uint8,address,bytes,bool))[],uint256)": FunctionFragment;
+    "claimWithoutCompound()": FunctionFragment;
+    "depositSy(uint256)": FunctionFragment;
+    "depositToken(address,(address,uint256,address,address,address,(uint8,address,bytes,bool)),uint256)": FunctionFragment;
+    "readBotState()": FunctionFragment;
+    "readMarketExtState(address)": FunctionFragment;
+    "removeLiqToYt((uint256,uint256,uint256,uint256,uint256),(uint256,uint256,uint256,uint256,uint256),uint256,uint256)": FunctionFragment;
+    "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: [
-      StrategyStateStruct,
-      ApproxParamsStruct,
-      BigNumberish,
-      BigNumberish
-    ]
+    values: [ApproxParamsStruct, BigNumberish, BigNumberish]
   ): string;
   encodeFunctionData(
     functionFragment: "addLiqFromYt",
-    values: [
-      StrategyStateStruct,
-      ApproxParamsStruct,
-      BigNumberish,
-      BigNumberish
-    ]
+    values: [ApproxParamsStruct, BigNumberish, BigNumberish]
   ): string;
   encodeFunctionData(
     functionFragment: "addLiqKeepYt",
     values: [
       string,
-      StrategyStateStruct,
       ApproxParamsStruct,
       BigNumberish,
       BigNumberish,
       BigNumberish
     ]
   ): string;
+  encodeFunctionData(
+    functionFragment: "approveInf",
+    values: [ITradingBotBase.MultiApprovalStruct[]]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "claimAndCompound",
+    values: [string, TokenInputStruct[], BigNumberish]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "claimWithoutCompound",
+    values?: undefined
+  ): string;
+  encodeFunctionData(
+    functionFragment: "depositSy",
+    values: [BigNumberish]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "depositToken",
+    values: [string, TokenInputStruct, BigNumberish]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "readBotState",
+    values?: undefined
+  ): string;
+  encodeFunctionData(
+    functionFragment: "readMarketExtState",
+    values: [string]
+  ): string;
   encodeFunctionData(
     functionFragment: "removeLiqToYt",
-    values: [
-      StrategyStateStruct,
-      ApproxParamsStruct,
-      ApproxParamsStruct,
-      BigNumberish,
-      BigNumberish
-    ]
+    values: [ApproxParamsStruct, ApproxParamsStruct, BigNumberish, BigNumberish]
   ): string;
   encodeFunctionData(
     functionFragment: "setSpecs",
@@ -129,13 +258,11 @@ export interface ILongYieldTradingBotInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "swapSyToYt",
-    values: [
-      string,
-      StrategyStateStruct,
-      ApproxParamsStruct,
-      BigNumberish,
-      BigNumberish
-    ]
+    values: [string, ApproxParamsStruct, BigNumberish, BigNumberish]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "withdrawFunds",
+    values: [string, BigNumberish]
   ): string;
 
   decodeFunctionResult(
@@ -150,38 +277,65 @@ export interface ILongYieldTradingBotInterface extends utils.Interface {
     functionFragment: "addLiqKeepYt",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(functionFragment: "approveInf", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "claimAndCompound",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "claimWithoutCompound",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(functionFragment: "depositSy", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "depositToken",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "readBotState",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "readMarketExtState",
+    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
+  ): 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,uint256)": EventFragment;
+    "AddLiqKeepYt(tuple,uint256,uint256,uint256,uint256)": EventFragment;
+    "ClaimAndCompound(uint256,uint256)": EventFragment;
+    "DepositSy(uint256)": EventFragment;
+    "DepositToken(address,uint256)": EventFragment;
+    "RemoveLiqToYt(tuple,uint256,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,15 +346,8 @@ export type AddLiqFromSyEvent = TypedEvent<
 export type AddLiqFromSyEventFilter = TypedEventFilter<AddLiqFromSyEvent>;
 
 export type AddLiqFromYtEvent = TypedEvent<
-  [
-    StrategyStateStructOutput,
-    ApproxParamsStructOutput,
-    BigNumber,
-    BigNumber,
-    BigNumber
-  ],
+  [ApproxParamsStructOutput, BigNumber, BigNumber, BigNumber],
   {
-    state: StrategyStateStructOutput;
     botParams: ApproxParamsStructOutput;
     maxYtIn: BigNumber;
     netYtIn: BigNumber;
@@ -211,16 +358,8 @@ export type AddLiqFromYtEvent = TypedEvent<
 export type AddLiqFromYtEventFilter = TypedEventFilter<AddLiqFromYtEvent>;
 
 export type AddLiqKeepYtEvent = TypedEvent<
-  [
-    StrategyStateStructOutput,
-    ApproxParamsStructOutput,
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    BigNumber
-  ],
+  [ApproxParamsStructOutput, BigNumber, BigNumber, BigNumber, BigNumber],
   {
-    state: StrategyStateStructOutput;
     botParams: ApproxParamsStructOutput;
     maxSyIn: BigNumber;
     netSyIn: BigNumber;
@@ -231,16 +370,28 @@ export type AddLiqKeepYtEvent = TypedEvent<
 
 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, BigNumber],
   {
-    state: StrategyStateStructOutput;
     botParams: ApproxParamsStructOutput;
     maxLpRemoved: BigNumber;
     netLpIn: BigNumber;
@@ -251,15 +402,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 +413,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;
@@ -298,7 +449,6 @@ export interface ILongYieldTradingBot extends BaseContract {
 
   functions: {
     addLiqFromSy(
-      oldState: StrategyStateStruct,
       botParams: ApproxParamsStruct,
       minLpOut: BigNumberish,
       maxSyIn: BigNumberish,
@@ -306,7 +456,6 @@ export interface ILongYieldTradingBot extends BaseContract {
     ): Promise<ContractTransaction>;
 
     addLiqFromYt(
-      oldState: StrategyStateStruct,
       botParams: ApproxParamsStruct,
       minLpOut: BigNumberish,
       maxYtIn: BigNumberish,
@@ -315,7 +464,6 @@ export interface ILongYieldTradingBot extends BaseContract {
 
     addLiqKeepYt(
       router: string,
-      oldState: StrategyStateStruct,
       botParams: ApproxParamsStruct,
       maxSyIn: BigNumberish,
       minLpOut: BigNumberish,
@@ -323,8 +471,44 @@ export interface ILongYieldTradingBot extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
+    approveInf(
+      arr: ITradingBotBase.MultiApprovalStruct[],
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    claimAndCompound(
+      router: string,
+      inps: TokenInputStruct[],
+      minSyOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    claimWithoutCompound(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    depositSy(
+      netSyIn: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    depositToken(
+      router: string,
+      inp: TokenInputStruct,
+      minSyOut: BigNumberish,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    readBotState(
+      overrides?: CallOverrides
+    ): Promise<[BotStateStructOutput] & { botState: BotStateStructOutput }>;
+
+    readMarketExtState(
+      router: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
     removeLiqToYt(
-      oldState: StrategyStateStruct,
       botParams: ApproxParamsStruct,
       guessTotalPtToSwap: ApproxParamsStruct,
       maxLpRemoved: BigNumberish,
@@ -339,16 +523,20 @@ export interface ILongYieldTradingBot extends BaseContract {
 
     swapSyToYt(
       router: string,
-      oldState: StrategyStateStruct,
       botParams: ApproxParamsStruct,
       minYtOut: BigNumberish,
       maxSyIn: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
+
+    withdrawFunds(
+      token: string,
+      amount: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
   };
 
   addLiqFromSy(
-    oldState: StrategyStateStruct,
     botParams: ApproxParamsStruct,
     minLpOut: BigNumberish,
     maxSyIn: BigNumberish,
@@ -356,7 +544,6 @@ export interface ILongYieldTradingBot extends BaseContract {
   ): Promise<ContractTransaction>;
 
   addLiqFromYt(
-    oldState: StrategyStateStruct,
     botParams: ApproxParamsStruct,
     minLpOut: BigNumberish,
     maxYtIn: BigNumberish,
@@ -365,7 +552,6 @@ export interface ILongYieldTradingBot extends BaseContract {
 
   addLiqKeepYt(
     router: string,
-    oldState: StrategyStateStruct,
     botParams: ApproxParamsStruct,
     maxSyIn: BigNumberish,
     minLpOut: BigNumberish,
@@ -373,8 +559,42 @@ export interface ILongYieldTradingBot extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  approveInf(
+    arr: ITradingBotBase.MultiApprovalStruct[],
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  claimAndCompound(
+    router: string,
+    inps: TokenInputStruct[],
+    minSyOut: BigNumberish,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  claimWithoutCompound(
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  depositSy(
+    netSyIn: BigNumberish,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  depositToken(
+    router: string,
+    inp: TokenInputStruct,
+    minSyOut: BigNumberish,
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  readBotState(overrides?: CallOverrides): Promise<BotStateStructOutput>;
+
+  readMarketExtState(
+    router: string,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   removeLiqToYt(
-    oldState: StrategyStateStruct,
     botParams: ApproxParamsStruct,
     guessTotalPtToSwap: ApproxParamsStruct,
     maxLpRemoved: BigNumberish,
@@ -389,16 +609,20 @@ export interface ILongYieldTradingBot extends BaseContract {
 
   swapSyToYt(
     router: string,
-    oldState: StrategyStateStruct,
     botParams: ApproxParamsStruct,
     minYtOut: BigNumberish,
     maxSyIn: BigNumberish,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  withdrawFunds(
+    token: string,
+    amount: BigNumberish,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   callStatic: {
     addLiqFromSy(
-      oldState: StrategyStateStruct,
       botParams: ApproxParamsStruct,
       minLpOut: BigNumberish,
       maxSyIn: BigNumberish,
@@ -412,7 +636,6 @@ export interface ILongYieldTradingBot extends BaseContract {
     >;
 
     addLiqFromYt(
-      oldState: StrategyStateStruct,
       botParams: ApproxParamsStruct,
       minLpOut: BigNumberish,
       maxYtIn: BigNumberish,
@@ -427,7 +650,6 @@ export interface ILongYieldTradingBot extends BaseContract {
 
     addLiqKeepYt(
       router: string,
-      oldState: StrategyStateStruct,
       botParams: ApproxParamsStruct,
       maxSyIn: BigNumberish,
       minLpOut: BigNumberish,
@@ -441,8 +663,41 @@ export interface ILongYieldTradingBot extends BaseContract {
       }
     >;
 
+    approveInf(
+      arr: ITradingBotBase.MultiApprovalStruct[],
+      overrides?: CallOverrides
+    ): Promise<void>;
+
+    claimAndCompound(
+      router: string,
+      inps: TokenInputStruct[],
+      minSyOut: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<
+      [BigNumber, BigNumber] & { netSyOut: BigNumber; netPendleOut: BigNumber }
+    >;
+
+    claimWithoutCompound(
+      overrides?: CallOverrides
+    ): Promise<TokenAmountStructOutput[]>;
+
+    depositSy(netSyIn: BigNumberish, overrides?: CallOverrides): Promise<void>;
+
+    depositToken(
+      router: string,
+      inp: TokenInputStruct,
+      minSyOut: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<void>;
+
+    readBotState(overrides?: CallOverrides): Promise<BotStateStructOutput>;
+
+    readMarketExtState(
+      router: string,
+      overrides?: CallOverrides
+    ): Promise<MarketExtStateStructOutput>;
+
     removeLiqToYt(
-      oldState: StrategyStateStruct,
       botParams: ApproxParamsStruct,
       guessTotalPtToSwap: ApproxParamsStruct,
       maxLpRemoved: BigNumberish,
@@ -463,7 +718,6 @@ export interface ILongYieldTradingBot extends BaseContract {
 
     swapSyToYt(
       router: string,
-      oldState: StrategyStateStruct,
       botParams: ApproxParamsStruct,
       minYtOut: BigNumberish,
       maxSyIn: BigNumberish,
@@ -471,41 +725,42 @@ export interface ILongYieldTradingBot extends BaseContract {
     ): Promise<
       [BigNumber, BigNumber] & { exactYtOut: BigNumber; netSyIn: BigNumber }
     >;
+
+    withdrawFunds(
+      token: string,
+      amount: BigNumberish,
+      overrides?: CallOverrides
+    ): 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,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,
+    "AddLiqKeepYt(tuple,uint256,uint256,uint256,uint256)"(
       botParams?: null,
       maxSyIn?: null,
       netSyIn?: null,
@@ -513,7 +768,6 @@ export interface ILongYieldTradingBot extends BaseContract {
       netYtOut?: null
     ): AddLiqKeepYtEventFilter;
     AddLiqKeepYt(
-      state?: null,
       botParams?: null,
       maxSyIn?: null,
       netSyIn?: null,
@@ -521,40 +775,65 @@ export interface ILongYieldTradingBot extends BaseContract {
       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,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,
@@ -562,7 +841,6 @@ export interface ILongYieldTradingBot extends BaseContract {
     ): Promise<BigNumber>;
 
     addLiqFromYt(
-      oldState: StrategyStateStruct,
       botParams: ApproxParamsStruct,
       minLpOut: BigNumberish,
       maxYtIn: BigNumberish,
@@ -571,7 +849,6 @@ export interface ILongYieldTradingBot extends BaseContract {
 
     addLiqKeepYt(
       router: string,
-      oldState: StrategyStateStruct,
       botParams: ApproxParamsStruct,
       maxSyIn: BigNumberish,
       minLpOut: BigNumberish,
@@ -579,8 +856,42 @@ export interface ILongYieldTradingBot extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
+    approveInf(
+      arr: ITradingBotBase.MultiApprovalStruct[],
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    claimAndCompound(
+      router: string,
+      inps: TokenInputStruct[],
+      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(
+      router: string,
+      inp: TokenInputStruct,
+      minSyOut: BigNumberish,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    readBotState(overrides?: CallOverrides): Promise<BigNumber>;
+
+    readMarketExtState(
+      router: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
     removeLiqToYt(
-      oldState: StrategyStateStruct,
       botParams: ApproxParamsStruct,
       guessTotalPtToSwap: ApproxParamsStruct,
       maxLpRemoved: BigNumberish,
@@ -595,17 +906,21 @@ export interface ILongYieldTradingBot extends BaseContract {
 
     swapSyToYt(
       router: string,
-      oldState: StrategyStateStruct,
       botParams: ApproxParamsStruct,
       minYtOut: BigNumberish,
       maxSyIn: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
+
+    withdrawFunds(
+      token: string,
+      amount: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
   };
 
   populateTransaction: {
     addLiqFromSy(
-      oldState: StrategyStateStruct,
       botParams: ApproxParamsStruct,
       minLpOut: BigNumberish,
       maxSyIn: BigNumberish,
@@ -613,7 +928,6 @@ export interface ILongYieldTradingBot extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     addLiqFromYt(
-      oldState: StrategyStateStruct,
       botParams: ApproxParamsStruct,
       minLpOut: BigNumberish,
       maxYtIn: BigNumberish,
@@ -622,7 +936,6 @@ export interface ILongYieldTradingBot extends BaseContract {
 
     addLiqKeepYt(
       router: string,
-      oldState: StrategyStateStruct,
       botParams: ApproxParamsStruct,
       maxSyIn: BigNumberish,
       minLpOut: BigNumberish,
@@ -630,8 +943,42 @@ export interface ILongYieldTradingBot extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
+    approveInf(
+      arr: ITradingBotBase.MultiApprovalStruct[],
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    claimAndCompound(
+      router: string,
+      inps: TokenInputStruct[],
+      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(
+      router: string,
+      inp: TokenInputStruct,
+      minSyOut: BigNumberish,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    readBotState(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    readMarketExtState(
+      router: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
     removeLiqToYt(
-      oldState: StrategyStateStruct,
       botParams: ApproxParamsStruct,
       guessTotalPtToSwap: ApproxParamsStruct,
       maxLpRemoved: BigNumberish,
@@ -646,11 +993,16 @@ export interface ILongYieldTradingBot extends BaseContract {
 
     swapSyToYt(
       router: string,
-      oldState: StrategyStateStruct,
       botParams: ApproxParamsStruct,
       minYtOut: BigNumberish,
       maxSyIn: BigNumberish,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
+
+    withdrawFunds(
+      token: string,
+      amount: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
   };
 }