diff --git a/contracts/governance/src/ZeroExProtocolGovernor.sol b/contracts/governance/src/ZeroExProtocolGovernor.sol index fa4edaf9cf..815395085a 100644 --- a/contracts/governance/src/ZeroExProtocolGovernor.sol +++ b/contracts/governance/src/ZeroExProtocolGovernor.sol @@ -85,8 +85,6 @@ contract ZeroExProtocolGovernor is bytes32 descriptionHash ) public override onlySecurityCouncil { _cancel(targets, values, calldatas, descriptionHash); - - ejectSecurityCouncil(); } // Like the GovernorTimelockControl.queue function but without the proposal checks, @@ -103,8 +101,6 @@ contract ZeroExProtocolGovernor is // Execute the batch of rollbacks via the timelock controller ZeroExTimelock timelockController = ZeroExTimelock(payable(timelock())); timelockController.executeRollbackBatch(targets, values, calldatas, 0, descriptionHash); - - ejectSecurityCouncil(); } function assignSecurityCouncil(address _securityCouncil) public override onlyGovernance { diff --git a/contracts/governance/src/ZeroExTreasuryGovernor.sol b/contracts/governance/src/ZeroExTreasuryGovernor.sol index 3202796f7c..7e56ea12f7 100644 --- a/contracts/governance/src/ZeroExTreasuryGovernor.sol +++ b/contracts/governance/src/ZeroExTreasuryGovernor.sol @@ -108,8 +108,6 @@ contract ZeroExTreasuryGovernor is bytes32 descriptionHash ) public override onlySecurityCouncil { _cancel(targets, values, calldatas, descriptionHash); - - ejectSecurityCouncil(); } function assignSecurityCouncil(address _securityCouncil) public override onlyGovernance { diff --git a/contracts/governance/test/ZeroExGovernorBaseTest.t.sol b/contracts/governance/test/ZeroExGovernorBaseTest.t.sol index d97b8c5293..2681f1d921 100644 --- a/contracts/governance/test/ZeroExGovernorBaseTest.t.sol +++ b/contracts/governance/test/ZeroExGovernorBaseTest.t.sol @@ -177,7 +177,9 @@ abstract contract ZeroExGovernorBaseTest is BaseTest { governor.assignSecurityCouncil(account1); } - function testSecurityCouncilAreEjectedAfterCancellingAProposal() public { + // This functionality is currently not enabled + // Leaving this test for potential future use. + function SecurityCouncilAreEjectedAfterCancellingAProposal() public { // Create a proposal address[] memory targets = new address[](1); targets[0] = address(callReceiverMock); diff --git a/contracts/governance/test/ZeroExProtocolGovernor.t.sol b/contracts/governance/test/ZeroExProtocolGovernor.t.sol index 6a863e6a4a..e6c34bcad1 100644 --- a/contracts/governance/test/ZeroExProtocolGovernor.t.sol +++ b/contracts/governance/test/ZeroExProtocolGovernor.t.sol @@ -123,8 +123,11 @@ contract ZeroExProtocolGovernorTest is ZeroExGovernorBaseTest { vm.expectEmit(true, true, true, true); emit CallExecuted(proposalId, 0, targets[0], values[0], calldatas[0]); - vm.expectEmit(true, false, false, false); - emit SecurityCouncilEjected(); + // This functionality is currently not enabled + // Leaving this test for potential future use. + // vm.expectEmit(true, false, false, false); + // emit SecurityCouncilEjected(); + protocolGovernor.executeRollback(targets, values, calldatas, keccak256(bytes("Emergency rollback"))); }