diff --git a/contracts/contract/dao/protocol/RocketDAOProtocolVerifier.sol b/contracts/contract/dao/protocol/RocketDAOProtocolVerifier.sol index c9944e29..5876a61e 100644 --- a/contracts/contract/dao/protocol/RocketDAOProtocolVerifier.sol +++ b/contracts/contract/dao/protocol/RocketDAOProtocolVerifier.sol @@ -270,7 +270,7 @@ contract RocketDAOProtocolVerifier is RocketBase, RocketDAOProtocolVerifierInter setUint(defeatIndexKey, _index); } - /// @notice Called by a challenger to claim bonds (both refunded bonds and any rewards paid) + /// @notice Called by a challenger to claim bonds (both refunded bonds and any rewards paid minus the 20% bond burn) /// @param _proposalID The ID of the proposal /// @param _indices An array of indices which the challenger has a claim against function claimBondChallenger(uint256 _proposalID, uint256[] calldata _indices) external onlyLatestContract("rocketDAOProtocolVerifier", address(this)) onlyRegisteredNode(msg.sender) { @@ -339,7 +339,7 @@ contract RocketDAOProtocolVerifier is RocketBase, RocketDAOProtocolVerifierInter } } - /// @notice Called by a proposer to claim bonds (both refunded bond and any rewards paid) + /// @notice Called by a proposer to claim bonds (both refunded bond and any rewards paid minus the 20% bond burn) /// @param _proposalID The ID of the proposal /// @param _indices An array of indices which the proposer has a claim against function claimBondProposer(uint256 _proposalID, uint256[] calldata _indices) external onlyLatestContract("rocketDAOProtocolVerifier", address(this)) onlyRegisteredNode(msg.sender) { diff --git a/contracts/contract/dao/protocol/settings/RocketDAOProtocolSettingsAuction.sol b/contracts/contract/dao/protocol/settings/RocketDAOProtocolSettingsAuction.sol index 6befc3de..89591275 100644 --- a/contracts/contract/dao/protocol/settings/RocketDAOProtocolSettingsAuction.sol +++ b/contracts/contract/dao/protocol/settings/RocketDAOProtocolSettingsAuction.sol @@ -16,7 +16,7 @@ contract RocketDAOProtocolSettingsAuction is RocketDAOProtocolSettings, RocketDA setSettingBool("auction.lot.bidding.enabled", true); setSettingUint("auction.lot.value.minimum", 1 ether); setSettingUint("auction.lot.value.maximum", 10 ether); - setSettingUint("auction.lot.duration", 40320); // 7 days + setSettingUint("auction.lot.duration", 50400); // 7 days setSettingUint("auction.price.start", 1 ether); // 100% setSettingUint("auction.price.reserve", 0.5 ether); // 50% // Settings initialised diff --git a/contracts/contract/dao/protocol/settings/RocketDAOProtocolSettingsProposals.sol b/contracts/contract/dao/protocol/settings/RocketDAOProtocolSettingsProposals.sol index efe3a02a..197de446 100644 --- a/contracts/contract/dao/protocol/settings/RocketDAOProtocolSettingsProposals.sol +++ b/contracts/contract/dao/protocol/settings/RocketDAOProtocolSettingsProposals.sol @@ -53,11 +53,11 @@ contract RocketDAOProtocolSettingsProposals is RocketDAOProtocolSettings, Rocket // Must be at least 30 minutes (RPIP-33) require(_value >= 30 minutes, "Value must be at least 30 minutes"); } else if(settingKey == keccak256(bytes("proposal.quorum"))) { - // Must be >= 15% & < 75% + // Must be >= 15% & < 75% (RPIP-63) require(_value >= 0.15 ether && _value < 0.75 ether, "Value must be >= 15% & < 75%"); } else if(settingKey == keccak256(bytes("proposal.veto.quorum"))) { - // Must be >= 15% & < 75% - require(_value >= 0.15 ether && _value < 0.75 ether, "Value must be >= 15% & < 75%"); + // Must be >= 51% & < 75% (RPIP-33) + require(_value >= 0.51 ether && _value < 0.75 ether, "Value must be >= 51% & < 75%"); } else if(settingKey == keccak256(bytes("proposal.max.block.age"))) { // Must be > 128 blocks & < 7200 blocks (RPIP-33) require(_value > 128 && _value < 7200, "Value must be > 128 blocks & < 7200 blocks");