Skip to content
This repository was archived by the owner on Mar 1, 2024. It is now read-only.

Checkpoints optimization v2 #355

Open
imyourm8 wants to merge 12 commits into
base: v0.3.0-backport
Choose a base branch
from
Open

Checkpoints optimization v2 #355

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7c7d803
chg: combine status and deactiovationEpoch
Apr 22, 2021
886082a
chg: eliminate few more storage reads in normal circumstances
Apr 23, 2021
b8fdf6c
fix: do not remove signer from unstaked validator record
Apr 23, 2021
5567e04
fix: increase total staked amount during validator restake
Apr 23, 2021
5a31651
fix: test
Apr 23, 2021
344dd9d
misc: return back code
Apr 23, 2021
6c07739
chg: migration of data code
Apr 23, 2021
9e9bd93
new: withdraw rewards to different address
Apr 23, 2021
2fb6089
fix: deduce total amount during slashing
Apr 23, 2021
20c93ae
fix: slashing
Apr 23, 2021
0ef6457
fix: slashing tests
Apr 26, 2021
8c0e267
fix: migration test
Apr 26, 2021
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
Prev Previous commit
Next Next commit
chg: eliminate few more storage reads in normal circumstances
  • Loading branch information
Denis Ermolin
Denis Ermolin committed Apr 23, 2021
commit 886082a108257a677f0a9682f8e645d9ba064844
2 changes: 1 addition & 1 deletion contracts/staking/slashing/SlashingManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ contract SlashingManager is ISlashingManager, Ownable {
lastAdd = signer;
uint256 amount;
uint256 delegatedAmount;
(amount,,,,,,,,,,,delegatedAmount,,) = stakeManager.validators(validatorId);
(amount,,,,,,,,,,,delegatedAmount,) = stakeManager.validators(validatorId);

// add delegation power
amount = amount.add(delegatedAmount);
Expand Down
109 changes: 57 additions & 52 deletions contracts/staking/stakeManager/StakeManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ contract StakeManager is
}

function delegatedAmount(uint256 validatorId) public view returns (uint256) {
return validators[validatorId].delegatedAmount;
return signerState[validators[validatorId].signer].totalAmount.sub(validators[validatorId].amount);
}

