* Install open zeppelin contracts * Init foundry in governance * Add wrapped ZRX token * Add governance contracts testing to CI * Set optimizer runs to default * Upgrade to patched version of openzeppelin/contracts * Test stakingakng / unwrapping ZRX * Init npm package * Lint fix, removing lib from gitignore * Add openzeppelin contracts git submodule for foundry * Add vanilla governor contract * Fix reference paths to imported packages * Temporarily switch to using a mocked version of ZRX * Ignore foundry's lib in link checker * Fix a conflict in gitignore between forge lib adn built lib * Upload governance code coverage report to coveralls * Flesh out test scenarios for wrapping/unwrapping * Add basic ERC20 name and symbol tests * Wire in basic timelock controller and governor test setup * Test basic governor properties * Add basic voting power delegation tests * Add proposal execution happy path test * Split ERC20Votes logic between wrapped token and ZeroExVotes contracts * Exclude BaseTest from coverage in coveralls * Add protocol specific governor with produciton governance settings * Add a dedicated instance for the treasury governor This is currently using the default 1 token 1 vote mechanism but will be migrated * Add test for updating governance settings for voting delay, voting period and proposal threshold * Create seperate timelock contract instance for treasury and protocol * Test updating the timlock min delay * Set timelock delay to 2 days for protocol and 1 sec for treasury * Remove timelock from treasury governor * Refactor _checkpointsLookup to return entire Checkpoint instad of just number of votes * Update the totalSupply checkpoints updating logic * Quadratic voting power transfers and delegations * Fix workflow yaml * Initialise ZeroExVotes behind a ERC1967Proxy Test it cannot be reinitialised * Remove obsoleted console.logs from test * Storage pack Checkpoint enum * Remove keeping track of total balances for voting * Switch to using the foundry artifact in test * Fix rebase issue * Add timelock control over the treasury governor * Add test for wrapped token transfer * Emit separate events for changing linear and quadratic voting power * Add the ability to cancel a proposal * Limit the governors' cancel function to security council only * Eject security council after a proposal is cancelled * Add ability for governance to set the security council * Merge the governors test suites into one reusable set of tests * Add an empty test function to base test contract to remove it from coverage reports. Fudge but no other way to ignore it in report * Security council can rollback protocol upgrades * Upgrade to solidity 0.8.19 * Move IZeroExGovernor to src * Abstract Security council interface into its own * Emit events when assigning and ejecting the security council * Use a cast to bytes4 instead of LibBytes Co-authored-by: duncancmt <1207590+duncancmt@users.noreply.github.com> * Writing total supply checkpoints and setup of quorum percentage of quadratic total supply for treasure governor * Add test for transferring tokens when delegating * Rename IZeroExSecurityCouncil to ISecurityCouncil * Add security council restrictions to governors * Remove obsolete overflow check * Improve test coverage * Upgrade open-zeppelin contracts to 4.8.2 * Test delegation by signature * Test non security council requests to rollback protocol changes cannot be executed * Better revert messages * Test correct interfaces are supported * Remove obsoleted funciton * Further test delegation by signature scenario * Split the delegation functionality tests * Add test for initialisation of voting contract * Add test for reading checkpoints * Update code comments * Fix compilation warnings * Run smt checker * Add checkpoint tests * Rename parameter in moveEntireVotingPower to match the one in movePartialVotingPower * Switch moveEntireVotingPower to a more generic moveVotingPower implementation as in the open-zeppelin contracts * Install foundry earlier in CI * Switch movePartialVotingPower to the generic moveVotingPower implementation * Write totalSupplyCheckpoints via the generic _writeCheckpoint * Add threshold for quadratic voting power * Remove autoinserted code by OZ * Add openzeppelin/contracts-upgradable * Add initializable base to Voting contract * Fix terminogy error in natspec * Fix code comment * Remove obsoleted overrides and add a missing modifier to moveVotingPower * Remove amount check Co-authored-by: duncancmt <1207590+duncancmt@users.noreply.github.com> * Fix a calculation error and clean tests * Update thresholds for treasury governor * Fix testShouldNotBeAbleToDelegateWithSignatureAfterExpiry * Update from @duncancmt without "memory-safe" the IR optimizer produces significantly worse code and it disables the stack limit evader Co-authored-by: duncancmt <1207590+duncancmt@users.noreply.github.com> * Add onlyProxy to initializer * Fix quadratic voting weight base * Rename voting parameter for clarity * Make addresses immutable (#680) * Make addresses immutable * Fix linting issues --------- Co-authored-by: elenadimitrova <elena@arenabg.com> * Prevent griefing by a malicious ZeroExVotes upgrade (#681) * Gas optimization * Minimal change to prevent malicious ZeroExVotes from griefing * Add demonstration of griefing upgrade * Fix rebase issues with tests * Fix prettier issues * Add checks to test --------- Co-authored-by: elenadimitrova <elena@arenabg.com> * Rename SecurityCouncil contract * Add timestamp to delegator balance updates * Make quadraticThreshold `immutable` for gas efficiency * Remove the logic for ejecting security council * Switch balance timestamp to be a block number * Test votes migration for adding a new vote weight mechanism (#674) * Add Emacs files to .gitignore * Make some functions unproected to demonstrate a migration * Add example (broken) migration * Add migration test for voting logic * Try to simplify tests * Fix compilation errors * Fix underflow test with new logic * Flesh out migration test for voting * Replace cube root library * Fix stack too deep in coverage --------- Co-authored-by: elenadimitrova <elena@arenabg.com> * Change test case to testFail * Update contracts/governance/test/ZeroExVotesMigration.sol Co-authored-by: duncancmt <1207590+duncancmt@users.noreply.github.com> --------- Co-authored-by: duncancmt <1207590+duncancmt@users.noreply.github.com> Co-authored-by: Duncan Townsend <git@duncancmt.com>
165 lines
5.5 KiB
Solidity
165 lines
5.5 KiB
Solidity
// 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 "@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 "@openzeppelin/utils/math/SafeCast.sol";
|
|
import "./IZeroExVotes.sol";
|
|
import "./CallWithGas.sol";
|
|
|
|
contract ZRXWrappedToken is ERC20, ERC20Permit, ERC20Wrapper {
|
|
using CallWithGas for address;
|
|
|
|
struct DelegateInfo {
|
|
address delegate;
|
|
uint96 balanceLastUpdated;
|
|
}
|
|
|
|
constructor(
|
|
IERC20 wrappedToken,
|
|
IZeroExVotes _zeroExVotes
|
|
) ERC20("Wrapped ZRX", "wZRX") ERC20Permit("Wrapped ZRX") ERC20Wrapper(wrappedToken) {
|
|
zeroExVotes = _zeroExVotes;
|
|
}
|
|
|
|
IZeroExVotes public immutable zeroExVotes;
|
|
mapping(address => DelegateInfo) 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 pure override(ERC20, ERC20Wrapper) returns (uint8) {
|
|
return 18;
|
|
}
|
|
|
|
function _afterTokenTransfer(address from, address to, uint256 amount) internal override(ERC20) {
|
|
super._afterTokenTransfer(from, to, amount);
|
|
|
|
DelegateInfo memory fromDelegate = delegateInfo(from);
|
|
DelegateInfo memory toDelegate = delegateInfo(to);
|
|
|
|
uint256 fromBalance = fromDelegate.delegate == address(0) ? 0 : balanceOf(from) + amount;
|
|
uint256 toBalance = toDelegate.delegate == address(0) ? 0 : balanceOf(to) - amount;
|
|
|
|
if (fromDelegate.delegate != address(0)) _delegates[from].balanceLastUpdated = SafeCast.toUint96(block.number);
|
|
|
|
if (toDelegate.delegate != address(0)) _delegates[to].balanceLastUpdated = SafeCast.toUint96(block.number);
|
|
|
|
zeroExVotes.moveVotingPower(
|
|
fromDelegate.delegate,
|
|
toDelegate.delegate,
|
|
fromBalance,
|
|
toBalance,
|
|
fromDelegate.balanceLastUpdated,
|
|
toDelegate.balanceLastUpdated,
|
|
amount
|
|
);
|
|
}
|
|
|
|
function _mint(address account, uint256 amount) internal override(ERC20) {
|
|
super._mint(account, amount);
|
|
|
|
zeroExVotes.writeCheckpointTotalSupplyMint(balanceOf(account) - amount, amount);
|
|
}
|
|
|
|
function _burn(address account, uint256 amount) internal override(ERC20) {
|
|
super._burn(account, amount);
|
|
|
|
address(zeroExVotes).functionCallWithGas(
|
|
abi.encodeCall(zeroExVotes.writeCheckpointTotalSupplyBurn, (balanceOf(account) + amount, amount)),
|
|
500_000,
|
|
32
|
|
);
|
|
}
|
|
|
|
/**
|
|
* @dev Get the address `account` is currently delegating to.
|
|
*/
|
|
function delegates(address account) public view returns (address) {
|
|
return _delegates[account].delegate;
|
|
}
|
|
|
|
/**
|
|
* @dev Get the last block number when `account`'s balance changed.
|
|
*/
|
|
function delegatorBalanceLastUpdated(address account) public view returns (uint96) {
|
|
return _delegates[account].balanceLastUpdated;
|
|
}
|
|
|
|
function delegateInfo(address account) public view returns (DelegateInfo memory) {
|
|
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 {
|
|
DelegateInfo memory delegateInfo = delegateInfo(delegator);
|
|
uint256 delegatorBalance = balanceOf(delegator);
|
|
|
|
_delegates[delegator] = DelegateInfo(delegatee, SafeCast.toUint96(block.timestamp));
|
|
|
|
emit DelegateChanged(delegator, delegateInfo.delegate, delegatee);
|
|
|
|
zeroExVotes.moveVotingPower(
|
|
delegateInfo.delegate,
|
|
delegatee,
|
|
delegatorBalance,
|
|
0,
|
|
delegateInfo.balanceLastUpdated,
|
|
0,
|
|
delegatorBalance
|
|
);
|
|
}
|
|
}
|