From 986f7ee34c4459148bd6a9347b8744c8aee5665d Mon Sep 17 00:00:00 2001 From: Hsiao-Wei Wang Date: Wed, 1 Jun 2022 02:33:12 +0800 Subject: [PATCH 1/3] Use table to list the specs. Add `Capella` and `EIP4844` to README --- README.md | 66 ++++++++++++++----------------------------------------- 1 file changed, 16 insertions(+), 50 deletions(-) diff --git a/README.md b/README.md index fb58edf8d1..c92dd65dda 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,6 @@ To learn more about proof-of-stake and sharding, see the [PoS FAQ](https://eth.w 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) @@ -14,55 +13,22 @@ This repository hosts the current Ethereum proof-of-stake specifications. Discus 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: - -### Phase 0 - -* [The Beacon Chain](specs/phase0/beacon-chain.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) -* [Weak Subjectivity](specs/phase0/weak-subjectivity.md) - -### Altair - -* [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) -* [P2P Networking](specs/altair/p2p-interface.md) - -### Bellatrix (also known as The Merge) - -The Bellatrix protocol upgrade is still actively in development. The exact specification has not been formally accepted as final and details are still subject to change. - -* Background material: - * An [ethresear.ch](https://ethresear.ch) post [describing the basic mechanism of the CL+EL merge](https://ethresear.ch/t/the-eth1-eth2-transition/6265) - * [ethereum.org](https://ethereum.org) high-level description of the CL+EL merge [here](https://ethereum.org/en/eth2/docking/) -* Specifications: - * [Beacon Chain changes](specs/bellatrix/beacon-chain.md) - * [Bellatrix fork](specs/bellatrix/fork.md) - * [Fork Choice changes](specs/bellatrix/fork-choice.md) - * [Validator additions](specs/bellatrix/validator.md) - * [P2P Networking](specs/bellatrix/p2p-interface.md) - -### Sharding - -Sharding follows Bellatrix, 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) +### Stable Specifications + +| Code Name | Fork Version | Previous Fork | Specs | Notes | +| - | - | - | - | - | +| **Phase0** | `0x00000000` | - | | | +| **Altair** | `0x01000000` | Phase0 | | | +| **Bellatrix** | `0x02000000` | Altair | | [ethereum.org - The Merge intro](https://ethereum.org/en/upgrades/merge/) | + +### In-development Specifications +| Code Name or Topic | Specs | Notes | +| - | - | - | +| Capella (tentative) | | +| EIP4844 (tentative) | | +| Sharding (outdated) | | +| Custody Game (outdated) | | dependent on sharding | +| Data Availability Sampling (outdated) | | | ### Accompanying documents can be found in [specs](specs) and include: From df1464728bfea9fbfd18f20f00cd69cbebc90ca7 Mon Sep 17 00:00:00 2001 From: Hsiao-Wei Wang Date: Thu, 2 Jun 2022 22:14:39 +0800 Subject: [PATCH 2/3] Remove fork version and previous fork. Add seq. --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c92dd65dda..c581b89ebd 100644 --- a/README.md +++ b/README.md @@ -15,11 +15,11 @@ Features are researched and developed in parallel, and then consolidated into se ### Stable Specifications -| Code Name | Fork Version | Previous Fork | Specs | Notes | -| - | - | - | - | - | -| **Phase0** | `0x00000000` | - | | | -| **Altair** | `0x01000000` | Phase0 | | | -| **Bellatrix** | `0x02000000` | Altair | | [ethereum.org - The Merge intro](https://ethereum.org/en/upgrades/merge/) | +| Seq. | Code Name | Specs | Notes | +| - | - | - | - | +| 0 | **Phase0** | | | +| 1 | **Altair** | | | +| 2 | **Bellatrix** | | [ethereum.org - The Merge intro](https://ethereum.org/en/upgrades/merge/) | ### In-development Specifications | Code Name or Topic | Specs | Notes | @@ -27,8 +27,8 @@ Features are researched and developed in parallel, and then consolidated into se | Capella (tentative) | | | EIP4844 (tentative) | | | Sharding (outdated) | | -| Custody Game (outdated) | | dependent on sharding | -| Data Availability Sampling (outdated) | | | +| Custody Game (outdated) | | Dependent on sharding | +| Data Availability Sampling (outdated) | | | ### Accompanying documents can be found in [specs](specs) and include: From dde1313a9d068cba0b7ea3c2edc9c446f388978c Mon Sep 17 00:00:00 2001 From: Hsiao-Wei Wang Date: Mon, 6 Jun 2022 16:03:46 +0800 Subject: [PATCH 3/3] Add Fork Epoch column --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c581b89ebd..fcae73a321 100644 --- a/README.md +++ b/README.md @@ -15,11 +15,11 @@ Features are researched and developed in parallel, and then consolidated into se ### Stable Specifications -| Seq. | Code Name | Specs | Notes | +| Seq. | Code Name | Fork Epoch | Specs | | - | - | - | - | -| 0 | **Phase0** |
  • Core
    • [The beacon chain](specs/phase0/beacon-chain.md)
    • [Deposit contract](specs/phase0/deposit-contract.md)
    • [Beacon chain fork choice](specs/phase0/fork-choice.md)
  • Additions
    • [Honest validator guide](specs/phase0/validator.md)
    • [P2P networking](specs/phase0/p2p-interface.md)
    • [Weak subjectivity](specs/phase0/weak-subjectivity.md)
| | -| 1 | **Altair** |
  • Core
    • [Beacon chain changes](specs/altair/beacon-chain.md)
    • [Altair fork](specs/altair/fork.md)
  • Additions
    • [Light client sync protocol](specs/altair/sync-protocol.md)
    • [Honest validator guide changes](specs/altair/validator.md)
    • [P2P networking](specs/altair/p2p-interface.md)
| | -| 2 | **Bellatrix** |
  • Core
    • [Beacon Chain changes](specs/bellatrix/beacon-chain.md)
    • [Bellatrix fork](specs/bellatrix/fork.md)
    • [Fork choice changes](specs/bellatrix/fork-choice.md)
  • Additions
    • [Honest validator guide changes](specs/bellatrix/validator.md)
    • [P2P networking](specs/bellatrix/p2p-interface.md)
| [ethereum.org - The Merge intro](https://ethereum.org/en/upgrades/merge/) | +| 0 | **Phase0** |`0` |
  • Core
    • [The beacon chain](specs/phase0/beacon-chain.md)
    • [Deposit contract](specs/phase0/deposit-contract.md)
    • [Beacon chain fork choice](specs/phase0/fork-choice.md)
  • Additions
    • [Honest validator guide](specs/phase0/validator.md)
    • [P2P networking](specs/phase0/p2p-interface.md)
    • [Weak subjectivity](specs/phase0/weak-subjectivity.md)
| +| 1 | **Altair** | `74240` |
  • Core
    • [Beacon chain changes](specs/altair/beacon-chain.md)
    • [Altair fork](specs/altair/fork.md)
  • Additions
    • [Light client sync protocol](specs/altair/sync-protocol.md)
    • [Honest validator guide changes](specs/altair/validator.md)
    • [P2P networking](specs/altair/p2p-interface.md)
| +| 2 | **Bellatrix**
(["The Merge"](https://ethereum.org/en/upgrades/merge/)) | TBD |
  • Core
    • [Beacon Chain changes](specs/bellatrix/beacon-chain.md)
    • [Bellatrix fork](specs/bellatrix/fork.md)
    • [Fork choice changes](specs/bellatrix/fork-choice.md)
  • Additions
    • [Honest validator guide changes](specs/bellatrix/validator.md)
    • [P2P networking](specs/bellatrix/p2p-interface.md)
| ### In-development Specifications | Code Name or Topic | Specs | Notes |