fix(contracts): fix tests, operator map bug

chainbound · Oct 9, 2024 · 67df143 · 67df143
1 parent eb5c531
commit 67df143
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/bolt-contracts/src/contracts/BoltManager.sol b/bolt-contracts/src/contracts/BoltManager.sol
@@ -37,9 +37,6 @@ contract BoltManager is IBoltManager, OwnableUpgradeable, UUPSUpgradeable {
     /// @notice Set of operator addresses that have opted in to Bolt Protocol.
     EnumerableMap.OperatorMap private operators;
 
-    /// @notice Mapping of operator addresses to RPC endpoints.
-    mapping(address => string) private operatorRPCs;
-
     /// @notice Set of restaking protocols supported. Each address corresponds to the
     /// associated Bolt Middleware contract.
     EnumerableSet.AddressSet private restakingProtocols;
@@ -119,24 +116,23 @@ contract BoltManager is IBoltManager, OwnableUpgradeable, UUPSUpgradeable {
     // ========= OPERATOR FUNCTIONS ====== //
 
     /// @notice Registers an operator with Bolt. Only callable by a supported middleware contract.
-    function registerOperator(address operator, string calldata rpc) external onlyMiddleware {
-        if (operators.contains(operator)) {
+    function registerOperator(address operatorAddr, string calldata rpc) external onlyMiddleware {
+        if (operators.contains(operatorAddr)) {
             revert OperatorAlreadyRegistered();
         }
 
-        operators.add(operator);
-        operators.enable(operator);
+        // Timestamp will be set when we enable the operator below
+        Operator memory operator = Operator(rpc, msg.sender, 0);
 
-        operatorRPCs[operator] = rpc;
+        operators.set(operatorAddr, operator);
+        operators.enable(operatorAddr);
     }
 
     /// @notice De-registers an operator from Bolt. Only callable by a supported middleware contract.
     function deregisterOperator(
         address operator
     ) public onlyMiddleware {
         operators.remove(operator);
-
-        delete operatorRPCs[operator];
     }
 
     /// @notice Allow an operator to signal indefinite opt-out from Bolt Protocol.

diff --git a/bolt-contracts/test/BoltManager.EigenLayer.t.sol b/bolt-contracts/test/BoltManager.EigenLayer.t.sol
@@ -176,7 +176,7 @@ contract BoltManagerEigenLayerTest is Test {
         assertEq(middleware.isStrategyEnabled(address(eigenLayerDeployer.wethStrat())), true);
     }
 
-    function test_deregisterEigenLayerOperatorFromAVS() public {
+    function testDeregisterOperatorFromAVS() public {
         _eigenLayerOptInRoutine();
         vm.prank(operator);
         middleware.deregisterOperator();
@@ -195,7 +195,7 @@ contract BoltManagerEigenLayerTest is Test {
     //     assertEq(totalStake, 1 ether);
     // }
 
-    function test_getEigenLayerProposerStatus() public {
+    function testProposerStatus() public {
         _eigenLayerOptInRoutine();
 
         bytes32 pubkeyHash = _pubkeyHash(validatorPubkey);
@@ -229,7 +229,7 @@ contract BoltManagerEigenLayerTest is Test {
         assertEq(statuses.length, 10);
     }
 
-    function testGetNonExistentProposerStatus() public {
+    function testNonExistentProposerStatus() public {
         _eigenLayerOptInRoutine();
 
         bytes32 pubkeyHash = bytes32(uint256(1));
@@ -238,7 +238,7 @@ contract BoltManagerEigenLayerTest is Test {
         manager.getProposerStatus(pubkeyHash);
     }
 
-    function testGetWhitelistedCollaterals() public {
+    function testWhitelistedCollaterals() public {
         _adminRoutine();
         address[] memory collaterals = middleware.getWhitelistedCollaterals();
         assertEq(collaterals.length, 1);