Skip to content

Commit ff96cf7

Browse files
committed
Add missing SC permission
1 parent 38ad1d5 commit ff96cf7

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

contracts/contract/dao/protocol/settings/RocketDAOProtocolSettingsSecurity.sol

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ contract RocketDAOProtocolSettingsSecurity is RocketDAOProtocolSettings, RocketD
2727
setBool(keccak256(abi.encodePacked("dao.security.allowed.setting", "minipool", "minipool.bond.reduction.enabled")), true);
2828
setBool(keccak256(abi.encodePacked("dao.security.allowed.setting", "network", "network.submit.balances.enabled")), true);
2929
setBool(keccak256(abi.encodePacked("dao.security.allowed.setting", "network", "network.submit.prices.enabled")), true);
30+
setBool(keccak256(abi.encodePacked("dao.security.allowed.setting", "network", "network.submit.rewards.enabled")), true);
3031
setBool(keccak256(abi.encodePacked("dao.security.allowed.setting", "node", "node.registration.enabled")), true);
3132
setBool(keccak256(abi.encodePacked("dao.security.allowed.setting", "node", "node.smoothing.pool.registration.enabled")), true);
3233
setBool(keccak256(abi.encodePacked("dao.security.allowed.setting", "node", "node.deposit.enabled")), true);
@@ -59,6 +60,12 @@ contract RocketDAOProtocolSettingsSecurity is RocketDAOProtocolSettings, RocketD
5960
} else if(settingKey == keccak256(abi.encodePacked("proposal.action.time"))) {
6061
// >= 1 day (RPIP-33)
6162
require(_value >= 1 days, "Value must be >= 1 day");
63+
} else if(settingKey == keccak256(abi.encodePacked("upgradeveto.quorum"))) {
64+
// >= 33% & < 75%
65+
require(_value >= 0.33 ether && _value <= 0.75 ether, "Quorum setting must be >= 33% & <= 75%");
66+
} else if(settingKey == keccak256(abi.encodePacked("upgrade.delay"))) {
67+
// >= 7 days
68+
require(_value >= 7 days, "Value must be >= 7 days");
6269
}
6370
}
6471
// Update setting now

contracts/contract/upgrade/RocketUpgradeOneDotFour.sol

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ contract RocketUpgradeOneDotFour is RocketBase {
9090
// Add new security council allowed parameter
9191
setBool(keccak256(abi.encodePacked("dao.security.allowed.setting", "network", "network.node.commission.share.security.council.adder")), true);
9292

93+
// Add missing security council permission for rewards submission enabled
94+
setBool(keccak256(abi.encodePacked("dao.security.allowed.setting", "network", "network.submit.rewards.enabled")), true);
95+
9396
// Deposit settings
9497
{
9598
bytes32 settingNameSpace = keccak256(abi.encodePacked("dao.protocol.setting.", "deposit"));

0 commit comments

Comments
 (0)