feat: potential changes to the sc election

Makefile

@@ -11,7 +11,7 @@ coverage                :; forge coverage
 gas                     :; forge test --gas-report
 gas-check               :; forge snapshot --check --tolerance 1
 snapshot                :; forge snapshot
-test-unit               :; forge test -vvv
+test-unit               :; ARB_RPC_URL=https://arb1.arbitrum.io/rpc forge test -vvv
 clean                   :; forge clean
 fmt                     :; forge fmt
 gen-network             :; yarn gen:network

files/mainnet/deployedContracts.json

@@ -31,6 +31,6 @@
     "l1ProxyAdmin": "0x5613AF0474EB9c528A34701A5b1662E3C8FA0678",
     "l1Timelock": "0xE6841D92B0C345144506576eC13ECf5103aC7f49",
     "l1AddressRegistry": "0xd514C2b3aaBDBfa10800B9C96dc1eB25427520A0",
-    "l2AddressRegistry":"0x56C4E9Eb6c63aCDD19AeC2b1a00e4f0d7aBda9d3",
+    "l2AddressRegistry":"0x1dFA102bc097446bb2B836082367991dE24A1c64",
     "novaL1AddressRegistry":"0x2F06643fc2CC18585Ae790b546388F0DE4Ec6635"
   }

foundry.toml

@@ -9,7 +9,7 @@ via_ir = false
 solc_version = '0.8.16'
 
 [profile.sec_council_mgmt]
-optimizer_runs = 750
+optimizer_runs = 200
 
 [fmt]
 number_underscore = 'thousands'

hardhat.config.ts

@@ -19,7 +19,7 @@ const solidityProfiles = {
     settings: {
       optimizer: {
         enabled: true,
-        runs: 750
+        runs: 200
       },
     }
   }

scripts/proposals/sec-council-rotate/data.json

