Merge branch 'dev'

.gitignore

@@ -16,7 +16,6 @@ eth2.0-spec-tests/
 
 # Dynamically built from Markdown spec
 tests/core/pyspec/eth2spec/phase0/
-tests/core/pyspec/eth2spec/phase1/
 tests/core/pyspec/eth2spec/altair/
 
 # coverage reports

Makefile

@@ -20,7 +20,11 @@ GENERATOR_VENVS = $(patsubst $(GENERATOR_DIR)/%, $(GENERATOR_DIR)/%venv, $(GENER
 # To check generator matching:
 #$(info $$GENERATOR_TARGETS is [${GENERATOR_TARGETS}])
 
-MARKDOWN_FILES = $(wildcard $(SPEC_DIR)/phase0/*.md) $(wildcard $(SPEC_DIR)/phase1/*.md) $(wildcard $(SPEC_DIR)/altair/*.md) $(wildcard $(SSZ_DIR)/*.md) $(wildcard $(SPEC_DIR)/networking/*.md) $(wildcard $(SPEC_DIR)/validator/*.md)
+MARKDOWN_FILES = $(wildcard $(SPEC_DIR)/phase0/*.md) $(wildcard $(SPEC_DIR)/altair/*.md) $(wildcard $(SSZ_DIR)/*.md) \
+                 $(wildcard $(SPEC_DIR)/merge/*.md) \
+                 $(wildcard $(SPEC_DIR)/custody/*.md) \
+                 $(wildcard $(SPEC_DIR)/das/*.md) \
+                 $(wildcard $(SPEC_DIR)/sharding/*.md)
 
 COV_HTML_OUT=.htmlcov
 COV_INDEX_FILE=$(PY_SPEC_DIR)/$(COV_HTML_OUT)/index.html
@@ -50,7 +54,6 @@ partial_clean:
 	rm -rf $(PY_SPEC_DIR)/.pytest_cache
 	rm -rf $(DEPOSIT_CONTRACT_TESTER_DIR)/.pytest_cache
 	rm -rf $(PY_SPEC_DIR)/phase0
-	rm -rf $(PY_SPEC_DIR)/phase1
 	rm -rf $(PY_SPEC_DIR)/altair
 	rm -rf $(PY_SPEC_DIR)/$(COV_HTML_OUT)
 	rm -rf $(PY_SPEC_DIR)/.coverage
@@ -88,11 +91,11 @@ install_test:
 
 test: pyspec
 	. venv/bin/activate; cd $(PY_SPEC_DIR); \
-	python3 -m pytest -n 4 --disable-bls --cov=eth2spec.phase0.spec --cov=eth2spec.phase1.spec --cov=eth2spec.altair.spec --cov-report="html:$(COV_HTML_OUT)" --cov-branch eth2spec
+	python3 -m pytest -n 4 --disable-bls --cov=eth2spec.phase0.spec --cov=eth2spec.altair.spec --cov-report="html:$(COV_HTML_OUT)" --cov-branch eth2spec
 
 find_test: pyspec
 	. venv/bin/activate; cd $(PY_SPEC_DIR); \
-	python3 -m pytest -k=$(K) --disable-bls --cov=eth2spec.phase0.spec --cov=eth2spec.phase1.spec --cov=eth2spec.altair.spec --cov-report="html:$(COV_HTML_OUT)" --cov-branch eth2spec
+	python3 -m pytest -k=$(K) --disable-bls --cov=eth2spec.phase0.spec --cov=eth2spec.altair.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); \
@@ -112,10 +115,11 @@ check_toc: $(MARKDOWN_FILES:=.toc)
 codespell:
 	codespell . --skip ./.git -I .codespell-whitelist
 
+# TODO: add future merge, sharding, etc. packages to linting.
 lint: pyspec
 	. venv/bin/activate; cd $(PY_SPEC_DIR); \
 	flake8  --config $(LINTER_CONFIG_FILE) ./eth2spec \
-	&& mypy --config-file $(LINTER_CONFIG_FILE) -p eth2spec.phase0 -p eth2spec.phase1 -p eth2spec.altair
+	&& mypy --config-file $(LINTER_CONFIG_FILE) -p eth2spec.phase0 -p eth2spec.altair
 
 lint_generators: pyspec
 	. venv/bin/activate; cd $(TEST_GENERATORS_DIR); \

README.md

@@ -11,7 +11,10 @@ This repository hosts the current Eth2 specifications. Discussions about design
 
 [![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:
+Core specifications for Eth2 clients be found in [specs](specs/). These are divided into features.
+Features are researched and developed in parallel, and then consolidated into sequential upgrades when ready.
+
+The current features are:
 
 ### Phase 0
 
@@ -26,14 +29,37 @@ Core specifications for Eth2 clients be found in [specs](specs/). These are divi
 * [Beacon chain changes](specs/altair/beacon-chain.md)
 * [Altair fork](specs/altair/fork.md)
 * [Light client sync protocol](specs/altair/sync-protocol.md)
+* [Honest Validator guide changes](specs/altair/validator.md)
 
-### Sharding
+### Merge
 
-The sharding spec is still actively in R&D; see the most recent available pull request [here](https://github.com/ethereum/eth2.0-specs/pull/2146) and some technical details [here](https://hackmd.io/@HWeNw8hNRimMm2m2GH56Cw/B1YJPGkpD).
+The merge is still actively in R&D. The specifications outline a general direction for engineering work,
+while the details are in review and may change.
 
-### Merge
+* Background material:
+  * An [ethresear.ch](https://ethresear.ch) post [describing the basic mechanism](https://ethresear.ch/t/the-eth1-eth2-transition/6265)
+  * [ethereum.org](https://ethereum.org) high-level description of the merge [here](https://ethereum.org/en/eth2/docking/)
+* Specifications:
+  * [Beacon Chain changes](specs/merge/beacon-chain.md)
+  * [Fork Choice changes](specs/merge/fork-choice.md)
+  * [Validator additions](specs/merge/validator.md)
 
-The merge is still actively in R&D; see an [ethresear.ch](https://ethresear.ch) post describing the proposed basic mechanism [here](https://ethresear.ch/t/the-eth1-eth2-transition/6265) and the section of [ethereum.org](https://ethereum.org) describing the merge at a high level [here](https://ethereum.org/en/eth2/docking/).
+### Sharding
+
+Sharding follows the merge, and is divided into three parts:
+
+* Sharding base functionality - In early engineering phase
+  * [Beacon Chain changes](specs/sharding/beacon-chain.md)
+  * [P2P Network changes](specs/sharding/p2p-interface.md)
+* Custody Game - Ready, dependent on sharding 
+  * [Beacon Chain changes](specs/custody_game/beacon-chain.md)
+  * [Validator custody work](specs/custody_game/validator.md)
+* Data Availability Sampling - In active R&D
+  * Technical details [here](https://hackmd.io/@HWeNw8hNRimMm2m2GH56Cw/B1YJPGkpD).
+  * [Core types and functions](specs/das/das-core.md)
+  * [P2P Networking](specs/das/p2p-interface.md)
+  * [Fork Choice](specs/das/fork-choice.md)
+  * [Sampling process](specs/das/sampling.md)
 
 ### Accompanying documents can be found in [specs](specs) and include:
 
@@ -58,14 +84,12 @@ The following are the broad design goals for Ethereum 2.0:
 * to utilize crypto and design techniques that allow for a large participation of validators in total and per unit time
 * to allow for a typical consumer laptop with `O(C)` resources to process/validate `O(1)` shards (including any system level validation such as the beacon chain)
 
-
 ## Useful external resources
 
 * [Design Rationale](https://notes.ethereum.org/s/rkhCgQteN#)
 * [Phase 0 Onboarding Document](https://notes.ethereum.org/s/Bkn3zpwxB)
 * [Combining GHOST and Casper paper](https://arxiv.org/abs/2003.03052)
 
-
 ## For spec contributors
 
 Documentation on the different components used during spec writing can be found here:

configs/README.md

@@ -3,7 +3,7 @@
 This directory contains a set of constants presets used for testing, testnets, and mainnet.
 
 A preset file contains all the constants known for its target.
-Later-fork constants can be ignored, e.g. ignore Phase 1 constants as a client that only supports Phase 0 currently.
+Later-fork constants can be ignored, e.g. ignore Sharding constants as a client that only supports Phase 0 currently.
 
 
 ## Forking
@@ -15,10 +15,9 @@ Over time, the need to sync an older state may be deprecated.
 In this case, the prefix on the new constant may be removed, and the old constant will keep a special name before completely being removed.
 
 A previous iteration of forking made use of "timelines", but this collides with the definitions used in the spec (constants for special forking slots, etc.), and was not integrated sufficiently in any of the spec tools or implementations.
-Instead, the config essentially doubles as fork definition now, e.g. changing the value for `PHASE_1_FORK_SLOT` changes the fork.
+Instead, the config essentially doubles as fork definition now, e.g. changing the value for `ALTAIR_FORK_SLOT` changes the fork.
 
 Another reason to prefer forking through constants is the ability to program a forking moment based on context, instead of being limited to a static slot number.
-
 
 ## Format
 
@@ -32,4 +31,4 @@ Each preset is a key-value mapping.
 
 Presets may contain comments to describe the values.
 
-See [`mainnet_phase0.yaml`](./mainnet_phase0.yaml) for a complete example.
+See [`mainnet/phase0.yaml`](./mainnet/phase0.yaml) for a complete example.

configs/mainnet/altair.yaml

@@ -31,13 +31,16 @@ EPOCHS_PER_SYNC_COMMITTEE_PERIOD: 256
 # Signature domains
 # ---------------------------------------------------------------
 DOMAIN_SYNC_COMMITTEE: 0x07000000
+DOMAIN_SYNC_COMMITTEE_SELECTION_PROOF: 0x08000000
+DOMAIN_CONTRIBUTION_AND_PROOF: 0x09000000
 
 
 # Fork
 # ---------------------------------------------------------------
+# 0x01000000
 ALTAIR_FORK_VERSION: 0x01000000
 # TBD
-ALTAIR_FORK_SLOT: 0
+ALTAIR_FORK_SLOT: 18446744073709551615
 
 
 # Sync protocol

configs/mainnet/phase1.yaml → configs/mainnet/custody_game.yaml

@@ -1,67 +1,9 @@
-# Mainnet preset - phase 1
+# Mainnet preset - Custody Game
 
 CONFIG_NAME: "mainnet"
 
-# phase1-fork
-# ---------------------------------------------------------------
-PHASE_1_FORK_VERSION: 0x01000000
-# [STUB]
-PHASE_1_FORK_SLOT: 0
-INITIAL_ACTIVE_SHARDS: 64
-
-
-# beacon-chain
-# ---------------------------------------------------------------
-# Misc
-# 2**10 (= 1,024)
-MAX_SHARDS: 1024
-# 2**7 (= 128)
-LIGHT_CLIENT_COMMITTEE_SIZE: 128
-# 2**3 (= 8)
-GASPRICE_ADJUSTMENT_COEFFICIENT: 8
-
-# Shard block configs
-# 2**20 (= 1048,576) bytes
-MAX_SHARD_BLOCK_SIZE: 1048576
-# 2**18 (= 262,144) bytes
-TARGET_SHARD_BLOCK_SIZE: 262144
-# Note: MAX_SHARD_BLOCKS_PER_ATTESTATION is derived from the list length.
-SHARD_BLOCK_OFFSETS: [1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233]
-# len(SHARD_BLOCK_OFFSETS)
-MAX_SHARD_BLOCKS_PER_ATTESTATION: 12
-# 2**12 (= 4,096)
-BYTES_PER_CUSTODY_CHUNK: 4096
-# ceillog2(MAX_SHARD_BLOCK_SIZE // BYTES_PER_CUSTODY_CHUNK)
-CUSTODY_RESPONSE_DEPTH: 8
-
-# Gwei values
-# 2**14 (= 16,384) Gwei
-MAX_GASPRICE: 16384
-# 2**3 (= 8) Gwei
-MIN_GASPRICE: 8
-
 # Time parameters
-# 2**3 (= 8) | online epochs
-ONLINE_PERIOD: 8
-# 2**8 (= 256) | epochs
-LIGHT_CLIENT_COMMITTEE_PERIOD: 256
-
-# Max operations per block
-# 2**20 (= 1,048,576) 
-MAX_CUSTODY_CHUNK_CHALLENGE_RECORDS: 1048576
-
-# Domain types
-DOMAIN_SHARD_PROPOSAL: 0x80000000
-DOMAIN_SHARD_COMMITTEE: 0x81000000
-DOMAIN_LIGHT_CLIENT: 0x82000000
-# custody-game spec
-DOMAIN_CUSTODY_BIT_SLASHING: 0x83000000
-DOMAIN_LIGHT_SELECTION_PROOF: 0x84000000
-DOMAIN_LIGHT_AGGREGATE_AND_PROOF: 0x85000000
-
-# custody-game
 # ---------------------------------------------------------------
-# Time parameters
 # 2**1 (= 2) epochs, 12.8 minutes
 RANDAO_PENALTY_EPOCHS: 2
 # 2**15 (= 32,768) epochs, ~146 days
@@ -74,16 +16,16 @@ CUSTODY_PERIOD_TO_RANDAO_PADDING: 2048
 MAX_CHUNK_CHALLENGE_DELAY: 32768
 
 # Misc parameters
+# ---------------------------------------------------------------
 # 2**256 - 189
 CUSTODY_PRIME: 115792089237316195423570985008687907853269984665640564039457584007913129639747
 # 3
 CUSTODY_SECRETS: 3
-# 2**5 (= 32) bytes
-BYTES_PER_CUSTODY_ATOM: 32
 # 1/1024 chance of custody bit 1
 CUSTODY_PROBABILITY_EXPONENT: 10
 
 # Max operations
+# ---------------------------------------------------------------
 # 2**8 (= 256)
 MAX_CUSTODY_KEY_REVEALS: 256
 # 2**0 (= 1)
@@ -96,6 +38,13 @@ MAX_CUSTODY_CHUNK_CHALLENGE_RESP: 16
 MAX_CUSTODY_SLASHINGS: 1
 
 # Reward and penalty quotients
+# ---------------------------------------------------------------
 EARLY_DERIVED_SECRET_REVEAL_SLOT_REWARD_MULTIPLE: 2
 # 2**8 (= 256)
 MINOR_REWARD_QUOTIENT: 256
+
+# Signature domains
+# ---------------------------------------------------------------
+DOMAIN_CUSTODY_BIT_SLASHING: 0x83000000
+DOMAIN_LIGHT_SELECTION_PROOF: 0x84000000
+DOMAIN_LIGHT_AGGREGATE_AND_PROOF: 0x85000000

configs/mainnet/merge.yaml

@@ -0,0 +1,9 @@
+# Mainnet preset - The Merge
+
+CONFIG_NAME: "mainnet"
+
+# Fork
+# ---------------------------------------------------------------
+MERGE_FORK_VERSION: 0x02000000
+# TBD, temporarily max uint64 value: 2**64 - 1
+MERGE_FORK_SLOT: 18446744073709551615

configs/mainnet/sharding.yaml

@@ -0,0 +1,47 @@
+# Mainnet preset - Sharding
+
+CONFIG_NAME: "mainnet"
+
+# Fork
+# ---------------------------------------------------------------
+SHARDING_FORK_VERSION: 0x03000000
+# TBD, temporarily max uint64 value: 2**64 - 1
+SHARDING_FORK_SLOT: 18446744073709551615
+
+
+# Beacon-chain
+# ---------------------------------------------------------------
+# Misc
+# 2**10 (= 1,024)
+MAX_SHARDS: 1024
+# 2**6 = 64
+INITIAL_ACTIVE_SHARDS: 64
+# 2**3 (= 8)
+GASPRICE_ADJUSTMENT_COEFFICIENT: 8
+# 2**4 (= 16)
+MAX_SHARD_PROPOSER_SLASHINGS: 16
+
+# Shard block configs
+# ---------------------------------------------------------------
+MAX_SHARD_HEADERS_PER_SHARD: 4
+# 2**11 (= 2,048)
+MAX_SAMPLES_PER_BLOCK: 2048
+# 2**10 (= 1,1024)
+TARGET_SAMPLES_PER_BLOCK: 1024
+
+# Gwei values
+# ---------------------------------------------------------------
+# 2**33 (= 8,589,934,592) Gwei
+MAX_GASPRICE: 8589934592
+# 2**3 (= 8) Gwei
+MIN_GASPRICE: 8
+
+# Time parameters
+# ---------------------------------------------------------------
+# 2**8 (= 256) | epochs
+SHARD_COMMITTEE_PERIOD: 256
+
+# Signature domains
+# ---------------------------------------------------------------
+DOMAIN_SHARD_PROPOSER: 0x80000000
+DOMAIN_SHARD_COMMITTEE: 0x81000000

configs/minimal/altair.yaml

@@ -31,14 +31,16 @@ EPOCHS_PER_SYNC_COMMITTEE_PERIOD: 8
 # Signature domains
 # ---------------------------------------------------------------
 DOMAIN_SYNC_COMMITTEE: 0x07000000
+DOMAIN_SYNC_COMMITTEE_SELECTION_PROOF: 0x08000000
+DOMAIN_CONTRIBUTION_AND_PROOF: 0x09000000
 
 
 # Fork
 # ---------------------------------------------------------------
-# Highest byte set to 0x01 to avoid collisions with mainnet versioning
+# [customized] Highest byte set to 0x01 to avoid collisions with mainnet versioning
 ALTAIR_FORK_VERSION: 0x01000001
 # [customized]
-ALTAIR_FORK_SLOT: 0
+ALTAIR_FORK_SLOT: 18446744073709551615
 
 
 # Sync protocol

configs/minimal/custody_game.yaml

@@ -0,0 +1,50 @@
+# Minimal preset - Custody Game
+
+CONFIG_NAME: "minimal"
+
+# Time parameters
+# ---------------------------------------------------------------
+# 2**1 (= 2) epochs, 12.8 minutes
+RANDAO_PENALTY_EPOCHS: 2
+# [customized] quicker for testing
+EARLY_DERIVED_SECRET_PENALTY_MAX_FUTURE_EPOCHS: 64
+# [customized] quicker for testing
+EPOCHS_PER_CUSTODY_PERIOD: 32
+# [customized] quicker for testing
+CUSTODY_PERIOD_TO_RANDAO_PADDING: 8
+# [customize for faster testing]
+MAX_CHUNK_CHALLENGE_DELAY: 64
+
+# Misc parameters
+# ---------------------------------------------------------------
+# 2**256 - 189
+CUSTODY_PRIME: 115792089237316195423570985008687907853269984665640564039457584007913129639747
+# 3
+CUSTODY_SECRETS: 3
+# 1/4 chance of custody bit 1 [customized for faster testing]
+CUSTODY_PROBABILITY_EXPONENT: 2
+
+# Max operations
+# ---------------------------------------------------------------
+# 2**8 (= 256)
+MAX_CUSTODY_KEY_REVEALS: 256
+# 2**0 (= 1)
+MAX_EARLY_DERIVED_SECRET_REVEALS: 1
+# [customized]
+MAX_CUSTODY_CHUNK_CHALLENGES: 2
+# [customized]
+MAX_CUSTODY_CHUNK_CHALLENGE_RESP: 8
+# 2**0 (= 1)
+MAX_CUSTODY_SLASHINGS: 1
+
+# Reward and penalty quotients
+# ---------------------------------------------------------------
+EARLY_DERIVED_SECRET_REVEAL_SLOT_REWARD_MULTIPLE: 2
+# 2**8 (= 256)
+MINOR_REWARD_QUOTIENT: 256
+
+# Signature domains
+# ---------------------------------------------------------------
+DOMAIN_CUSTODY_BIT_SLASHING: 0x83000000
+DOMAIN_LIGHT_SELECTION_PROOF: 0x84000000
+DOMAIN_LIGHT_AGGREGATE_AND_PROOF: 0x85000000