feat(protocol): allow minGuardians be any value between 0 and numGuar…

…dians (#16384)
taikoxyz · Mar 10, 2024 · 0b1385e · 0b1385e
1 parent 2a0fe95
commit 0b1385e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/packages/protocol/contracts/L1/provers/Guardians.sol b/packages/protocol/contracts/L1/provers/Guardians.sol
@@ -7,9 +7,6 @@ import "../../common/EssentialContract.sol";
 /// @notice A contract that manages a set of guardians and their approvals.
 /// @custom:security-contact security@taiko.xyz
 abstract contract Guardians is EssentialContract {
-    /// @notice The minimum number of guardians
-    uint256 public constant MIN_NUM_GUARDIANS = 5;
-
     /// @notice Contains the index of the guardian in `guardians` plus one (zero means not a
     /// guardian)
     /// @dev Slot 1
@@ -58,15 +55,13 @@ abstract contract Guardians is EssentialContract {
         onlyOwner
         nonReentrant
     {
-        // We need at least MIN_NUM_GUARDIANS and at most 255 guardians (so the approval bits fit in
-        // a uint256)
-        if (_newGuardians.length < MIN_NUM_GUARDIANS || _newGuardians.length > type(uint8).max) {
+        // We need at most 255 guardians (so the approval bits fit in a uint256)
+        if (_newGuardians.length == 0 || _newGuardians.length > type(uint8).max) {
             revert INVALID_GUARDIAN_SET();
         }
         // Minimum number of guardians to approve is at least equal or greater than half the
         // guardians (rounded up) and less or equal than the total number of guardians
-        if (_minGuardians < (_newGuardians.length + 1) >> 1 || _minGuardians > _newGuardians.length)
-        {
+        if (_minGuardians == 0 || _minGuardians > _newGuardians.length) {
             revert INVALID_MIN_GUARDIANS();
         }
 

diff --git a/packages/protocol/test/L1/Guardians.t.sol b/packages/protocol/test/L1/Guardians.t.sol
@@ -15,7 +15,7 @@ contract DummyGuardians is Guardians {
     }
 }
 
-contract TestSignalService is TaikoTest {
+contract TestGuardianProver is TaikoTest {
     DummyGuardians target;
 
     function getSigners(uint256 numGuardians) internal returns (address[] memory signers) {