Skip to content
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

Update slot helpers v0.6 #2345

Merged
merged 3 commits into from
Apr 22, 2019
Merged

Update slot helpers v0.6 #2345

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
1da6590
Update config to v0.6.0
0xKiwi Apr 22, 2019
f1870a3
finish docs
0xKiwi Apr 22, 2019
4e822aa
Update slot helper docs to v0.6
0xKiwi Apr 22, 2019
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
27 changes: 20 additions & 7 deletions beacon-chain/core/helpers/slot_epoch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@ import (
// SlotToEpoch returns the epoch number of the input slot.
//
// Spec pseudocode definition:
// def slot_to_epoch(slot: SlotNumber) -> Epoch:
// return slot // SLOTS_PER_EPOCH
// def slot_to_epoch(slot: Slot) -> Epoch:
// """
// Return the epoch number of the given ``slot``.
// """
// return slot // SLOTS_PER_EPOCH
func SlotToEpoch(slot uint64) uint64 {
return slot / params.BeaconConfig().SlotsPerEpoch
}
Expand All @@ -18,7 +21,10 @@ func SlotToEpoch(slot uint64) uint64 {
// the slot number stored in beacon state.
//
// Spec pseudocode definition:
// def get_current_epoch(state: BeaconState) -> Epoch:
// def get_current_epoch(state: BeaconState) -> Epoch:
// """
// Return the current epoch of the given ``state``.
// """
// return slot_to_epoch(state.slot)
func CurrentEpoch(state *pb.BeaconState) uint64 {
return SlotToEpoch(state.Slot)
Expand All @@ -28,14 +34,18 @@ func CurrentEpoch(state *pb.BeaconState) uint64 {
// the slot number stored in beacon state. It also checks for
// underflow condition.
//
// Spec pseudocode definition:
// def get_previous_epoch(state: BeaconState) -> Epoch:
// """`
// Return the previous epoch of the given ``state``.
// Return the current epoch if it's genesis epoch.
// """
// return max(get_current_epoch(state) - 1, GENESIS_EPOCH)
// current_epoch = get_current_epoch(state)
// return (current_epoch - 1) if current_epoch > GENESIS_EPOCH else current_epoch
func PrevEpoch(state *pb.BeaconState) uint64 {
if CurrentEpoch(state) > params.BeaconConfig().GenesisEpoch {
return CurrentEpoch(state) - 1
currentEpoch := CurrentEpoch(state)
if currentEpoch > params.BeaconConfig().GenesisEpoch {
return currentEpoch - 1
}
return params.BeaconConfig().GenesisEpoch
}
Expand All @@ -50,7 +60,10 @@ func NextEpoch(state *pb.BeaconState) uint64 {
// current epoch.
//
// Spec pseudocode definition:
// def get_epoch_start_slot(epoch: Epoch) -> SlotNumber:
// def get_epoch_start_slot(epoch: Epoch) -> Slot:
// """
// Return the starting slot of the given ``epoch``.
// """
// return epoch * SLOTS_PER_EPOCH
func StartSlot(epoch uint64) uint64 {
return epoch * params.BeaconConfig().SlotsPerEpoch
Expand Down
2 changes: 1 addition & 1 deletion beacon-chain/core/validators/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ func SlashValidator(state *pb.BeaconState, idx uint64) (*pb.BeaconState, error)
return nil, fmt.Errorf("could not get proposer idx: %v", err)
}
whistleblowerReward := helpers.EffectiveBalance(state, idx) /
params.BeaconConfig().WhistlerBlowerRewardQuotient
params.BeaconConfig().WhistleBlowingRewardQuotient

state.ValidatorBalances[whistleblowerIdx] += whistleblowerReward
state.ValidatorBalances[idx] -= whistleblowerReward
Expand Down
Loading