4393145321

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/51c71a90b81c5870f27d3507b55e3601617ac183">51c71a90b<a href="https://github.com/0xProject/protocol/commit/51c71a90b81c5870f27d3507b55e3601617ac183">&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/51c71a90b81c5870f27d3507b55e3601617ac183&quot;&gt;51c71a90b&lt;/a&gt;&lt;a href=&quot;https://github.com/0xProject/protocol/commit/51c71a90b81c5870f27d3507b55e3601617ac183&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/0xProject/protocol/commit/51c71a90b81c5870f27d3507b55e3601&lt;/a&gt;617ac183">&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/80066469e11a4a808ce13c1bad2f7811b42110a3">80066469e</a><a href="https://github.com/0xProject/protocol/commit/51c71a90b81c5870f27d3507b55e3601617ac183">&amp;quot;&amp;gt;80066469e&amp;lt;/a&amp;gt;&amp;quot;&amp;gt;80066469e&amp;lt;/a&amp;gt;&amp;lt;a href=&amp;quot;https://github.com/0xProject/protocol/commit/51c71a90b81c5870f27d3507b55e3601617ac&lt;/a&gt;183&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/03fc744bb">03fc744bb">03fc744bb</a>

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

Run Details

30 of 42 branches covered (71.43%)

Branch coverage included in aggregate %.

171 of 171 new or added lines in 8 files covered. (100.0%)

139 of 171 relevant lines covered (81.29%)

22.02 hits per line

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

0.0

/contracts/governance/test/BaseTest.t.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 "forge-std/Test.sol";
import "forge-std/console.sol";
import "@openzeppelin/token/ERC20/ERC20.sol";
import "@openzeppelin/proxy/ERC1967/ERC1967Proxy.sol";
import "./ZRXMock.sol";
import "../src/ZRXWrappedToken.sol";
import "../src/ZeroExVotes.sol";
import "../src/ZeroExTimelock.sol";
import "../src/ZeroExProtocolGovernor.sol";
import "../src/ZeroExTreasuryGovernor.sol";

