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

feat(metamorpho): add no pending value error #96

Merged
merged 4 commits into from
Sep 21, 2023
Merged

feat(metamorpho): add no pending value error #96

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
fea8da2
feat(metamorpho): add no pending value error
Rubilmax Sep 20, 2023
5070df2
Merge branch 'feat/revocator' of github.com:morpho-labs/morpho-blue-m…
Rubilmax Sep 20, 2023
7e5a256
fix(test): adapt test
Rubilmax Sep 20, 2023
db6c69b
refactor(test): rename timeElapsed to elapsed
Rubilmax Sep 20, 2023
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
9 changes: 5 additions & 4 deletions src/MetaMorpho.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,19 +97,20 @@ contract MetaMorpho is ERC4626, ERC20Permit, Ownable2Step, IMetaMorpho {
_;
}

modifier onlyAllocator() {
require(isAllocator(_msgSender()), ErrorsLib.NOT_ALLOCATOR);
modifier onlyGuardian() {
require(_msgSender() == guardian, ErrorsLib.NOT_GUARDIAN);

_;
}

modifier onlyGuardian() {
require(_msgSender() == guardian, ErrorsLib.NOT_GUARDIAN);
modifier onlyAllocator() {
require(isAllocator(_msgSender()), ErrorsLib.NOT_ALLOCATOR);

_;
}

modifier timelockElapsed(uint256 submittedAt) {
require(submittedAt != 0, ErrorsLib.NO_PENDING_VALUE);
require(block.timestamp >= submittedAt + timelock, ErrorsLib.TIMELOCK_NOT_ELAPSED);
require(block.timestamp <= submittedAt + timelock + TIMELOCK_EXPIRATION, ErrorsLib.TIMELOCK_EXPIRATION_EXCEEDED);

Expand Down
2 changes: 2 additions & 0 deletions src/libraries/ErrorsLib.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ library ErrorsLib {

string internal constant MISSING_MARKET = "missing market";

string internal constant NO_PENDING_VALUE = "no pending value";

string internal constant WITHDRAW_FAILED_MORPHO = "withdraw failed on Morpho";

string internal constant MARKET_NOT_CREATED = "market not created";
Expand Down
24 changes: 4 additions & 20 deletions test/forge/RoleTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,20 @@ contract RoleTest is BaseTest {

vm.startPrank(caller);

vm.expectRevert("Ownable: caller is not the owner");
vault.submitTimelock(1);

vm.expectRevert("Ownable: caller is not the owner");
vault.acceptTimelock();

vm.expectRevert("Ownable: caller is not the owner");
vault.setRiskManager(caller);

vm.expectRevert("Ownable: caller is not the owner");
vault.setIsAllocator(caller, true);

vm.expectRevert("Ownable: caller is not the owner");
vault.submitTimelock(1);

vm.expectRevert("Ownable: caller is not the owner");
vault.submitFee(1);

vm.expectRevert("Ownable: caller is not the owner");
vault.acceptFee();
vault.submitGuardian(address(1));

vm.expectRevert("Ownable: caller is not the owner");
vault.setFeeRecipient(caller);
Expand All @@ -43,9 +40,6 @@ contract RoleTest is BaseTest {
vm.expectRevert(bytes(ErrorsLib.NOT_RISK_MANAGER));
vault.submitCap(allMarkets[0], CAP);

vm.expectRevert(bytes(ErrorsLib.NOT_RISK_MANAGER));
vault.acceptCap(allMarkets[0].id());

vm.stopPrank();
}

Expand Down Expand Up @@ -74,18 +68,8 @@ contract RoleTest is BaseTest {
vm.prank(OWNER);
vault.submitCap(allMarkets[0], CAP);

vm.warp(block.timestamp + vault.timelock());

vm.prank(OWNER);
vault.acceptCap(allMarkets[0].id());

vm.prank(RISK_MANAGER);
vault.submitCap(allMarkets[1], CAP);

vm.warp(block.timestamp + vault.timelock());

vm.prank(RISK_MANAGER);
vault.acceptCap(allMarkets[1].id());
}

function testAllocatorOrRiskManagerOrOwnerShouldTriggerAllocatorFunctions() public {
Expand Down
37 changes: 26 additions & 11 deletions test/forge/TimelockTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,19 @@ contract TimelockTest is BaseTest {
assertEq(submittedAt, 0, "submittedAt");
}

function testAcceptTimelockNotOwner() public {
function testAcceptTimelockNoPendingValue() public {
vm.expectRevert(bytes(ErrorsLib.NO_PENDING_VALUE));
vault.acceptTimelock();
}

function testAcceptTimelockNotOwner(uint256 timelock) public {
timelock = bound(timelock, 0, TIMELOCK - 1);

vm.prank(OWNER);
vault.submitTimelock(timelock);

vm.warp(block.timestamp + TIMELOCK);

vm.expectRevert("Ownable: caller is not the owner");
Rubilmax marked this conversation as resolved.
Show resolved Hide resolved
vault.acceptTimelock();
}
Expand All @@ -95,12 +107,10 @@ contract TimelockTest is BaseTest {
vault.acceptTimelock();
}

function testAcceptTimelockExpirationExceeded(uint256 timelock, uint256 elapsed) public {
timelock = bound(timelock, 0, MAX_TIMELOCK);
function testAcceptTimelockDecreasedTimelockExpirationExceeded(uint256 timelock, uint256 elapsed) public {
timelock = bound(timelock, 0, TIMELOCK - 1);
elapsed = bound(elapsed, TIMELOCK + TIMELOCK_EXPIRATION + 1, type(uint64).max);

vm.assume(timelock != TIMELOCK);

vm.prank(OWNER);
vault.submitTimelock(timelock);

Expand Down Expand Up @@ -140,32 +150,37 @@ contract TimelockTest is BaseTest {
assertEq(Id.unwrap(vault.withdrawQueue(0)), Id.unwrap(id), "withdrawQueue");
}

function testAcceptCapTimelockNotElapsed(uint256 alpsed) public {
alpsed = bound(alpsed, 0, TIMELOCK - 1);
function testAcceptCapNoPendingValue() public {
vm.expectRevert(bytes(ErrorsLib.NO_PENDING_VALUE));
vault.acceptCap(allMarkets[0].id());
}

function testAcceptCapTimelockNotElapsed(uint256 elapsed) public {
elapsed = bound(elapsed, 0, TIMELOCK - 1);

vm.prank(RISK_MANAGER);
vault.submitCap(allMarkets[0], CAP);

vm.warp(block.timestamp + alpsed);
vm.warp(block.timestamp + elapsed);

vm.prank(RISK_MANAGER);
vm.expectRevert(bytes(ErrorsLib.TIMELOCK_NOT_ELAPSED));
vault.acceptCap(allMarkets[0].id());
}

function testAcceptCapTimelockExpirationExceeded(uint256 timelock, uint256 timeElapsed) public {
function testAcceptCapTimelockExpirationExceeded(uint256 timelock, uint256 elapsed) public {
timelock = bound(timelock, 1, MAX_TIMELOCK);

vm.assume(timelock != vault.timelock());

_setTimelock(timelock);

timeElapsed = bound(timeElapsed, timelock + TIMELOCK_EXPIRATION + 1, type(uint64).max);
elapsed = bound(elapsed, timelock + TIMELOCK_EXPIRATION + 1, type(uint64).max);

vm.startPrank(RISK_MANAGER);
vault.submitCap(allMarkets[0], CAP);

vm.warp(block.timestamp + timeElapsed);
vm.warp(block.timestamp + elapsed);

vm.expectRevert(bytes(ErrorsLib.TIMELOCK_EXPIRATION_EXCEEDED));
vault.acceptCap(allMarkets[0].id());
Expand Down
Loading