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

Phase 0 tests work on phase 1, yay :)

This commit is contained in:
Dankrad Feist 2019-05-08 23:30:08 +01:00
parent 79c193ff60
commit 6ab55efd3d
No known key found for this signature in database
GPG Key ID: 6815E6A20BEBBABA
20 changed files with 159 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -13,7 +13,11 @@ YAML_TEST_TARGETS = $(patsubst $(GENERATOR_DIR)/%, $(YAML_TEST_DIR)/%, $(GENERAT
GENERATOR_VENVS = $(patsubst $(GENERATOR_DIR)/%, $(GENERATOR_DIR)/%venv, $(GENERATORS))
PY_SPEC_PHASE_0_TARGETS = $(PY_SPEC_DIR)/eth2spec/phase0/spec.py
PY_SPEC_PHASE_0_DEPS = $(SPEC_DIR)/core/0_*.md
PY_SPEC_PHASE_1_TARGETS = $(PY_SPEC_DIR)/eth2spec/phase1/custody_game.py $(PY_SPEC_DIR)/eth2spec/phase1/shard_data_chains.py
PY_SPEC_PHASE_1_DEPS = $(SPEC_DIR)/core/1_*.md
PY_SPEC_ALL_TARGETS = $(PY_SPEC_PHASE_0_TARGETS)
@ -50,13 +54,13 @@ phase0: $(PY_SPEC_PHASE_0_TARGETS)
# "make phase1" to create pyspec for phase1
phase1: $(PY_SPEC_PHASE_1_TARGETS)
$(PY_SPEC_DIR)/eth2spec/phase0/spec.py:
$(PY_SPEC_DIR)/eth2spec/phase0/spec.py: $(PY_SPEC_PHASE_0_DEPS)
python3 $(SCRIPT_DIR)/phase0/build_spec.py $(SPEC_DIR)/core/0_beacon-chain.md $@
$(PY_SPEC_DIR)/eth2spec/phase1/custody_game.py:
$(PY_SPEC_DIR)/eth2spec/phase1/custody_game.py: $(PY_SPEC_PHASE_1_DEPS)
python3 $(SCRIPT_DIR)/phase0/build_spec.py -p1 $(SPEC_DIR)/core/1_custody-game.md $@
$(PY_SPEC_DIR)/eth2spec/phase1/shard_data_chains.py:
$(PY_SPEC_DIR)/eth2spec/phase1/shard_data_chains.py: $(PY_SPEC_PHASE_0_DEPS)
python3 $(SCRIPT_DIR)/phase0/build_spec.py -p1 $(SPEC_DIR)/core/1_shard-data-chains.md $@

18
scripts/phase0/build_spec.py
View File

@ -89,11 +89,29 @@ def build_phase1_spec(sourcefile, outfile):
code_lines = []
code_lines.append("""
from eth2spec.phase0.spec import *
from eth2spec.phase0.spec import apply_constants_preset as apply_constants_preset_phase0
""")
code_lines += function_puller.get_spec(sourcefile)
code_lines.append("""
# Access to overwrite spec constants based on configuration
def apply_constants_preset(preset: Dict[str, Any]):
apply_constants_preset_phase0(preset)
global_vars = globals()
for k, v in preset.items():
global_vars[k] = v
# Deal with derived constants
global_vars['GENESIS_EPOCH'] = slot_to_epoch(GENESIS_SLOT)
# Initialize SSZ types again, to account for changed lengths
init_SSZ_types()
""")
with open(outfile, 'w') as out:
out.write("\n".join(code_lines))

7
scripts/phase0/function_puller.py
View File

@ -39,10 +39,11 @@ def get_spec(file_name: str, phase:int = 0) -> List[str]:
else:
if pulling_from == linenum and line == '{':
if is_update_section:
code_lines.append('%s = SSZTypeExtension(%s, {' % (current_name, current_name))
code_lines.append('%s = SSZTypeExtension("%s", {' % (current_name, current_name))
current_typedef = ['global_vars["%s"] = SSZTypeExtension("%s", {' % (current_name, current_name)]
else:
code_lines.append('%s = SSZType({' % current_name)
current_typedef = ['global_vars["%s"] = SSZType({' % current_name]
code_lines.append('%s = SSZType("%s", {' % (current_name, current_name))
current_typedef = ['global_vars["%s"] = SSZType("%s", {' % (current_name, current_name)]
elif pulling_from is not None:
# Add some whitespace between functions
if line[:3] == 'def':

5
specs/core/1_custody-game.md
View File

@ -661,12 +661,12 @@ def process_bit_challenge_response(state: BeaconState,
### Handling of custody-related deadlines
Run `process_reveal_deadlines(state)` immediately after `process_ejections(state)`:
Run `process_reveal_deadlines(state)` immediately after `process_registry_updates(state)`:
```python
def process_reveal_deadlines(state: BeaconState) -> None:
for index, validator in enumerate(state.validator_registry):
if (validator.latest_custody_reveal_period +
if (validator.next_custody_reveal_period +
(CUSTODY_RESPONSE_DEADLINE // EPOCHS_PER_CUSTODY_PERIOD) <
get_validators_custody_reveal_period(state, index)):
slash_validator(state, index)
@ -693,6 +693,7 @@ Append this to `process_final_updates(state)`:
```python
def after_process_final_updates(state: BeaconState) -> None:
current_epoch = get_current_epoch(state)
# Clean up exposed RANDAO key reveals
state.exposed_derived_secrets[current_epoch % EARLY_DERIVED_SECRET_PENALTY_MAX_FUTURE_EPOCHS] = []
```

0
test_libs/pyspec/eth2spec/phase1/__init__.py Normal file
View File

77
test_libs/pyspec/eth2spec/phase1/state_transition.py Normal file
View File

@ -0,0 +1,77 @@
from . import spec
from typing import (
Any,
Callable,
List
)
from .spec import (
BeaconState,
BeaconBlock,
Slot,
)
from eth2spec.phase0.state_transition import (
expected_deposit_count,
process_operation_type,
process_operations as process_operations_phase0,
process_block as process_block_phase0,
process_epoch_transition as process_epoch_transition_phase0,
state_transition_to as state_transition_to_phase0,
state_transition as state_transition_phase0
)
def process_operations(state: BeaconState, block: BeaconBlock) -> None:
process_operations_phase0(state, block)
process_operation_type(
state,
block.body.custody_key_reveals,
spec.MAX_CUSTODY_KEY_REVEALS,
spec.process_custody_key_reveal,
)
process_operation_type(
state,
block.body.early_derived_secret_reveals,
spec.MAX_EARLY_DERIVED_SECRET_REVEALS,
spec.process_early_derived_secret_reveal,
)
def process_block(state: BeaconState,
block: BeaconBlock,
verify_state_root: bool=False) -> None:
spec.process_block_header(state, block)
spec.process_randao(state, block)
spec.process_eth1_data(state, block)
process_operations(state, block)
if verify_state_root:
spec.verify_block_state_root(state, block)
def process_epoch_transition(state: BeaconState) -> None:
spec.process_justification_and_finalization(state)
spec.process_crosslinks(state)
# TODO: Eligible
spec.process_rewards_and_penalties(state)
spec.process_registry_updates(state)
spec.process_reveal_deadlines(state)
spec.process_challenge_deadlines(state)
spec.process_slashings(state)
spec.process_final_updates(state)
spec.after_process_final_updates(state)
def state_transition_to(state: BeaconState, up_to: Slot) -> BeaconState:
while state.slot < up_to:
spec.cache_state(state)
if (state.slot + 1) % spec.SLOTS_PER_EPOCH == 0:
process_epoch_transition(state)
spec.advance_slot(state)
def state_transition(state: BeaconState,
block: BeaconBlock,
verify_state_root: bool=False) -> BeaconState:
state_transition_to(state, block.slot)
process_block(state, block, verify_state_root)

24
test_libs/pyspec/eth2spec/utils/minimal_ssz.py
View File

@ -6,9 +6,14 @@ BYTES_PER_CHUNK = 32
BYTES_PER_LENGTH_OFFSET = 4
ZERO_CHUNK = b'\x00' * BYTES_PER_CHUNK
cached_typedefs = {}
def SSZType(fields):
def SSZType(name, fields):
class SSZObject():
if name != None:
__name__ = name
__qualname__ = name
def __init__(self, **kwargs):
for f, t in fields.items():
if f not in kwargs:
@ -25,8 +30,11 @@ def SSZType(fields):
def __str__(self):
output = []
for field in self.fields:
output.append(f'{field}: {getattr(self, field)}')
output.append(f'{field}: {repr(getattr(self, field))},')
return "\n".join(output)
def __repr__(self):
return name + "(**{\n " + str(self).replace("\n", "\n ") + "\n})"
def serialize(self):
return serialize_value(self, self.__class__)
@ -35,12 +43,16 @@ def SSZType(fields):
return hash_tree_root(self, self.__class__)
SSZObject.fields = fields
if name != None:
cached_typedefs[name] = SSZObject
return SSZObject
def SSZTypeExtension(original_type, new_fields):
fields = original_type.fields.copy()
fields.update(original_type.fields)
return SSZType(fields)
typedef = cached_typedefs[original_type]
typedef.fields.update(new_fields)
return typedef
class Vector():
def __init__(self, items):
@ -319,7 +331,7 @@ def truncate(container):
key: container.fields[key]
for key in field_keys[:-1]
}
truncated_class = SSZType(truncated_fields)
truncated_class = SSZType(None, truncated_fields)
kwargs = {
field: getattr(container, field)
for field in field_keys[:-1]

6
test_libs/pyspec/tests/block_processing/test_process_attestation.py
View File

@ -1,12 +1,12 @@
from copy import deepcopy
import pytest
import eth2spec.phase0.spec as spec
import eth2spec.phase1.spec as spec
from eth2spec.phase0.state_transition import (
from eth2spec.phase1.state_transition import (
state_transition,
)
from eth2spec.phase0.spec import (
from eth2spec.phase1.spec import (
get_current_epoch,
process_attestation,
slot_to_epoch,

4
test_libs/pyspec/tests/block_processing/test_process_attester_slashing.py
View File

@ -1,8 +1,8 @@
from copy import deepcopy
import pytest
import eth2spec.phase0.spec as spec
from eth2spec.phase0.spec import (
import eth2spec.phase1.spec as spec
from eth2spec.phase1.spec import (
get_beacon_proposer_index,
process_attester_slashing,
)

2
test_libs/pyspec/tests/block_processing/test_process_block_header.py
View File

@ -2,7 +2,7 @@ from copy import deepcopy
import pytest
from eth2spec.phase0.spec import (
from eth2spec.phase1.spec import (
get_beacon_proposer_index,
cache_state,
advance_slot,

4
test_libs/pyspec/tests/block_processing/test_process_deposit.py
View File

@ -1,9 +1,9 @@
from copy import deepcopy
import pytest
import eth2spec.phase0.spec as spec
import eth2spec.phase1.spec as spec
from eth2spec.phase0.spec import (
from eth2spec.phase1.spec import (
ZERO_HASH,
process_deposit,
)

4
test_libs/pyspec/tests/block_processing/test_process_proposer_slashing.py
View File

@ -1,8 +1,8 @@
from copy import deepcopy
import pytest
import eth2spec.phase0.spec as spec
from eth2spec.phase0.spec import (
import eth2spec.phase1.spec as spec
from eth2spec.phase1.spec import (
get_current_epoch,
process_proposer_slashing,
)

4
test_libs/pyspec/tests/block_processing/test_process_transfer.py
View File

@ -1,9 +1,9 @@
from copy import deepcopy
import pytest
import eth2spec.phase0.spec as spec
import eth2spec.phase1.spec as spec
from eth2spec.phase0.spec import (
from eth2spec.phase1.spec import (
get_active_validator_indices,
get_beacon_proposer_index,
get_current_epoch,

4
test_libs/pyspec/tests/block_processing/test_voluntary_exit.py
View File

@ -1,9 +1,9 @@
from copy import deepcopy
import pytest
import eth2spec.phase0.spec as spec
import eth2spec.phase1.spec as spec
from eth2spec.phase0.spec import (
from eth2spec.phase1.spec import (
get_active_validator_indices,
get_churn_limit,
get_current_epoch,

3
test_libs/pyspec/tests/conftest.py
View File

@ -1,6 +1,6 @@
import pytest
from eth2spec.phase0 import spec
from eth2spec.phase1 import spec
from preset_loader import loader
from .helpers import (
@ -20,7 +20,6 @@ def config(request):
presets = loader.load_presets('../../configs/', config_name)
spec.apply_constants_preset(presets)
@pytest.fixture
def num_validators(config):
return spec.SLOTS_PER_EPOCH * 8

6
test_libs/pyspec/tests/epoch_processing/test_process_crosslinks.py
View File

@ -1,12 +1,12 @@
from copy import deepcopy
import pytest
import eth2spec.phase0.spec as spec
import eth2spec.phase1.spec as spec
from eth2spec.phase0.state_transition import (
from eth2spec.phase1.state_transition import (
state_transition,
)
from eth2spec.phase0.spec import (
from eth2spec.phase1.spec import (
cache_state,
get_crosslink_deltas,
process_crosslinks,

4
test_libs/pyspec/tests/epoch_processing/test_process_registry_updates.py
View File

@ -2,9 +2,9 @@ from copy import deepcopy
import pytest
import eth2spec.phase0.spec as spec
import eth2spec.phase1.spec as spec
from eth2spec.phase0.spec import (
from eth2spec.phase1.spec import (
get_current_epoch,
is_active_validator,
)

9
test_libs/pyspec/tests/helpers.py
View File

@ -2,12 +2,12 @@ from copy import deepcopy
from py_ecc import bls
from eth2spec.phase0.state_transition import (
from eth2spec.phase1.state_transition import (
state_transition,
)
import eth2spec.phase0.spec as spec
import eth2spec.phase1.spec as spec
from eth2spec.utils.minimal_ssz import signing_root
from eth2spec.phase0.spec import (
from eth2spec.phase1.spec import (
# constants
ZERO_HASH,
# SSZ
@ -420,3 +420,6 @@ def get_state_root(state, slot) -> bytes:
"""
assert slot < state.slot <= slot + spec.SLOTS_PER_HISTORICAL_ROOT
return state.latest_state_roots[slot % spec.SLOTS_PER_HISTORICAL_ROOT]
# Stub to be overwritten by config
import_spec = None

4
test_libs/pyspec/tests/test_finality.py
View File

@ -2,9 +2,9 @@ from copy import deepcopy
import pytest
import eth2spec.phase0.spec as spec
import eth2spec.phase1.spec as spec
from eth2spec.phase0.state_transition import (
from eth2spec.phase1.state_transition import (
state_transition,
)
from .helpers import (

8
test_libs/pyspec/tests/test_sanity.py
View File

@ -3,10 +3,10 @@ from copy import deepcopy
import pytest
from py_ecc import bls
import eth2spec.phase0.spec as spec
import eth2spec.phase1.spec as spec
from eth2spec.utils.minimal_ssz import signing_root
from eth2spec.phase0.spec import (
from eth2spec.phase1.spec import (
# constants
ZERO_HASH,
SLOTS_PER_HISTORICAL_ROOT,
@ -25,7 +25,7 @@ from eth2spec.phase0.spec import (
verify_merkle_branch,
hash,
)
from eth2spec.phase0.state_transition import (
from eth2spec.phase1.state_transition import (
state_transition,
)
from eth2spec.utils.merkle_minimal import (
@ -326,7 +326,7 @@ def test_voluntary_exit(state):
def test_transfer(state):
# overwrite default 0 to test
spec.MAX_TRANSFERS = 1
spec.apply_constants_preset({"MAX_TRANSFERS": 1})
pre_state = deepcopy(state)
current_epoch = get_current_epoch(pre_state)