Merge pull request #18 from DLC-link/feat/compaction

Pre-audit cleanup

Author: scolear

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 DLC.Link
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,30 +1,8 @@
-# dlc-symbiotic
-
-Repository for the dlc-link Symbiotic integration.
-
-### Slashing
-
-<img src="./assets/slash_flow.png" alt="slash_flow" width="100%" />
-
-## Usage
-
-You can start a local Sepolia fork using:
-
-```shell
-anvil --fork-url https://eth-sepolia.g.alchemy.com/v2/your-api-key
-```
-
-And deploy the NetworkMiddleware contract using:
-
-```shell
-forge script SetupNetworkMiddleware --rpc-url http://localhost:8545 --broadcast -vvvv --private-key 0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d
-```
-
-
-## Workflow and Dependencies 
+[![Tests](https://github.com/DLC-link/dlc-symbiotic/actions/workflows/test.yml/badge.svg)](https://github.com/DLC-link/dlc-symbiotic/actions/workflows/test.yml)
 
-<img src="./assets/workflow_and_dependencies.png" alt="workflow_and_dependencies" width="100%" />
+# dlc-symbiotic
 
+Repository for iBTC Network's Symbiotic integration.
 
 ## Development
 
@@ -40,40 +18,24 @@ $ forge build
 $ forge test
 ```
 
-### Format
-
-```shell
-$ forge fmt
-```
-
-### Gas Snapshots
-
-```shell
-$ forge snapshot
-```
+## Usage
 
-### Anvil
+You can start a local Sepolia fork using:
 
 ```shell
-$ anvil
+anvil --fork-url https://eth-sepolia.g.alchemy.com/v2/your-api-key
 ```
 
-### Deploy
+And deploy a standard configuration of a Vault and the NetworkMiddleware contract using:
 
 ```shell
-$ forge script script/Counter.s.sol:CounterScript --rpc-url <your_rpc_url> --private-key <your_private_key>
+forge script DeployAll 11155111 --rpc-url http://localhost:8545 --broadcast -vvvv --private-key 0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d --sig 'run(uint256)'
 ```
 
-### Cast
+## Workflow and Dependencies
 
-```shell
-$ cast <subcommand>
-```
+<img src="./assets/workflow_and_dependencies.png" alt="workflow_and_dependencies" width="100%" />
 
-### Help
+### Slashing
 
-```shell
-$ forge --help
-$ anvil --help
-$ cast --help
-```
+<img src="./assets/slash_flow.png" alt="slash_flow" width="100%" />

foundry.toml

@@ -3,12 +3,14 @@ ast = true
 build_info = true
 extra_output = ["storageLayout"]
 ffi = true
-fs_permissions = [{access = "read", path = "script/addresses"}]
+fs_permissions = [{ access = "read", path = "script/addresses" }]
 libs = ["lib"]
 out = "out"
 solc = "0.8.25"
 src = "src"
 via_ir = true
+optimizer = true
+optimizer-runs = 200
 
 [fmt]
 bracket_spacing = false

script/0.Deploy_All.s.sol

@@ -46,7 +46,7 @@ contract DeployAll is Script {
     address VAULT_FACTORY;
     address DELEGATOR_FACTORY;
     address SLASHER_FACTORY;
-    address NEWTORK_OPTIN_SERVICE;
+    address NETWORK_OPTIN_SERVICE;
     address VAULT_OPTIN_SERVICE;
     address DEFAULT_STAKER_REWARDS_FACTORY;
     address DEFAULT_OPERATOR_REWARDS_FACTORY;
@@ -96,6 +96,7 @@ contract DeployAll is Script {
 
     ProxyAdmin public proxyAdmin;
     TransparentUpgradeableProxy public proxy;
+    TransparentUpgradeableProxy private gr_proxy;
 
     function run(
         uint256 _chainId
@@ -104,11 +105,11 @@ contract DeployAll is Script {
         NETWORK_MIDDLEWARE_SERVICE = readFile.readInput(_chainId, "symbiotic", "NETWORK_MIDDLEWARE_SERVICE");
         NETWORK_REGISTRY = readFile.readInput(_chainId, "symbiotic", "NETWORK_REGISTRY");
         OPERATOR_REGISTRY = readFile.readInput(_chainId, "symbiotic", "OPERATOR_REGISTRY");
-        COLLATERAL = readFile.readInput(_chainId, "symbiotic", "COLLATERAL");
+        COLLATERAL = readFile.readInput(_chainId, "iBTC", "COLLATERAL");
         VAULT_FACTORY = readFile.readInput(_chainId, "symbiotic", "VAULT_FACTORY");
         DELEGATOR_FACTORY = readFile.readInput(_chainId, "symbiotic", "DELEGATOR_FACTORY");
         SLASHER_FACTORY = readFile.readInput(_chainId, "symbiotic", "SLASHER_FACTORY");
-        NEWTORK_OPTIN_SERVICE = readFile.readInput(_chainId, "symbiotic", "NEWTORK_OPTIN_SERVICE");
+        NETWORK_OPTIN_SERVICE = readFile.readInput(_chainId, "symbiotic", "NETWORK_OPTIN_SERVICE");
         VAULT_OPTIN_SERVICE = readFile.readInput(_chainId, "symbiotic", "VAULT_OPTIN_SERVICE");
         DEFAULT_STAKER_REWARDS_FACTORY = readFile.readInput(_chainId, "symbiotic", "DEFAULT_STAKER_REWARDS_FACTORY");
         DEFAULT_OPERATOR_REWARDS_FACTORY = readFile.readInput(_chainId, "symbiotic", "DEFAULT_OPERATOR_REWARDS_FACTORY");
@@ -124,8 +125,14 @@ contract DeployAll is Script {
         //  ---------------------------------- Start Vault Deployment ----------------------------------
 
         // ------------------------------- Start Global Receiver Deployment -------------------------------
-        iBTC_globalReceiver = new iBTC_GlobalReceiver();
-        iBTC_globalReceiver.initialize(COLLATERAL, OWNER);
+        iBTC_GlobalReceiver grImplementation = new iBTC_GlobalReceiver();
+        gr_proxy = new TransparentUpgradeableProxy(
+            address(grImplementation),
+            OWNER,
+            abi.encodeWithSelector(iBTC_GlobalReceiver.initialize.selector, COLLATERAL, OWNER)
+        );
+        proxyAdmin = ProxyAdmin(_getAdminAddress(address(gr_proxy)));
+        iBTC_globalReceiver = iBTC_GlobalReceiver(address(gr_proxy));
         // ------------------------------- End Global Receiver Deployment -------------------------------
 
         // ------------------------------- Start Vault Configurator Deployment -------------------------------
@@ -234,7 +241,7 @@ contract DeployAll is Script {
                 NETWORK,
                 OPERATOR_REGISTRY,
                 VAULT_FACTORY,
-                NEWTORK_OPTIN_SERVICE,
+                NETWORK_OPTIN_SERVICE,
                 OWNER,
                 STAKER_REWARDS,
                 OPERATOR_REWARDS,

src/iBTC_NetworkMiddleware.sol

@@ -41,6 +41,8 @@ contract NetworkMiddleware is Initializable, SimpleKeyRegistry32, OwnableUpgrade
     error ZeroRewardToken();
     error ZeroEpochDuration();
     error ZeroSlashingWindow();
+    error ZeroStakerReward();
+    error ZeroOperatorNetOptin();
 
     error NotOperator();
     error NotVault();
@@ -61,9 +63,7 @@ contract NetworkMiddleware is Initializable, SimpleKeyRegistry32, OwnableUpgrade
     error InvalidEpoch();
 
     error SlashingWindowTooShort();
-    error TooBigSlashAmount();
     error UnknownSlasherType();
-    error NotVetoSlasher();
 
     error ZeroTotalStake();
     error ZeroRewardAmount();
@@ -77,13 +77,6 @@ contract NetworkMiddleware is Initializable, SimpleKeyRegistry32, OwnableUpgrade
         bytes32 key;
     }
 
-    struct SlashedInfo {
-        uint48 epoch;
-        address operator;
-        uint256 slashedAmount;
-        uint256 timeStamp;
-    }
-
     address public NETWORK;
     address public OPERATOR_REGISTRY;
     address public VAULT_REGISTRY;
@@ -96,14 +89,13 @@ contract NetworkMiddleware is Initializable, SimpleKeyRegistry32, OwnableUpgrade
     uint48 public EPOCH_DURATION;
     uint48 public SLASHING_WINDOW;
     uint48 public START_TIME;
-    bytes32 public constant REWARD_DISTRIBUTION_ROLE = keccak256("REWARD_DISTRIBUTION_ROLE");
+    bytes32 public constant REWARD_DISTRIBUTION_ROLE =
+        0x9f89a45310bee56665a077229020c3130eedbd18bff771c3dc399fb850b2e12f; // keccak256("REWARD_DISTRIBUTION_ROLE");
 
     uint48 private constant INSTANT_SLASHER_TYPE = 0;
     uint48 private constant VETO_SLASHER_TYPE = 1;
 
-    uint256 public slashIndex;
     uint256 public subnetworksCnt;
-    mapping(uint256 slashIndex => SlashedInfo) slashedInfos;
     mapping(uint48 => uint256) public totalStakeCache;
     mapping(uint48 => bool) public totalStakeCached;
     mapping(uint48 epoch => mapping(address operator => uint256 amounts)) public operatorStakeCache;
@@ -151,13 +143,33 @@ contract NetworkMiddleware is Initializable, SimpleKeyRegistry32, OwnableUpgrade
         __Ownable_init(_owner);
         MultisigValidated.initialize(_owner, _minimumThreshold, _threshold);
 
-        _checkNonZeroAddress(_network, "ZeroNetwork");
-        _checkNonZeroAddress(_operatorRegistry, "ZeroOperatorRegistry");
-        _checkNonZeroAddress(_vaultRegistry, "ZeroVaultRegistry");
-        _checkNonZeroAddress(_operatorNetOptin, "ZeroOperatorNetOptin");
-        _checkNonZeroAddress(_owner, "ZeroOwner");
-        _checkNonZeroAddress(_stakerReward, "ZeroStakerReward");
-        _checkNonZeroAddress(_operatorReward, "ZeroOperatorReward");
+        if (_network == address(0)) {
+            revert ZeroNetwork();
+        }
+
+        if (_operatorRegistry == address(0)) {
+            revert ZeroOperatorRegistry();
+        }
+
+        if (_vaultRegistry == address(0)) {
+            revert ZeroVaultRegistry();
+        }
+
+        if (_operatorNetOptin == address(0)) {
+            revert ZeroOperatorNetOptin();
+        }
+
+        if (_owner == address(0)) {
+            revert ZeroOwner();
+        }
+
+        if (_stakerReward == address(0)) {
+            revert ZeroStakerReward();
+        }
+
+        if (_operatorReward == address(0)) {
+            revert ZeroOperatorReward();
+        }
 
         if (_slashingWindow < _epochDuration) {
             revert SlashingWindowTooShort();
@@ -520,12 +532,6 @@ contract NetworkMiddleware is Initializable, SimpleKeyRegistry32, OwnableUpgrade
         return enabledTime != 0 && enabledTime <= timestamp && (disabledTime == 0 || disabledTime >= timestamp);
     }
 
-    function _checkNonZeroAddress(address addr, string memory errorMessage) private pure {
-        if (addr == address(0)) {
-            revert(errorMessage);
-        }
-    }
-
     function _slashVault(
         uint48 timestamp,
         address vault,