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

ensure only forward progress with eth1data voting

This commit is contained in:
Danny Ryan 2020-05-20 13:23:59 -06:00
parent aa6352608e
commit 96f785e84b
No known key found for this signature in database
GPG Key ID: 2765A792E42CE07A
3 changed files with 57 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
setup.py
View File

@ -150,7 +150,10 @@ def get_eth1_data(block: Eth1Block) -> Eth1Data:
""" """
A stub function return mocking Eth1Data. A stub function return mocking Eth1Data.
""" """
return Eth1Data(block_hash=hash_tree_root(block)) return Eth1Data(
deposit_root=block.deposit_root,
deposit_count=block.deposit_count,
block_hash=hash_tree_root(block))
def hash(x: bytes) -> Bytes32: # type: ignore def hash(x: bytes) -> Bytes32: # type: ignore

14
specs/phase0/validator.md
View File

@ -252,11 +252,13 @@ The `block.body.eth1_data` field is for block proposers to vote on recent Eth1 d
###### `Eth1Block` ###### `Eth1Block`
Let `Eth1Block` be an abstract object representing Eth1 blocks with the `timestamp` field available. Let `Eth1Block` be an abstract object representing Eth1 blocks with the `timestamp` and depost contract data available.
```python ```python
class Eth1Block(Container): class Eth1Block(Container):
timestamp: uint64 timestamp: uint64
deposit_root: Root
deposit_count: uint64
# All other eth1 block fields # All other eth1 block fields
``` ```
@ -289,8 +291,14 @@ def is_candidate_block(block: Eth1Block, period_start: uint64) -> bool:
def get_eth1_vote(state: BeaconState, eth1_chain: Sequence[Eth1Block]) -> Eth1Data: def get_eth1_vote(state: BeaconState, eth1_chain: Sequence[Eth1Block]) -> Eth1Data:
period_start = voting_period_start_time(state) period_start = voting_period_start_time(state)
# `eth1_chain` abstractly represents all blocks in the eth1 chain sorted by ascending block height # `eth1_chain` abstractly represents all blocks in the eth1 chain sorted by ascending block height
votes_to_consider = [get_eth1_data(block) for block in eth1_chain if votes_to_consider = [
is_candidate_block(block, period_start)] get_eth1_data(block) for block in eth1_chain
if (
is_candidate_block(block, period_start)
# Ensure cannot move back to earlier deposit contract states
and get_eth1_data(block).deposit_count >= state.eth1_data.deposit_count
)
]
# Valid votes already cast during this period # Valid votes already cast during this period
valid_votes = [vote for vote in state.eth1_data_votes if vote in votes_to_consider] valid_votes = [vote for vote in state.eth1_data_votes if vote in votes_to_consider]

46
tests/core/pyspec/eth2spec/test/validator/test_validator_unittest.py
View File

@ -190,8 +190,14 @@ def test_get_eth1_vote_consensus_vote(spec, state):
assert votes_length >= 3 # We need to have the majority vote assert votes_length >= 3 # We need to have the majority vote
state.eth1_data_votes = () state.eth1_data_votes = ()
block_1 = spec.Eth1Block(timestamp=period_start - spec.SECONDS_PER_ETH1_BLOCK * spec.ETH1_FOLLOW_DISTANCE - 1) block_1 = spec.Eth1Block(
block_2 = spec.Eth1Block(timestamp=period_start - spec.SECONDS_PER_ETH1_BLOCK * spec.ETH1_FOLLOW_DISTANCE) timestamp=period_start - spec.SECONDS_PER_ETH1_BLOCK * spec.ETH1_FOLLOW_DISTANCE - 1,
deposit_count=state.eth1_data.deposit_count,
)
block_2 = spec.Eth1Block(
timestamp=period_start - spec.SECONDS_PER_ETH1_BLOCK * spec.ETH1_FOLLOW_DISTANCE,
deposit_count=state.eth1_data.deposit_count,
)
eth1_chain = [block_1, block_2] eth1_chain = [block_1, block_2]
eth1_data_votes = [] eth1_data_votes = []
@ -218,8 +224,14 @@ def test_get_eth1_vote_tie(spec, state):
assert votes_length > 0 and votes_length % 2 == 0 assert votes_length > 0 and votes_length % 2 == 0
state.eth1_data_votes = () state.eth1_data_votes = ()
block_1 = spec.Eth1Block(timestamp=period_start - spec.SECONDS_PER_ETH1_BLOCK * spec.ETH1_FOLLOW_DISTANCE - 1) block_1 = spec.Eth1Block(
block_2 = spec.Eth1Block(timestamp=period_start - spec.SECONDS_PER_ETH1_BLOCK * spec.ETH1_FOLLOW_DISTANCE) timestamp=period_start - spec.SECONDS_PER_ETH1_BLOCK * spec.ETH1_FOLLOW_DISTANCE - 1,
deposit_count=state.eth1_data.deposit_count,
)
block_2 = spec.Eth1Block(
timestamp=period_start - spec.SECONDS_PER_ETH1_BLOCK * spec.ETH1_FOLLOW_DISTANCE,
deposit_count=state.eth1_data.deposit_count,
)
eth1_chain = [block_1, block_2] eth1_chain = [block_1, block_2]
eth1_data_votes = [] eth1_data_votes = []
# Half votes are for block_1, another half votes are for block_2 # Half votes are for block_1, another half votes are for block_2
@ -237,6 +249,32 @@ def test_get_eth1_vote_tie(spec, state):
assert eth1_data.block_hash == eth1_chain[0].hash_tree_root() assert eth1_data.block_hash == eth1_chain[0].hash_tree_root()
@with_all_phases
@spec_state_test
def test_get_eth1_vote_chain_in_past(spec, state):
min_new_period_epochs = get_min_new_period_epochs(spec)
for _ in range(min_new_period_epochs + 1):
next_epoch(spec, state)
period_start = spec.voting_period_start_time(state)
votes_length = spec.get_current_epoch(state) % spec.EPOCHS_PER_ETH1_VOTING_PERIOD
assert votes_length > 0 and votes_length % 2 == 0
state.eth1_data_votes = ()
block_1 = spec.Eth1Block(
timestamp=period_start - spec.SECONDS_PER_ETH1_BLOCK * spec.ETH1_FOLLOW_DISTANCE,
deposit_count=state.eth1_data.deposit_count - 1, # Chain prior to current eth1data
)
eth1_chain = [block_1]
eth1_data_votes = []
state.eth1_data_votes = eth1_data_votes
eth1_data = spec.get_eth1_vote(state, eth1_chain)
# Should be default vote
assert eth1_data == state.eth1_data
@with_all_phases @with_all_phases
@spec_state_test @spec_state_test
def test_compute_new_state_root(spec, state): def test_compute_new_state_root(spec, state):