Minor wording fixes

This commit is contained in:
Hsiao-Wei Wang 2021-03-30 13:48:40 +08:00
parent 7344442618
commit 3391f991ac
No known key found for this signature in database
GPG Key ID: 1111A8A81778319E
10 changed files with 17 additions and 6 deletions

View File

@ -29,6 +29,7 @@ The current features are:
* [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)
### Merge
@ -83,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:

View File

@ -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.

View File

@ -37,6 +37,7 @@ DOMAIN_CONTRIBUTION_AND_PROOF: 0x09000000
# Fork
# ---------------------------------------------------------------
# 0x01000000
ALTAIR_FORK_VERSION: 0x01000000
# TBD
ALTAIR_FORK_SLOT: 0

View File

@ -1,5 +1,7 @@
# Mainnet preset - Custody Game
CONFIG_NAME: "mainnet"
# Time parameters
# ---------------------------------------------------------------
# 2**1 (= 2) epochs, 12.8 minutes

View File

@ -1,5 +1,7 @@
# Mainnet preset - The Merge
CONFIG_NAME: "mainnet"
# Fork
# ---------------------------------------------------------------
MERGE_FORK_VERSION: 0x02000000

View File

@ -1,5 +1,7 @@
# Mainnet preset - Sharding
CONFIG_NAME: "mainnet"
# Fork
# ---------------------------------------------------------------
SHARDING_FORK_VERSION: 0x03000000

View File

@ -37,7 +37,7 @@ 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

View File

@ -1,5 +1,7 @@
# Minimal preset - Custody Game
CONFIG_NAME: "minimal"
# Time parameters
# ---------------------------------------------------------------
# 2**1 (= 2) epochs, 12.8 minutes

View File

@ -1,5 +1,7 @@
# Minimal preset - The Merge
CONFIG_NAME: "minimal"
# Fork
# ---------------------------------------------------------------
MERGE_FORK_VERSION: 0x02000001

View File

@ -1,5 +1,7 @@
# Minimal preset - Sharding
CONFIG_NAME: "minimal"
# Fork
# ---------------------------------------------------------------
SHARDING_FORK_VERSION: 0x03000001