NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finalize fist 3 rules; fix old governor spec

Browse Source
This commit is contained in:
teryanarmen
2022-05-16 14:26:31 -07:00
parent c45f34adc8
commit 793b88efd8
9 changed files with 165 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
certora/applyHarness.patch
View File

@ -1,6 +1,6 @@
diff -ruN access/AccessControl.sol access/AccessControl.sol
--- access/AccessControl.sol 2022-05-06 13:44:28.000000000 -0700
+++ access/AccessControl.sol 2022-05-09 09:49:26.000000000 -0700
+++ access/AccessControl.sol 2022-05-11 11:17:20.000000000 -0700
@@ -93,7 +93,7 @@
*
* _Available since v4.6._
@ -12,7 +12,7 @@ diff -ruN access/AccessControl.sol access/AccessControl.sol
diff -ruN governance/Governor.sol governance/Governor.sol
--- governance/Governor.sol 2022-05-09 09:11:10.000000000 -0700
+++ governance/Governor.sol 2022-05-09 09:49:26.000000000 -0700
+++ governance/Governor.sol 2022-05-11 11:17:20.000000000 -0700
@@ -42,7 +42,7 @@
string private _name;
@ -24,7 +24,7 @@ diff -ruN governance/Governor.sol governance/Governor.sol
// {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-06 13:44:28.000000000 -0700
+++ governance/TimelockController.sol 2022-05-09 09:49:26.000000000 -0700
+++ governance/TimelockController.sol 2022-05-12 19:13:19.000000000 -0700
@@ -24,10 +24,10 @@
bytes32 public constant TIMELOCK_ADMIN_ROLE = keccak256("TIMELOCK_ADMIN_ROLE");
bytes32 public constant PROPOSER_ROLE = keccak256("PROPOSER_ROLE");
@ -38,7 +38,22 @@ diff -ruN governance/TimelockController.sol governance/TimelockController.sol
/**
* @dev Emitted when a call is scheduled as part of operation `id`.
@@ -353,4 +353,4 @@
@@ -332,10 +332,11 @@
uint256 value,
bytes calldata data
) private {
- (bool success, ) = target.call{value: value}(data);
- require(success, "TimelockController: underlying transaction reverted");
+ return; // can't deal with external calls
+ // (bool success, ) = target.call{value: value}(data);
+ // require(success, "TimelockController: underlying transaction reverted");
- emit CallExecuted(id, index, target, value, data);
+ // emit CallExecuted(id, index, target, value, data);
}
/**
@@ -353,4 +354,4 @@
emit MinDelayChange(_minDelay, newDelay);
_minDelay = newDelay;
}
@ -46,7 +61,7 @@ diff -ruN governance/TimelockController.sol governance/TimelockController.sol
+}
diff -ruN governance/extensions/GovernorPreventLateQuorum.sol governance/extensions/GovernorPreventLateQuorum.sol
--- governance/extensions/GovernorPreventLateQuorum.sol 2022-05-09 09:11:01.000000000 -0700
+++ governance/extensions/GovernorPreventLateQuorum.sol 2022-05-09 09:49:26.000000000 -0700
+++ governance/extensions/GovernorPreventLateQuorum.sol 2022-05-11 11:17:20.000000000 -0700
@@ -21,8 +21,8 @@
using SafeCast for uint256;
using Timers for Timers.BlockNumber;
@ -60,7 +75,7 @@ diff -ruN governance/extensions/GovernorPreventLateQuorum.sol governance/extensi
event ProposalExtended(uint256 indexed proposalId, uint64 extendedDeadline);
diff -ruN governance/utils/Votes.sol governance/utils/Votes.sol
--- governance/utils/Votes.sol 2022-05-06 13:44:28.000000000 -0700
+++ governance/utils/Votes.sol 2022-05-09 09:49:26.000000000 -0700
+++ governance/utils/Votes.sol 2022-05-11 11:17:20.000000000 -0700
@@ -35,7 +35,25 @@
bytes32 private constant _DELEGATION_TYPEHASH =
keccak256("Delegation(address delegatee,uint256 nonce,uint256 expiry)");
@ -135,7 +150,7 @@ diff -ruN governance/utils/Votes.sol governance/utils/Votes.sol
}
diff -ruN token/ERC1155/ERC1155.sol token/ERC1155/ERC1155.sol
--- token/ERC1155/ERC1155.sol 2022-05-06 13:44:28.000000000 -0700
+++ token/ERC1155/ERC1155.sol 2022-05-09 09:49:26.000000000 -0700
+++ token/ERC1155/ERC1155.sol 2022-05-11 11:17:20.000000000 -0700
@@ -268,7 +268,7 @@
uint256 id,
uint256 amount,
@ -192,7 +207,7 @@ diff -ruN token/ERC1155/ERC1155.sol token/ERC1155/ERC1155.sol
bytes4 response
diff -ruN token/ERC20/ERC20.sol token/ERC20/ERC20.sol
--- token/ERC20/ERC20.sol 2022-05-06 13:44:28.000000000 -0700
+++ token/ERC20/ERC20.sol 2022-05-09 09:49:26.000000000 -0700
+++ token/ERC20/ERC20.sol 2022-05-11 11:17:20.000000000 -0700
@@ -277,7 +277,7 @@
* - `account` cannot be the zero address.
* - `account` must have at least `amount` tokens.
@ -213,7 +228,7 @@ diff -ruN token/ERC20/ERC20.sol token/ERC20/ERC20.sol
/**
diff -ruN token/ERC20/extensions/ERC20FlashMint.sol token/ERC20/extensions/ERC20FlashMint.sol
--- token/ERC20/extensions/ERC20FlashMint.sol 2022-05-06 13:44:28.000000000 -0700
+++ token/ERC20/extensions/ERC20FlashMint.sol 2022-05-09 09:49:26.000000000 -0700
+++ token/ERC20/extensions/ERC20FlashMint.sol 2022-05-11 11:17:20.000000000 -0700
@@ -40,9 +40,11 @@
require(token == address(this), "ERC20FlashMint: wrong token");
// silence warning about unused variable without the addition of bytecode.
@ -229,7 +244,7 @@ diff -ruN token/ERC20/extensions/ERC20FlashMint.sol token/ERC20/extensions/ERC20
* `receiver`, who is required to implement the {IERC3156FlashBorrower}
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-09 09:49:26.000000000 -0700
+++ token/ERC20/extensions/ERC20Votes.sol 2022-05-11 11:17:20.000000000 -0700
@@ -33,8 +33,8 @@
bytes32 private constant _DELEGATION_TYPEHASH =
keccak256("Delegation(address delegatee,uint256 nonce,uint256 expiry)");
@ -362,7 +377,7 @@ diff -ruN token/ERC20/extensions/ERC20Votes.sol token/ERC20/extensions/ERC20Vote
}
diff -ruN token/ERC20/extensions/ERC20Wrapper.sol token/ERC20/extensions/ERC20Wrapper.sol
--- token/ERC20/extensions/ERC20Wrapper.sol 2022-05-06 13:44:28.000000000 -0700
+++ token/ERC20/extensions/ERC20Wrapper.sol 2022-05-09 09:49:26.000000000 -0700
+++ token/ERC20/extensions/ERC20Wrapper.sol 2022-05-11 11:17:20.000000000 -0700
@@ -44,7 +44,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.
@ -374,7 +389,7 @@ diff -ruN token/ERC20/extensions/ERC20Wrapper.sol token/ERC20/extensions/ERC20Wr
return value;
diff -ruN token/ERC721/extensions/draft-ERC721Votes.sol token/ERC721/extensions/draft-ERC721Votes.sol
--- token/ERC721/extensions/draft-ERC721Votes.sol 2022-05-06 13:44:28.000000000 -0700
+++ token/ERC721/extensions/draft-ERC721Votes.sol 2022-05-09 09:49:26.000000000 -0700
+++ token/ERC721/extensions/draft-ERC721Votes.sol 2022-05-11 11:17:20.000000000 -0700
@@ -34,7 +34,7 @@
/**
* @dev Returns the balance of `account`.
@ -384,3 +399,14 @@ diff -ruN token/ERC721/extensions/draft-ERC721Votes.sol token/ERC721/extensions/
return balanceOf(account);
}
}
diff -ruN utils/Address.sol utils/Address.sol
--- utils/Address.sol 2022-05-06 13:43:21.000000000 -0700
+++ utils/Address.sol 2022-05-15 10:58:38.000000000 -0700
@@ -131,6 +131,7 @@
uint256 value,
string memory errorMessage
) internal returns (bytes memory) {
+ return "";
require(address(this).balance >= value, "Address: insufficient balance for call");
require(isContract(target), "Address: call to non-contract");