refactor: make chain id variable

alt-research · Apr 2, 2024 · b47896b · b47896b
1 parent 1d1d645
commit b47896b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/contracts/script/MachServiceManagerDeployer.s.sol b/contracts/script/MachServiceManagerDeployer.s.sol
@@ -55,6 +55,7 @@ contract MachServiceManagerDeployer is Script {
         address churner;
         address ejector;
         address confirmer;
+        uint256 chainId;
         // from eigenlayer contracts
         address avsDirectory;
         address delegationManager;
@@ -103,6 +104,7 @@ contract MachServiceManagerDeployer is Script {
         addressConfig.churner = msg.sender;
         addressConfig.ejector = msg.sender;
         addressConfig.confirmer = msg.sender;
+        addressConfig.chainId = 1;
         addressConfig.avsDirectory = address(eigenLayerContracts.avsDirectory);
         addressConfig.delegationManager = address(eigenLayerContracts.delegationManager);
 
@@ -217,7 +219,8 @@ contract MachServiceManagerDeployer is Script {
                 IPauserRegistry(pauserRegistry),
                 0,
                 addressConfig.machAVSCommunityMultisig,
-                addressConfig.machAVSCommunityMultisig
+                addressConfig.machAVSCommunityMultisig,
+                addressConfig.chainId 
             )
         );
         vm.stopBroadcast();

diff --git a/contracts/src/core/MachServiceManager.sol b/contracts/src/core/MachServiceManager.sol
@@ -73,13 +73,15 @@ contract MachServiceManager is
         IPauserRegistry _pauserRegistry,
         uint256 _initialPausedStatus,
         address _initialOwner,
-        address _alertConfirmer
+        address _alertConfirmer,
+        uint256 _chainId
     ) public initializer {
         _initializePauser(_pauserRegistry, _initialPausedStatus);
         _transferOwnership(_initialOwner);
         _setAlertConfirmer(_alertConfirmer);
         allowlistEnabled = true;
         quorumThresholdPercentage = 66;
+        chainId = _chainId;
     }
 
     //////////////////////////////////////////////////////////////////////////////

diff --git a/contracts/src/core/MachServiceManagerStorage.sol b/contracts/src/core/MachServiceManagerStorage.sol
@@ -14,8 +14,6 @@ abstract contract MachServiceManagerStorage {
     // CONSTANTS
     uint256 public constant THRESHOLD_DENOMINATOR = 100;
 
-    uint256 public immutable chainId = block.chainid;
-
     EnumerableSet.Bytes32Set internal _messageHashes;
 
     /// @notice Ethereum addresses of currently register operators
@@ -33,7 +31,10 @@ abstract contract MachServiceManagerStorage {
     /// @notice Minimul quorum threshold percentage
     uint8 public quorumThresholdPercentage;
 
+    /// @notice Chain id
+    uint256 public chainId;
+
     // storage gap for upgradeability
     // slither-disable-next-line shadowing-state
-    uint256[46] private __GAP;
+    uint256[45] private __GAP;
 }