@@ -0,0 +1,12 @@
+{
+  "actionChainIds": [
+    42161
+  ],
+  "actionAddresses": [
+    "0x86E93E21AD108CaE7ADe482C34C230Bfd94D4A8B"
+  ],
+  "arbSysSendTxToL1Args": {
+    "l1Timelock": "0xE6841D92B0C345144506576eC13ECf5103aC7f49",
+    "calldata": "0x8f2a0bb000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000000008e40c6e3e3ea77546fc470efab6a7eb5b3896023b6a7c80fd8a11ea1920a2710000000000000000000000000000000000000000000000000000000000003f4800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000a723c008e76e379c55599d2e4d93879beafda79c000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001800000000000000000000000004dbd4fc535ac27206064b68ffcf827b0a60bab3f000000000000000000000000cf57572261c7c2bcf21ffd220ea7d1a27d40a82700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000841cff79cd00000000000000000000000086e93e21ad108cae7ade482c34c230bfd94d4a8b00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000004b147f40c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+  }
+}

scripts/proposals/sec-council-rotate/generate.bash

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+yarn gen:proposalData \
+    --govChainProviderRPC https://arb1.arbitrum.io/rpc \
+    --actionChainIds 42161 \
+    --actionAddresses \
+        0x86E93E21AD108CaE7ADe482C34C230Bfd94D4A8B \
+    --writeToJsonPath ./scripts/proposals/sec-council-rotate/data.json

scripts/proposals/sec-council-upgrade-rotation/data.json

@@ -0,0 +1,12 @@
+{
+  "actionChainIds": [
+    42161
+  ],
+  "actionAddresses": [
+    "0xeF98Fc7A7F08De47Ed01f3F11f07319c22106445"
+  ],
+  "arbSysSendTxToL1Args": {
+    "l1Timelock": "0xE6841D92B0C345144506576eC13ECf5103aC7f49",
+    "calldata": "0x8f2a0bb000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000000d078d01ffb5a3a5eac98137cbe898b2f21c1114069936d04a90b74ee9806e3f5000000000000000000000000000000000000000000000000000000000003f4800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000a723c008e76e379c55599d2e4d93879beafda79c000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001800000000000000000000000004dbd4fc535ac27206064b68ffcf827b0a60bab3f000000000000000000000000cf57572261c7c2bcf21ffd220ea7d1a27d40a82700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000841cff79cd000000000000000000000000ef98fc7a7f08de47ed01f3f11f07319c2210644500000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000004b147f40c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+  }
+}

src/gov-action-contracts/AIPs/AIPNovaFeeRoutingAction.sol

@@ -58,7 +58,9 @@ contract AIPNovaFeeRoutingAction {
         // upgrade executor should have at least 3 * fullWeight ETH to fund the distributors
         // we need each of the reward distributors to have at least fullWeight in balance
         // otherwise we may get NoFundsToDistribute() errors
-        require(address(this).balance >= 3 * fullWeight, "AIPNovaFeeRoutingAction: insufficient balance");
+        require(
+            address(this).balance >= 3 * fullWeight, "AIPNovaFeeRoutingAction: insufficient balance"
+        );
         _fundDistributor(novaL1SurplusFeeDistr);
         _fundDistributor(novaL2SurplusFeeDistr);
         _fundDistributor(novaL2BaseFeeDistr);
@@ -134,7 +136,7 @@ contract AIPNovaFeeRoutingAction {
     }
 
     function _fundDistributor(address recipient) internal {
-        (bool b, ) = recipient.call{value: fullWeight}("");
+        (bool b,) = recipient.call{value: fullWeight}("");
         require(b, "AIPNovaFeeRoutingAction: funding failed");
     }
 }

src/gov-action-contracts/AIPs/SecurityCouncilMgmt/SecurityCouncilUpgradeAction.sol

@@ -0,0 +1,111 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity 0.8.16;
+
+import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
+import "../../address-registries/L2AddressRegistryInterfaces.sol";
+import "@openzeppelin/contracts-upgradeable/access/IAccessControlUpgradeable.sol";
+import
+    "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesQuorumFractionUpgradeable.sol";
+import "../../../security-council-mgmt/governors/SecurityCouncilNomineeElectionGovernor.sol";
+
+/// @notice Perform the following upgrade proposed by the Arbitrum Foundation:
+/// - Upgrade the sec council manager to allow member rotation and sets min rotation vars
+/// - Upgrade the sec council nominee election governor to allow modifying the cadence of election
+/// - Adjusting the qualification threshold of the Member Election phase from 0.2% to 0.1%
+/// - Updating the ArbitrumDAO Constitution to reflect these changes
+contract SecurityCouncilUpgradeAction {
+    IL2AddressRegistry public immutable l2AddressRegistry;
+    address public immutable secCouncilManagerImpl;
+    address public immutable scNomineeElectionGovernorImpl;
+    uint256 public immutable minRotationPeriod;
+    address public immutable minRotationPeriodSetter;
+    uint256 public immutable cadenceInMonths;
+    bytes32 public immutable newConstitutionHash;
+
+    constructor(
+        IL2AddressRegistry _l2AddressRegistry,
+        address _secCouncilManagerImpl,
+        address _scNomineeElectionGovernorImpl,
+        uint256 _minRotationPeriod,
+        address _minRotationPeriodSetter,
+        uint256 _cadenceInMonths,
+        bytes32 _newConstitutionHash
+    ) {
+        l2AddressRegistry = _l2AddressRegistry;
+        secCouncilManagerImpl = _secCouncilManagerImpl;
+        scNomineeElectionGovernorImpl = _scNomineeElectionGovernorImpl;
+        minRotationPeriod = _minRotationPeriod;
+        minRotationPeriodSetter = _minRotationPeriodSetter;
+        cadenceInMonths = _cadenceInMonths;
+        newConstitutionHash = _newConstitutionHash;
+    }
+
+    function perform() external {
+        SecurityCouncilNomineeElectionGovernor scNomineeElectionGovernor =
+        SecurityCouncilNomineeElectionGovernor(
+            payable(address(l2AddressRegistry.scNomineeElectionGovernor()))
+        );
+        require(
+            scNomineeElectionGovernor.electionCount() == 6,
+            "SecurityCouncilUpgradeAction: not expected timing"
+        );
+
+        // Upgrade the sec council manager to allow member rotation and sets min rotation vars
+        ISecurityCouncilManager secCouncilManager = l2AddressRegistry.securityCouncilManager();
+        l2AddressRegistry.govProxyAdmin().upgradeAndCall(
+            TransparentUpgradeableProxy(payable(address(secCouncilManager))),
+            secCouncilManagerImpl,
+            abi.encodeCall(
+                ISecurityCouncilManager(secCouncilManagerImpl).postUpgradeInit,
+                (minRotationPeriod, minRotationPeriodSetter)
+            )
+        );
+        require(
+            minRotationPeriod == secCouncilManager.minRotationPeriod(),
+            "SecurityCouncilUpgradeAction: Min rotation period not set"
+        );
+        require(
+            IAccessControlUpgradeable(address(secCouncilManager)).hasRole(
+                secCouncilManager.MIN_ROTATION_PERIOD_SETTER_ROLE(), minRotationPeriodSetter
+            ),
+            "SecurityCouncilUpgradeAction: Min rotation period setter not set"
+        );
+
+        // Upgrade the sec council nominee election governor to allow modifying the cadence of election
+        l2AddressRegistry.govProxyAdmin().upgradeAndCall(
+            TransparentUpgradeableProxy(payable(address(scNomineeElectionGovernor))),
+            scNomineeElectionGovernorImpl,
+            abi.encodeCall(scNomineeElectionGovernor.postUpgradeInit, ())
+        );
+
+        scNomineeElectionGovernor.relay(
+            address(scNomineeElectionGovernor),
+            0,
+            abi.encodeCall(scNomineeElectionGovernor.setCadence, (cadenceInMonths))
+        );
+        require(
+            scNomineeElectionGovernor.cadenceInMonths() == cadenceInMonths,
+            "SecurityCouncilUpgradeAction: Cadence not set"
+        );
+
+        // Adjusting the qualification threshold of the Member Election phase from 0.2% to 0.1%
+        scNomineeElectionGovernor.relay(
+            address(scNomineeElectionGovernor),
+            0,
+            abi.encodeCall(scNomineeElectionGovernor.updateQuorumNumerator, (10))
+        );
+        require(
+            scNomineeElectionGovernor.quorumNumerator() == 10,
+            "SecurityCouncilUpgradeAction: Quorum numerator not set"
+        );
+
+        // Updating the ArbitrumDAO Constitution to reflect these changes
+        IArbitrumDAOConstitution arbitrumDaoConstitution =
+            l2AddressRegistry.arbitrumDAOConstitution();
+        arbitrumDaoConstitution.setConstitutionHash(newConstitutionHash);
+        require(
+            arbitrumDaoConstitution.constitutionHash() == newConstitutionHash,
+            "SecurityCouncilUpgradeAction: new constitution hash not set"
+        );
+    }
+}

src/gov-action-contracts/address-registries/L2AddressRegistry.sol

@@ -1,19 +1,24 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity 0.8.16;
 
+import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
 import "./L2AddressRegistryInterfaces.sol";
 
 contract L2AddressRegistry is IL2AddressRegistry {
     IL2ArbitrumGoverner public immutable coreGov;
     IL2ArbitrumGoverner public immutable treasuryGov;
     IFixedDelegateErc20Wallet public immutable treasuryWallet;
     IArbitrumDAOConstitution public immutable arbitrumDAOConstitution;
+    ProxyAdmin public immutable govProxyAdmin;
+    ISecurityCouncilNomineeElectionGovernor public immutable scNomineeElectionGovernor;
 
     constructor(
         IL2ArbitrumGoverner _coreGov,
         IL2ArbitrumGoverner _treasuryGov,
         IFixedDelegateErc20Wallet _treasuryWallet,
-        IArbitrumDAOConstitution _arbitrumDAOConstitution
+        IArbitrumDAOConstitution _arbitrumDAOConstitution,
+        ProxyAdmin _govProxyAdmin,
+        ISecurityCouncilNomineeElectionGovernor _scNomineeElectionGovernor
     ) {
         require(
             _treasuryWallet.owner() == _treasuryGov.timelock(),
@@ -27,6 +32,13 @@ contract L2AddressRegistry is IL2AddressRegistry {
         treasuryGov = _treasuryGov;
         treasuryWallet = _treasuryWallet;
         arbitrumDAOConstitution = _arbitrumDAOConstitution;
+        require(
+            _govProxyAdmin.getProxyAdmin(TransparentUpgradeableProxy(payable(address(_coreGov))))
+                == address(_govProxyAdmin),
+            "GovProxyAdmin must be proxy admin of the core governor"
+        );
+        govProxyAdmin = _govProxyAdmin;
+        scNomineeElectionGovernor = _scNomineeElectionGovernor;
     }
 
     function coreGovTimelock() external view returns (IArbitrumTimelock) {
@@ -40,4 +52,16 @@ contract L2AddressRegistry is IL2AddressRegistry {
     function l2ArbitrumToken() external view returns (IL2ArbitrumToken) {
         return IL2ArbitrumGoverner(address(coreGov)).token();
     }
+
+    function scMemberElectionGovernor()
+        external
+        view
+        returns (ISecurityCouncilMemberElectionGovernor)
+    {
+        return scNomineeElectionGovernor.securityCouncilMemberElectionGovernor();
+    }
+
+    function securityCouncilManager() external view returns (ISecurityCouncilManager) {
+        return scNomineeElectionGovernor.securityCouncilManager();
+    }
 }

src/gov-action-contracts/address-registries/L2AddressRegistryInterfaces.sol

@@ -2,11 +2,15 @@
 pragma solidity 0.8.16;
 
 import "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
+import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
 import "../../interfaces/IArbitrumTimelock.sol";
 import "../../interfaces/IFixedDelegateErc20Wallet.sol";
 import "../../interfaces/IL2ArbitrumToken.sol";
 import "../../interfaces/IL2ArbitrumGovernor.sol";
 import "../../interfaces/IArbitrumDAOConstitution.sol";
+import "../../security-council-mgmt/interfaces/ISecurityCouncilManager.sol";
+import "../../security-council-mgmt/interfaces/ISecurityCouncilNomineeElectionGovernor.sol";
+import "../../security-council-mgmt/interfaces/ISecurityCouncilMemberElectionGovernor.sol";
 
 interface ICoreGovTimelockGetter {
     function coreGovTimelock() external view returns (IArbitrumTimelock);
@@ -36,12 +40,30 @@ interface IArbitrumDAOConstitutionGetter {
     function arbitrumDAOConstitution() external view returns (IArbitrumDAOConstitution);
 }
 
+interface IGovProxyAdminGetter {
+    function govProxyAdmin() external view returns (ProxyAdmin);
+}
+
+interface ISecurityCouncilGetters {
+    function securityCouncilManager() external view returns (ISecurityCouncilManager);
+    function scNomineeElectionGovernor()
+        external
+        view
+        returns (ISecurityCouncilNomineeElectionGovernor);
+    function scMemberElectionGovernor()
+        external
+        view
+        returns (ISecurityCouncilMemberElectionGovernor);
+}
+
 interface IL2AddressRegistry is
     ICoreGovGetter,
     ICoreGovTimelockGetter,
     ITreasuryGovTimelockGetter,
     IDaoTreasuryGetter,
     ITreasuryGovGetter,
     IL2ArbitrumTokenGetter,
-    IArbitrumDAOConstitutionGetter
+    IArbitrumDAOConstitutionGetter,
+    IGovProxyAdminGetter,
+    ISecurityCouncilGetters
 {}

src/gov-action-contracts/governance/CancelTimelockAndRemoveMemberAction.sol

@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity 0.8.16;
+
+import "../address-registries/L2AddressRegistry.sol";
+import "./CancelTimelockOperation.sol";
+
+contract CancelTimelockAndRemoveMemberAction {
+    IL2AddressRegistry public immutable l2AddressRegistry;
+
+    constructor(IL2AddressRegistry _l2AddressRegistry) {
+        l2AddressRegistry = _l2AddressRegistry;
+    }
+
+    function perform(address memberToRemove, bytes32 operationId) public {
+        // first remove the council member
+        ISecurityCouncilManager scm = l2AddressRegistry.securityCouncilManager();
+        IAccessControlUpgradeable(address(scm)).grantRole(scm.MEMBER_REMOVER_ROLE(), address(this));
+        scm.removeMember(memberToRemove);
+        IAccessControlUpgradeable(address(scm)).revokeRole(scm.MEMBER_REMOVER_ROLE(), address(this));
+
+        // then cancel the rotation operation in the timelock
+        CancelTimelockOperation.cancel(l2AddressRegistry.coreGov(), operationId);
+    }
+}

src/interfaces/IArbitrumTimelock.sol

@@ -13,4 +13,5 @@ interface IArbitrumTimelock {
     ) external;
     function getMinDelay() external view returns (uint256 duration);
     function updateDelay(uint256 newDelay) external;
+    function isOperation(bytes32 id) external view returns (bool registered);
 }