Minor wording fixes
This commit is contained in:
parent
7344442618
commit
3391f991ac
|
@ -29,6 +29,7 @@ The current features are:
|
||||||
* [Beacon chain changes](specs/altair/beacon-chain.md)
|
* [Beacon chain changes](specs/altair/beacon-chain.md)
|
||||||
* [Altair fork](specs/altair/fork.md)
|
* [Altair fork](specs/altair/fork.md)
|
||||||
* [Light client sync protocol](specs/altair/sync-protocol.md)
|
* [Light client sync protocol](specs/altair/sync-protocol.md)
|
||||||
|
* [Honest Validator guide changes](specs/altair/validator.md)
|
||||||
|
|
||||||
### Merge
|
### 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 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)
|
* 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
|
## Useful external resources
|
||||||
|
|
||||||
* [Design Rationale](https://notes.ethereum.org/s/rkhCgQteN#)
|
* [Design Rationale](https://notes.ethereum.org/s/rkhCgQteN#)
|
||||||
* [Phase 0 Onboarding Document](https://notes.ethereum.org/s/Bkn3zpwxB)
|
* [Phase 0 Onboarding Document](https://notes.ethereum.org/s/Bkn3zpwxB)
|
||||||
* [Combining GHOST and Casper paper](https://arxiv.org/abs/2003.03052)
|
* [Combining GHOST and Casper paper](https://arxiv.org/abs/2003.03052)
|
||||||
|
|
||||||
|
|
||||||
## For spec contributors
|
## For spec contributors
|
||||||
|
|
||||||
Documentation on the different components used during spec writing can be found here:
|
Documentation on the different components used during spec writing can be found here:
|
||||||
|
|
|
@ -15,11 +15,10 @@ 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.
|
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.
|
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.
|
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
|
## Format
|
||||||
|
|
||||||
Each preset is a key-value mapping.
|
Each preset is a key-value mapping.
|
||||||
|
@ -32,4 +31,4 @@ Each preset is a key-value mapping.
|
||||||
|
|
||||||
Presets may contain comments to describe the values.
|
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.
|
||||||
|
|
|
@ -37,6 +37,7 @@ DOMAIN_CONTRIBUTION_AND_PROOF: 0x09000000
|
||||||
|
|
||||||
# Fork
|
# Fork
|
||||||
# ---------------------------------------------------------------
|
# ---------------------------------------------------------------
|
||||||
|
# 0x01000000
|
||||||
ALTAIR_FORK_VERSION: 0x01000000
|
ALTAIR_FORK_VERSION: 0x01000000
|
||||||
# TBD
|
# TBD
|
||||||
ALTAIR_FORK_SLOT: 0
|
ALTAIR_FORK_SLOT: 0
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
# Mainnet preset - Custody Game
|
# Mainnet preset - Custody Game
|
||||||
|
|
||||||
|
CONFIG_NAME: "mainnet"
|
||||||
|
|
||||||
# Time parameters
|
# Time parameters
|
||||||
# ---------------------------------------------------------------
|
# ---------------------------------------------------------------
|
||||||
# 2**1 (= 2) epochs, 12.8 minutes
|
# 2**1 (= 2) epochs, 12.8 minutes
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
# Mainnet preset - The Merge
|
# Mainnet preset - The Merge
|
||||||
|
|
||||||
|
CONFIG_NAME: "mainnet"
|
||||||
|
|
||||||
# Fork
|
# Fork
|
||||||
# ---------------------------------------------------------------
|
# ---------------------------------------------------------------
|
||||||
MERGE_FORK_VERSION: 0x02000000
|
MERGE_FORK_VERSION: 0x02000000
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
# Mainnet preset - Sharding
|
# Mainnet preset - Sharding
|
||||||
|
|
||||||
|
CONFIG_NAME: "mainnet"
|
||||||
|
|
||||||
# Fork
|
# Fork
|
||||||
# ---------------------------------------------------------------
|
# ---------------------------------------------------------------
|
||||||
SHARDING_FORK_VERSION: 0x03000000
|
SHARDING_FORK_VERSION: 0x03000000
|
||||||
|
|
|
@ -37,7 +37,7 @@ DOMAIN_CONTRIBUTION_AND_PROOF: 0x09000000
|
||||||
|
|
||||||
# Fork
|
# 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
|
ALTAIR_FORK_VERSION: 0x01000001
|
||||||
# [customized]
|
# [customized]
|
||||||
ALTAIR_FORK_SLOT: 0
|
ALTAIR_FORK_SLOT: 0
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
# Minimal preset - Custody Game
|
# Minimal preset - Custody Game
|
||||||
|
|
||||||
|
CONFIG_NAME: "minimal"
|
||||||
|
|
||||||
# Time parameters
|
# Time parameters
|
||||||
# ---------------------------------------------------------------
|
# ---------------------------------------------------------------
|
||||||
# 2**1 (= 2) epochs, 12.8 minutes
|
# 2**1 (= 2) epochs, 12.8 minutes
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
# Minimal preset - The Merge
|
# Minimal preset - The Merge
|
||||||
|
|
||||||
|
CONFIG_NAME: "minimal"
|
||||||
|
|
||||||
# Fork
|
# Fork
|
||||||
# ---------------------------------------------------------------
|
# ---------------------------------------------------------------
|
||||||
MERGE_FORK_VERSION: 0x02000001
|
MERGE_FORK_VERSION: 0x02000001
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
# Minimal preset - Sharding
|
# Minimal preset - Sharding
|
||||||
|
|
||||||
|
CONFIG_NAME: "minimal"
|
||||||
|
|
||||||
# Fork
|
# Fork
|
||||||
# ---------------------------------------------------------------
|
# ---------------------------------------------------------------
|
||||||
SHARDING_FORK_VERSION: 0x03000001
|
SHARDING_FORK_VERSION: 0x03000001
|
||||||
|
|
Loading…
Reference in New Issue