contract BaseTest is Test {
    address payable internal account1 = payable(vm.addr(1));
    address payable internal account2 = payable(vm.addr(2));
    address payable internal account3 = payable(vm.addr(3));
    address payable internal account4 = payable(vm.addr(4));
    address payable internal securityCouncil = payable(vm.addr(5));
    uint256 internal quadraticThreshold = 500000e18;

    bytes32 internal constant DELEGATION_TYPEHASH =
        keccak256("Delegation(address delegatee,uint256 nonce,uint256 expiry)");

    constructor() {
        vm.deal(account1, 1e20);
        vm.deal(account2, 1e20);
        vm.deal(account3, 1e20);
        vm.deal(account4, 1e20);
        vm.deal(securityCouncil, 1e20);
    }

    function setupGovernance()
        internal
        returns (IERC20, ZRXWrappedToken, ZeroExVotes, ZeroExTimelock, ZeroExTimelock, address, address)
    {
        (IERC20 zrxToken, ZRXWrappedToken token, ZeroExVotes votes) = setupZRXWrappedToken();

        vm.startPrank(account1);
        address[] memory proposers = new address[](0);
        address[] memory executors = new address[](0);

        ZeroExTimelock protocolTimelock = new ZeroExTimelock(3 days, proposers, executors, account1);
        ZeroExProtocolGovernor protocolGovernor = new ZeroExProtocolGovernor(
            IVotes(address(votes)),
            protocolTimelock,
            securityCouncil
        );
        protocolTimelock.grantRole(protocolTimelock.PROPOSER_ROLE(), address(protocolGovernor));
        protocolTimelock.grantRole(protocolTimelock.EXECUTOR_ROLE(), address(protocolGovernor));
        protocolTimelock.grantRole(protocolTimelock.CANCELLER_ROLE(), address(protocolGovernor));

        ZeroExTimelock treasuryTimelock = new ZeroExTimelock(2 days, proposers, executors, account1);
        ZeroExTreasuryGovernor treasuryGovernor = new ZeroExTreasuryGovernor(
            IVotes(address(votes)),
            treasuryTimelock,
            securityCouncil
        );

        treasuryTimelock.grantRole(treasuryTimelock.PROPOSER_ROLE(), address(treasuryGovernor));
        treasuryTimelock.grantRole(treasuryTimelock.EXECUTOR_ROLE(), address(treasuryGovernor));
        treasuryTimelock.grantRole(treasuryTimelock.CANCELLER_ROLE(), address(treasuryGovernor));
        vm.stopPrank();

        return (
            zrxToken,
            token,
            votes,
            protocolTimelock,
            treasuryTimelock,
            address(protocolGovernor),
            address(treasuryGovernor)
        );
    }

    function setupZRXWrappedToken() internal returns (IERC20, ZRXWrappedToken, ZeroExVotes) {
        vm.startPrank(account1);
        bytes memory _bytecode = vm.getCode("./ZRXToken.json");
        address _address;
        assembly {
            _address := create(0, add(_bytecode, 0x20), mload(_bytecode))
        }

        IERC20 zrxToken = IERC20(address(_address));

        ZeroExVotes votes = new ZeroExVotes();
        ERC1967Proxy votesProxy = new ERC1967Proxy(address(votes), new bytes(0));
        votes = ZeroExVotes(address(votesProxy));

        ZRXWrappedToken token = new ZRXWrappedToken(zrxToken, IZeroExVotes(address(votesProxy)));
        votes.initialize(address(token), quadraticThreshold);
        vm.stopPrank();

        return (zrxToken, token, votes);
    }
}

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
20	pragma solidity ^0.8.19;
21
22	import "forge-std/Test.sol";
23	import "forge-std/console.sol";
24	import "@openzeppelin/token/ERC20/ERC20.sol";
25	import "@openzeppelin/proxy/ERC1967/ERC1967Proxy.sol";
26	import "./ZRXMock.sol";
27	import "../src/ZRXWrappedToken.sol";
28	import "../src/ZeroExVotes.sol";
29	import "../src/ZeroExTimelock.sol";
30	import "../src/ZeroExProtocolGovernor.sol";
31	import "../src/ZeroExTreasuryGovernor.sol";
32
33	contract BaseTest is Test {
34	address payable internal account1 = payable(vm.addr(1));
35	address payable internal account2 = payable(vm.addr(2));
36	address payable internal account3 = payable(vm.addr(3));
37	address payable internal account4 = payable(vm.addr(4));
38	address payable internal securityCouncil = payable(vm.addr(5));
39	uint256 internal quadraticThreshold = 500000e18;
40
41	bytes32 internal constant DELEGATION_TYPEHASH =
42	keccak256("Delegation(address delegatee,uint256 nonce,uint256 expiry)");
43
44	constructor() {
45	vm.deal(account1, 1e20);
46	vm.deal(account2, 1e20);
47	vm.deal(account3, 1e20);
48	vm.deal(account4, 1e20);
49	vm.deal(securityCouncil, 1e20);
50	}
51
52	function setupGovernance()
53	internal
54	returns (IERC20, ZRXWrappedToken, ZeroExVotes, ZeroExTimelock, ZeroExTimelock, address, address)
55	{
56	(IERC20 zrxToken, ZRXWrappedToken token, ZeroExVotes votes) = setupZRXWrappedToken();	×
57
58	vm.startPrank(account1);	×
59	address[] memory proposers = new address[](0);	×
60	address[] memory executors = new address[](0);	×
61
62	ZeroExTimelock protocolTimelock = new ZeroExTimelock(3 days, proposers, executors, account1);	×
63	ZeroExProtocolGovernor protocolGovernor = new ZeroExProtocolGovernor(	×
64	IVotes(address(votes)),
65	protocolTimelock,
66	securityCouncil
67	);
68	protocolTimelock.grantRole(protocolTimelock.PROPOSER_ROLE(), address(protocolGovernor));	×
69	protocolTimelock.grantRole(protocolTimelock.EXECUTOR_ROLE(), address(protocolGovernor));	×
70	protocolTimelock.grantRole(protocolTimelock.CANCELLER_ROLE(), address(protocolGovernor));	×
71
72	ZeroExTimelock treasuryTimelock = new ZeroExTimelock(2 days, proposers, executors, account1);	×
73	ZeroExTreasuryGovernor treasuryGovernor = new ZeroExTreasuryGovernor(	×
74	IVotes(address(votes)),
75	treasuryTimelock,
76	securityCouncil
77	);
78
79	treasuryTimelock.grantRole(treasuryTimelock.PROPOSER_ROLE(), address(treasuryGovernor));	×
80	treasuryTimelock.grantRole(treasuryTimelock.EXECUTOR_ROLE(), address(treasuryGovernor));	×
81	treasuryTimelock.grantRole(treasuryTimelock.CANCELLER_ROLE(), address(treasuryGovernor));	×
82	vm.stopPrank();	×
83
84	return (	×
85	zrxToken,
86	token,
87	votes,
88	protocolTimelock,
89	treasuryTimelock,
90	address(protocolGovernor),
91	address(treasuryGovernor)
92	);
93	}
94
95	function setupZRXWrappedToken() internal returns (IERC20, ZRXWrappedToken, ZeroExVotes) {
96	vm.startPrank(account1);	×
97	bytes memory _bytecode = vm.getCode("./ZRXToken.json");	×
98	address _address;	×
99	assembly {
100	_address := create(0, add(_bytecode, 0x20), mload(_bytecode))	×
101	}
102
103	IERC20 zrxToken = IERC20(address(_address));	×
104
105	ZeroExVotes votes = new ZeroExVotes();	×
106	ERC1967Proxy votesProxy = new ERC1967Proxy(address(votes), new bytes(0));	×
107	votes = ZeroExVotes(address(votesProxy));	×
108
109	ZRXWrappedToken token = new ZRXWrappedToken(zrxToken, IZeroExVotes(address(votesProxy)));	×
110	votes.initialize(address(token), quadraticThreshold);	×
111	vm.stopPrank();	×
112
113	return (zrxToken, token, votes);	×
114	}
115	}

0xProject / protocol / 4393145321

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