Browse Source

removed some spurious comments

Michael George 3 years ago
parent
commit
d95c3eeee1
1 changed files with 14 additions and 34 deletions
  1. 14 34
      certora/applyHarness.patch

+ 14 - 34
certora/applyHarness.patch

@@ -1,12 +1,12 @@
 diff -ruN .gitignore .gitignore
 --- .gitignore	1969-12-31 19:00:00.000000000 -0500
-+++ .gitignore	2021-12-01 10:05:19.757088138 -0500
++++ .gitignore	2021-12-09 14:46:33.923637220 -0500
 @@ -0,0 +1,2 @@
 +*
 +!.gitignore
 diff -ruN governance/compatibility/GovernorCompatibilityBravo.sol governance/compatibility/GovernorCompatibilityBravo.sol
---- governance/compatibility/GovernorCompatibilityBravo.sol	2021-12-01 10:02:39.909936316 -0500
-+++ governance/compatibility/GovernorCompatibilityBravo.sol	2021-12-01 10:00:48.002627620 -0500
+--- governance/compatibility/GovernorCompatibilityBravo.sol	2021-12-03 15:24:56.523654357 -0500
++++ governance/compatibility/GovernorCompatibilityBravo.sol	2021-12-09 14:46:33.923637220 -0500
 @@ -245,7 +245,7 @@
      /**
       * @dev See {Governor-_quorumReached}. In this module, only forVotes count toward the quorum.
@@ -14,7 +14,7 @@ diff -ruN governance/compatibility/GovernorCompatibilityBravo.sol governance/com
 -    function _quorumReached(uint256 proposalId) internal view virtual override returns (bool) {
 +    function _quorumReached(uint256 proposalId) public view virtual override returns (bool) { // HARNESS: changed to public from internal
          ProposalDetails storage details = _proposalDetails[proposalId];
-         return quorum(proposalSnapshot(proposalId)) < details.forVotes;
+         return quorum(proposalSnapshot(proposalId)) <= details.forVotes;
      }
 @@ -253,7 +253,7 @@
      /**
@@ -26,8 +26,8 @@ diff -ruN governance/compatibility/GovernorCompatibilityBravo.sol governance/com
          return details.forVotes > details.againstVotes;
      }
 diff -ruN governance/extensions/GovernorCountingSimple.sol governance/extensions/GovernorCountingSimple.sol
---- governance/extensions/GovernorCountingSimple.sol	2021-12-01 10:02:39.909936316 -0500
-+++ governance/extensions/GovernorCountingSimple.sol	2021-12-01 10:00:48.002627620 -0500
+--- governance/extensions/GovernorCountingSimple.sol	2021-12-03 15:24:56.523654357 -0500
++++ governance/extensions/GovernorCountingSimple.sol	2021-12-09 14:46:33.923637220 -0500
 @@ -64,7 +64,7 @@
      /**
       * @dev See {Governor-_quorumReached}.
@@ -47,9 +47,9 @@ diff -ruN governance/extensions/GovernorCountingSimple.sol governance/extensions
  
          return proposalvote.forVotes > proposalvote.againstVotes;
 diff -ruN governance/extensions/GovernorTimelockControl.sol governance/extensions/GovernorTimelockControl.sol
---- governance/extensions/GovernorTimelockControl.sol	2021-12-01 10:02:39.909936316 -0500
-+++ governance/extensions/GovernorTimelockControl.sol	2021-12-01 10:00:48.002627620 -0500
-@@ -109,7 +109,7 @@
+--- governance/extensions/GovernorTimelockControl.sol	2021-12-03 15:24:56.523654357 -0500
++++ governance/extensions/GovernorTimelockControl.sol	2021-12-09 14:46:33.923637220 -0500
+@@ -111,7 +111,7 @@
          bytes[] memory calldatas,
          bytes32 descriptionHash
      ) internal virtual override {
@@ -59,8 +59,8 @@ diff -ruN governance/extensions/GovernorTimelockControl.sol governance/extension
  
      /**
 diff -ruN governance/Governor.sol governance/Governor.sol
---- governance/Governor.sol	2021-12-01 10:02:39.909936316 -0500
-+++ governance/Governor.sol	2021-12-01 10:00:48.002627620 -0500
+--- governance/Governor.sol	2021-12-03 15:24:56.523654357 -0500
++++ governance/Governor.sol	2021-12-09 14:46:56.411503587 -0500
 @@ -38,8 +38,8 @@
  
      string private _name;
@@ -72,7 +72,7 @@ diff -ruN governance/Governor.sol governance/Governor.sol
      /**
       * @dev Restrict access to governor executing address. Some module might override the _executor function to make
       * sure this modifier is consistant with the execution model.
-@@ -154,12 +154,12 @@
+@@ -167,12 +167,12 @@
      /**
       * @dev Amount of votes already cast passes the threshold limit.
       */
@@ -87,29 +87,9 @@ diff -ruN governance/Governor.sol governance/Governor.sol
  
      /**
       * @dev Register a vote with a given support and voting weight.
-@@ -320,7 +320,7 @@
-             v,
-             r,
-             s
--        );
-+        ); // mention that we assume that hashing works correctly
-         return _castVote(proposalId, voter, support, "");
-     }
- 
-diff -ruN governance/TimelockController.sol governance/TimelockController.sol
---- governance/TimelockController.sol	2021-12-01 10:02:39.909936316 -0500
-+++ governance/TimelockController.sol	2021-12-01 10:00:48.002627620 -0500
-@@ -299,6 +299,7 @@
-             _call(id, i, targets[i], values[i], datas[i]);
-         }
-         _afterCall(id);
-+        // ASSUME THAT THERE IS NO REENTRANCY IN WIZARDHARNESS1
-     }
- 
-     /**
 diff -ruN token/ERC20/extensions/ERC20Votes.sol token/ERC20/extensions/ERC20Votes.sol
---- token/ERC20/extensions/ERC20Votes.sol	2021-12-01 10:02:39.909936316 -0500
-+++ token/ERC20/extensions/ERC20Votes.sol	2021-12-01 10:00:48.018627515 -0500
+--- token/ERC20/extensions/ERC20Votes.sol	2021-12-03 15:24:56.527654330 -0500
++++ token/ERC20/extensions/ERC20Votes.sol	2021-12-09 14:46:33.927637196 -0500
 @@ -84,7 +84,7 @@
       *
       * - `blockNumber` must have been already mined