Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Certora] Implement reviews suggestions #413

Merged
merged 4 commits into from
Apr 8, 2024
Merged

[Certora] Implement reviews suggestions #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
017b74e
feat: use timestamp hook
QGarchery Apr 2, 2024
70c4440
feat: add not marked for removal on non enabled markets
QGarchery Apr 2, 2024
6a59f0e
fix: persistent ghost lastTimestamp
QGarchery Apr 2, 2024
d43b547
refactor: naming timestamp hook
QGarchery Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions certora/specs/ConsistentState.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@ function hasSupplyCapIsNotMarkedForRemoval(MetaMorphoHarness.Id id) returns bool
invariant supplyCapIsNotMarkedForRemoval(MetaMorphoHarness.Id id)
hasSupplyCapIsNotMarkedForRemoval(id);

function isNotEnabledIsNotMarkedForRemoval(MetaMorphoHarness.Id id) returns bool {
MetaMorphoHarness.MarketConfig config = config_(id);

return !config.enabled => config.removableAt == 0;
}

// Check that a non-enabled market cannot be marked for removal.
invariant notEnabledIsNotMarkedForRemoval(MetaMorphoHarness.Id id)
isNotEnabledIsNotMarkedForRemoval(id);

function hasPendingCapIsNotMarkedForRemoval(MetaMorphoHarness.Id id) returns bool {
return pendingCap_(id).validAt > 0 => config_(id).removableAt == 0;
}
Expand Down
32 changes: 10 additions & 22 deletions certora/specs/Timelock.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,21 @@ function summarySupplyshares(MetaMorphoHarness.Id id, address user) returns uint
return res;
}

persistent ghost uint256 lastTimestamp;

hook TIMESTAMP uint newTimestamp {
MathisGD marked this conversation as resolved.
Show resolved Hide resolved
// Safe require because timestamps are guaranteed to be increasing.
require newTimestamp >= lastTimestamp;
// Safe require as it corresponds to some time very far into the future.
require newTimestamp < 2^63;
lastTimestamp = newTimestamp;
}

// Show that nextGuardianUpdateTime does not revert.
rule nextGuardianUpdateTimeDoesNotRevert() {
// The environment e yields the current time.
env e;
require e.msg.value == 0;
// Safe require as it corresponds to some time very far into the future.
require e.block.timestamp < 2^63;

// Safe require because it is a verified invariant.
require isTimelockInRange();
Expand All @@ -35,8 +43,6 @@ rule nextGuardianUpdateTimeDoesNotRevert() {
rule guardianUpdateTime(env e_next, method f, calldataarg args) {
// The environment e yields the current time.
env e;
// Safe require as it corresponds to some time very far into the future.
require e.block.timestamp < 2^63;

// Safe require because it is a verified invariant.
require isTimelockInRange();
Expand All @@ -46,8 +52,6 @@ rule guardianUpdateTime(env e_next, method f, calldataarg args) {

// Assume that the guardian is already set.
require prevGuardian != 0;
// Sane assumption on the current time, as any following transaction should happen after it.
require e_next.block.timestamp >= e.block.timestamp;
uint256 nextGuardianUpdateTimeBeforeInteraction = nextGuardianUpdateTime(e);
// Increasing nextGuardianUpdateTime with no interaction;
assert nextGuardianUpdateTimeBeforeInteraction >= nextTime;
Expand All @@ -68,8 +72,6 @@ rule nextCapIncreaseTimeDoesNotRevert(MetaMorphoHarness.Id id) {
// The environment e yields the current time.
env e;
require e.msg.value == 0;
// Safe require as it corresponds to some time very far into the future.
require e.block.timestamp < 2^63;

// Safe require because it is a verified invariant.
require isTimelockInRange();
Expand All @@ -85,8 +87,6 @@ rule nextCapIncreaseTimeDoesNotRevert(MetaMorphoHarness.Id id) {
rule capIncreaseTime(env e_next, method f, calldataarg args) {
// The environment e yields the current time.
env e;
// Safe require as it corresponds to some time very far into the future.
require e.block.timestamp < 2^63;

MetaMorphoHarness.Id id;

Expand All @@ -96,8 +96,6 @@ rule capIncreaseTime(env e_next, method f, calldataarg args) {
uint256 nextTime = nextCapIncreaseTime(e, id);
uint184 prevCap = config_(id).cap;

// Sane assumption on the current time, as any following transaction should happen after it.
require e_next.block.timestamp >= e.block.timestamp;
uint256 nextCapIncreaseTimeBeforeInteraction = nextCapIncreaseTime(e_next, id);
// Increasing nextCapIncreaseTime with no interaction;
assert nextCapIncreaseTimeBeforeInteraction >= nextTime;
Expand All @@ -118,8 +116,6 @@ rule nextTimelockDecreaseTimeDoesNotRevert() {
// The environment e yields the current time.
env e;
require e.msg.value == 0;
// Safe require as it corresponds to some time very far into the future.
require e.block.timestamp < 2^63;

// Safe require because it is a verified invariant.
require isTimelockInRange();
Expand All @@ -135,17 +131,13 @@ rule nextTimelockDecreaseTimeDoesNotRevert() {
rule timelockDecreaseTime(env e_next, method f, calldataarg args) {
// The environment e yields the current time.
env e;
// Safe require as it corresponds to some time very far into the future.
require e.block.timestamp < 2^63;

// Safe require because it is a verified invariant.
require isTimelockInRange();

uint256 nextTime = nextTimelockDecreaseTime(e);
uint256 prevTimelock = timelock();

// Sane assumption on the current time, as any following transaction should happen after it.
require e_next.block.timestamp >= e.block.timestamp;
uint256 nextTimelockDecreaseTimeBeforeInteraction = nextTimelockDecreaseTime(e_next);
// Increasing nextTimelockDecreaseTime with no interaction;
assert nextTimelockDecreaseTimeBeforeInteraction >= nextTime;
Expand All @@ -166,8 +158,6 @@ rule nextRemovableTimeDoesNotRevert(MetaMorphoHarness.Id id) {
// The environment e yields the current time.
env e;
require e.msg.value == 0;
// Safe require as it corresponds to some time very far into the future.
require e.block.timestamp < 2^63;

// Safe require because it is a verified invariant.
require isTimelockInRange();
Expand Down Expand Up @@ -195,8 +185,6 @@ rule removableTime(env e_next, method f, calldataarg args) {

// Assume that the market is enabled.
require config_(id).enabled;
// Sane assumption on the current time, as any following transaction should happen after it.
require e_next.block.timestamp >= e.block.timestamp;
uint256 nextRemovableTimeBeforeInteraction = nextRemovableTime(e_next, id);
// Increasing nextRemovableTime with no interaction;
assert nextRemovableTimeBeforeInteraction >= nextTime;
Expand Down
Loading