Support Delayed Token Update

README.md

@@ -138,13 +138,31 @@ These functions verify balances and authorize the caller to retrieve their accum
 
 ### How to Deploy
 
-**1)** Run the deployment script defined in `scripts/`:
+**1)** Run the deployment script `DeployProxy.s.sol` defined in `scripts/`:
 
 __`❍ npm run deploy:holesky`__: verification is done automatically.
 
 __`❍ npm run deploy:hoodi`__: verification needs to be done manually for now.
 
-### Public Testnet
+### How to Update Module Contracts
+
+It is possible to update each one of the three modules: `StrategyManager`, `BasedAppsManager` and `ProtocolManager`.
+
+It is possible to update multiple modules at the same time. 
+
+**1)** Go on the Proxy Contract on Etherscan, under "Write as Proxy" call the function:
+
+__`❍ updateModules`__: specifying the correct module id and the new module address.
+
+### How to Upgrade the Implementation Contract 
+
+**1)** Go on the Proxy Contract on Etherscan, under "Write as Proxy" call the function:
+
+__`❍ upgradeToAndCall`__: specifying the new implementation address. The data field can be left empty in this case.
+
+There is also the `UpgradeProxy.s.sol` script file that can be run easily from the CLI.
+
+### Public Testnet Holesky
 
 | Name | Proxy | Implementation | Notes |
 | -------- | -------- | -------- | -------- | 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "based-applications",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "description": "SSV Based Applications",
   "author": "SSV.Network",
   "repository": {

scripts/DeployProxy.s.sol

@@ -32,6 +32,7 @@ contract DeployProxy is Script {
             withdrawalExpireTime: 3 days,
             obligationTimelockPeriod: 14 days,
             obligationExpireTime: 3 days,
+            tokenUpdateTimelockPeriod: 14 days,
             maxFeeIncrement: 500
         });
 
@@ -76,6 +77,10 @@ contract DeployProxy is Script {
             config.obligationTimelockPeriod
         );
         console.log("Obligation Expire Time:", config.obligationExpireTime);
+        console.log(
+            "Token Update Timelock Period:",
+            config.tokenUpdateTimelockPeriod
+        );
         console.log("Max Shares:", config.maxShares);
         console.log("Max Fee Increment:", config.maxFeeIncrement);
         vm.stopBroadcast();

src/core/SSVBasedApps.sol

@@ -72,7 +72,7 @@ contract SSVBasedApps is
         IBasedAppManager ssvBasedAppManger_,
         IStrategyManager ssvStrategyManager_,
         IProtocolManager protocolManager_,
-        ProtocolStorageLib.Data memory config
+        ProtocolStorageLib.Data calldata config
     ) external override initializer onlyProxy {
         __UUPSUpgradeable_init();
         __Ownable_init_unchained(owner_);
@@ -89,7 +89,7 @@ contract SSVBasedApps is
         IBasedAppManager ssvBasedAppManger_,
         IStrategyManager ssvStrategyManager_,
         IProtocolManager protocolManager_,
-        ProtocolStorageLib.Data memory config
+        ProtocolStorageLib.Data calldata config
     ) internal onlyInitializing {
         CoreStorageLib.Data storage s = CoreStorageLib.load();
         ProtocolStorageLib.Data storage sp = ProtocolStorageLib.load();
@@ -114,6 +114,7 @@ contract SSVBasedApps is
         sp.withdrawalExpireTime = config.withdrawalExpireTime;
         sp.obligationTimelockPeriod = config.obligationTimelockPeriod;
         sp.obligationExpireTime = config.obligationExpireTime;
+        sp.tokenUpdateTimelockPeriod = config.tokenUpdateTimelockPeriod;
         sp.maxShares = config.maxShares;
 
         emit MaxFeeIncrementSet(sp.maxFeeIncrement);
@@ -147,6 +148,12 @@ contract SSVBasedApps is
         _delegateTo(SSVCoreModules.SSV_BAPPS_MANAGER);
     }
 
+    function updateBAppsTokens(
+        ICore.TokenConfig[] calldata tokenConfigs
+    ) external {
+        _delegateTo(SSVCoreModules.SSV_BAPPS_MANAGER);
+    }
+
     function createObligation(
         uint32 strategyId,
         address bApp,
@@ -271,7 +278,7 @@ contract SSVBasedApps is
         uint32 strategyId,
         address bApp,
         address token,
-        uint256 amount,
+        uint32 percentage,
         bytes calldata data
     ) external {
         _delegateTo(SSVCoreModules.SSV_STRATEGY_MANAGER);
@@ -323,6 +330,10 @@ contract SSVBasedApps is
         _delegateTo(SSVCoreModules.SSV_PROTOCOL_MANAGER);
     }
 
