Merge pull request #1829 from ethereum/dev

release v0.12.0

Makefile

@@ -75,15 +75,15 @@ install_test:
 
 test: pyspec
  . venv/bin/activate; cd $(PY_SPEC_DIR); \
- python -m pytest -n 4 --cov=eth2spec.phase0.spec --cov=eth2spec.phase1.spec --cov-report="html:$(COV_HTML_OUT)" --cov-branch eth2spec
+ python -m pytest -n 4 --disable-bls --cov=eth2spec.phase0.spec --cov=eth2spec.phase1.spec --cov-report="html:$(COV_HTML_OUT)" --cov-branch eth2spec
 
 find_test: pyspec
  . venv/bin/activate; cd $(PY_SPEC_DIR); \
- python -m pytest -k=$(K) --cov=eth2spec.phase0.spec --cov=eth2spec.phase1.spec --cov-report="html:$(COV_HTML_OUT)" --cov-branch eth2spec
+ python -m pytest -k=$(K) --disable-bls --cov=eth2spec.phase0.spec --cov=eth2spec.phase1.spec --cov-report="html:$(COV_HTML_OUT)" --cov-branch eth2spec
 
 citest: pyspec
  mkdir -p tests/core/pyspec/test-reports/eth2spec; . venv/bin/activate; cd $(PY_SPEC_DIR); \
- python -m pytest -n 4 --junitxml=eth2spec/test_results.xml eth2spec
+ python -m pytest -n 4 --disable-bls --junitxml=eth2spec/test_results.xml eth2spec
 
 open_cov:
  ((open "$(COV_INDEX_FILE)" || xdg-open "$(COV_INDEX_FILE)") &> /dev/null) &

README.md

@@ -9,11 +9,14 @@ This repository hosts the current Eth2 specifications. Discussions about design
 
 ## Specs
 
