@pendle/core-v2 2.17.0-tradingbot → 2.17.1-tradingbot

package/contracts/core/TradingBot/BotDecisionLib.sol

@@ -31,7 +31,7 @@ struct StrategyState {
     StrategyFlag syRatioFlag;
 }
 
-library BotDecisionLib {
+contract BotDecisionLib {
     using MarketExtLib for MarketExtState;
     using MarketExtLib for ApproxParams;
     using BotSimulationLib for BotState;
@@ -57,7 +57,7 @@ library BotDecisionLib {
      *
      * @param botParams ApproxParams for this binary search function
      * @param oldState The initial StrategyState, to be moved away from
-     * @param intParams ApproxParams for internal action's approximation (e.g. for router's swap)
+     * @param intParams ApproxParams for public action's approximation (e.g. for router's swap)
      * @dev For `botParams`, eps = the precision such that slightly lower
      * ((return value) * (1 - eps)) does not reach a new state
      *
@@ -78,7 +78,7 @@ library BotDecisionLib {
         StrategyState memory oldState,
         ApproxParams memory botParams,
         ApproxParams memory intParams
-    ) internal pure returns (uint256) {
+    ) public pure returns (uint256) {
         RebalanceDetails memory rebalance = RebalanceDetails(
             bot,
             marketExt,
@@ -225,7 +225,7 @@ library BotDecisionLib {
         BotState memory bot,
         MarketExtState memory marketExt,
         LongTradingSpecs memory specs
-    ) internal pure returns (StrategyState memory currentState) {
+    ) public pure returns (StrategyState memory currentState) {
         uint256 iy = marketExt.impliedYield();
         (, uint256 ptInLp) = marketExt.previewAssetsFromLp(bot.lpBalance);
         uint256 currentYtPtRatio = (
@@ -248,7 +248,7 @@ library BotDecisionLib {
         }
     }
 
-    function actionToTake(StrategyState memory currentState) internal pure returns (ActionType) {
+    function actionToTake(StrategyState memory currentState) public pure returns (ActionType) {
         if (currentState.iyFlag == StrategyFlag.TOO_LOW) {
             if (currentState.syRatioFlag == StrategyFlag.TOO_HIGH) {
                 return ActionType.SwapSyToYt;

package/contracts/core/TradingBot/LongYieldTradingBot.sol

@@ -14,22 +14,28 @@ contract LongYieldTradingBot is
     UUPSUpgradeable
 {
     LongTradingSpecs public specs;
+    address public immutable decisionLib;
 
     constructor(
         address _market,
         address _PENDLE,
-        LongTradingSpecs memory _specs
+        address _decisionLib
     ) TradingBotBase(_market, _PENDLE) {
-        specs = _specs;
+        decisionLib = _decisionLib;
     }
 
     function _authorizeUpgrade(address) internal override onlyOwner {}
 
-    function initialize() external initializer {
+    function initialize(LongTradingSpecs memory _specs) external initializer {
+        _setSpecs(_specs);
         __BoringOwnable_init();
     }
 
     function setSpecs(LongTradingSpecs calldata _specs) external onlyOwner {
+        _setSpecs(_specs);
+    }
+
+    function _setSpecs(LongTradingSpecs memory _specs) internal {
         specs = _specs;
     }
 
@@ -40,7 +46,7 @@ contract LongYieldTradingBot is
         uint256 minYtOut,
         uint256 maxSyIn
     ) external onlyOwner returns (uint256 exactYtOut, uint256 netSyIn) {
-        exactYtOut = BotDecisionLib.binarySearchUntilSwitchState(
+        exactYtOut = BotDecisionLib(decisionLib).binarySearchUntilSwitchState(
             readBotState(),
             readMarketExtState(router),
             specs,
@@ -64,7 +70,7 @@ contract LongYieldTradingBot is
         uint256 minLpOut,
         uint256 minYtOut
     ) external onlyOwner returns (uint256 netSyIn, uint256 netLpOut, uint256 netYtOut) {
-        netSyIn = BotDecisionLib.binarySearchUntilSwitchState(
+        netSyIn = BotDecisionLib(decisionLib).binarySearchUntilSwitchState(
             readBotState(),
             readMarketExtState(router),
             specs,
@@ -85,8 +91,8 @@ contract LongYieldTradingBot is
         ApproxParams calldata botParams,
         uint256 minLpOut,
         uint256 maxSyIn
-    ) external onlyOwner returns (uint256 netLpOut, uint256 netSyIn) {
-        uint256 netPtFromSwap = BotDecisionLib.binarySearchUntilSwitchState(
+    ) external onlyOwner returns (uint256 netPtFromSwap, uint256 netLpOut, uint256 netSyIn) {
+        netPtFromSwap = BotDecisionLib(decisionLib).binarySearchUntilSwitchState(
             readBotState(),
             readMarketExtState(address(this)),
             specs,
@@ -106,8 +112,8 @@ contract LongYieldTradingBot is
         ApproxParams calldata botParams,
         uint256 minLpOut,
         uint256 maxYtIn
-    ) external onlyOwner returns (uint256 netLpOut, uint256 netYtIn) {
-        uint256 netPtFromSwap = BotDecisionLib.binarySearchUntilSwitchState(
+    ) external onlyOwner returns (uint256 netPtFromSwap, uint256 netLpOut, uint256 netYtIn) {
+        netPtFromSwap = BotDecisionLib(decisionLib).binarySearchUntilSwitchState(
             readBotState(),
             readMarketExtState(address(this)),
             specs,
@@ -128,7 +134,7 @@ contract LongYieldTradingBot is
         uint256 maxLpRemoved,
         uint256 minYtOut
     ) external onlyOwner returns (uint256 netLpRemoved, uint256 netYtOut) {
-        netLpRemoved = BotDecisionLib.binarySearchUntilSwitchState(
+        netLpRemoved = BotDecisionLib(decisionLib).binarySearchUntilSwitchState(
             readBotState(),
             readMarketExtState(address(this)),
             specs,

package/contracts/core/TradingBot/TradingBotBase.sol

@@ -52,10 +52,6 @@ abstract contract TradingBotBase is BoringOwnableUpgradeable, TokenHelper, ITrad
         emit WithdrawFunds(token, amount);
     }
 
-    function approveInf(address token, address spender) external onlyOwner {
-        _safeApproveInf(token, spender);
-    }
-
     function claimAndCompound(
         address router,
         TokenInput[] calldata inps,
@@ -117,4 +113,19 @@ abstract contract TradingBotBase is BoringOwnableUpgradeable, TokenHelper, ITrad
                 value: inp.tokenIn == NATIVE ? inp.netTokenIn : 0
             }(address(this), SY, minSyOut, inp);
     }
+
+    function approveInf(MultiApproval[] calldata arr) external onlyOwner {
+        for (uint256 i = 0; i < arr.length; ) {
+            MultiApproval calldata ele = arr[i];
+            for (uint256 j = 0; j < ele.tokens.length; ) {
+                _safeApproveInf(ele.tokens[j], ele.spender);
+                unchecked {
+                    j++;
+                }
+            }
+            unchecked {
+                i++;
+            }
+        }
+    }
 }

package/contracts/core/TradingBot/TradingBotOffchain.sol

@@ -11,6 +11,12 @@ contract TradingBotOffchain {
     using MarketApproxPtInLib for MarketState;
     using PYIndexLib for PYIndex;
 
+    address immutable public decisionLib;
+
+    constructor(address _decisionLib) {
+        decisionLib = _decisionLib;
+    }   
+
     /// SY interest from YT is excluded
     function claimForBot(
         address bot,
@@ -37,7 +43,7 @@ contract TradingBotOffchain {
         ActionType action,
         uint256 botParam,
         ApproxParams memory swapApproxParams
-    ) external pure returns (bool success, BotState memory bot, MarketExtState memory marketExt) {
+    ) external view returns (bool success, BotState memory bot, MarketExtState memory marketExt) {
         bot = botCalldata;
         marketExt = marketExtCalldata;
 
@@ -64,9 +70,9 @@ contract TradingBotOffchain {
         StrategyState calldata initialState,
         ApproxParams calldata botParams,
         ApproxParams calldata intParams
-    ) external pure returns (uint256) {
+    ) external view returns (uint256) {
         return
-            BotDecisionLib.binarySearchUntilSwitchState(
+            BotDecisionLib(decisionLib).binarySearchUntilSwitchState(
                 bot,
                 marketExt,
                 specs,
@@ -82,7 +88,7 @@ contract TradingBotOffchain {
         ActionType action,
         uint256 botParam,
         ApproxParams calldata intParams
-    ) external pure returns (uint256) {
+    ) external view returns (uint256) {
         if (action == ActionType.RemoveLiqToYt) {
             return _searchForIntParamRemoveLiqToYt(marketExt, botParam, intParams);
         } else {
@@ -94,18 +100,18 @@ contract TradingBotOffchain {
         BotState calldata bot,
         MarketExtState calldata marketExt,
         LongTradingSpecs calldata specs
-    ) external pure returns (StrategyState memory) {
-        return BotDecisionLib.strategyState(bot, marketExt, specs);
+    ) external view returns (StrategyState memory) {
+        return BotDecisionLib(decisionLib).strategyState(bot, marketExt, specs);
     }
 
-    function actionToTake(StrategyState memory currentState) external pure returns (ActionType) {
-        return BotDecisionLib.actionToTake(currentState);
+    function actionToTake(StrategyState memory currentState) external view returns (ActionType) {
+        return BotDecisionLib(decisionLib).actionToTake(currentState);
     }
 
     function tvlInSy(
         BotState calldata bot,
         MarketExtState calldata marketExt
-    ) external pure returns (uint256) {
+    ) external view returns (uint256) {
         return BotSimulationLib.tvlInSy(bot, marketExt);
     }
 
@@ -113,7 +119,7 @@ contract TradingBotOffchain {
         MarketExtState memory marketExt,
         uint256 netLpToRemove,
         ApproxParams memory intParams
-    ) private pure returns (uint256 totalPtToSwap) {
+    ) private view returns (uint256 totalPtToSwap) {
         (uint256 netSyRemoved, uint256 netPtRemoved) = marketExt.state.removeLiquidity(
             netLpToRemove
         );

package/contracts/interfaces/TradingBot/ILongYieldTradingBot.sol

@@ -70,14 +70,14 @@ interface ILongYieldTradingBot {
         ApproxParams calldata botParams,
         uint256 minLpOut,
         uint256 maxSyIn
-    ) external returns (uint256 netLpOut, uint256 netSyIn);
+    ) external returns (uint256 netPtFromSwap, uint256 netLpOut, uint256 netSyIn);
 
     function addLiqFromYt(
         StrategyState memory oldState,
         ApproxParams calldata botParams,
         uint256 minLpOut,
         uint256 maxYtIn
-    ) external returns (uint256 netLpOut, uint256 netYtIn);
+    ) external returns (uint256 netPtFromSwap, uint256 netLpOut, uint256 netYtIn);
 
     function removeLiqToYt(
         StrategyState memory oldState,

package/contracts/interfaces/TradingBot/ITradingBotBase.sol

@@ -5,6 +5,11 @@ import "../IPAllAction.sol";
 import "../../core/TradingBot/BotSimulationLib.sol";
 
 interface ITradingBotBase {
+    struct MultiApproval {
+        address[] tokens;
+        address spender;
+    }
+
     event DepositSy(uint256 netSyIn);
 
     event DepositToken(address indexed token, uint256 netTokenIn);
@@ -26,8 +31,6 @@ interface ITradingBotBase {
 
     function withdrawFunds(address token, uint256 amount) external;
 
-    function approveInf(address token, address spender) external;
-
     function claimAndCompound(
         address router,
         TokenInput[] calldata inps,

package/package.json

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