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

Apply suggestions from code review 

Co-authored-by: Radosław Kapka <rkapka@wp.pl>
Co-authored-by: dankrad <dankrad@ethereum.org>
Co-authored-by: terence tsao <terence@prysmaticlabs.com>
This commit is contained in:
vbuterin 2020-12-31 09:35:27 +08:00 committed by protolambda
parent 0af9e25e6b
commit ca6323866d
No known key found for this signature in database
GPG Key ID: EC89FDBB2B4C7623
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
specs/phase1/beacon-chain.md
View File

@ -114,6 +114,7 @@ We define the following Python custom types for type hinting and readability:
| Name | Value | | Name | Value |
| - | - | | - | - |
| `DOMAIN_SHARD_HEADER` | `DomainType('0x80000000')` | | `DOMAIN_SHARD_HEADER` | `DomainType('0x80000000')` |
| `DOMAIN_SHARD_COMMITTEE` | `DomainType('0x81000000')` |
## Updated containers ## Updated containers
@ -424,12 +425,7 @@ def process_operations(state: BeaconState, body: BeaconBlockBody) -> None:
```python ```python
def process_attestation(state: BeaconState, attestation: Attestation) -> None: def process_attestation(state: BeaconState, attestation: Attestation) -> None:
phase0.process_attestation(state, attestation) phase0.process_attestation(state, attestation)
update_pending_votes( update_pending_votes(state, attestation)
state=state,
attestation: Attestation,
root=,
aggregation_bits=attestation.aggregation_bits
)
``` ```
#### `update_pending_votes` #### `update_pending_votes`
@ -447,7 +443,7 @@ def update_pending_votes(state: BeaconState,
if header.root == attestation.data.shard_header_root: if header.root == attestation.data.shard_header_root:
pending_header = header pending_header = header
assert pending_header is not None assert pending_header is not None
assert pending_header.slot == attestation.data.slot + 1 assert pending_header.slot == attestation.data.slot
assert pending_header.shard == compute_shard_from_committee_index( assert pending_header.shard == compute_shard_from_committee_index(
state, state,
attestation.data.index, attestation.data.index,
@ -466,9 +462,9 @@ def update_pending_votes(state: BeaconState,
] ]
if True not in [c.confirmed for c in all_candidates]: if True not in [c.confirmed for c in all_candidates]:
# Requirement 2: >= 2/3 of balance attesting # Requirement 2: >= 2/3 of balance attesting
participants = get_attesting_indices(state, attestationg.data, pending_commitment.votes) participants = get_attesting_indices(state, attestation.data, pending_commitment.votes)
participants_balance = get_total_balance(state, participants) participants_balance = get_total_balance(state, participants)
full_committee = get_beacon_committee(state, attestationg.data.slot, attestationg.data.shard) full_committee = get_beacon_committee(state, attestation.data.slot, attestation.data.index)
full_committee_balance = get_total_balance(state, full_committee) full_committee_balance = get_total_balance(state, full_committee)
if participants_balance * 3 > full_committee_balance * 2: if participants_balance * 3 > full_committee_balance * 2:
pending_header.confirmed = True pending_header.confirmed = True
@ -478,7 +474,7 @@ def update_pending_votes(state: BeaconState,
```python ```python
def process_shard_header(state: BeaconState, def process_shard_header(state: BeaconState,
signed_header: Signed[ShardDataHeader]) -> None: signed_header: Signed[ShardHeader]) -> None:
header = signed_header.message header = signed_header.message
header_root = hash_tree_root(header) header_root = hash_tree_root(header)
# Verify signature # Verify signature
@ -499,6 +495,7 @@ def process_shard_header(state: BeaconState,
if compute_epoch_at_slot(header.slot) == get_current_epoch(state): if compute_epoch_at_slot(header.slot) == get_current_epoch(state):
pending_headers = state.current_epoch_pending_shard_headers pending_headers = state.current_epoch_pending_shard_headers
else: else:
assert compute_epoch_at_slot(header.slot) == get_previous_epoch(state):
pending_headers = state.previous_epoch_pending_shard_headers pending_headers = state.previous_epoch_pending_shard_headers
# Check that this header is not yet in the pending list # Check that this header is not yet in the pending list
@ -561,7 +558,7 @@ def process_epoch(state: BeaconState) -> None:
def process_pending_headers(state: BeaconState): def process_pending_headers(state: BeaconState):
for slot in range(SLOTS_PER_EPOCH): for slot in range(SLOTS_PER_EPOCH):
for shard in range(SHARD_COUNT): for shard in range(get_active_shard_count(state)):
# Pending headers for this (slot, shard) combo # Pending headers for this (slot, shard) combo
candidates = [ candidates = [
c for c in state.previous_epoch_pending_shard_headers if c for c in state.previous_epoch_pending_shard_headers if
@ -601,7 +598,7 @@ def process_pending_headers(state: BeaconState):
```python ```python
def charge_confirmed_header_fees(state: BeaconState) -> None: def charge_confirmed_header_fees(state: BeaconState) -> None:
new_gasprice = state.shard_gasprice new_gasprice = state.shard_gasprice
adjustment_quotient = get_active_shard_count(state) * SLOTS_PER_EPOCH * GASPRICE_ADJUSTMENT_COEFFICIENT adjustment_quotient = get_active_shard_count(state, get_current_epoch(state)) * SLOTS_PER_EPOCH * GASPRICE_ADJUSTMENT_COEFFICIENT
for slot in range(SLOTS_PER_EPOCH): for slot in range(SLOTS_PER_EPOCH):
for shard in range(SHARD_COUNT): for shard in range(SHARD_COUNT):
confirmed_candidates = [ confirmed_candidates = [