4324702352

Build Type

github

Committed by GitHub

Commit Message

<a href="https://github.com/0xProject/protocol/commit/<a class=hub.com/0xProject/protocol/commit/<a class="double-link" href="https://git"><a class=hub.com/0xProject/protocol/commit/<a class="double-link" href="https://git"><a class=hub.com/0xProject/protocol/commit/d72707dfa23e736264e5b5b64e8eaa8106b5491c">d72707dfa<a href="https://github.com/0xProject/protocol/commit/d72707dfa23e736264e5b5b64e8eaa8106b5491c">&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/0xProject/protocol/commit/&lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/0xProject/protocol/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/0xProject/protocol/commit/d72707dfa23e736264e5b5b64e8eaa8106b5491c&quot;&gt;d72707dfa&lt;/a&gt;&lt;a href=&quot;https://github.com/0xProject/protocol/commit/d72707dfa23e736264e5b5b64e8eaa8106b5491c&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/0xProject/protocol/commit/d72707dfa23e736264e5b5b64e8eaa81&lt;/a&gt;06b5491c">&quot;&gt;Merge &lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/0xProject/protocol/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/0xProject/protocol/commit/<a class="double-link" href="https://github.com/0xProject/protocol/commit/34406aaf242d3ed459b3383e70480e7195e66c49">34406aaf2</a><a href="https://github.com/0xProject/protocol/commit/d72707dfa23e736264e5b5b64e8eaa8106b5491c">&amp;quot;&amp;gt;34406aaf2&amp;lt;/a&amp;gt;&amp;quot;&amp;gt;34406aaf2&amp;lt;/a&amp;gt;&amp;lt;a href=&amp;quot;https://github.com/0xProject/protocol/commit/d72707dfa23e736264e5b5b64e8eaa8106b54&lt;/a&gt;91c&quot;&gt; into &lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/0xProject/protocol/commit/<a class="double-link" href="https://github.com/0xProject/protocol/commit/d97dab83c">d97dab83c">d97dab83c</a>

Pull Request Pull Request #641: Decentralised governance of 0x protocol and treasury

Run Details

37 of 56 branches covered (66.07%)

Branch coverage included in aggregate %.

170 of 170 new or added lines in 7 files covered. (100.0%)

156 of 170 relevant lines covered (91.76%)

17.39 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

90.0

/contracts/governance/src/ZeroExProtocolGovernor.sol

// SPDX-License-Identifier: Apache-2.0
/*

  Copyright 2023 ZeroEx Intl.

  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at

    http://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.

*/
pragma solidity ^0.8.19;

import "./ISecurityCouncil.sol";
import "./ZeroExTimelock.sol";
import "@openzeppelin/governance/Governor.sol";
import "@openzeppelin/governance/extensions/GovernorSettings.sol";
import "@openzeppelin/governance/extensions/GovernorCountingSimple.sol";
import "@openzeppelin/governance/extensions/GovernorVotes.sol";
import "@openzeppelin/governance/extensions/GovernorTimelockControl.sol";

