123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290 |
- diff -ruN .gitignore .gitignore
- --- .gitignore 1969-12-31 16:00:00.000000000 -0800
- +++ .gitignore 2022-05-27 01:31:23.000000000 -0700
- @@ -0,0 +1,2 @@
- +*
- +!.gitignore
- diff -ruN access/AccessControl.sol access/AccessControl.sol
- --- access/AccessControl.sol 2022-05-25 09:38:35.000000000 -0700
- +++ access/AccessControl.sol 2022-05-27 01:31:23.000000000 -0700
- @@ -93,7 +93,7 @@
- *
- * _Available since v4.6._
- */
- - function _checkRole(bytes32 role) internal view virtual {
- + function _checkRole(bytes32 role) public view virtual { // HARNESS: internal -> public
- _checkRole(role, _msgSender());
- }
-
- diff -ruN governance/Governor.sol governance/Governor.sol
- --- governance/Governor.sol 2022-05-25 09:38:35.000000000 -0700
- +++ governance/Governor.sol 2022-05-27 01:31:23.000000000 -0700
- @@ -44,7 +44,7 @@
-
- string private _name;
-
- - mapping(uint256 => ProposalCore) private _proposals;
- + mapping(uint256 => ProposalCore) internal _proposals;
-
- // This queue keeps track of the governor operating on itself. Calls to functions protected by the
- // {onlyGovernance} modifier needs to be whitelisted in this queue. Whitelisting is set in {_beforeExecute},
- diff -ruN governance/TimelockController.sol governance/TimelockController.sol
- --- governance/TimelockController.sol 2022-05-25 09:38:35.000000000 -0700
- +++ governance/TimelockController.sol 2022-05-27 01:31:23.000000000 -0700
- @@ -28,10 +28,10 @@
- bytes32 public constant PROPOSER_ROLE = keccak256("PROPOSER_ROLE");
- bytes32 public constant EXECUTOR_ROLE = keccak256("EXECUTOR_ROLE");
- bytes32 public constant CANCELLER_ROLE = keccak256("CANCELLER_ROLE");
- - uint256 internal constant _DONE_TIMESTAMP = uint256(1);
- + uint256 public constant _DONE_TIMESTAMP = uint256(1);
-
- mapping(bytes32 => uint256) private _timestamps;
- - uint256 private _minDelay;
- + uint256 public _minDelay;
-
- /**
- * @dev Emitted when a call is scheduled as part of operation `id`.
- diff -ruN governance/extensions/GovernorCountingSimple.sol governance/extensions/GovernorCountingSimple.sol
- --- governance/extensions/GovernorCountingSimple.sol 2022-05-25 09:38:35.000000000 -0700
- +++ governance/extensions/GovernorCountingSimple.sol 2022-05-27 03:15:40.000000000 -0700
- @@ -27,7 +27,7 @@
- mapping(address => bool) hasVoted;
- }
-
- - mapping(uint256 => ProposalVote) private _proposalVotes;
- + mapping(uint256 => ProposalVote) internal _proposalVotes;
-
- /**
- * @dev See {IGovernor-COUNTING_MODE}.
- diff -ruN governance/extensions/GovernorPreventLateQuorum.sol governance/extensions/GovernorPreventLateQuorum.sol
- --- governance/extensions/GovernorPreventLateQuorum.sol 2022-05-25 09:38:35.000000000 -0700
- +++ governance/extensions/GovernorPreventLateQuorum.sol 2022-05-27 01:31:23.000000000 -0700
- @@ -21,8 +21,8 @@
- using SafeCast for uint256;
- using Timers for Timers.BlockNumber;
-
- - uint64 private _voteExtension;
- - mapping(uint256 => Timers.BlockNumber) private _extendedDeadlines;
- + uint64 internal _voteExtension;
- + mapping(uint256 => Timers.BlockNumber) internal _extendedDeadlines;
-
- /// @dev Emitted when a proposal deadline is pushed back due to reaching quorum late in its voting period.
- event ProposalExtended(uint256 indexed proposalId, uint64 extendedDeadline);
- diff -ruN governance/utils/Votes.sol governance/utils/Votes.sol
- --- governance/utils/Votes.sol 2022-05-25 09:38:35.000000000 -0700
- +++ governance/utils/Votes.sol 2022-05-27 01:31:23.000000000 -0700
- @@ -35,7 +35,25 @@
- bytes32 private constant _DELEGATION_TYPEHASH =
- keccak256("Delegation(address delegatee,uint256 nonce,uint256 expiry)");
-
- - mapping(address => address) private _delegation;
- + // HARNESS : Hooks cannot access any information from Checkpoints yet, so I am also updating votes and fromBlock in this struct
- + struct Ckpt {
- + uint32 fromBlock;
- + uint224 votes;
- + }
- + mapping(address => Ckpt) public _checkpoints;
- +
- + // HARNESSED getters
- + function numCheckpoints(address account) public view returns (uint32) {
- + return SafeCast.toUint32(_delegateCheckpoints[account]._checkpoints.length);
- + }
- + function ckptFromBlock(address account, uint32 pos) public view returns (uint32) {
- + return _delegateCheckpoints[account]._checkpoints[pos]._blockNumber;
- + }
- + function ckptVotes(address account, uint32 pos) public view returns (uint224) {
- + return _delegateCheckpoints[account]._checkpoints[pos]._value;
- + }
- +
- + mapping(address => address) public _delegation;
- mapping(address => Checkpoints.History) private _delegateCheckpoints;
- Checkpoints.History private _totalCheckpoints;
-
- @@ -124,7 +142,7 @@
- *
- * Emits events {DelegateChanged} and {DelegateVotesChanged}.
- */
- - function _delegate(address account, address delegatee) internal virtual {
- + function _delegate(address account, address delegatee) public virtual {
- address oldDelegate = delegates(account);
- _delegation[account] = delegatee;
-
- @@ -142,10 +160,10 @@
- uint256 amount
- ) internal virtual {
- if (from == address(0)) {
- - _totalCheckpoints.push(_add, amount);
- + _totalCheckpoints.push(_totalCheckpoints.latest() + amount); // Harnessed to remove function pointers
- }
- if (to == address(0)) {
- - _totalCheckpoints.push(_subtract, amount);
- + _totalCheckpoints.push(_totalCheckpoints.latest() - amount); // Harnessed to remove function pointers
- }
- _moveDelegateVotes(delegates(from), delegates(to), amount);
- }
- @@ -160,11 +178,13 @@
- ) private {
- if (from != to && amount > 0) {
- if (from != address(0)) {
- - (uint256 oldValue, uint256 newValue) = _delegateCheckpoints[from].push(_subtract, amount);
- + (uint256 oldValue, uint256 newValue) = _delegateCheckpoints[from].push(_delegateCheckpoints[from].latest() - amount); // HARNESSED TO REMOVE FUNCTION POINTERS
- + _checkpoints[from] = Ckpt({fromBlock: SafeCast.toUint32(block.number), votes: SafeCast.toUint224(newValue)}); // HARNESS
- emit DelegateVotesChanged(from, oldValue, newValue);
- }
- if (to != address(0)) {
- - (uint256 oldValue, uint256 newValue) = _delegateCheckpoints[to].push(_add, amount);
- + (uint256 oldValue, uint256 newValue) = _delegateCheckpoints[to].push(_delegateCheckpoints[to].latest() + amount); // HARNESSED TO REMOVE FUNCTION POINTERS
- + _checkpoints[to] = Ckpt({fromBlock: SafeCast.toUint32(block.number), votes: SafeCast.toUint224(newValue)}); // HARNESS
- emit DelegateVotesChanged(to, oldValue, newValue);
- }
- }
- @@ -207,5 +227,5 @@
- /**
- * @dev Must return the voting units held by an account.
- */
- - function _getVotingUnits(address) internal view virtual returns (uint256);
- + function _getVotingUnits(address) public virtual returns (uint256); // HARNESS: internal -> public
- }
- diff -ruN token/ERC1155/ERC1155.sol token/ERC1155/ERC1155.sol
- --- token/ERC1155/ERC1155.sol 2022-05-25 09:38:35.000000000 -0700
- +++ token/ERC1155/ERC1155.sol 2022-05-27 01:31:23.000000000 -0700
- @@ -268,7 +268,7 @@
- uint256 id,
- uint256 amount,
- bytes memory data
- - ) internal virtual {
- + ) public virtual { // HARNESS: internal -> public
- require(to != address(0), "ERC1155: mint to the zero address");
-
- address operator = _msgSender();
- @@ -301,7 +301,7 @@
- uint256[] memory ids,
- uint256[] memory amounts,
- bytes memory data
- - ) internal virtual {
- + ) public virtual { // HARNESS: internal -> public
- require(to != address(0), "ERC1155: mint to the zero address");
- require(ids.length == amounts.length, "ERC1155: ids and amounts length mismatch");
-
- @@ -334,7 +334,7 @@
- address from,
- uint256 id,
- uint256 amount
- - ) internal virtual {
- + ) public virtual { // HARNESS: internal -> public
- require(from != address(0), "ERC1155: burn from the zero address");
-
- address operator = _msgSender();
- @@ -367,7 +367,7 @@
- address from,
- uint256[] memory ids,
- uint256[] memory amounts
- - ) internal virtual {
- + ) public virtual { // HARNESS: internal -> public
- require(from != address(0), "ERC1155: burn from the zero address");
- require(ids.length == amounts.length, "ERC1155: ids and amounts length mismatch");
-
- @@ -471,7 +471,7 @@
- uint256 id,
- uint256 amount,
- bytes memory data
- - ) private {
- + ) public { // HARNESS: private -> public
- if (to.isContract()) {
- try IERC1155Receiver(to).onERC1155Received(operator, from, id, amount, data) returns (bytes4 response) {
- if (response != IERC1155Receiver.onERC1155Received.selector) {
- @@ -492,7 +492,7 @@
- uint256[] memory ids,
- uint256[] memory amounts,
- bytes memory data
- - ) private {
- + ) public { // HARNESS: private -> public
- if (to.isContract()) {
- try IERC1155Receiver(to).onERC1155BatchReceived(operator, from, ids, amounts, data) returns (
- bytes4 response
- diff -ruN token/ERC20/ERC20.sol token/ERC20/ERC20.sol
- --- token/ERC20/ERC20.sol 2022-05-25 09:38:35.000000000 -0700
- +++ token/ERC20/ERC20.sol 2022-05-27 01:31:23.000000000 -0700
- @@ -277,7 +277,7 @@
- * - `account` cannot be the zero address.
- * - `account` must have at least `amount` tokens.
- */
- - function _burn(address account, uint256 amount) internal virtual {
- + function _burn(address account, uint256 amount) public virtual { // HARNESS: internal -> public
- require(account != address(0), "ERC20: burn from the zero address");
-
- _beforeTokenTransfer(account, address(0), amount);
- diff -ruN token/ERC20/extensions/ERC20FlashMint.sol token/ERC20/extensions/ERC20FlashMint.sol
- --- token/ERC20/extensions/ERC20FlashMint.sol 2022-05-25 09:38:35.000000000 -0700
- +++ token/ERC20/extensions/ERC20FlashMint.sol 2022-05-27 01:31:23.000000000 -0700
- @@ -40,9 +40,11 @@
- require(token == address(this), "ERC20FlashMint: wrong token");
- // silence warning about unused variable without the addition of bytecode.
- amount;
- - return 0;
- + return fee; // HARNESS: made "return" nonzero
- }
-
- + uint256 public fee; // HARNESS: added it to simulate random fee amount
- +
- /**
- * @dev Returns the receiver address of the flash fee. By default this
- * implementation returns the address(0) which means the fee amount will be burnt.
- diff -ruN token/ERC20/extensions/ERC20Votes.sol token/ERC20/extensions/ERC20Votes.sol
- --- token/ERC20/extensions/ERC20Votes.sol 2022-05-06 13:43:21.000000000 -0700
- +++ token/ERC20/extensions/ERC20Votes.sol 2022-05-27 01:31:23.000000000 -0700
- @@ -33,8 +33,8 @@
- bytes32 private constant _DELEGATION_TYPEHASH =
- keccak256("Delegation(address delegatee,uint256 nonce,uint256 expiry)");
-
- - mapping(address => address) private _delegates;
- - mapping(address => Checkpoint[]) private _checkpoints;
- + mapping(address => address) public _delegates;
- + mapping(address => Checkpoint[]) public _checkpoints;
- Checkpoint[] private _totalSupplyCheckpoints;
-
- /**
- @@ -169,7 +169,7 @@
- /**
- * @dev Snapshots the totalSupply after it has been decreased.
- */
- - function _burn(address account, uint256 amount) internal virtual override {
- + function _burn(address account, uint256 amount) public virtual override {
- super._burn(account, amount);
-
- _writeCheckpoint(_totalSupplyCheckpoints, _subtract, amount);
- diff -ruN token/ERC20/extensions/ERC20Wrapper.sol token/ERC20/extensions/ERC20Wrapper.sol
- --- token/ERC20/extensions/ERC20Wrapper.sol 2022-05-25 09:38:35.000000000 -0700
- +++ token/ERC20/extensions/ERC20Wrapper.sol 2022-05-27 01:31:23.000000000 -0700
- @@ -55,7 +55,7 @@
- * @dev Mint wrapped token to cover any underlyingTokens that would have been transferred by mistake. Internal
- * function that can be exposed with access control if desired.
- */
- - function _recover(address account) internal virtual returns (uint256) {
- + function _recover(address account) public virtual returns (uint256) { // HARNESS: internal -> public
- uint256 value = underlying.balanceOf(address(this)) - totalSupply();
- _mint(account, value);
- return value;
- diff -ruN token/ERC721/extensions/draft-ERC721Votes.sol token/ERC721/extensions/draft-ERC721Votes.sol
- --- token/ERC721/extensions/draft-ERC721Votes.sol 2022-05-25 09:38:35.000000000 -0700
- +++ token/ERC721/extensions/draft-ERC721Votes.sol 2022-05-27 01:31:23.000000000 -0700
- @@ -34,7 +34,7 @@
- /**
- * @dev Returns the balance of `account`.
- */
- - function _getVotingUnits(address account) internal view virtual override returns (uint256) {
- + function _getVotingUnits(address account) public view virtual override returns (uint256) {
- return balanceOf(account);
- }
- }
- diff -ruN utils/Address.sol utils/Address.sol
- --- utils/Address.sol 2022-05-25 09:38:35.000000000 -0700
- +++ utils/Address.sol 2022-05-27 01:31:23.000000000 -0700
- @@ -131,6 +131,7 @@
- uint256 value,
- string memory errorMessage
- ) internal returns (bytes memory) {
- + return ""; // external calls havoc
- require(address(this).balance >= value, "Address: insufficient balance for call");
- require(isContract(target), "Address: call to non-contract");
-
|