refactor whitelist check on validator registration

ssvlabs · Jul 3, 2024 · bac7ff4 · bac7ff4
1 parent 453d75b
commit bac7ff4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/contracts/libraries/OperatorLib.sol b/contracts/libraries/OperatorLib.sol
@@ -77,13 +77,14 @@ library OperatorLib {
                         // msg.sender is not whitelisted via bitmap or legacy whitelist/whitelisting contract
                         revert ISSVNetworkCore.CallerNotWhitelistedWithData(operatorId);
                     }
-                    // Legacy address whitelists (EOAs or generic contracts)
+                    // Legacy address & whitelisting contract check
                     if (whitelistedAddress != msg.sender) {
-                        // Check if msg.sender is whitelisted via whitelisting contract
-                        if (!OperatorLib.isWhitelistingContract(whitelistedAddress)) {
-                            revert ISSVNetworkCore.InvalidWhitelistingContract(whitelistedAddress);
-                        }
-                        if (!ISSVWhitelistingContract(whitelistedAddress).isWhitelisted(msg.sender, operatorId)) {
+                        // Check if whitelistedAddress is a valid whitelisting contract and if msg.sender is whitelisted by it
+                        // For non-whitelisting contracts, check if msg.sender is whitelisted (EOAs or generic contracts)
+                        if (
+                            !OperatorLib.isWhitelistingContract(whitelistedAddress) ||
+                            !ISSVWhitelistingContract(whitelistedAddress).isWhitelisted(msg.sender, operatorId)
+                        ) {
                             revert ISSVNetworkCore.CallerNotWhitelistedWithData(operatorId);
                         }
                     }

diff --git a/test-forked/operators-whitelist.ts b/test-forked/operators-whitelist.ts
@@ -81,7 +81,7 @@ describe('Whitelisting Tests (fork) - Pre-upgrade SSV Core Contracts Tests', ()
         ],
         { account: owners[2].account },
       ),
-    ).to.be.rejectedWith('InvalidWhitelistingContract');
+    ).to.be.rejectedWith('CallerNotWhitelistedWithData');
   });
 
   it('Register using legacy whitelisted operators in 4 operators cluster events/logic', async () => {