-Core specifications for Eth2 clients be found in [specs/](specs/). These are divided into phases. Each subsequent phase depends upon the prior. The current phases specified are:
+[![GitHub release](https://img.shields.io/github/v/release/ethereum/eth2.0-specs)](https://github.com/ethereum/eth2.0-specs/releases/) [![PyPI version](https://badge.fury.io/py/eth2spec.svg)](https://badge.fury.io/py/eth2spec)
+
+
+Core specifications for Eth2 clients be found in [specs](specs/). These are divided into phases. Each subsequent phase depends upon the prior. The current phases specified are:
 
 ### Phase 0
 * [The Beacon Chain](specs/phase0/beacon-chain.md)
-* [Fork Choice](specs/phase0/fork-choice.md)
+* [Beacon Chain Fork Choice](specs/phase0/fork-choice.md)
 * [Deposit Contract](specs/phase0/deposit-contract.md)
 * [Honest Validator](specs/phase0/validator.md)
 * [P2P Networking](specs/phase0/p2p-interface.md)
@@ -22,8 +25,9 @@ Core specifications for Eth2 clients be found in [specs/](specs/). These are div
 * [From Phase 0 to Phase 1](specs/phase1/phase1-fork.md)
 * [The Beacon Chain for Shards](specs/phase1/beacon-chain.md)
 * [Custody Game](specs/phase1/custody-game.md)
-* [Shard Transition and Fraud Proofs](specs/phase1/fraud-proofs.md)
+* [Shard Transition and Fraud Proofs](specs/phase1/shard-transition.md)
 * [Light client syncing protocol](specs/phase1/light-client-sync.md)
+* [Beacon Chain Fork Choice for Shards](specs/phase1/fork-choice.md)
 
 ### Phase 2
 

configs/mainnet.yaml

@@ -94,8 +94,8 @@ EPOCHS_PER_ETH1_VOTING_PERIOD: 32
 SLOTS_PER_HISTORICAL_ROOT: 8192
 # 2**8 (= 256) epochs ~27 hours
 MIN_VALIDATOR_WITHDRAWABILITY_DELAY: 256
-# 2**11 (= 2,048) epochs 9 days
-PERSISTENT_COMMITTEE_PERIOD: 2048
+# 2**8 (= 256) epochs ~27 hours
+SHARD_COMMITTEE_PERIOD: 256
 # 2**6 (= 64) epochs ~7 hours
 MAX_EPOCHS_PER_CROSSLINK: 64
 # 2**2 (= 4) epochs 25.6 minutes
@@ -122,8 +122,8 @@ BASE_REWARD_FACTOR: 64
 WHISTLEBLOWER_REWARD_QUOTIENT: 512
 # 2**3 (= 8)
 PROPOSER_REWARD_QUOTIENT: 8
-# 2**25 (= 33,554,432)
-INACTIVITY_PENALTY_QUOTIENT: 33554432
+# 2**24 (= 16,777,216)
+INACTIVITY_PENALTY_QUOTIENT: 16777216
 # 2**5 (= 32)
 MIN_SLASHING_PENALTY_QUOTIENT: 32
 
@@ -132,8 +132,8 @@ MIN_SLASHING_PENALTY_QUOTIENT: 32
 # ---------------------------------------------------------------
 # 2**4 (= 16)
 MAX_PROPOSER_SLASHINGS: 16
-# 2**0 (= 1)
-MAX_ATTESTER_SLASHINGS: 1
+# 2**1 (= 2)
+MAX_ATTESTER_SLASHINGS: 2
 # 2**7 (= 128)
 MAX_ATTESTATIONS: 128
 # 2**4 (= 16)
@@ -161,6 +161,8 @@ DOMAIN_CUSTODY_BIT_SLASHING: 0x83000000
 # Phase 1: Upgrade from Phase 0
 # ---------------------------------------------------------------
 PHASE_1_FORK_VERSION: 0x01000000
+# [STUB]
+PHASE_1_GENESIS_SLOT: 32
 INITIAL_ACTIVE_SHARDS: 64
 
 # Phase 1: General
@@ -173,8 +175,6 @@ ONLINE_PERIOD: 8
 LIGHT_CLIENT_COMMITTEE_SIZE: 128
 # 2**8 (= 256) | epochs | ~27 hours
 LIGHT_CLIENT_COMMITTEE_PERIOD: 256
-# 2**8 (= 256) | epochs | ~27 hours
-SHARD_COMMITTEE_PERIOD: 256
 # 2**18 (= 262,144)
 SHARD_BLOCK_CHUNK_SIZE: 262144
 # 2**2 (= 4)

configs/minimal.yaml

@@ -89,13 +89,13 @@ MIN_SEED_LOOKAHEAD: 1
 # 2**2 (= 4) epochs
 MAX_SEED_LOOKAHEAD: 4
 # [customized] higher frequency new deposits from eth1 for testing
-EPOCHS_PER_ETH1_VOTING_PERIOD: 2
+EPOCHS_PER_ETH1_VOTING_PERIOD: 4
 # [customized] smaller state
 SLOTS_PER_HISTORICAL_ROOT: 64
 # 2**8 (= 256) epochs
 MIN_VALIDATOR_WITHDRAWABILITY_DELAY: 256
 # [customized] higher frequency of committee turnover and faster time to acceptable voluntary exit
-PERSISTENT_COMMITTEE_PERIOD: 128
+SHARD_COMMITTEE_PERIOD: 64
 # [customized] fast catchup crosslinks
 MAX_EPOCHS_PER_CROSSLINK: 4
 # 2**2 (= 4) epochs
@@ -122,8 +122,8 @@ BASE_REWARD_FACTOR: 64
 WHISTLEBLOWER_REWARD_QUOTIENT: 512
 # 2**3 (= 8)
 PROPOSER_REWARD_QUOTIENT: 8
-# 2**25 (= 33,554,432)
-INACTIVITY_PENALTY_QUOTIENT: 33554432
+# 2**24 (= 16,777,216)
+INACTIVITY_PENALTY_QUOTIENT: 16777216
 # 2**5 (= 32)
 MIN_SLASHING_PENALTY_QUOTIENT: 32
 
@@ -132,8 +132,8 @@ MIN_SLASHING_PENALTY_QUOTIENT: 32
 # ---------------------------------------------------------------
 # 2**4 (= 16)
 MAX_PROPOSER_SLASHINGS: 16
-# 2**0 (= 1)
-MAX_ATTESTER_SLASHINGS: 1
+# 2**1 (= 2)
+MAX_ATTESTER_SLASHINGS: 2
 # 2**7 (= 128)
 MAX_ATTESTATIONS: 128
 # 2**4 (= 16)
@@ -162,6 +162,8 @@ DOMAIN_CUSTODY_BIT_SLASHING: 0x83000000
 # ---------------------------------------------------------------
 # [customized] for testnet distinction
 PHASE_1_FORK_VERSION: 0x01000001
+# [customized] for testing
+PHASE_1_GENESIS_SLOT: 8
 # [customized] reduced for testing
 INITIAL_ACTIVE_SHARDS: 4
 
@@ -176,8 +178,6 @@ ONLINE_PERIOD: 8
 LIGHT_CLIENT_COMMITTEE_SIZE: 128
 # 2**8 (= 256) | epochs
 LIGHT_CLIENT_COMMITTEE_PERIOD: 256
-# 2**8 (= 256) | epochs
-SHARD_COMMITTEE_PERIOD: 256
 # 2**18 (= 262,144)
 SHARD_BLOCK_CHUNK_SIZE: 262144
 # 2**2 (= 4)

setup.py

@@ -108,7 +108,7 @@ def get_spec(file_name: str) -> SpecObject:
 PHASE1_IMPORTS = '''from eth2spec.phase0 import spec as phase0
 from eth2spec.config.config_util import apply_constants_config
 from typing import (
- Any, Dict, Set, Sequence, NewType, Tuple, TypeVar, Callable
+ Any, Dict, Set, Sequence, NewType, Tuple, TypeVar, Callable, Optional
 )
 
 from dataclasses import (
@@ -146,8 +146,14 @@ def ceillog2(x: uint64) -> int:
 hash_cache: Dict[bytes, Bytes32] = {}
 
 
-def get_eth1_data(distance: uint64) -> Bytes32:
- return hash(distance)
+def get_eth1_data(block: Eth1Block) -> Eth1Data:
+ """
+ A stub function return mocking Eth1Data.
+ """
+ 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
@@ -373,9 +379,10 @@ def finalize_options(self):
  self.md_doc_paths = """
  specs/phase0/beacon-chain.md
  specs/phase0/fork-choice.md
+ specs/phase0/validator.md
  specs/phase1/custody-game.md
  specs/phase1/beacon-chain.md
- specs/phase1/fraud-proofs.md
+ specs/phase1/shard-transition.md
  specs/phase1/fork-choice.md
  specs/phase1/phase1-fork.md
  """
@@ -478,6 +485,7 @@ def run(self):
  url="https://github.com/ethereum/eth2.0-specs",
  include_package_data=False,
  package_data={'configs': ['*.yaml'],
+
  'specs': ['**/*.md'],
  'eth2spec': ['VERSION.txt']},
  package_dir={
@@ -497,9 +505,10 @@ def run(self):
  "eth-utils>=1.3.0,<2",
  "eth-typing>=2.1.0,<3.0.0",
  "pycryptodome==3.9.4",
- "py_ecc==2.0.0",
+ "py_ecc==4.0.0",
+ "milagro_bls_binding==1.3.0",
  "dataclasses==0.6",
- "remerkleable==0.1.13",
+ "remerkleable==0.1.16",
  "ruamel.yaml==0.16.5",
  "lru-dict==1.1.6"
  ]