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

Comment updates and simplification for dissolve() in RocketMinipoolDelegate #244

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Comment updates and simplification for dissolve() in RocketMinipoolDelegate #244

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
089d4bc
Update comments since dissolve() requires timeout
harpocryptes Apr 19, 2022
8ee1169
Simply dissolve() requires
harpocryptes Apr 19, 2022
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
8 changes: 4 additions & 4 deletions contracts/contract/minipool/RocketMinipoolDelegate.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,15 +420,15 @@ contract RocketMinipoolDelegate is RocketMinipoolStorageLayout, RocketMinipoolIn
}

// Dissolve the minipool, returning user deposited ETH to the deposit pool
// Only accepts calls from the minipool owner (node), or from any address if timed out
// Only accepts calls if the minipool has timed out
function dissolve() override external onlyInitialised {
// Check current status
require(status == MinipoolStatus.Initialised || status == MinipoolStatus.Prelaunch, "The minipool can only be dissolved while initialised or in prelaunch");
require(status == MinipoolStatus.Prelaunch, "The minipool can only be dissolved while in prelaunch");
// Load contracts
RocketDAOProtocolSettingsMinipoolInterface rocketDAOProtocolSettingsMinipool = RocketDAOProtocolSettingsMinipoolInterface(getContractAddress("rocketDAOProtocolSettingsMinipool"));
// Check if being dissolved by minipool owner or minipool is timed out
// Check if minipool has timed out
require(
(status == MinipoolStatus.Prelaunch && block.timestamp.sub(statusTime) >= rocketDAOProtocolSettingsMinipool.getLaunchTimeout()),
block.timestamp.sub(statusTime) >= rocketDAOProtocolSettingsMinipool.getLaunchTimeout(),
"The minipool can only be dissolved once it has timed out"
);
// Perform the dissolution
Expand Down