Merge remote-tracking branch 'origin/m2-dev' into feat/add-docker-sup…

…port
alt-research · Mar 28, 2024 · 6b5e488 · 6b5e488
2 parents 69a55db + ed515fc
commit 6b5e488
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/contracts/src/core/MachServiceManager.sol b/contracts/src/core/MachServiceManager.sol
@@ -78,6 +78,7 @@ contract MachServiceManager is
         _initializePauser(_pauserRegistry, _initialPausedStatus);
         _transferOwnership(_initialOwner);
         _setAlertConfirmer(_alertConfirmer);
+        allowlistEnabled = true;
         quorumThresholdPercentage = 66;
     }
 

diff --git a/contracts/src/core/MachServiceManagerStorage.sol b/contracts/src/core/MachServiceManagerStorage.sol
@@ -19,15 +19,19 @@ abstract contract MachServiceManagerStorage {
     /// @notice Ethereum addresses of currently register operators
     EnumerableSet.AddressSet internal _operators;
 
-    /// @notice address that is permissioned to confirm alerts
-    address public alertConfirmer;
-
     /// @notice Set of operators that are allowed to register
     mapping(address => bool) internal _allowlist;
 
+    /// @notice address that is permissioned to confirm alerts
+    address public alertConfirmer;
+
     /// @notice Whether or not the allowlist is enabled
-    bool public allowlistEnabled = true;
+    bool public allowlistEnabled;
 
     /// @notice Minimul quorum threshold percentage
     uint8 public quorumThresholdPercentage;
+
+    // storage gap for upgradeability
+    // slither-disable-next-line shadowing-state
+    uint256[46] private __GAP;
 }