diff --git a/certora/harnesses/GovernorCountingSimpleHarness.sol b/certora/harnesses/GovernorCountingSimpleHarness.sol deleted file mode 100644 index 52e980a81..000000000 --- a/certora/harnesses/GovernorCountingSimpleHarness.sol +++ /dev/null @@ -1,29 +0,0 @@ -import "../../contracts/governance/extensions/GovernorCountingSimple.sol"; - -contract GovernorCountingSimpleHarness is GovernorCountingSimple { - - mapping(uint256 => uint256) _quorum; - - function quorum(uint256 blockNumber) public view override virtual returns (uint256) { - return _quorum[blockNumber]; - } - - mapping (address => mapping (uint256 => uint256)) _getVotes; - - function getVotes(address account, uint256 blockNumber) public view override virtual returns (uint256) { - return _getVotes[account][blockNumber]; - } - - uint256 _votingDelay; - function votingDelay() public view override virtual returns (uint256) { - return _votingDelay; - } - - uint256 _votingPeriod; - function votingPeriod() public view override virtual returns (uint256) { - return _votingPeriod; - } - - constructor(string memory name) Governor(name) {} - -} \ No newline at end of file diff --git a/certora/harnesses/GovernorHarness.sol b/certora/harnesses/GovernorHarness.sol deleted file mode 100644 index 56cee4afa..000000000 --- a/certora/harnesses/GovernorHarness.sol +++ /dev/null @@ -1,120 +0,0 @@ -import "../../contracts/governance/Governor.sol"; - -contract GovernorHarness is Governor { - - function isExecuted(uint256 proposalId) public view returns (bool) { - return _proposals[proposalId].executed; - } - - function isCanceled(uint256 proposalId) public view returns (bool) { - return _proposals[proposalId].canceled; - } - - function snapshot(uint256 proposalId) public view returns (uint64) { - return _proposals[proposalId].voteStart._deadline; - } - - - function initialized(uint256 proposalId) public view returns (bool){ - if (_proposals[proposalId].voteStart._deadline != 0 && _proposals[proposalId].voteEnd._deadline != 0) { - return true; - } - return false; - } - - - mapping(uint256 => uint256) _quorum; - - function quorum(uint256 blockNumber) public view override virtual returns (uint256) { - return _quorum[blockNumber]; - } - - - mapping (address => mapping (uint256 => uint256)) _getVotes; - - function getVotes(address account, uint256 blockNumber) public view override virtual returns (uint256) { - return _getVotes[account][blockNumber]; - } - - - mapping (uint256 => bool) __quoromReached; - - function _quorumReached(uint256 proposalId) public view override virtual returns (bool) { - return __quoromReached[proposalId]; - } - - - mapping (uint256 => bool) __voteSucceeded; - - function _voteSucceeded(uint256 proposalId) public view override virtual returns (bool) { - return __voteSucceeded[proposalId]; - } - - - //string _COUNTING_MODE; - function COUNTING_MODE() public pure override virtual returns (string memory) { - return "dummy"; - } - - - mapping(uint256 => mapping(address => bool)) _hasVoted; - - function hasVoted(uint256 proposalId, address account) public view override virtual returns (bool) { - return _hasVoted[proposalId][account]; - } - - - uint256 _votingDelay; - - function votingDelay() public view override virtual returns (uint256) { - return _votingDelay; - } - - - uint256 _votingPeriod; - - function votingPeriod() public view override virtual returns (uint256) { - return _votingPeriod; - } - - - function _countVote( - uint256 proposalId, - address account, - uint8 support, - uint256 weight - ) internal override virtual { - // havoc something - } - - - constructor(string memory name) Governor(name) {} - - // _countVots == Sum of castVote - // - // RHS: - // 1) use counter_vote_power as a counter - // 2) use counter_vote_power as a temp var for a ghost - // - // LHS: - // mapping of count - // countMap - - // uint decision; - // uint numberOfOptions; - - function callPropose(address[] memory targets, - uint256[] memory values, - bytes[] memory calldatas) public virtual returns (uint256) { - return super.propose(targets, values, calldatas, ""); - } - - - // Harness of castVoteWithReason to be able to impose requirement on the proposal ID. - uint256 public _pId_Harness; - function castVoteWithReason(uint256 proposalId, uint8 support, string calldata reason) - public override returns (uint256) { - require(proposalId == _pId_Harness); - return super.castVoteWithReason(proposalId, support, reason); - } -} \ No newline at end of file diff --git a/certora/harnesses/GovernorProposalThresholdHarness.sol b/certora/harnesses/GovernorProposalThresholdHarness.sol deleted file mode 100644 index 1d0559a60..000000000 --- a/certora/harnesses/GovernorProposalThresholdHarness.sol +++ /dev/null @@ -1,63 +0,0 @@ -import "../../contracts/governance/extensions/GovernorProposalThreshold.sol"; - -contract GovernorProposalThresholdHarness is GovernorProposalThreshold { - - mapping(uint256 => uint256) _quorum; - - function quorum(uint256 blockNumber) public view override virtual returns (uint256) { - return _quorum[blockNumber]; - } - - mapping (address => mapping (uint256 => uint256)) _getVotes; - - function getVotes(address account, uint256 blockNumber) public view override virtual returns (uint256) { - return _getVotes[account][blockNumber]; - } - - mapping (uint256 => bool) __quoromReached; - function _quorumReached(uint256 proposalId) public view override virtual returns (bool) { - return __quoromReached[proposalId]; - } - - mapping (uint256 => bool) __voteSucceeded; - function _voteSucceeded(uint256 proposalId) public view override virtual returns (bool) { - return __voteSucceeded[proposalId]; - } - - //string _COUNTING_MODE; - function COUNTING_MODE() public pure override virtual returns (string memory) { - return "dummy"; - } - - mapping(uint256 => mapping(address => bool)) _hasVoted; - function hasVoted(uint256 proposalId, address account) public view override virtual returns (bool) { - return _hasVoted[proposalId][account]; - } - - uint256 _votingDelay; - function votingDelay() public view override virtual returns (uint256) { - return _votingDelay; - } - - uint256 _votingPeriod; - function votingPeriod() public view override virtual returns (uint256) { - return _votingPeriod; - } - - function _countVote( - uint256 proposalId, - address account, - uint8 support, - uint256 weight - ) internal override virtual { - // havoc something - } - - uint256 _proposalThreshold; - function proposalThreshold() public view override virtual returns (uint256) { - return _proposalThreshold; - } - - constructor(string memory name) Governor(name) {} - -} \ No newline at end of file diff --git a/certora/harnesses/GovernorTimelockCompoundHarness.sol b/certora/harnesses/GovernorTimelockCompoundHarness.sol deleted file mode 100644 index f8a85e53f..000000000 --- a/certora/harnesses/GovernorTimelockCompoundHarness.sol +++ /dev/null @@ -1,58 +0,0 @@ -import "../../contracts/governance/extensions/GovernorTimelockCompound.sol"; - -contract GovernorTimelockCompoundHarness is GovernorTimelockCompound { - - mapping(uint256 => uint256) _quorum; - - function quorum(uint256 blockNumber) public view override virtual returns (uint256) { - return _quorum[blockNumber]; - } - - mapping (address => mapping (uint256 => uint256)) _getVotes; - - function getVotes(address account, uint256 blockNumber) public view override virtual returns (uint256) { - return _getVotes[account][blockNumber]; - } - - mapping (uint256 => bool) __quoromReached; - function _quorumReached(uint256 proposalId) public view override virtual returns (bool) { - return __quoromReached[proposalId]; - } - - mapping (uint256 => bool) __voteSucceeded; - function _voteSucceeded(uint256 proposalId) public view override virtual returns (bool) { - return __voteSucceeded[proposalId]; - } - - //string _COUNTING_MODE; - function COUNTING_MODE() public pure override virtual returns (string memory) { - return "dummy"; - } - - mapping(uint256 => mapping(address => bool)) _hasVoted; - function hasVoted(uint256 proposalId, address account) public view override virtual returns (bool) { - return _hasVoted[proposalId][account]; - } - - uint256 _votingDelay; - function votingDelay() public view override virtual returns (uint256) { - return _votingDelay; - } - - uint256 _votingPeriod; - function votingPeriod() public view override virtual returns (uint256) { - return _votingPeriod; - } - - function _countVote( - uint256 proposalId, - address account, - uint8 support, - uint256 weight - ) internal override virtual { - // havoc something - } - - constructor(string memory name, ICompoundTimelock timelock) Governor(name) GovernorTimelockCompound(timelock) {} - -} \ No newline at end of file diff --git a/certora/harnesses/GovernorVotesHarness.sol b/certora/harnesses/GovernorVotesHarness.sol deleted file mode 100644 index 3e06c8daa..000000000 --- a/certora/harnesses/GovernorVotesHarness.sol +++ /dev/null @@ -1,51 +0,0 @@ -import "../../contracts/governance/extensions/GovernorVotes.sol"; - -contract GovernorVotesHarness is GovernorVotes { - - mapping(uint256 => uint256) _quorum; - - function quorum(uint256 blockNumber) public view override virtual returns (uint256) { - return _quorum[blockNumber]; - } - - mapping (uint256 => bool) __quoromReached; - function _quorumReached(uint256 proposalId) public view override virtual returns (bool) { - return __quoromReached[proposalId]; - } - - mapping (uint256 => bool) __voteSucceeded; - function _voteSucceeded(uint256 proposalId) public view override virtual returns (bool) { - return __voteSucceeded[proposalId]; - } - - //string _COUNTING_MODE; - function COUNTING_MODE() public pure override virtual returns (string memory) { - return "dummy"; - } - - mapping(uint256 => mapping(address => bool)) _hasVoted; - function hasVoted(uint256 proposalId, address account) public view override virtual returns (bool) { - return _hasVoted[proposalId][account]; - } - - uint256 _votingDelay; - function votingDelay() public view override virtual returns (uint256) { - return _votingDelay; - } - - uint256 _votingPeriod; - function votingPeriod() public view override virtual returns (uint256) { - return _votingPeriod; - } - - function _countVote( - uint256 proposalId, - address account, - uint8 support, - uint256 weight - ) internal override virtual { - // havoc something - } - - constructor(ERC20Votes tokenAddr, string memory name) GovernorVotes(tokenAddr) Governor(name) {} -} \ No newline at end of file diff --git a/certora/harnesses/GovernorVotesQuorumFractionHarness.sol b/certora/harnesses/GovernorVotesQuorumFractionHarness.sol deleted file mode 100644 index 86ae202ad..000000000 --- a/certora/harnesses/GovernorVotesQuorumFractionHarness.sol +++ /dev/null @@ -1,47 +0,0 @@ -import "../../contracts/governance/extensions/GovernorVotesQuorumFraction.sol"; - -contract GovernorVotesQuorumFractionHarness is GovernorVotesQuorumFraction { - - mapping (uint256 => bool) __quoromReached; - function _quorumReached(uint256 proposalId) public view override virtual returns (bool) { - return __quoromReached[proposalId]; - } - - mapping (uint256 => bool) __voteSucceeded; - function _voteSucceeded(uint256 proposalId) public view override virtual returns (bool) { - return __voteSucceeded[proposalId]; - } - - //string _COUNTING_MODE; - function COUNTING_MODE() public pure override virtual returns (string memory) { - return "dummy"; - } - - mapping(uint256 => mapping(address => bool)) _hasVoted; - function hasVoted(uint256 proposalId, address account) public view override virtual returns (bool) { - return _hasVoted[proposalId][account]; - } - - uint256 _votingDelay; - function votingDelay() public view override virtual returns (uint256) { - return _votingDelay; - } - - uint256 _votingPeriod; - function votingPeriod() public view override virtual returns (uint256) { - return _votingPeriod; - } - - function _countVote( - uint256 proposalId, - address account, - uint8 support, - uint256 weight - ) internal override virtual { - // havoc something - } - - constructor(ERC20Votes tokenAddr, string memory name, uint256 quorumNumeratorValue) - GovernorVotesQuorumFraction(quorumNumeratorValue) GovernorVotes(tokenAddr) Governor(name) {} - -} \ No newline at end of file