4084712771

Build Type

github

Committed by GitHub

Commit Message

<a href="https://github.com/0xProject/protocol/commit/<a class=hub.com/0xProject/protocol/commit/e5de14a811aa81735bf3c00265b97c2dacef471c">e5de14a81<a href="https://github.com/0xProject/protocol/commit/e5de14a811aa81735bf3c00265b97c2dacef471c">">Merge </a><a class="double-link" href="https://github.com/0xProject/protocol/commit/<a class="double-link" href="https://github.com/0xProject/protocol/commit/40072d9cee9c8a970a0eb00b3feebe30ff1a9977">40072d9ce</a>">40072d9ce</a><a href="https://github.com/0xProject/protocol/commit/e5de14a811aa81735bf3c00265b97c2dacef471c"> into a472125c6">a472125c6</a>

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

Run Details

10 of 24 branches covered (41.67%)

Branch coverage included in aggregate %.

84 of 84 new or added lines in 4 files covered. (100.0%)

54 of 84 relevant lines covered (64.29%)

2.99 hits per line

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

61.54

/contracts/governance/src/ZRXWrappedToken.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.17;

import "@openzeppelin/token/ERC20/ERC20.sol";
import "@openzeppelin/token/ERC20/extensions/draft-ERC20Permit.sol";
import "@openzeppelin/token/ERC20/extensions/ERC20Wrapper.sol";
import "@openzeppelin/governance/utils/IVotes.sol";
import "./IZeroExVotes.sol";

