status-im
/
eth2.0-specs
mirror of https://github.com/status-im/eth2.0-specs.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #827 from ethereum/vbuterin-patch-20 

Cosmetic improvement to reward/penalty functions
This commit is contained in:
Hsiao-Wei Wang 2019-03-22 11:59:23 +08:00 committed by GitHub
parent 417d526ce9 512ceff1bb
commit 49cdef54e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
specs/core/0_beacon-chain.md
View File

@ -2048,12 +2048,8 @@ def compute_inactivity_leak_deltas(state: BeaconState) -> Tuple[List[Gwei], List
```python ```python
def get_crosslink_deltas(state: BeaconState) -> Tuple[List[Gwei], List[Gwei]]: def get_crosslink_deltas(state: BeaconState) -> Tuple[List[Gwei], List[Gwei]]:
# deltas[0] for rewards rewards = [0 for index in range(len(state.validator_registry))]
# deltas[1] for penalties penalties = [0 for index in range(len(state.validator_registry))]
deltas = [
[0 for index in range(len(state.validator_registry))],
[0 for index in range(len(state.validator_registry))]
]
previous_epoch_start_slot = get_epoch_start_slot(get_previous_epoch(state)) previous_epoch_start_slot = get_epoch_start_slot(get_previous_epoch(state))
current_epoch_start_slot = get_epoch_start_slot(get_current_epoch(state)) current_epoch_start_slot = get_epoch_start_slot(get_current_epoch(state))
for slot in range(previous_epoch_start_slot, current_epoch_start_slot): for slot in range(previous_epoch_start_slot, current_epoch_start_slot):
@ -2063,10 +2059,10 @@ def get_crosslink_deltas(state: BeaconState) -> Tuple[List[Gwei], List[Gwei]]:
total_balance = get_total_balance(state, crosslink_committee) total_balance = get_total_balance(state, crosslink_committee)
for index in crosslink_committee: for index in crosslink_committee:
if index in participants: if index in participants:
deltas[0][index] += get_base_reward(state, index) * participating_balance // total_balance rewards[index] += get_base_reward(state, index) * participating_balance // total_balance
else: else:
deltas[1][index] += get_base_reward(state, index) penalties[index] += get_base_reward(state, index)
return deltas return [rewards, penalties]
``` ```
#### Apply rewards #### Apply rewards
@ -2075,13 +2071,17 @@ Run the following:
```python ```python
def apply_rewards(state: BeaconState) -> None: def apply_rewards(state: BeaconState) -> None:
deltas1 = get_justification_and_finalization_deltas(state) rewards1, penalties1 = get_justification_and_finalization_deltas(state)
deltas2 = get_crosslink_deltas(state) rewards2, penalties2 = get_crosslink_deltas(state)
for i in range(len(state.validator_registry)): for i in range(len(state.validator_registry)):
set_balance(state, i, max( set_balance(
state,
i,
max(
0, 0,
get_balance(state, i) + deltas1[0][i] + deltas2[0][i] - deltas1[1][i] - deltas2[1][i] get_balance(state, i) + rewards1[i] + rewards2[i] - penalties1[i] - penalties2[i],
)) ),
)
``` ```
#### Ejections #### Ejections