contract ZeroExProtocolGovernor is
    ISecurityCouncil,
    Governor,
    GovernorSettings,
    GovernorCountingSimple,
    GovernorVotes,
    GovernorTimelockControl
{
    constructor(
        IVotes _token,
        ZeroExTimelock _timelock,
        address _securityCouncil
    )
        Governor("ZeroExProtocolGovernor")
        GovernorSettings(14400 /* 2 days */, 50400 /* 7 days */, 1000000e18)
        GovernorVotes(_token)
        GovernorTimelockControl(TimelockController(payable(_timelock)))
    {
        securityCouncil = _securityCouncil;
    }

    function quorum(uint256 blockNumber) public pure override returns (uint256) {
        return 10000000e18;
    }

    // The following functions are overrides required by Solidity.

    function votingDelay() public view override(IGovernor, GovernorSettings) returns (uint256) {
        return super.votingDelay();
    }

    function votingPeriod() public view override(IGovernor, GovernorSettings) returns (uint256) {
        return super.votingPeriod();
    }

    function state(uint256 proposalId) public view override(Governor, GovernorTimelockControl) returns (ProposalState) {
        return super.state(proposalId);
    }

    function propose(
        address[] memory targets,
        uint256[] memory values,
        bytes[] memory calldatas,
        string memory description
    ) public override(Governor, IGovernor) securityCouncilAssigned(calldatas) returns (uint256) {
        return super.propose(targets, values, calldatas, description);
    }

    function proposalThreshold() public view override(Governor, GovernorSettings) returns (uint256) {
        return super.proposalThreshold();
    }

    function cancel(
        address[] memory targets,
        uint256[] memory values,
        bytes[] memory calldatas,
        bytes32 descriptionHash
    ) public override onlySecurityCouncil {
        _cancel(targets, values, calldatas, descriptionHash);

        ejectSecurityCouncil();
    }

    // Like the GovernorTimelockControl.queue function but without the proposal checks,
    // (as there's effectively no proposal).
    // And also using a delay of 0 as opposed to the minimum delay of the timelock
    function executeRollback(
        address[] memory targets,
        uint256[] memory values,
        bytes[] memory calldatas,
        bytes32 descriptionHash
    ) public {
        require(msg.sender == securityCouncil, "ZeroExProtocolGovernor: Only security council allowed");

        // 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 {
        super.assignSecurityCouncil(_securityCouncil);
    }

    function queue(
        address[] memory targets,
        uint256[] memory values,
        bytes[] memory calldatas,
        bytes32 descriptionHash
    ) public override securityCouncilAssigned(calldatas) returns (uint256) {
        return super.queue(targets, values, calldatas, descriptionHash);
    }

    function _execute(
        uint256 proposalId,
        address[] memory targets,
        uint256[] memory values,
        bytes[] memory calldatas,
        bytes32 descriptionHash
    ) internal override(Governor, GovernorTimelockControl) {
        super._execute(proposalId, targets, values, calldatas, descriptionHash);
    }

    function _cancel(
        address[] memory targets,
        uint256[] memory values,
        bytes[] memory calldatas,
        bytes32 descriptionHash
    ) internal override(Governor, GovernorTimelockControl) returns (uint256) {
        return super._cancel(targets, values, calldatas, descriptionHash);
    }

    function _executor() internal view override(Governor, GovernorTimelockControl) returns (address) {
        return super._executor();
    }

    function supportsInterface(
        bytes4 interfaceId
    ) public view override(Governor, GovernorTimelockControl) returns (bool) {
        return super.supportsInterface(interfaceId);
    }
}