contract ZRXWrappedToken is ERC20, ERC20Permit, ERC20Wrapper {
    constructor(
        IERC20 wrappedToken,
        IZeroExVotes _zeroExVotes
    ) ERC20("Wrapped ZRX", "wZRX") ERC20Permit("Wrapped ZRX") ERC20Wrapper(wrappedToken) {
        zeroExVotes = _zeroExVotes;
    }

    IZeroExVotes public zeroExVotes;
    mapping(address => address) private _delegates;

    bytes32 private constant _DELEGATION_TYPEHASH =
        keccak256("Delegation(address delegatee,uint256 nonce,uint256 expiry)");

    /**
     * @dev Emitted when an account changes their delegate.
     */
    event DelegateChanged(address indexed delegator, address indexed fromDelegate, address indexed toDelegate);

    // The functions below are the required overrides from the base contracts

    function decimals() public view override(ERC20, ERC20Wrapper) returns (uint8) {
        super.decimals();
    }

    function _afterTokenTransfer(address from, address to, uint256 amount) internal override(ERC20) {
        super._afterTokenTransfer(from, to, amount);

        // Move voting power when tokens are transferred.
        zeroExVotes.moveVotingPower(delegates(from), delegates(to), amount);
    }

    /**
     * @dev Maximum token supply. Defaults to `type(uint224).max` (2^224^ - 1).
     */
    function _maxSupply() internal view virtual returns (uint224) {
        return type(uint224).max;
    }

    function _mint(address to, uint256 amount) internal override(ERC20) {
        super._mint(to, amount);

        // Snapshots the totalSupply after it has been increased.
        require(totalSupply() <= _maxSupply(), "ERC20Votes: total supply risks overflowing votes");

        zeroExVotes.writeCheckpointAddTotalSupply(amount);
    }

    function _burn(address account, uint256 amount) internal override(ERC20) {
        super._burn(account, amount);

        // Snapshots the totalSupply after it has been decreased.
        zeroExVotes.writeCheckpointSubTotalSupply(amount);
    }

    /**
     * @dev Get the address `account` is currently delegating to.
     */
    function delegates(address account) public view returns (address) {
        return _delegates[account];
    }

    /**
     * @dev Delegate votes from the sender to `delegatee`.
     */
    function delegate(address delegatee) public {
        _delegate(_msgSender(), delegatee);
    }

    /**
     * @dev Delegates votes from signer to `delegatee`
     */
    function delegateBySig(address delegatee, uint256 nonce, uint256 expiry, uint8 v, bytes32 r, bytes32 s) public {
        require(block.timestamp <= expiry, "ERC20Votes: signature expired");
        address signer = ECDSA.recover(
            _hashTypedDataV4(keccak256(abi.encode(_DELEGATION_TYPEHASH, delegatee, nonce, expiry))),
            v,
            r,
            s
        );
        require(nonce == _useNonce(signer), "ERC20Votes: invalid nonce");
        _delegate(signer, delegatee);
    }

    /**
     * @dev Change delegation for `delegator` to `delegatee`.
     *
     * Emits events {DelegateChanged} and {IZeroExVotes-DelegateVotesChanged}.
     */
    function _delegate(address delegator, address delegatee) internal virtual {
        address currentDelegate = delegates(delegator);
        uint256 delegatorBalance = balanceOf(delegator);
        _delegates[delegator] = delegatee;

        emit DelegateChanged(delegator, currentDelegate, delegatee);

        zeroExVotes.moveVotingPower(currentDelegate, delegatee, delegatorBalance);
    }
}

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.17;
20
21	import "@openzeppelin/token/ERC20/ERC20.sol";
22	import "@openzeppelin/token/ERC20/extensions/draft-ERC20Permit.sol";
23	import "@openzeppelin/token/ERC20/extensions/ERC20Wrapper.sol";
24	import "@openzeppelin/governance/utils/IVotes.sol";
25	import "./IZeroExVotes.sol";
26
27	contract ZRXWrappedToken is ERC20, ERC20Permit, ERC20Wrapper {
28	constructor(
29	IERC20 wrappedToken,
30	IZeroExVotes _zeroExVotes
31	) ERC20("Wrapped ZRX", "wZRX") ERC20Permit("Wrapped ZRX") ERC20Wrapper(wrappedToken) {
32	zeroExVotes = _zeroExVotes;
33	}
34
35	IZeroExVotes public zeroExVotes;
36	mapping(address => address) private _delegates;
37
38	bytes32 private constant _DELEGATION_TYPEHASH =
39	keccak256("Delegation(address delegatee,uint256 nonce,uint256 expiry)");
40
41	/**
42	* @dev Emitted when an account changes their delegate.
43	*/
44	event DelegateChanged(address indexed delegator, address indexed fromDelegate, address indexed toDelegate);
45
46	// The functions below are the required overrides from the base contracts
47
48	function decimals() public view override(ERC20, ERC20Wrapper) returns (uint8) {
49	super.decimals();	×
50	}
51
52	function _afterTokenTransfer(address from, address to, uint256 amount) internal override(ERC20) {
53	super._afterTokenTransfer(from, to, amount);	7✔
54
55	// Move voting power when tokens are transferred.
56	zeroExVotes.moveVotingPower(delegates(from), delegates(to), amount);	7✔
57	}
58
59	/**
60	* @dev Maximum token supply. Defaults to `type(uint224).max` (2^224^ - 1).
61	*/
62	function _maxSupply() internal view virtual returns (uint224) {
63	return type(uint224).max;	5✔
64	}
65
66	function _mint(address to, uint256 amount) internal override(ERC20) {
67	super._mint(to, amount);	5✔
68
69	// Snapshots the totalSupply after it has been increased.
70	require(totalSupply() <= _maxSupply(), "ERC20Votes: total supply risks overflowing votes");	5!
71
72	zeroExVotes.writeCheckpointAddTotalSupply(amount);	5✔
73	}
74
75	function _burn(address account, uint256 amount) internal override(ERC20) {
76	super._burn(account, amount);	2✔
77
78	// Snapshots the totalSupply after it has been decreased.
79	zeroExVotes.writeCheckpointSubTotalSupply(amount);	2✔
80	}
81
82	/**
83	* @dev Get the address `account` is currently delegating to.
84	*/
85	function delegates(address account) public view returns (address) {
86	return _delegates[account];	16✔
87	}
88
89	/**
90	* @dev Delegate votes from the sender to `delegatee`.
91	*/
92	function delegate(address delegatee) public {
93	_delegate(_msgSender(), delegatee);	2✔
94	}
95
96	/**
97	* @dev Delegates votes from signer to `delegatee`
98	*/
99	function delegateBySig(address delegatee, uint256 nonce, uint256 expiry, uint8 v, bytes32 r, bytes32 s) public {
100	require(block.timestamp <= expiry, "ERC20Votes: signature expired");	×
101	address signer = ECDSA.recover(	×
102	_hashTypedDataV4(keccak256(abi.encode(_DELEGATION_TYPEHASH, delegatee, nonce, expiry))),
103	v,
104	r,
105	s
106	);
107	require(nonce == _useNonce(signer), "ERC20Votes: invalid nonce");	×
108	_delegate(signer, delegatee);	×
109	}
110
111	/**
112	* @dev Change delegation for `delegator` to `delegatee`.
113	*
114	* Emits events {DelegateChanged} and {IZeroExVotes-DelegateVotesChanged}.
115	*/
116	function _delegate(address delegator, address delegatee) internal virtual {
117	address currentDelegate = delegates(delegator);	2✔
118	uint256 delegatorBalance = balanceOf(delegator);	2✔
119	_delegates[delegator] = delegatee;	2✔
120
121	emit DelegateChanged(delegator, currentDelegate, delegatee);	2✔
122
123	zeroExVotes.moveVotingPower(currentDelegate, delegatee, delegatorBalance);	2✔
124	}
125	}

0xProject / protocol / 4084712771

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