@pendle/core-v2 2.19.0-tradingbot → 2.19.1-tradingbot

package/build/artifacts/contracts/interfaces/TradingBot/ITradingBotBase.sol/ITradingBotBase.json

@@ -291,123 +291,6 @@
       "stateMutability": "payable",
       "type": "function"
     },
-    {
-      "inputs": [],
-      "name": "readBotState",
-      "outputs": [
-        {
-          "components": [
-            {
-              "internalType": "uint256",
-              "name": "lpBalance",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "ytBalance",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "ptBalance",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "syBalance",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "buyBins",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct BotState",
-          "name": "botState",
-          "type": "tuple"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "readMarketExtState",
-      "outputs": [
-        {
-          "components": [
-            {
-              "components": [
-                {
-                  "internalType": "int256",
-                  "name": "totalPt",
-                  "type": "int256"
-                },
-                {
-                  "internalType": "int256",
-                  "name": "totalSy",
-                  "type": "int256"
-                },
-                {
-                  "internalType": "int256",
-                  "name": "totalLp",
-                  "type": "int256"
-                },
-                {
-                  "internalType": "address",
-                  "name": "treasury",
-                  "type": "address"
-                },
-                {
-                  "internalType": "int256",
-                  "name": "scalarRoot",
-                  "type": "int256"
-                },
-                {
-                  "internalType": "uint256",
-                  "name": "expiry",
-                  "type": "uint256"
-                },
-                {
-                  "internalType": "uint256",
-                  "name": "lnFeeRateRoot",
-                  "type": "uint256"
-                },
-                {
-                  "internalType": "uint256",
-                  "name": "reserveFeePercent",
-                  "type": "uint256"
-                },
-                {
-                  "internalType": "uint256",
-                  "name": "lastLnImpliedRate",
-                  "type": "uint256"
-                }
-              ],
-              "internalType": "struct MarketState",
-              "name": "state",
-              "type": "tuple"
-            },
-            {
-              "internalType": "PYIndex",
-              "name": "index",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "blockTime",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct MarketExtState",
-          "name": "marketExt",
-          "type": "tuple"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "readStrategyData",

package/contracts/core/TradingBot/{base/BotActionHelper.sol → LongYield/LongYieldActionHelper.sol}

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.17;
 
-import "./TradingBotBase.sol";
-import "./BotActionCallback.sol";
+import "../base/TradingBotBase.sol";
+import "../base/BotActionCallback.sol";
 
-abstract contract BotActionHelper is TradingBotBase, BotActionCallback {
+abstract contract LongYieldActionHelper is TradingBotBase, BotActionCallback {
     using PYIndexLib for IPYieldToken;
     using PYIndexLib for PYIndex;
     using MarketMathCore for MarketState;
@@ -13,31 +13,6 @@ abstract contract BotActionHelper is TradingBotBase, BotActionCallback {
 
     bytes internal constant EMPTY_BYTES = abi.encode();
 
-    function _mintPY(
-        uint256 netSyIn,
-        uint256 minPyOut
-    ) internal returns (uint256 netPyOut) {
-        return IPAllAction(router).mintPyFromSy(
-            address(this),
-            YT,
-            netSyIn,
-            minPyOut
-        );
-    }
-
-    function _swapSyToYt(
-        address router,
-        uint256 exactYtOut,
-        uint256 maxSyIn
-    ) internal returns (uint256 netSyIn) {
-        (netSyIn, ) = IPAllAction(router).swapSyForExactYt(
-            address(this),
-            market,
-            exactYtOut,
-            maxSyIn
-        );
-    }
-
     function _addLiqKeepYt(
         address router,
         uint256 netSyIn,
@@ -53,31 +28,7 @@ abstract contract BotActionHelper is TradingBotBase, BotActionCallback {
                 minYtOut
             );
     }
-
-    /// @dev Mimics PendleRouter's addLiquiditySingleSy
-    function _addLiqFromSy(
-        uint256 netPtFromSwap,
-        uint256 minLpOut,
-        uint256 maxSyIn
-    ) internal returns (uint256 netLpOut, uint256 netSyIn) {
-        MarketState memory state = IPMarket(market).readState(address(this));
-        PYIndex index = IPYieldToken(YT).newIndex();
-
-        (uint256 netSyToSwap, , ) = state.swapSyForExactPt(index, netPtFromSwap, block.timestamp);
-        (, , uint256 netSyToAdd, ) = state.addLiquidity(
-            maxSyIn - netSyToSwap,
-            netPtFromSwap,
-            block.timestamp
-        ); // ensures netSyToAdd <= maxSyIn - netSyToSwap
-        netSyIn = netSyToSwap + netSyToAdd;
-
-        _transferOut(SY, market, netSyIn);
-        IPMarket(market).swapSyForExactPt(market, netPtFromSwap, EMPTY_BYTES); // PT goes to market for LP
-        (netLpOut, , ) = IPMarket(market).mint(address(this), netSyToAdd, netPtFromSwap);
-
-        if (netLpOut < minLpOut) revert Errors.BotInsufficientLpOut(netLpOut, minLpOut);
-    }
-
+    
     function _addLiqFromYt(
         uint256 netPtFromSwap,
         uint256 minLpOut
@@ -147,32 +98,4 @@ abstract contract BotActionHelper is TradingBotBase, BotActionCallback {
 
         IPMarket(market).swapExactPtForSy(YT, totalPtToSwap, _encodeRemoveLiqToYt(minYtOut)); // SY goes to YT to mint PY
     }
-
-    function _swapPtForYt(
-        uint256 netPtToSwap,
-        ApproxParams memory guessTotalPtToSwap,
-        uint256 minYtOut
-    ) internal returns (uint256 netYtOut) {
-        (netYtOut, ) = IPAllAction(router).swapExactPtForYt(
-            address(this),
-            market,
-            netPtToSwap,
-            minYtOut,
-            guessTotalPtToSwap
-        );
-    }
-
-    function _swapYtForPt(
-        uint256 netYtToSwap,
-        ApproxParams memory guessTotalYtToSwap,
-        uint256 minPtOut
-    ) internal returns (uint256 netPtOut) {
-        (netPtOut, ) = IPAllAction(router).swapExactYtForPt(
-            address(this),
-            market,
-            netYtToSwap,
-            minPtOut,
-            guessTotalYtToSwap
-        );
-    }
 }

package/contracts/core/TradingBot/LongYield/LongYieldTradingBot.sol

@@ -2,13 +2,13 @@
 pragma solidity 0.8.17;
 
 import "../base/TradingBotBase.sol";
-import "../base/BotActionHelper.sol";
+import "./LongYieldActionHelper.sol";
 import "../../../interfaces/TradingBot/ILongYieldTradingBot.sol";
 import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
 
 contract LongYieldTradingBot is
     TradingBotBase,
-    BotActionHelper,
+    LongYieldActionHelper,
     ILongYieldTradingBot,
     UUPSUpgradeable
 {

package/contracts/core/TradingBot/ShortYield/ShortYieldActionHelper.sol

@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.8.17;
+
+import "../base/TradingBotBase.sol";
+
+abstract contract ShortYieldActionHelper is TradingBotBase {
+    using PYIndexLib for IPYieldToken;
+    using PYIndexLib for PYIndex;
+    using MarketMathCore for MarketState;
+    using MarketApproxPtInLib for MarketState;
+    using Math for int256;
+
+    bytes internal constant EMPTY_BYTES = abi.encode();
+
+    function _mintPY(
+        uint256 netSyIn,
+        uint256 minPyOut
+    ) internal returns (uint256 netPyOut) {
+        return IPAllAction(router).mintPyFromSy(
+            address(this),
+            YT,
+            netSyIn,
+            minPyOut
+        );
+    }
+
+    function _swapPtForYt(
+        uint256 netPtToSwap,
+        ApproxParams memory guessTotalPtToSwap,
+        uint256 minYtOut
+    ) internal returns (uint256 netYtOut) {
+        (netYtOut, ) = IPAllAction(router).swapExactPtForYt(
+            address(this),
+            market,
+            netPtToSwap,
+            minYtOut,
+            guessTotalPtToSwap
+        );
+    }
+
+    function _swapYtForPt(
+        uint256 netYtToSwap,
+        ApproxParams memory guessTotalYtToSwap,
+        uint256 minPtOut
+    ) internal returns (uint256 netPtOut) {
+        (netPtOut, ) = IPAllAction(router).swapExactYtForPt(
+            address(this),
+            market,
+            netYtToSwap,
+            minPtOut,
+            guessTotalYtToSwap
+        );
+    }
+}

package/contracts/core/TradingBot/ShortYield/ShortYieldTradingBot.sol

@@ -2,13 +2,13 @@
 pragma solidity 0.8.17;
 
 import "../base/TradingBotBase.sol";
-import "../base/BotActionHelper.sol";
+import "./ShortYieldActionHelper.sol";
 import "../../../interfaces/TradingBot/IShortYieldTradingBot.sol";
 import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
 
 contract ShortYieldTradingBot is
     TradingBotBase,
-    BotActionHelper,
+    ShortYieldActionHelper,
     IShortYieldTradingBot,
     UUPSUpgradeable
 {

package/contracts/core/TradingBot/base/TradingBotBase.sol

@@ -4,7 +4,7 @@ pragma solidity 0.8.17;
 import "../../libraries/BoringOwnableUpgradeable.sol";
 import "../../libraries/TokenHelper.sol";
 import "../../../interfaces/TradingBot/ITradingBotBase.sol";
-import "../libraries/BotSimulationLib.sol";
+import "../../../interfaces/TradingBot/IBotDecisionHelper.sol";
 
 abstract contract TradingBotBase is BoringOwnableUpgradeable, TokenHelper, ITradingBotBase {
     using TokenAmountLib for TokenAmount[];
@@ -110,13 +110,13 @@ abstract contract TradingBotBase is BoringOwnableUpgradeable, TokenHelper, ITrad
         rewards = rewards.add(lpRewardTokens, lpRewardAmounts);
     }
 
-    function readMarketExtState() public returns (MarketExtState memory marketExt) {
+    function _readMarketExtState() internal returns (MarketExtState memory marketExt) {
         marketExt.state = IPMarket(market).readState(router);
         marketExt.index = IPYieldToken(YT).newIndex();
         marketExt.blockTime = block.timestamp;
     }
 
-    function readBotState() public view returns (BotState memory botState) {
+    function _readBotState() internal view returns (BotState memory botState) {
         botState.lpBalance = _selfBalance(market);
         botState.syBalance = _selfBalance(SY);
         botState.ytBalance = _selfBalance(YT);
@@ -172,8 +172,8 @@ abstract contract TradingBotBase is BoringOwnableUpgradeable, TokenHelper, ITrad
     }
 
     function readStrategyData() public returns (StrategyData memory strategyData) {
-        strategyData.botState = readBotState();
-        strategyData.marketExt = readMarketExtState();
+        strategyData.botState = _readBotState();
+        strategyData.marketExt = _readMarketExtState();
         strategyData.specs = specs;
     }
 

package/contracts/interfaces/TradingBot/ITradingBotBase.sol

@@ -57,10 +57,6 @@ interface ITradingBotBase {
 
     function claimWithoutCompound() external returns (TokenAmount[] memory rewards);
 
-    function readMarketExtState() external returns (MarketExtState memory marketExt);
-
-    function readBotState() external view returns (BotState memory botState);
-
     function readStrategyData() external returns (StrategyData memory strategyData);
 
     function setSpecs(TradingSpecs calldata _specs) external;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@pendle/core-v2",
   "description": "Core smart contracts of Pendle Protocol.",
   "license": "BUSL-1.1",
-  "version": "2.19.0-tradingbot",
+  "version": "2.19.1-tradingbot",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",

package/typechain-types/BotActionCallback.ts

@@ -205,8 +205,6 @@ export interface BotActionCallbackInterface extends utils.Interface {
     "market()": FunctionFragment;
     "owner()": FunctionFragment;
     "pendingOwner()": FunctionFragment;
-    "readBotState()": FunctionFragment;
-    "readMarketExtState()": FunctionFragment;
     "readStrategyData()": FunctionFragment;
     "router()": FunctionFragment;
     "setSpecs((uint256,uint256,uint256,uint256,uint256,uint256))": FunctionFragment;
@@ -255,14 +253,6 @@ export interface BotActionCallbackInterface extends utils.Interface {
     functionFragment: "pendingOwner",
     values?: undefined
   ): string;
-  encodeFunctionData(
-    functionFragment: "readBotState",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "readMarketExtState",
-    values?: undefined
-  ): string;
   encodeFunctionData(
     functionFragment: "readStrategyData",
     values?: undefined
@@ -319,14 +309,6 @@ export interface BotActionCallbackInterface extends utils.Interface {
     functionFragment: "pendingOwner",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "readBotState",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "readMarketExtState",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "readStrategyData",
     data: BytesLike
@@ -478,14 +460,6 @@ export interface BotActionCallback extends BaseContract {
 
     pendingOwner(overrides?: CallOverrides): Promise<[string]>;
 
-    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>;
@@ -579,12 +553,6 @@ export interface BotActionCallback extends BaseContract {
 
   pendingOwner(overrides?: CallOverrides): Promise<string>;
 
-  readBotState(overrides?: CallOverrides): Promise<BotStateStructOutput>;
-
-  readMarketExtState(
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
   readStrategyData(
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
@@ -675,12 +643,6 @@ export interface BotActionCallback extends BaseContract {
 
     pendingOwner(overrides?: CallOverrides): Promise<string>;
 
-    readBotState(overrides?: CallOverrides): Promise<BotStateStructOutput>;
-
-    readMarketExtState(
-      overrides?: CallOverrides
-    ): Promise<MarketExtStateStructOutput>;
-
     readStrategyData(
       overrides?: CallOverrides
     ): Promise<StrategyDataStructOutput>;
@@ -819,12 +781,6 @@ export interface BotActionCallback extends BaseContract {
 
     pendingOwner(overrides?: CallOverrides): 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>;
@@ -908,12 +864,6 @@ export interface BotActionCallback extends BaseContract {
 
     pendingOwner(overrides?: CallOverrides): 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>;

package/typechain-types/ILongYieldTradingBot.ts

@@ -262,8 +262,6 @@ export interface ILongYieldTradingBotInterface extends utils.Interface {
     "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;
@@ -298,14 +296,6 @@ export interface ILongYieldTradingBotInterface extends utils.Interface {
     functionFragment: "depositToken",
     values: [TokenInputStruct, BigNumberish]
   ): string;
-  encodeFunctionData(
-    functionFragment: "readBotState",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "readMarketExtState",
-    values?: undefined
-  ): string;
   encodeFunctionData(
     functionFragment: "readStrategyData",
     values?: undefined
@@ -345,14 +335,6 @@ export interface ILongYieldTradingBotInterface extends utils.Interface {
     functionFragment: "depositToken",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "readBotState",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "readMarketExtState",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "readStrategyData",
     data: BytesLike
@@ -535,14 +517,6 @@ export interface ILongYieldTradingBot extends BaseContract {
       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>;
@@ -602,12 +576,6 @@ export interface ILongYieldTradingBot extends BaseContract {
     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>;
@@ -674,12 +642,6 @@ export interface ILongYieldTradingBot extends BaseContract {
       overrides?: CallOverrides
     ): Promise<void>;
 
-    readBotState(overrides?: CallOverrides): Promise<BotStateStructOutput>;
-
-    readMarketExtState(
-      overrides?: CallOverrides
-    ): Promise<MarketExtStateStructOutput>;
-
     readStrategyData(
       overrides?: CallOverrides
     ): Promise<StrategyDataStructOutput>;
@@ -833,12 +795,6 @@ export interface ILongYieldTradingBot extends BaseContract {
       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>;
@@ -899,12 +855,6 @@ export interface ILongYieldTradingBot extends BaseContract {
       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>;