1	// SPDX-License-Identifier: Apache-2.0
2	/*
3
4	Copyright 2023 ZeroEx Intl.
5
6	Licensed under the Apache License, Version 2.0 (the "License");
7	you may not use this file except in compliance with the License.
8	You may obtain a copy of the License at
9
10	http://www.apache.org/licenses/LICENSE-2.0
11
12	Unless required by applicable law or agreed to in writing, software
13	distributed under the License is distributed on an "AS IS" BASIS,
14	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15	See the License for the specific language governing permissions and
16	limitations under the License.
17
18	*/
19	pragma solidity ^0.8.19;
20
21	import "./ISecurityCouncil.sol";
22	import "./ZeroExTimelock.sol";
23	import "@openzeppelin/governance/Governor.sol";
24	import "@openzeppelin/governance/extensions/GovernorSettings.sol";
25	import "@openzeppelin/governance/extensions/GovernorCountingSimple.sol";
26	import "@openzeppelin/governance/extensions/GovernorVotes.sol";
27	import "@openzeppelin/governance/extensions/GovernorTimelockControl.sol";
28
29	contract ZeroExProtocolGovernor is
30	ISecurityCouncil,
31	Governor,
32	GovernorSettings,
33	GovernorCountingSimple,
34	GovernorVotes,
35	GovernorTimelockControl
36	{
37	constructor(
38	IVotes _token,
39	ZeroExTimelock _timelock,
40	address _securityCouncil
41	)
42	Governor("ZeroExProtocolGovernor")
43	GovernorSettings(14400 /* 2 days /, 50400 / 7 days */, 1000000e18)
44	GovernorVotes(_token)
45	GovernorTimelockControl(TimelockController(payable(_timelock)))
46	{
47	securityCouncil = _securityCouncil;
48	}
49
50	function quorum(uint256 blockNumber) public pure override returns (uint256) {
51	return 10000000e18;	26✔
52	}
53
54	// The following functions are overrides required by Solidity.
55
56	function votingDelay() public view override(IGovernor, GovernorSettings) returns (uint256) {
57	return super.votingDelay();	14✔
58	}
59
60	function votingPeriod() public view override(IGovernor, GovernorSettings) returns (uint256) {
61	return super.votingPeriod();	14✔
62	}
63
64	function state(uint256 proposalId) public view override(Governor, GovernorTimelockControl) returns (ProposalState) {
65	return super.state(proposalId);	41✔
66	}
67
68	function propose(
69	address[] memory targets,
70	uint256[] memory values,
71	bytes[] memory calldatas,
72	string memory description
73	) public override(Governor, IGovernor) securityCouncilAssigned(calldatas) returns (uint256) {
74	return super.propose(targets, values, calldatas, description);	12✔
75	}
76
77	function proposalThreshold() public view override(Governor, GovernorSettings) returns (uint256) {
78	return super.proposalThreshold();	14✔
79	}
80
81	function cancel(
82	address[] memory targets,
83	uint256[] memory values,
84	bytes[] memory calldatas,
85	bytes32 descriptionHash
86	) public override onlySecurityCouncil {
87	_cancel(targets, values, calldatas, descriptionHash);	1✔
88
89	ejectSecurityCouncil();	1✔
90	}
91
92	// Like the GovernorTimelockControl.queue function but without the proposal checks,
93	// (as there's effectively no proposal).
94	// And also using a delay of 0 as opposed to the minimum delay of the timelock
95	function executeRollback(
96	address[] memory targets,
97	uint256[] memory values,
98	bytes[] memory calldatas,
99	bytes32 descriptionHash
100	) public {
101	require(msg.sender == securityCouncil, "ZeroExProtocolGovernor: Only security council allowed");	2!
102
103	// Execute the batch of rollbacks via the timelock controller
104	ZeroExTimelock timelockController = ZeroExTimelock(payable(timelock()));	2✔
105	timelockController.executeRollbackBatch(targets, values, calldatas, 0, descriptionHash);	2✔
106
107	ejectSecurityCouncil();	1✔
108	}
109
110	function assignSecurityCouncil(address _securityCouncil) public override onlyGovernance {
111	super.assignSecurityCouncil(_securityCouncil);	5✔
112	}
113
114	function queue(
115	address[] memory targets,
116	uint256[] memory values,
117	bytes[] memory calldatas,
118	bytes32 descriptionHash
119	) public override securityCouncilAssigned(calldatas) returns (uint256) {
120	return super.queue(targets, values, calldatas, descriptionHash);	11✔
121	}
122
123	function _execute(
124	uint256 proposalId,
125	address[] memory targets,
126	uint256[] memory values,
127	bytes[] memory calldatas,
128	bytes32 descriptionHash
129	) internal override(Governor, GovernorTimelockControl) {
130	super._execute(proposalId, targets, values, calldatas, descriptionHash);	10✔
131	}
132
133	function _cancel(
134	address[] memory targets,
135	uint256[] memory values,
136	bytes[] memory calldatas,
137	bytes32 descriptionHash
138	) internal override(Governor, GovernorTimelockControl) returns (uint256) {
139	return super._cancel(targets, values, calldatas, descriptionHash);	1✔
140	}
141
142	function _executor() internal view override(Governor, GovernorTimelockControl) returns (address) {
143	return super._executor();	37✔
144	}
145
146	function supportsInterface(
147	bytes4 interfaceId
148	) public view override(Governor, GovernorTimelockControl) returns (bool) {
149	return super.supportsInterface(interfaceId);	×
150	}
151	}

0xProject / protocol / 4324702352

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous