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

PR feedback: add `ForkData`

This commit is contained in:
Hsiao-Wei Wang 2018-11-27 11:52:06 +08:00
parent b66f168468
commit 43ef444613
No known key found for this signature in database
GPG Key ID: 95B070122902DEA4
1 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,9 +245,7 @@ The `BeaconState` has the following fields:
'candidate_pow_receipt_roots': [CandidatePoWReceiptRootRecord], 'candidate_pow_receipt_roots': [CandidatePoWReceiptRootRecord],
# Parameters relevant to hard forks / versioning. # Parameters relevant to hard forks / versioning.
# Should be updated only by hard forks. # Should be updated only by hard forks.
'pre_fork_version': 'uint64', 'fork_data': ForkData,
'post_fork_version': 'uint64',
'fork_slot_number': 'uint64',
# Attestations not yet processed # Attestations not yet processed
'pending_attestations': [AttestationRecord], 'pending_attestations': [AttestationRecord],
# recent beacon block hashes needed to process attestations, older to newer # recent beacon block hashes needed to process attestations, older to newer
@ -326,6 +324,18 @@ A `CandidatePoWReceiptRootRecord` object contains the following fields:
} }
``` ```
A `ForkData` object contains the following fields:
```python
{
# Previous fork version
'pre_fork_version': 'uint64',
# Post fork version
'post_fork_version': 'uint64',
# Fork slot number
'fork_slot_number': 'uint64'
}
```
## Beacon chain processing ## Beacon chain processing
The beacon chain is the "main chain" of the PoS system. The beacon chain's main responsibilities are: The beacon chain is the "main chain" of the PoS system. The beacon chain's main responsibilities are:
@ -669,9 +679,11 @@ def on_startup(current_validators: List[ValidatorRecord],
randao_commitment in initial_validator_entries: randao_commitment in initial_validator_entries:
validators, _ = get_new_validators( validators, _ = get_new_validators(
current_validators=validators, current_validators=validators,
pre_fork_version=pre_fork_version, fork_data=ForkData(
post_fork_version=pre_fork_version, pre_fork_version=pre_fork_version,
fork_slot_number=2**64 - 1, post_fork_version=pre_fork_version,
fork_slot_number=2**64 - 1,
),
pubkey=pubkey, pubkey=pubkey,
proof_of_possession=proof_of_possession, proof_of_possession=proof_of_possession,
withdrawal_credentials=withdrawal_credentials, withdrawal_credentials=withdrawal_credentials,
@ -735,28 +747,23 @@ def min_empty_validator(validators: List[ValidatorRecord], current_slot: int):
``` ```
```python ```python
def get_fork_version(pre_fork_version: int, def get_fork_version(fork_data: ForkData,
post_fork_version: int,
fork_slot_number: int,
slot: int) -> int: slot: int) -> int:
return pre_fork_version if slot < fork_slot_number else post_fork_version if slot < fork_data.fork_slot_number:
return fork_data.pre_fork_version
def get_domain(pre_fork_version: int, else:
post_fork_version: int, return fork_data.post_fork_version
fork_slot_number: int,
def get_domain(fork_data: ForkData,
slot: int, slot: int,
base_domain: int) -> int: base_domain: int) -> int:
return get_fork_version( return get_fork_version(
pre_fork_version, fork_data,
post_fork_version,
fork_slot_number,
slot slot
) * 2**32 + base_domain ) * 2**32 + base_domain
def get_new_validators(current_validators: List[ValidatorRecord], def get_new_validators(current_validators: List[ValidatorRecord],
pre_fork_version: int, fork_data: ForkData,
post_fork_version: int,
fork_slot_number: int,
pubkey: int, pubkey: int,
proof_of_possession: bytes, proof_of_possession: bytes,
withdrawal_credentials: Hash32, withdrawal_credentials: Hash32,
@ -771,9 +778,7 @@ def get_new_validators(current_validators: List[ValidatorRecord],
msg=hash(signed_message), msg=hash(signed_message),
sig=proof_of_possession, sig=proof_of_possession,
domain=get_domain( domain=get_domain(
pre_fork_version, fork_data,
post_fork_version,
fork_slot_number,
current_slot, current_slot,
DOMAIN_DEPOSIT DOMAIN_DEPOSIT
) )
@ -812,9 +817,11 @@ def add_validator(state: BeaconState,
current_slot: int) -> int: current_slot: int) -> int:
state.validators, index = get_new_validators( state.validators, index = get_new_validators(
current_validators=state.validators, current_validators=state.validators,
pre_fork_version=state.pre_fork_version, fork_data=ForkData(
post_fork_version=state.post_fork_version, pre_fork_version=state.pre_fork_version,
fork_slot_number=state.fork_slot_number, post_fork_version=state.post_fork_version,
fork_slot_number=state.fork_slot_number,
),
pubkey=pubkey, pubkey=pubkey,
proof_of_possession=proof_of_possession, proof_of_possession=proof_of_possession,
withdrawal_credentials=withdrawal_credentials, withdrawal_credentials=withdrawal_credentials,
@ -830,7 +837,11 @@ def add_validator(state: BeaconState,
### Routine for removing a validator ### Routine for removing a validator
```python ```python
def exit_validator(index, state, block, penalize, current_slot): def exit_validator(index: int,
state: BeaconState,
block: BeaconBlock,
penalize: bool,
current_slot: int) -> None:
validator = state.validators[index] validator = state.validators[index]
validator.last_status_change_slot = current_slot validator.last_status_change_slot = current_slot
validator.exit_seq = state.current_exit_seq validator.exit_seq = state.current_exit_seq