function delegatorsReward(uint256 validatorId) public view returns (uint256) {
Expand All @@ -158,7 +158,7 @@ contract StakeManager is

function validatorReward(uint256 validatorId) public view returns (uint256) {
uint256 _validatorReward;
(, uint256 deactivationEpoch) = _readStatus(validatorId);
(, uint256 deactivationEpoch) = _readStatus(validators[validatorId].signer);
if (deactivationEpoch == 0) {
(_validatorReward, ) = _evaluateValidatorAndDelegationReward(validatorId);
}
Expand All @@ -178,11 +178,10 @@ contract StakeManager is
}

function isValidator(uint256 validatorId) public view returns (bool) {
(Status status, uint256 deactivationEpoch) = _readStatus(validatorId);
(Status status, uint256 deactivationEpoch) = _readStatus(validators[validatorId].signer);
return
_isValidator(
status,
validators[validatorId].amount,
deactivationEpoch,
currentEpoch
);
Expand Down Expand Up @@ -413,7 +412,7 @@ contract StakeManager is
function unstake(uint256 validatorId) external onlyStaker(validatorId) {
require(validatorAuction[validatorId].amount == 0);

(Status status, uint256 deactivationEpoch) = _readStatus(validatorId);
(Status status, uint256 deactivationEpoch) = _readStatus(validators[validatorId].signer);
require(
validators[validatorId].activationEpoch > 0 &&
deactivationEpoch == 0 &&
Expand Down Expand Up @@ -459,7 +458,9 @@ contract StakeManager is
}

function unstakeClaim(uint256 validatorId) public onlyStaker(validatorId) {
(Status status, uint256 deactivationEpoch) = _readStatus(validatorId);
address signer = validators[validatorId].signer;

(Status status, uint256 deactivationEpoch) = _readStatus(signer);
// can only claim stake back after WITHDRAWAL_DELAY
require(
deactivationEpoch > 0 &&
Expand All @@ -479,8 +480,9 @@ contract StakeManager is
validators[validatorId].jailTime = 0;
validators[validatorId].signer = address(0);

signerToValidator[validators[validatorId].signer] = INCORRECT_VALIDATOR_ID;
_writeStatus(validatorId, Status.Unstaked, deactivationEpoch);
signerToValidator[signer] = INCORRECT_VALIDATOR_ID;
_writeStatus(signer, Status.Unstaked, deactivationEpoch);
signerState[signer].totalAmount = signerState[signer].totalAmount.sub(amount);

_transferToken(msg.sender, amount);
logger.logUnstaked(msg.sender, validatorId, amount, newTotalStaked);
Expand All @@ -491,7 +493,7 @@ contract StakeManager is
uint256 amount,
bool stakeRewards
) public onlyWhenUnlocked onlyStaker(validatorId) {
(, uint256 deactivationEpoch) = _readStatus(validatorId);
(, uint256 deactivationEpoch) = _readStatus(validators[validatorId].signer);
require(deactivationEpoch == 0, "No restaking");

if (amount > 0) {
Expand Down Expand Up @@ -546,11 +548,13 @@ contract StakeManager is
}

function increaseValidatorDelegatedAmount(uint256 validatorId, uint256 amount) private {
validators[validatorId].delegatedAmount = validators[validatorId].delegatedAmount.add(amount);
address signer = validators[validatorId].signer;
signerState[signer].totalAmount = signerState[signer].totalAmount.add(amount);
}

function decreaseValidatorDelegatedAmount(uint256 validatorId, uint256 amount) public onlyDelegation(validatorId) {
validators[validatorId].delegatedAmount = validators[validatorId].delegatedAmount.sub(amount);
address signer = validators[validatorId].signer;
signerState[signer].totalAmount = signerState[signer].totalAmount.sub(amount);
}

function updateSigner(uint256 validatorId, bytes memory signerPubkey) public onlyStaker(validatorId) {
Expand All @@ -565,6 +569,10 @@ contract StakeManager is
signerToValidator[currentSigner] = INCORRECT_VALIDATOR_ID;
signerToValidator[signer] = validatorId;
validators[validatorId].signer = signer;

signerState[signer] = signerState[currentSigner];
delete signerState[currentSigner];

_updateSigner(currentSigner, signer);

// reset update time to current time
Expand Down Expand Up @@ -604,26 +612,24 @@ contract StakeManager is
break;
}

uint256 validatorId = signerToValidator[signer];
uint256 amount = validators[validatorId].amount;
(Status status, uint256 deactivationEpoch) = _readStatus(validatorId);
(Status status, uint256 deactivationEpoch) = _readStatus(signer);

if (_isValidator(status, amount, deactivationEpoch, _currentEpoch)) {
if (_isValidator(status, deactivationEpoch, _currentEpoch)) {
lastAdd = signer;

unstakeCtx.signedStakePower = unstakeCtx.signedStakePower.add(validators[validatorId].delegatedAmount).add(amount);
unstakeCtx.signedStakePower = unstakeCtx.signedStakePower.add(signerState[signer].totalAmount);

if (deactivationEpoch != 0) {
// this validator not a part of signers list anymore
unstakeCtx.deactivatedValidators[unstakeCtx.validatorIndex] = validatorId;
unstakeCtx.deactivatedValidators[unstakeCtx.validatorIndex] = signerToValidator[signer];
unstakeCtx.validatorIndex++;
} else {
unsignedCtx = _fillUnsignedValidators(unsignedCtx, signer);
}
} else if (status == Status.Locked) {
// TODO fix double unsignedValidators appearance
// make sure that jailed validator doesn't get his rewards too
unsignedCtx.unsignedValidators[unsignedCtx.unsignedValidatorIndex] = validatorId;
unsignedCtx.unsignedValidators[unsignedCtx.unsignedValidatorIndex] = signerToValidator[signer];
unsignedCtx.unsignedValidatorIndex++;
unsignedCtx.validatorIndex++;
}
Expand Down Expand Up @@ -689,7 +695,7 @@ contract StakeManager is
uint256 delSlashedAmount =
IValidatorShare(delegationContract).slash(
validators[validatorId].amount,
validators[validatorId].delegatedAmount,
signerState[validators[validatorId].signer].totalAmount,
_amount
);
_amount = _amount.sub(delSlashedAmount);
Expand All @@ -713,7 +719,9 @@ contract StakeManager is
}

function unjail(uint256 validatorId) public onlyStaker(validatorId) {
(Status status, uint256 deactivationEpoch) = _readStatus(validatorId);
address signer = validators[validatorId].signer;

(Status status, uint256 deactivationEpoch) = _readStatus(signer);

require(status == Status.Locked, "Not jailed");
require(deactivationEpoch == 0, "Already unstaking");
Expand All @@ -730,11 +738,10 @@ contract StakeManager is
}

// undo timeline so that validator is normal validator
updateTimeline(int256(amount.add(validators[validatorId].delegatedAmount)), 1, 0);
updateTimeline(int256(signerState[signer].totalAmount), 1, 0);

_writeStatus(validatorId, Status.Active, deactivationEpoch);

address signer = validators[validatorId].signer;
_writeStatus(signer, Status.Active, deactivationEpoch);

logger.logUnjailed(validatorId, signer);
}

Expand Down Expand Up @@ -762,13 +769,13 @@ contract StakeManager is
}
}

// TODO should be callable by the validator NFT owner instead
function updateValidatorDelegation(bool delegation) external {
uint256 validatorId = signerToValidator[msg.sender];
(Status status, uint256 deactivationEpoch) = _readStatus(validatorId);
(Status status, uint256 deactivationEpoch) = _readStatus(msg.sender);
require(
_isValidator(
status,
validators[validatorId].amount,
deactivationEpoch,
currentEpoch
),
Expand All @@ -794,11 +801,10 @@ contract StakeManager is

function _isValidator(
Status status,
uint256 amount,
uint256 deactivationEpoch,
uint256 _currentEpoch
) private pure returns (bool) {
return (amount > 0 && (deactivationEpoch == 0 || deactivationEpoch > _currentEpoch) && status == Status.Active);
return (deactivationEpoch == 0 || deactivationEpoch > _currentEpoch) && status == Status.Active;
}

function _fillUnsignedValidators(UnsignedValidatorsContext memory context, address signer)
Expand Down Expand Up @@ -930,16 +936,15 @@ contract StakeManager is
// attempt to save gas in case if rewards were updated previosuly
if (initialRewardPerStake < currentRewardPerStake) {
uint256 validatorsStake = validators[validatorId].amount;
uint256 delegatedAmount = validators[validatorId].delegatedAmount;
if (delegatedAmount > 0) {
uint256 combinedStakePower = validatorsStake.add(delegatedAmount);
uint256 totalAmount = signerState[validators[validatorId].signer].totalAmount;
if (totalAmount > validatorsStake) {
_increaseValidatorRewardWithDelegation(
validatorId,
validatorsStake,
delegatedAmount,
totalAmount,
_getEligibleValidatorReward(
validatorId,
combinedStakePower,
totalAmount,
currentRewardPerStake,
initialRewardPerStake
)
Expand Down Expand Up @@ -985,10 +990,9 @@ contract StakeManager is
function _increaseValidatorRewardWithDelegation(
uint256 validatorId,
uint256 validatorsStake,
uint256 delegatedAmount,
uint256 combinedStakePower,
uint256 reward
) private {
uint256 combinedStakePower = delegatedAmount.add(validatorsStake);
(uint256 validatorReward, uint256 delegatorsReward) =
_getValidatorAndDelegationReward(validatorId, validatorsStake, reward, combinedStakePower);

Expand Down Expand Up @@ -1031,7 +1035,7 @@ contract StakeManager is
returns (uint256 validatorReward, uint256 delegatorsReward)
{
uint256 validatorsStake = validators[validatorId].amount;
uint256 combinedStakePower = validatorsStake.add(validators[validatorId].delegatedAmount);
uint256 combinedStakePower = signerState[validators[validatorId].signer].totalAmount;
uint256 eligibleReward = rewardPerStake - validators[validatorId].initialRewardPerStake;
return
_getValidatorAndDelegationReward(
Expand All @@ -1050,11 +1054,13 @@ contract StakeManager is

uint256 _currentEpoch = currentEpoch;
validators[validatorId].jailTime = _currentEpoch.add(jailCheckpoints);

address signer = validators[validatorId].signer;
(, uint256 deactivationEpoch) = _readStatus(signer);
_writeStatus(signer, Status.Locked, deactivationEpoch);

(, uint256 deactivationEpoch) = _readStatus(validatorId);
_writeStatus(validatorId, Status.Locked, deactivationEpoch);
logger.logJailed(validatorId, _currentEpoch, validators[validatorId].signer);
return validators[validatorId].amount.add(validators[validatorId].delegatedAmount);
logger.logJailed(validatorId, _currentEpoch, signer);
return signerState[signer].totalAmount;
}

function _stakeFor(
Expand All @@ -1081,16 +1087,16 @@ contract StakeManager is
contractAddress: acceptDelegation
? validatorShareFactory.create(validatorId, address(_logger), registry)
: address(0x0),
status_deprecated: Status.Active,
status_deprecated: Status_deprecated.Active,
commissionRate: 0,
lastCommissionUpdate: 0,
delegatorsReward: INITIALIZED_AMOUNT,
delegatedAmount: 0,
initialRewardPerStake: rewardPerStake,
status: 0
delegatedAmount_deprecated: 0,
initialRewardPerStake: rewardPerStake
});

_writeStatus(validatorId, Status.Active, 0);
_writeStatus(signer, Status.Active, 0);
signerState[signer].totalAmount = amount;

latestSignerUpdateEpoch[validatorId] = _currentEpoch;
NFTContract.mint(user, validatorId);
Expand All @@ -1115,23 +1121,22 @@ contract StakeManager is
uint256 amount = validators[validatorId].amount;
address validator = ownerOf(validatorId);

(Status status, ) = _readStatus(validatorId);
_writeStatus(validatorId, status, exitEpoch);

// unbond all delegators in future
int256 delegationAmount = int256(validators[validatorId].delegatedAmount);
address signer = validators[validatorId].signer;
(Status status, ) = _readStatus(signer);
_writeStatus(signer, status, exitEpoch);

// disabled delegation
address delegationContract = validators[validatorId].contractAddress;
if (delegationContract != address(0)) {
IValidatorShare(delegationContract).lock();
}

_removeSigner(validators[validatorId].signer);
_removeSigner(signer);

_liquidateRewards(validatorId, validator);

uint256 targetEpoch = exitEpoch <= currentEpoch ? 0 : exitEpoch;
updateTimeline(-(int256(amount) + delegationAmount), -1, targetEpoch);
updateTimeline(-int256(signerState[signer].totalAmount), -1, targetEpoch);

logger.logUnstakeInit(validator, validatorId, exitEpoch, amount);
}
Expand Down
45 changes: 23 additions & 22 deletions contracts/staking/stakeManager/StakeManagerExtension.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,16 @@ contract StakeManagerExtension is StakeManagerStorage, Initializable, StakeManag
bytes calldata _signerPubkey
) external {
uint256 currentValidatorAmount = validators[validatorId].amount;
address signer = validators[validatorId].signer;

(, uint256 deactivationEpoch) = _readStatus(validatorId);
// re-use variable, dirty. It's deactivationEpoch
(, uint256 senderValidatorId) = _readStatus(signer);
require(
deactivationEpoch == 0 && currentValidatorAmount != 0,
senderValidatorId == 0 && currentValidatorAmount != 0,
"Invalid validator for an auction"
);
uint256 senderValidatorId = signerToValidator[msg.sender];

senderValidatorId = signerToValidator[msg.sender];
// make sure that signer wasn't used already
require(
NFTContract.balanceOf(msg.sender) == 0 && // existing validators can't bid
Expand All @@ -54,8 +57,7 @@ contract StakeManagerExtension is StakeManagerStorage, Initializable, StakeManag
"Invalid auction period"
);

uint256 perceivedStake = currentValidatorAmount;
perceivedStake = perceivedStake.add(validators[validatorId].delegatedAmount);
uint256 perceivedStake = signerState[signer].totalAmount;

Auction storage auction = validatorAuction[validatorId];
uint256 currentAuctionAmount = auction.amount;
Expand Down Expand Up @@ -99,13 +101,12 @@ contract StakeManagerExtension is StakeManagerStorage, Initializable, StakeManag
);
require(auction.user != address(0x0), "Invalid auction");

address signer = validators[validatorId].signer;
uint256 validatorAmount = validators[validatorId].amount;
uint256 perceivedStake = validatorAmount;
uint256 perceivedStake = signerState[signer].totalAmount;
uint256 auctionAmount = auction.amount;

perceivedStake = perceivedStake.add(validators[validatorId].delegatedAmount);

(, uint256 deactivationEpoch) = _readStatus(validatorId);
(, uint256 deactivationEpoch) = _readStatus(signer);
// validator is last auctioner
if (perceivedStake >= auctionAmount && deactivationEpoch == 0) {
require(token.transfer(auctionUser, auctionAmount), "Bid return failed");
Expand All @@ -128,19 +129,19 @@ contract StakeManagerExtension is StakeManagerStorage, Initializable, StakeManag
}

function migrateValidatorsData(uint256 validatorIdFrom, uint256 validatorIdTo) external {
for (uint256 i = validatorIdFrom; i < validatorIdTo; ++i) {
ValidatorShare contractAddress = ValidatorShare(validators[i].contractAddress);
if (contractAddress != ValidatorShare(0)) {
// move validator rewards out from ValidatorShare contract
validators[i].reward = contractAddress.validatorRewards_deprecated().add(INITIALIZED_AMOUNT);
validators[i].delegatedAmount = contractAddress.activeAmount();
validators[i].commissionRate = contractAddress.commissionRate_deprecated();
} else {
validators[i].reward = validators[i].reward.add(INITIALIZED_AMOUNT);
}

validators[i].delegatorsReward = INITIALIZED_AMOUNT;
}
// for (uint256 i = validatorIdFrom; i < validatorIdTo; ++i) {
// ValidatorShare contractAddress = ValidatorShare(validators[i].contractAddress);
// if (contractAddress != ValidatorShare(0)) {
// // move validator rewards out from ValidatorShare contract
// validators[i].reward = contractAddress.validatorRewards_deprecated().add(INITIALIZED_AMOUNT);
// validators[i].delegatedAmount = contractAddress.activeAmount();
// validators[i].commissionRate = contractAddress.commissionRate_deprecated();
// } else {
// validators[i].reward = validators[i].reward.add(INITIALIZED_AMOUNT);
// }

// validators[i].delegatorsReward = INITIALIZED_AMOUNT;
// }
}

function updateCheckpointRewardParams(
Expand Down
Loading