Skip to content

Dev/rune worker hub boost #11

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

Merged
kelvin2608 merged 3 commits into from
May 22, 2024
Merged

Dev/rune worker hub boost #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d42934
update boost mining reward
180945 May 21, 2024
6e4eb27
update latest timestamp when unregis
180945 May 21, 2024
7832af5
fixed slash miner feature
180945 May 22, 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
21 changes: 14 additions & 7 deletions contracts/WorkerHub.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,8 @@ ReentrancyGuardUpgradeable {

if (minerAddresses.hasValue(msg.sender)) {
_claimReward(msg.sender, false);
// reset boost
boost[msg.sender].reserved1 = 0;
boost[msg.sender].minerTimestamp = uint40(block.timestamp);

minerAddresses.erase(msg.sender);
Expand Down Expand Up @@ -618,7 +620,8 @@ ReentrancyGuardUpgradeable {
if (!minerAddresses.hasValue(_miner)) revert InvalidMiner();
// update reward
_claimReward(_miner, false);

boost[_miner].reserved1 += uint48(block.timestamp) - uint48(boost[_miner].minerTimestamp == 0 ? 1716046859 : boost[_miner].minerTimestamp);
boost[_miner].minerTimestamp = uint40(block.timestamp);
address modelAddress = miner.modelAddress;

// Remove miner from available miner
Expand All @@ -635,7 +638,7 @@ ReentrancyGuardUpgradeable {
miner.stake -= fine;

// reset boost
boost[msg.sender].minerTimestamp = uint40(block.timestamp);
boost[_miner].reserved1 = 0;
TransferHelper.safeTransferNative(treasury, fine);

emit FraudulentMinerPenalized(_miner, modelAddress, treasury, fine);
Expand Down Expand Up @@ -735,13 +738,17 @@ ReentrancyGuardUpgradeable {
}

function multiplier(address _miner) public view returns(uint256) {
if (!minerAddresses.hasValue(_miner)) {
return PERCENTAGE_DENOMINATOR;
uint256 minerLastTimestamp;

if (minerAddresses.hasValue(_miner) && boost[_miner].minerTimestamp == 0) {
minerLastTimestamp = 1716046859;
} else if (!minerAddresses.hasValue(_miner)) {
minerLastTimestamp = block.timestamp;
} else {
minerLastTimestamp = boost[_miner].minerTimestamp;
}
uint256 multiplierRes = (boost[_miner].reserved1 + block.timestamp - minerLastTimestamp) / 30 days;

uint256 minerLastTimestamp = minerAddresses.hasValue(_miner) && boost[_miner].minerTimestamp == 0 ?
1716046859 : boost[_miner].minerTimestamp;
uint256 multiplierRes = (block.timestamp - minerLastTimestamp) / 30 days;
return PERCENTAGE_DENOMINATOR + 500 * (multiplierRes >= 12 ? 12 : multiplierRes);
}
}
2 changes: 1 addition & 1 deletion contracts/interfaces/IWorkerHub.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ interface IWorkerHub is IInferable {
struct Boost {
uint40 minerTimestamp;
uint40 validatorTimestamp;
uint48 reserved1;
uint48 reserved1; // accumulated active time
uint128 reserved2;
}

Expand Down