diff --git a/Makefile b/Makefile index 77bfacf1..ecd35100 100644 --- a/Makefile +++ b/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 diff --git a/src/gov-action-contracts/AIPs/SecurityCouncilMgmt/RotateMembersUpgradeAction.sol b/src/gov-action-contracts/AIPs/SecurityCouncilMgmt/RotateMembersUpgradeAction.sol index 2f057107..2132f1db 100644 --- a/src/gov-action-contracts/AIPs/SecurityCouncilMgmt/RotateMembersUpgradeAction.sol +++ b/src/gov-action-contracts/AIPs/SecurityCouncilMgmt/RotateMembersUpgradeAction.sol @@ -11,9 +11,7 @@ contract RotateMembersUpgradeAction { address public immutable secCouncilManagerImpl; uint256 public immutable minRotationPeriod; address public immutable minRotationPeriodSetter; - // CHRIS: TODO: set the dao constitution hash here - bytes32 public immutable daoConstitutionHash = keccak256("testy"); - + constructor(IL2AddressRegistry _l2AddressRegistry, address _secCouncilManagerImpl, uint256 _minRotationPeriod, address _minRotationPeriodSetter) { l2AddressRegistry = _l2AddressRegistry; secCouncilManagerImpl = _secCouncilManagerImpl; @@ -31,12 +29,5 @@ contract RotateMembersUpgradeAction { require(minRotationPeriod == secCouncilManager.minRotationPeriod(), "RotateMembersUpgradeAction: Min rotation period not set"); require(IAccessControlUpgradeable(address(secCouncilManager)).hasRole(secCouncilManager.MIN_ROTATION_PERIOD_SETTER_ROLE(), minRotationPeriodSetter), "RotateMembersUpgradeAction: Min rotation period setter not set"); - - IArbitrumDAOConstitution arbitrumDaoConstitution = l2AddressRegistry.arbitrumDAOConstitution(); - arbitrumDaoConstitution.setConstitutionHash(daoConstitutionHash); - require( - arbitrumDaoConstitution.constitutionHash() == daoConstitutionHash, - "RotateMembersUpgradeAction: new constitution hash not set" - ); } } \ No newline at end of file diff --git a/test/gov-actions/RotateMembersUpgradeAction.t.sol b/test/gov-actions/RotateMembersUpgradeAction.t.sol index 84fc4271..b63d7c83 100644 --- a/test/gov-actions/RotateMembersUpgradeAction.t.sol +++ b/test/gov-actions/RotateMembersUpgradeAction.t.sol @@ -15,7 +15,6 @@ contract RotateMembersUpgradeActionTest is Test { UpgradeExecutor arbOneUe = UpgradeExecutor(0xCF57572261c7c2BCF21ffD220ea7d1a27D40A827); IArbitrumDAOConstitution constitution = IArbitrumDAOConstitution(0x1D62fFeB72e4c360CcBbacf7c965153b00260417); - bytes32 newConstitutionHash = keccak256("testy"); function setUp() public { string memory arbRpc = vm.envOr("ARB_RPC_URL", string("")); @@ -65,7 +64,6 @@ contract RotateMembersUpgradeActionTest is Test { "Min rotation period setter not set" ); assertEq(_getImplementation(), newImplementation, "implementation not set"); - assertEq(constitution.constitutionHash(), newConstitutionHash, "constitution hash not set"); } function _getImplementation() internal view returns (address) {