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

try optimise GovernorStates

Browse Source
This commit is contained in:
Hadrien Croubois
2023-03-14 10:23:49 +01:00
parent 704e265c41
commit e1120b9137
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
certora/specs/GovernorFunctions.spec
View File

@ -111,8 +111,8 @@ rule queue(uint256 pId, env e) {
uint8 stateBefore = state(e, pId);
uint8 otherStateBefore = state(e, otherId);
bool queuedBefore = isQueued(pId)
bool otherQueuedBefore = isQueued(otherId)
bool queuedBefore = isQueued(pId);
bool otherQueuedBefore = isQueued(otherId);
address[] targets; uint256[] values; bytes[] calldatas; bytes32 descrHash;
require pId == queue@withrevert(e, targets, values, calldatas, descrHash);
@ -174,8 +174,9 @@ rule cancel(uint256 pId, env e) {
uint256 otherId;
uint8 stateBefore = state(e, pId);
uint8 otherStateBefore = state(e, otherId);
uint8 stateBefore = state(e, pId);
uint8 otherStateBefore = state(e, otherId);
bool otherQueuedBefore = isQueued(otherId);
address[] targets; uint256[] values; bytes[] calldatas; bytes32 descrHash;
require pId == cancel@withrevert(e, targets, values, calldatas, descrHash);
@ -189,9 +190,11 @@ rule cancel(uint256 pId, env e) {
// effect
assert success => (
state(e, pId) == CANCELED()
state(e, pId) == CANCELED() &&
!isQueued(pId) // cancel resets timelockId
);
// no side-effect
assert state(e, otherId) != otherStateBefore => otherId == pId;
assert state(e, otherId) != otherStateBefore => otherId == pId;
assert isQueued(otherId) != otherQueuedBefore => otherId == pId;
}

26
certora/specs/GovernorStates.spec
View File

@ -92,35 +92,39 @@ rule stateIsConsistentWithVotes(uint256 pId, env e) {
require clockSanity(e);
requireInvariant proposalStateConsistency(pId);
uint8 currentState = state(e, pId);
uint48 currentClock = clock(e);
uint48 currentClock = clock(e);
uint8 currentState = state(e, pId);
uint256 snapshot = proposalSnapshot(pId);
uint256 deadline = proposalDeadline(pId);
bool quorumSuccess = quorumReached(pId);
bool voteSuccess = voteSucceeded(pId);
// Pending: before vote starts
assert currentState == PENDING() => (
proposalSnapshot(pId) >= currentClock
snapshot >= currentClock
);
// Active: after vote starts & before vote ends
assert currentState == ACTIVE() => (
proposalSnapshot(pId) < currentClock &&
proposalDeadline(pId) >= currentClock
snapshot < currentClock &&
deadline >= currentClock
);
// Succeeded: after vote end, with vote successful and quorum reached
assert currentState == SUCCEEDED() => (
proposalDeadline(pId) < currentClock &&
deadline < currentClock &&
(
quorumReached(pId) &&
voteSucceeded(pId)
quorumSuccess &&
voteSuccess
)
);
// Defeated: after vote end, with vote not successful or quorum not reached
assert currentState == DEFEATED() => (
proposalDeadline(pId) < currentClock &&
deadline < currentClock &&
(
!quorumReached(pId) ||
!voteSucceeded(pId)
!quorumSuccess ||
!voteSuccess
)
);
}