+    function updateTokenUpdateTimelockPeriod(uint32 value) external onlyOwner {
+        _delegateTo(SSVCoreModules.SSV_PROTOCOL_MANAGER);
+    }
+
     function updateMaxShares(uint256 value) external onlyOwner {
         _delegateTo(SSVCoreModules.SSV_PROTOCOL_MANAGER);
     }
@@ -364,6 +375,13 @@ contract SSVBasedApps is
         return (s.strategies[strategyId].owner, s.strategies[strategyId].fee);
     }
 
+    function ownedStrategies(
+        address owner
+    ) external view returns (uint32[] memory strategyIds) {
+        CoreStorageLib.Data storage s = CoreStorageLib.load();
+        return s.strategyOwners[owner];
+    }
+
     function strategyAccountShares(
         uint32 strategyId,
         address account,
@@ -420,22 +438,25 @@ contract SSVBasedApps is
         );
     }
 
-    function usedTokens(
-        uint32 strategyId,
-        address token
-    ) external view returns (uint32) {
-        CoreStorageLib.Data storage s = CoreStorageLib.load();
-        return s.usedTokens[strategyId][token];
-    }
-
     function bAppTokens(
         address bApp,
         address token
-    ) external view returns (uint32 value, bool isSet) {
+    )
+        external
+        view
+        returns (
+            uint32 currentValue,
+            bool isSet,
+            uint32 pendingValue,
+            uint32 effectTime
+        )
+    {
         CoreStorageLib.Data storage s = CoreStorageLib.load();
         return (
-            s.bAppTokens[bApp][token].value,
-            s.bAppTokens[bApp][token].isSet
+            s.bAppTokens[bApp][token].currentValue,
+            s.bAppTokens[bApp][token].isSet,
+            s.bAppTokens[bApp][token].pendingValue,
+            s.bAppTokens[bApp][token].effectTime
         );
     }
 
@@ -533,6 +554,10 @@ contract SSVBasedApps is
         return ProtocolStorageLib.load().obligationExpireTime;
     }
 
+    function tokenUpdateTimelockPeriod() external view returns (uint32) {
+        return ProtocolStorageLib.load().tokenUpdateTimelockPeriod;
+    }
+
     function getVersion() external pure returns (string memory) {
         return "0.0.1";
     }

src/core/interfaces/IBasedAppManager.sol

@@ -1,24 +1,30 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity 0.8.29;
 
+import { ICore } from "@ssv/src/core/interfaces/ICore.sol";
+
 interface IBasedAppManager {
-    event BAppMetadataURIUpdated(
-        address indexed bAppAddress,
-        string metadataURI
-    );
+    event BAppMetadataURIUpdated(address indexed bApp, string metadataURI);
     event BAppRegistered(
-        address indexed bAppAddress,
+        address indexed bApp,
         address[] tokens,
         uint32[] sharedRiskLevel,
         string metadataURI
     );
+    event BAppTokensUpdated(
+        address indexed bApp,
+        ICore.TokenConfig[] tokenConfigs
+    );
 
     function registerBApp(
         address[] calldata tokens,
         uint32[] calldata sharedRiskLevels,
         string calldata metadataURI
     ) external;
     function updateBAppMetadataURI(string calldata metadataURI) external;
+    function updateBAppsTokens(
+        ICore.TokenConfig[] calldata tokenConfigs
+    ) external;
 
     error BAppAlreadyRegistered();
     error BAppDoesNotSupportInterface();

src/core/interfaces/ICore.sol

@@ -7,9 +7,13 @@ interface ICore {
         /// @dev The shared risk level
         /// Encoding: The value is stored as a uint32. However, it represents a real (float) value.
         /// To get the actual real value (decode), divide by 10^6.
-        uint32 value;
+        uint32 currentValue;
         /// @dev if the shared risk level is set
         bool isSet;
+        /// @dev The value to be updated
+        uint32 pendingValue;
+        /// @dev The block time when the update request was sent
+        uint32 effectTime;
     }
 
     /// @notice Represents an Obligation
@@ -67,4 +71,14 @@ interface ICore {
         /// @dev The account latest generation
         mapping(address => uint256) accountGeneration;
     }
+
+    struct TokenUpdateRequest {
+        TokenConfig[] tokens;
+        uint32 requestTime;
+    }
+
+    struct TokenConfig {
+        address token;
+        uint32 sharedRiskLevel;
+    }
 }

