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

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: migration of data code
  • Loading branch information
Denis Ermolin
Denis Ermolin committed Apr 23, 2021
commit 6c0773978e084d68e74cff24670f13c840d26723
19 changes: 6 additions & 13 deletions contracts/staking/stakeManager/StakeManagerExtension.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,19 +129,12 @@ 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) {
address signer = validators[i].signer;

signerState[signer].totalAmount = validators[i].amount.add(validators[i].delegatedAmount_deprecated).sub(INITIALIZED_AMOUNT);
_writeStatus(signer, Status(uint256(validators[i].status_deprecated)), validators[i].deactivationEpoch_deprecated);
}
}

function updateCheckpointRewardParams(
Expand Down