ethereum · djrtwo · Aug 26, 2021 · Jun 15, 2021 · Jun 18, 2021 · Jun 18, 2021
diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,7 @@ build/
 output/
 dist/
 
-eth2.0-spec-tests/
+consensus-spec-tests/
 
 .pytest_cache
 .mypy_cache

diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ TEST_GENERATORS_DIR = ./tests/generators
 PY_SPEC_DIR = $(TEST_LIBS_DIR)/pyspec
 ETH2SPEC_MODULE_DIR = $(PY_SPEC_DIR)/eth2spec
 TEST_REPORT_DIR = $(PY_SPEC_DIR)/test-reports
-TEST_VECTOR_DIR = ../eth2.0-spec-tests/tests
+TEST_VECTOR_DIR = ../consensus-spec-tests/tests
 GENERATOR_DIR = ./tests/generators
 SOLIDITY_DEPOSIT_CONTRACT_DIR = ./solidity_deposit_contract
 SOLIDITY_DEPOSIT_CONTRACT_SOURCE = ${SOLIDITY_DEPOSIT_CONTRACT_DIR}/deposit_contract.sol

diff --git a/README.md b/README.md
@@ -1,17 +1,17 @@
-# Ethereum 2.0 Specifications
+# Ethereum Proof-of-Stake Consensus Specifications
 
 [![Join the chat at https://discord.gg/qGpsxSA](https://img.shields.io/badge/chat-on%20discord-blue.svg)](https://discord.gg/qGpsxSA) [![Join the chat at https://gitter.im/ethereum/sharding](https://badges.gitter.im/ethereum/sharding.svg)](https://gitter.im/ethereum/sharding?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-To learn more about sharding and Ethereum 2.0 (Serenity), see the [sharding FAQ](https://eth.wiki/sharding/Sharding-FAQs) and the [research compendium](https://notes.ethereum.org/s/H1PGqDhpm).
+To learn more about proof-of-stake and sharding, see the [PoS FAQ](https://eth.wiki/en/concepts/proof-of-stake-faqs), [sharding FAQ](https://eth.wiki/sharding/Sharding-FAQs) and the [research compendium](https://notes.ethereum.org/s/H1PGqDhpm).
 
-This repository hosts the current Eth2 specifications. Discussions about design rationale and proposed changes can be brought up and discussed as issues. Solidified, agreed-upon changes to the spec can be made through pull requests.
+This repository hosts the current Ethereum proof-of-stake specifications. Discussions about design rationale and proposed changes can be brought up and discussed as issues. Solidified, agreed-upon changes to the spec can be made through pull requests.
 
 
 ## Specs
 
 [![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 can be found in [specs](specs/). These are divided into features.
+Core specifications for Ethereum proof-of-stake clients can 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:
@@ -73,13 +73,12 @@ Sharding follows the merge, and is divided into three parts:
 
 Additional specifications and standards outside of requisite client functionality can be found in the following repos:
 
-* [Eth2 APIs](https://github.com/ethereum/eth2.0-apis)
-* [Eth2 Metrics](https://github.com/ethereum/eth2.0-metrics/)
-* [Interop Standards in Eth2 PM](https://github.com/ethereum/eth2.0-pm/tree/master/interop)
+* [Beacon APIs](https://github.com/ethereum/beacon-apis)
+* [Beacon Metrics](https://github.com/ethereum/beacon-metrics/)
 
 ## Design goals
 
-The following are the broad design goals for Ethereum 2.0:
+The following are the broad design goals for the Ethereum proof-of-stake consensus specifications:
 * to minimize complexity, even at the cost of some losses in efficiency
 * to remain live through major network partitions and when very large portions of nodes go offline
 * to select all components such that they are either quantum secure or can be easily swapped out for quantum secure counterparts when available
@@ -97,3 +96,7 @@ The following are the broad design goals for Ethereum 2.0:
 Documentation on the different components used during spec writing can be found here:
 * [YAML Test Generators](tests/generators/README.md)
 * [Executable Python Spec, with Py-tests](tests/core/pyspec/README.md)
+
+## Consensus spec tests
+
+Conformance tests built from the executable python spec are available in the [Ethereum Proof-of-Stake Consensus Spec Tests](https://github.com/ethereum/consensus-spec-tests) repo. Compressed tarballs are available in [releases](https://github.com/ethereum/consensus-spec-tests/releases).
diff --git a/presets/mainnet/sharding.yaml b/presets/mainnet/sharding.yaml
@@ -1,22 +1,24 @@
 # Mainnet preset - Sharding
 
-# Beacon-chain
-# ---------------------------------------------------------------
 # Misc
+# ---------------------------------------------------------------
 # 2**10 (= 1,024)
 MAX_SHARDS: 1024
-# 2**6 = 64
+# 2**6 (= 64)
 INITIAL_ACTIVE_SHARDS: 64
 # 2**3 (= 8)
-GASPRICE_ADJUSTMENT_COEFFICIENT: 8
+SAMPLE_PRICE_ADJUSTMENT_COEFFICIENT: 8
 # 2**4 (= 16)
 MAX_SHARD_PROPOSER_SLASHINGS: 16
-
-# Shard block configs
-# ---------------------------------------------------------------
+#
 MAX_SHARD_HEADERS_PER_SHARD: 4
 # 2**8 (= 256)
 SHARD_STATE_MEMORY_SLOTS: 256
+# 2**40 (= 1,099,511,627,776)
+BLOB_BUILDER_REGISTRY_LIMIT: 1099511627776
+
+# Shard blob samples
+# ---------------------------------------------------------------
 # 2**11 (= 2,048)
 MAX_SAMPLES_PER_BLOCK: 2048
 # 2**10 (= 1,1024)
@@ -25,6 +27,6 @@ TARGET_SAMPLES_PER_BLOCK: 1024
 # Gwei values
 # ---------------------------------------------------------------
 # 2**33 (= 8,589,934,592) Gwei
-MAX_GASPRICE: 8589934592
+MAX_SAMPLE_PRICE: 8589934592
 # 2**3 (= 8) Gwei
-MIN_GASPRICE: 8
+MIN_SAMPLE_PRICE: 8
diff --git a/presets/minimal/sharding.yaml b/presets/minimal/sharding.yaml
@@ -1,22 +1,25 @@
 # Minimal preset - Sharding
 
-# Beacon-chain
+# Misc
 # ---------------------------------------------------------------
 # Misc
 # [customized] reduced for testing
 MAX_SHARDS: 8
 # [customized] reduced for testing
 INITIAL_ACTIVE_SHARDS: 2
 # 2**3 (= 8)
-GASPRICE_ADJUSTMENT_COEFFICIENT: 8
+SAMPLE_PRICE_ADJUSTMENT_COEFFICIENT: 8
 # [customized] reduced for testing
 MAX_SHARD_PROPOSER_SLASHINGS: 4
-
-# Shard block configs
-# ---------------------------------------------------------------
+#
 MAX_SHARD_HEADERS_PER_SHARD: 4
 # 2**8 (= 256)
 SHARD_STATE_MEMORY_SLOTS: 256
+# 2**40 (= 1,099,511,627,776)
+BLOB_BUILDER_REGISTRY_LIMIT: 1099511627776
+
+# Shard blob samples
+# ---------------------------------------------------------------
 # 2**11 (= 2,048)
 MAX_SAMPLES_PER_BLOCK: 2048
 # 2**10 (= 1,1024)
@@ -25,6 +28,6 @@ TARGET_SAMPLES_PER_BLOCK: 1024
 # Gwei values
 # ---------------------------------------------------------------
 # 2**33 (= 8,589,934,592) Gwei
-MAX_GASPRICE: 8589934592
+MAX_SAMPLE_PRICE: 8589934592
 # 2**3 (= 8) Gwei
-MIN_GASPRICE: 8
+MIN_SAMPLE_PRICE: 8
diff --git a/setup.py b/setup.py
@@ -56,7 +56,7 @@ def floorlog2(x: int) -> uint64:
 
 
 OPTIMIZED_BLS_AGGREGATE_PUBKEYS = '''
-def eth2_aggregate_pubkeys(pubkeys: Sequence[BLSPubkey]) -> BLSPubkey:
+def eth_aggregate_pubkeys(pubkeys: Sequence[BLSPubkey]) -> BLSPubkey:
     return bls.AggregatePKs(pubkeys)
 '''
 
@@ -480,8 +480,8 @@ def hardcoded_ssz_dep_constants(cls) -> Dict[str, str]:
 
     @classmethod
     def implement_optimizations(cls, functions: Dict[str, str]) -> Dict[str, str]:
-        if "eth2_aggregate_pubkeys" in functions:
-            functions["eth2_aggregate_pubkeys"] = OPTIMIZED_BLS_AGGREGATE_PUBKEYS.strip()
+        if "eth_aggregate_pubkeys" in functions:
+            functions["eth_aggregate_pubkeys"] = OPTIMIZED_BLS_AGGREGATE_PUBKEYS.strip()
         return super().implement_optimizations(functions)
 
 #

diff --git a/specs/altair/beacon-chain.md b/specs/altair/beacon-chain.md
@@ -1,4 +1,4 @@
-# Ethereum 2.0 Altair Beacon chain changes
+# Altair -- The Beacon Chain
 
 ## Table of contents
 
@@ -287,7 +287,7 @@ def get_next_sync_committee(state: BeaconState) -> SyncCommittee:
     """
     indices = get_next_sync_committee_indices(state)
     pubkeys = [state.validators[index].pubkey for index in indices]
-    aggregate_pubkey = eth2_aggregate_pubkeys(pubkeys)
+    aggregate_pubkey = eth_aggregate_pubkeys(pubkeys)
     return SyncCommittee(pubkeys=pubkeys, aggregate_pubkey=aggregate_pubkey)
 ```
 
@@ -544,7 +544,7 @@ def process_sync_aggregate(state: BeaconState, sync_aggregate: SyncAggregate) ->
     previous_slot = max(state.slot, Slot(1)) - Slot(1)
     domain = get_domain(state, DOMAIN_SYNC_COMMITTEE, compute_epoch_at_slot(previous_slot))
     signing_root = compute_signing_root(get_block_root_at_slot(state, previous_slot), domain)
-    assert eth2_fast_aggregate_verify(participant_pubkeys, signing_root, sync_aggregate.sync_committee_signature)
+    assert eth_fast_aggregate_verify(participant_pubkeys, signing_root, sync_aggregate.sync_committee_signature)
 
     # Compute participant and proposer rewards
     total_active_increments = get_total_active_balance(state) // EFFECTIVE_BALANCE_INCREMENT

diff --git a/specs/altair/bls.md b/specs/altair/bls.md
@@ -1,4 +1,4 @@
-# Ethereum 2.0 Altair BLS extensions
+# Altair -- BLS extensions
 
 ## Table of contents
 
@@ -9,8 +9,8 @@
 - [Introduction](#introduction)
 - [Constants](#constants)
 - [Extensions](#extensions)
-  - [`eth2_aggregate_pubkeys`](#eth2_aggregate_pubkeys)
-  - [`eth2_fast_aggregate_verify`](#eth2_fast_aggregate_verify)
+  - [`eth_aggregate_pubkeys`](#eth_aggregate_pubkeys)
+  - [`eth_fast_aggregate_verify`](#eth_fast_aggregate_verify)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 <!-- /TOC -->
@@ -29,14 +29,14 @@ Knowledge of the [phase 0 specification](../phase0/beacon-chain.md) is assumed,
 
 ## Extensions
 
-### `eth2_aggregate_pubkeys`
+### `eth_aggregate_pubkeys`
 
 An additional function `AggregatePKs` is defined to extend the
 [IETF BLS signature draft standard v4](https://tools.ietf.org/html/draft-irtf-cfrg-bls-signature-04)
 spec referenced in the phase 0 document.
 
 ```python
-def eth2_aggregate_pubkeys(pubkeys: Sequence[BLSPubkey]) -> BLSPubkey:
+def eth_aggregate_pubkeys(pubkeys: Sequence[BLSPubkey]) -> BLSPubkey:
     """
     Return the aggregate public key for the public keys in ``pubkeys``.
 
@@ -46,16 +46,19 @@ def eth2_aggregate_pubkeys(pubkeys: Sequence[BLSPubkey]) -> BLSPubkey:
     Refer to the BLS signature draft standard for more information.
     """
     assert len(pubkeys) > 0
+    # Ensure that the given inputs are valid pubkeys
+    assert all(bls.KeyValidate(pubkey) for pubkey in pubkeys)
+
     result = copy(pubkeys[0])
     for pubkey in pubkeys[1:]:
         result += pubkey
     return result
 ```
 
-### `eth2_fast_aggregate_verify`
+### `eth_fast_aggregate_verify`
 
 ```python
-def eth2_fast_aggregate_verify(pubkeys: Sequence[BLSPubkey], message: Bytes32, signature: BLSSignature) -> bool:
+def eth_fast_aggregate_verify(pubkeys: Sequence[BLSPubkey], message: Bytes32, signature: BLSSignature) -> bool:
     """
     Wrapper to ``bls.FastAggregateVerify`` accepting the ``G2_POINT_AT_INFINITY`` signature when ``pubkeys`` is empty.
     """

diff --git a/specs/altair/fork.md b/specs/altair/fork.md
@@ -1,4 +1,4 @@
-# Ethereum 2.0 Altair fork
+# Altair -- Fork Logic
 
 **Notice**: This document is a work-in-progress for researchers and implementers.
 
@@ -17,7 +17,7 @@
 
 ## Introduction
 
-This document describes the process of the first upgrade of Ethereum 2.0: the Altair hard fork, introducing light client support and other improvements.
+This document describes the process of the first upgrade of the beacon chain: the Altair hard fork, introducing light client support and other improvements.
 
 ## Configuration
 

diff --git a/specs/altair/p2p-interface.md b/specs/altair/p2p-interface.md
@@ -1,6 +1,6 @@
-# Ethereum Altair networking specification
+# Altair -- Networking
 
-This document contains the networking specification for Ethereum 2.0 clients added during the Altair deployment.
+This document contains the networking specification for Altair.
 This document should be viewed as additive to the [document from Phase 0](../phase0/p2p-interface.md) and will be referred to as the "Phase 0 document" hereafter.
 Readers should understand the Phase 0 document and use it as a basis to understand the changes outlined in this document.
 

diff --git a/specs/altair/sync-protocol.md b/specs/altair/sync-protocol.md
@@ -1,4 +1,4 @@
-# Minimal Light Client
+# Altair -- Minimal Light Client
 
 **Notice**: This document is a work-in-progress for researchers and implementers.
 
@@ -28,8 +28,8 @@
 
 ## Introduction
 
-Eth2 is designed to be light client friendly for constrained environments to
-access Eth2 with reasonable safety and liveness.
+The beacon chain is designed to be light client friendly for constrained environments to
+access Ethereum with reasonable safety and liveness.
 Such environments include resource-constrained devices (e.g. phones for trust-minimised wallets)
 and metered VMs (e.g. blockchain VMs for cross-chain bridges).
 
@@ -184,7 +184,7 @@ def process_light_client_update(store: LightClientStore, update: LightClientUpda
     ):
         # Apply update if (1) 2/3 quorum is reached and (2) we have a finality proof.
         # Note that (2) means that the current light client design needs finality.
-        # It may be changed to re-organizable light client design. See the on-going issue eth2.0-specs#2182.
+        # It may be changed to re-organizable light client design. See the on-going issue consensus-specs#2182.
         apply_light_client_update(store.snapshot, update)
         store.valid_updates = set()
     elif current_slot > store.snapshot.header.slot + update_timeout:

diff --git a/specs/altair/validator.md b/specs/altair/validator.md
@@ -1,6 +1,6 @@
-# Ethereum 2.0 Altair -- Honest Validator
+# Altair -- Honest Validator
 
-This is an accompanying document to [Ethereum 2.0 Altair -- The Beacon Chain](./beacon-chain.md), which describes the expected actions of a "validator" participating in the Ethereum 2.0 protocol.
+This is an accompanying document to [Altair -- The Beacon Chain](./beacon-chain.md), which describes the expected actions of a "validator" participating in the Ethereum proof-of-stake protocol.
 
 ## Table of contents
 
@@ -49,8 +49,8 @@ This is an accompanying document to [Ethereum 2.0 Altair -- The Beacon Chain](./
 
 ## Introduction
 
-This document represents the expected behavior of an "honest validator" with respect to the Altair upgrade of the Ethereum 2.0 protocol.
-It builds on the [previous document for the behavior of an "honest validator" from Phase 0](../phase0/validator.md) of the Ethereum 2.0 protocol.
+This document represents the expected behavior of an "honest validator" with respect to the Altair upgrade of the Ethereum proof-of-stake protocol.
+It builds on the [previous document for the behavior of an "honest validator" from Phase 0](../phase0/validator.md) of the Ethereum proof-of-stake protocol.
 This previous document is referred to below as the "Phase 0 document".
 
 Altair introduces a new type of committee: the sync committee. Sync committees are responsible for signing each block of the canonical chain and there exists an efficient algorithm for light clients to sync the chain using the output of the sync committees.

diff --git a/specs/custody_game/beacon-chain.md b/specs/custody_game/beacon-chain.md
@@ -1,4 +1,4 @@
-# Ethereum 2.0 Custody Game -- Beacon Chain
+# Custody Game -- The Beacon Chain
 
 **Notice**: This document is a work-in-progress for researchers and implementers.
 
@@ -57,7 +57,7 @@
 
 ## Introduction
 
-This document details the beacon chain additions and changes of Ethereum 2.0 to support the shard data custody game,
+This document details the beacon chain additions and changes of to support the shard data custody game,
 building upon the [Sharding](../sharding/beacon-chain.md) specification.
 
 ## Constants

diff --git a/specs/custody_game/validator.md b/specs/custody_game/validator.md
@@ -1,8 +1,8 @@
-# Ethereum 2.0 Custody Game -- Honest Validator
+# Custody Game -- Honest Validator
 
 **Notice**: This document is a work-in-progress for researchers and implementers.
-This is an accompanying document to the [Ethereum 2.0 Custody Game](./), which describes the expected actions of a "validator"
-participating in the Ethereum 2.0 Custody Game.
+This is an accompanying document to the [Custody Game](./), which describes the expected actions of a "validator"
+participating in the shard data Custody Game.
 
 ## Table of contents
 

diff --git a/specs/das/das-core.md b/specs/das/das-core.md
@@ -1,4 +1,4 @@
-# Ethereum 2.0 Data Availability Sampling -- Core
+# Data Availability Sampling -- Core
 
 **Notice**: This document is a work-in-progress for researchers and implementers.
 

diff --git a/specs/das/fork-choice.md b/specs/das/fork-choice.md
@@ -1,4 +1,4 @@
-# Ethereum 2.0 Data Availability Sampling -- Fork Choice
+# Data Availability Sampling -- Fork Choice
 
 **Notice**: This document is a work-in-progress for researchers and implementers.
 
@@ -17,7 +17,7 @@
 
 ## Introduction
 
-This document is the beacon chain fork choice spec for Ethereum 2.0 Data Availability Sampling. The only change that we add from phase 0 is that we add a concept of "data dependencies";
+This document is the beacon chain fork choice spec for Data Availability Sampling. The only change that we add from phase 0 is that we add a concept of "data dependencies";
 a block is only eligible for consideration in the fork choice after a data availability test has been successfully completed for all dependencies.
 The "root" of a shard block for data dependency purposes is considered to be a `DataCommitment` object, which is a pair of a Kate commitment and a length.
 

diff --git a/specs/das/p2p-interface.md b/specs/das/p2p-interface.md
@@ -1,4 +1,4 @@
-# Ethereum 2.0 Data Availability Sampling -- Network specification
+# Data Availability Sampling -- Networking
 
 **Notice**: This document is a work-in-progress for researchers and implementers.
 

diff --git a/specs/das/sampling.md b/specs/das/sampling.md
@@ -1,4 +1,4 @@
-# Ethereum 2.0 Data Availability Sampling
+# Data Availability Sampling -- Sampling
 
 **Notice**: This document is a work-in-progress for researchers and implementers.