src/core/interfaces/IProtocolManager.sol

@@ -6,6 +6,7 @@ interface IProtocolManager {
     event FeeTimelockPeriodUpdated(uint32 feeTimelockPeriod);
     event ObligationExpireTimeUpdated(uint32 obligationExpireTime);
     event ObligationTimelockPeriodUpdated(uint32 obligationTimelockPeriod);
+    event TokenUpdateTimelockPeriodUpdated(uint32 tokenUpdateTimelockPeriod);
     event StrategyMaxFeeIncrementUpdated(uint32 maxFeeIncrement);
     event StrategyMaxSharesUpdated(uint256 maxShares);
     event WithdrawalExpireTimeUpdated(uint32 withdrawalExpireTime);
@@ -17,6 +18,7 @@ interface IProtocolManager {
     function updateMaxShares(uint256 value) external;
     function updateObligationExpireTime(uint32 value) external;
     function updateObligationTimelockPeriod(uint32 value) external;
+    function updateTokenUpdateTimelockPeriod(uint32 value) external;
     function updateWithdrawalExpireTime(uint32 value) external;
     function updateWithdrawalTimelockPeriod(uint32 value) external;
 }

src/core/interfaces/IStrategyManager.sol

@@ -93,7 +93,7 @@ interface IStrategyManager {
         uint32 indexed strategyId,
         address indexed bApp,
         address token,
-        uint256 amount,
+        uint32 percentage,
         address receiver
     );
 
@@ -148,7 +148,7 @@ interface IStrategyManager {
         uint32 strategyId,
         address bApp,
         address token,
-        uint256 amount,
+        uint32 percentage,
         bytes calldata data
     ) external;
     function updateAccountMetadataURI(string calldata metadataURI) external;

src/core/libraries/CoreStorageLib.sol

@@ -21,6 +21,11 @@ library CoreStorageLib {
          * @dev The strategy ID is incremental and unique
          */
         mapping(uint32 strategyId => ICore.Strategy) strategies;
+        /**
+         * @notice Tracks the owners of the strategies
+         * @dev The strategy ID is incremental and unique
+         */
+        mapping(address owner => uint32[] strategyId) strategyOwners;
         /**
          * @notice Links an account to a single strategy for a specific bApp
          * @dev Guarantees that an account cannot have more than one strategy for a given bApp
@@ -47,12 +52,6 @@ library CoreStorageLib {
          * @dev Uses a hash of the bApp and token to map the obligation percentage for the strategy.
          */
         mapping(uint32 strategyId => mapping(address bApp => mapping(address token => ICore.Obligation))) obligations;
-        /**
-         * @notice Tracks unallocated tokens in a strategy.
-         * @dev Count the number of bApps that have one obligation set for the token.
-         * If the counter is 0, the token is unused and we can allow fast withdrawal.
-         */
-        mapping(uint32 strategyId => mapping(address token => uint32 bAppsCounter)) usedTokens;
         /**
          * @notice Tracks all the withdrawal requests divided by token per strategy.
          * @dev User can have only one pending withdrawal request per token.
@@ -87,6 +86,12 @@ library CoreStorageLib {
          * @dev The bApp is identified with its address
          */
         mapping(address bApp => mapping(address token => ICore.SharedRiskLevel)) bAppTokens;
+        /**
+         * @notice Tracks the token update requests for a bApp
+         * @dev Only the bApp owner can submit one.
+         * Submitting a new request will overwrite the previous one and reset the timer.
+         */
+        mapping(address bApp => ICore.TokenUpdateRequest) tokenUpdateRequests;
     }
 
     uint256 private constant SSV_BASED_APPS_STORAGE_POSITION =

src/core/libraries/ProtocolStorageLib.sol

@@ -11,6 +11,7 @@ library ProtocolStorageLib {
         uint32 withdrawalExpireTime;
         uint32 obligationTimelockPeriod;
         uint32 obligationExpireTime;
+        uint32 tokenUpdateTimelockPeriod;
         uint32 maxFeeIncrement;
         uint256 maxShares;
     }