LIGHTCLIENT_PATCH/HF1 -> ALTAIR

.gitignore

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

Makefile

@@ -20,7 +20,7 @@ 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)/lightclient/*.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)/phase1/*.md) $(wildcard $(SPEC_DIR)/altair/*.md) $(wildcard $(SSZ_DIR)/*.md) $(wildcard $(SPEC_DIR)/networking/*.md) $(wildcard $(SPEC_DIR)/validator/*.md)
 
 COV_HTML_OUT=.htmlcov
 COV_INDEX_FILE=$(PY_SPEC_DIR)/$(COV_HTML_OUT)/index.html
@@ -49,7 +49,7 @@ partial_clean:
 	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)/lightclient
+	rm -rf $(PY_SPEC_DIR)/altair
 	rm -rf $(PY_SPEC_DIR)/$(COV_HTML_OUT)
 	rm -rf $(PY_SPEC_DIR)/.coverage
 	rm -rf $(PY_SPEC_DIR)/test-reports
@@ -86,11 +86,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.lightclient_patch.spec -cov-report="html:$(COV_HTML_OUT)" --cov-branch eth2spec
+	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
 
 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.lightclient_patch.spec --cov-report="html:$(COV_HTML_OUT)" --cov-branch eth2spec
+	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
 
 citest: pyspec
 	mkdir -p tests/core/pyspec/test-reports/eth2spec; . venv/bin/activate; cd $(PY_SPEC_DIR); \
@@ -113,7 +113,7 @@ codespell:
 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.lightclient_patch
+	&& mypy --config-file $(LINTER_CONFIG_FILE) -p eth2spec.phase0 -p eth2spec.phase1 -p eth2spec.altair
 
 lint_generators: pyspec
 	. venv/bin/activate; cd $(TEST_GENERATORS_DIR); \

README.md

@@ -21,10 +21,11 @@ Core specifications for Eth2 clients be found in [specs](specs/). These are divi
 * [Honest Validator](specs/phase0/validator.md)
 * [P2P Networking](specs/phase0/p2p-interface.md)
 
-### Light clients
+### Altair
 
-* [Beacon chain changes](specs/lightclient/beacon-chain.md)
-* [Light client sync protocol](specs/lightclient/sync-protocol.md)
+* [Beacon chain changes](specs/altair/beacon-chain.md)
+* [Altair fork](specs/altair/fork.md)
+* [Light client sync protocol](specs/altair/sync-protocol.md)
 
 ### Sharding
 

configs/mainnet/altair.yaml

@@ -1,15 +1,15 @@
-# Mainnet preset - lightclient patch
+# Mainnet preset - Altair
 
 CONFIG_NAME: "mainnet"
 
 # Updated penalty values
 # ---------------------------------------------------------------
 # 3 * 2**24) (= 50,331,648)
-HF1_INACTIVITY_PENALTY_QUOTIENT: 50331648
+ALTAIR_INACTIVITY_PENALTY_QUOTIENT: 50331648
 # 2**6 (= 64)
-HF1_MIN_SLASHING_PENALTY_QUOTIENT: 64
+ALTAIR_MIN_SLASHING_PENALTY_QUOTIENT: 64
 # 2
-HF1_PROPORTIONAL_SLASHING_MULTIPLIER: 2
+ALTAIR_PROPORTIONAL_SLASHING_MULTIPLIER: 2
 
 
 # Misc

configs/minimal/altair.yaml

@@ -1,15 +1,15 @@
-# Minimal preset - lightclient patch
+# Minimal preset - Altair
 
 CONFIG_NAME: "minimal"
 
 # Updated penalty values
 # ---------------------------------------------------------------
 # 3 * 2**24) (= 50,331,648)
-HF1_INACTIVITY_PENALTY_QUOTIENT: 50331648
+ALTAIR_INACTIVITY_PENALTY_QUOTIENT: 50331648
 # 2**6 (= 64)
-HF1_MIN_SLASHING_PENALTY_QUOTIENT: 64
+ALTAIR_MIN_SLASHING_PENALTY_QUOTIENT: 64
 # 2
-HF1_PROPORTIONAL_SLASHING_MULTIPLIER: 2
+ALTAIR_PROPORTIONAL_SLASHING_MULTIPLIER: 2
 
 
 # Misc

setup.py

@@ -179,7 +179,7 @@ def get_spec(file_name: str) -> SpecObject:
 
 from eth2spec.utils.hash_function import hash
 
-# Whenever lightclient is loaded, make sure we have the latest phase0
+# Whenever altair is loaded, make sure we have the latest phase0
 from importlib import reload
 reload(phase0)
 
@@ -386,7 +386,7 @@ def combine_spec_objects(spec0: SpecObject, spec1: SpecObject) -> SpecObject:
 fork_imports = {
     'phase0': PHASE0_IMPORTS,
     'phase1': PHASE1_IMPORTS,
-    'lightclient_patch': LIGHTCLIENT_IMPORT,
+    'altair': LIGHTCLIENT_IMPORT,
 }
 
 
@@ -453,16 +453,16 @@ def finalize_options(self):
                     specs/phase1/shard-fork-choice.md
                     specs/phase1/validator.md
                 """
-            elif self.spec_fork == "lightclient_patch":
+            elif self.spec_fork == "altair":
                 self.md_doc_paths = """
                     specs/phase0/beacon-chain.md
                     specs/phase0/fork-choice.md
                     specs/phase0/validator.md
                     specs/phase0/weak-subjectivity.md
-                    specs/lightclient/beacon-chain.md
-                    specs/lightclient/fork.md
+                    specs/altair/beacon-chain.md
+                    specs/altair/fork.md
                 """
-                # TODO: add specs/lightclient/sync-protocol.md back when the GeneralizedIndex helpers are included.
+                # TODO: add specs/altair/sync-protocol.md back when the GeneralizedIndex helpers are included.
             else:
                 raise Exception('no markdown files specified, and spec fork "%s" is unknown', self.spec_fork)
 

specs/altair/beacon-chain.md

@@ -1,4 +1,4 @@
-# Ethereum 2.0 HF1
+# Ethereum 2.0 Altair
 
 ## Table of contents
 
@@ -55,7 +55,7 @@
 
 ## Introduction
 
-This is a patch implementing the first hard fork to the beacon chain, tentatively named HF1 pending a permanent name.
+Altair is a patch implementing the first hard fork to the beacon chain.
 It has four main features:
 
 * Light client support via sync committees
@@ -108,9 +108,9 @@ This patch updates a few configuration values to move penalty constants toward t
 
 | Name | Value |
 | - | - |
-| `HF1_INACTIVITY_PENALTY_QUOTIENT` | `uint64(3 * 2**24)` (= 50,331,648) |
-| `HF1_MIN_SLASHING_PENALTY_QUOTIENT` | `uint64(2**6)` (=64) |
-| `HF1_PROPORTIONAL_SLASHING_MULTIPLIER` | `uint64(2)` |
+| `ALTAIR_INACTIVITY_PENALTY_QUOTIENT` | `uint64(3 * 2**24)` (= 50,331,648) |
+| `ALTAIR_MIN_SLASHING_PENALTY_QUOTIENT` | `uint64(2**6)` (=64) |
+| `ALTAIR_PROPORTIONAL_SLASHING_MULTIPLIER` | `uint64(2)` |
 
 ### Misc
 
@@ -152,8 +152,8 @@ class BeaconBlockBody(Container):
     deposits: List[Deposit, MAX_DEPOSITS]
     voluntary_exits: List[SignedVoluntaryExit, MAX_VOLUNTARY_EXITS]
     # Sync committee aggregate signature
-    sync_committee_bits: Bitvector[SYNC_COMMITTEE_SIZE]  # [New in HF1]
-    sync_committee_signature: BLSSignature  # [New in HF1]
+    sync_committee_bits: Bitvector[SYNC_COMMITTEE_SIZE]  # [New in Altair]
+    sync_committee_signature: BLSSignature  # [New in Altair]
 ```
 
 #### `BeaconState`
@@ -379,7 +379,7 @@ def get_inactivity_penalty_deltas(state: BeaconState) -> Tuple[Sequence[Gwei], S
                 effective_balance = state.validators[index].effective_balance
                 penalties[index] += Gwei(
                     effective_balance * get_finality_delay(state)
-                    // HF1_INACTIVITY_PENALTY_QUOTIENT
+                    // ALTAIR_INACTIVITY_PENALTY_QUOTIENT
                 )
 
     rewards = [Gwei(0) for _ in range(len(state.validators))]
@@ -391,7 +391,7 @@ def get_inactivity_penalty_deltas(state: BeaconState) -> Tuple[Sequence[Gwei], S
 #### New `slash_validator`
 
 *Note*: The function `slash_validator` is modified
-with the substitution of `MIN_SLASHING_PENALTY_QUOTIENT` with `HF1_MIN_SLASHING_PENALTY_QUOTIENT`.
+with the substitution of `MIN_SLASHING_PENALTY_QUOTIENT` with `ALTAIR_MIN_SLASHING_PENALTY_QUOTIENT`.
 
 ```python
 def slash_validator(state: BeaconState,
@@ -406,7 +406,7 @@ def slash_validator(state: BeaconState,
     validator.slashed = True
     validator.withdrawable_epoch = max(validator.withdrawable_epoch, Epoch(epoch + EPOCHS_PER_SLASHINGS_VECTOR))
     state.slashings[epoch % EPOCHS_PER_SLASHINGS_VECTOR] += validator.effective_balance
-    decrease_balance(state, slashed_index, validator.effective_balance // HF1_MIN_SLASHING_PENALTY_QUOTIENT)
+    decrease_balance(state, slashed_index, validator.effective_balance // ALTAIR_MIN_SLASHING_PENALTY_QUOTIENT)
 
     # Apply proposer and whistleblower rewards
     proposer_index = get_beacon_proposer_index(state)
@@ -425,8 +425,8 @@ def process_block(state: BeaconState, block: BeaconBlock) -> None:
     process_block_header(state, block)
     process_randao(state, block.body)
     process_eth1_data(state, block.body)
-    process_operations(state, block.body)  # [Modified in HF1]
-    process_sync_committee(state, block.body)  # [New in HF1]
+    process_operations(state, block.body)  # [Modified in Altair]
+    process_sync_committee(state, block.body)  # [New in Altair]
 ```
 
 #### Modified `process_attestation`
@@ -561,17 +561,17 @@ def process_sync_committee(state: BeaconState, body: BeaconBlockBody) -> None:
 
 ```python
 def process_epoch(state: BeaconState) -> None:
-    process_justification_and_finalization(state)  # [Modified in HF1]
-    process_rewards_and_penalties(state)  # [Modified in HF1]
+    process_justification_and_finalization(state)  # [Modified in Altair]
+    process_rewards_and_penalties(state)  # [Modified in Altair]
     process_registry_updates(state)
-    process_slashings(state)  # [Modified in HF1]
+    process_slashings(state)  # [Modified in Altair]
     process_eth1_data_reset(state)
     process_effective_balance_updates(state)
     process_slashings_reset(state)
     process_randao_mixes_reset(state)
     process_historical_roots_update(state)
-    process_participation_flag_updates(state)  # [New in HF1]
-    process_sync_committee_updates(state)  # [New in HF1]
+    process_participation_flag_updates(state)  # [New in Altair]
+    process_sync_committee_updates(state)  # [New in Altair]
 ```
 
 #### Justification and finalization
@@ -642,13 +642,13 @@ def process_rewards_and_penalties(state: BeaconState) -> None:
 
 #### Slashings
 
-*Note*: The function `process_slashings` is modified to use `HF1_PROPORTIONAL_SLASHING_MULTIPLIER`.
+*Note*: The function `process_slashings` is modified to use `ALTAIR_PROPORTIONAL_SLASHING_MULTIPLIER`.
 
 ```python
 def process_slashings(state: BeaconState) -> None:
     epoch = get_current_epoch(state)
     total_balance = get_total_active_balance(state)
-    adjusted_total_slashing_balance = min(sum(state.slashings) * HF1_PROPORTIONAL_SLASHING_MULTIPLIER, total_balance)
+    adjusted_total_slashing_balance = min(sum(state.slashings) * ALTAIR_PROPORTIONAL_SLASHING_MULTIPLIER, total_balance)
     for index, validator in enumerate(state.validators):
         if validator.slashed and epoch + EPOCHS_PER_SLASHINGS_VECTOR // 2 == validator.withdrawable_epoch:
             increment = EFFECTIVE_BALANCE_INCREMENT  # Factored out from penalty numerator to avoid uint64 overflow

specs/altair/fork.md

@@ -25,29 +25,29 @@ Warning: this configuration is not definitive.
 
 | Name | Value |
 | - | - |
-| `LIGHTCLIENT_PATCH_FORK_VERSION` | `Version('0x01000000')` |
-| `LIGHTCLIENT_PATCH_FORK_SLOT` | `Slot(0)` **TBD** |
+| `ALTAIR_FORK_VERSION` | `Version('0x01000000')` |
+| `ALTAIR_FORK_SLOT` | `Slot(0)` **TBD** |
 
 ## Fork to Light-client patch
 
 ### Fork trigger
 
-TBD. Social consensus, along with state conditions such as epoch boundary, finality, deposits, active validator count, etc. may be part of the decision process to trigger the fork. For now we assume the condition will be triggered at slot `LIGHTCLIENT_PATCH_FORK_SLOT`, where `LIGHTCLIENT_PATCH_FORK_SLOT % SLOTS_PER_EPOCH == 0`.
+TBD. Social consensus, along with state conditions such as epoch boundary, finality, deposits, active validator count, etc. may be part of the decision process to trigger the fork. For now we assume the condition will be triggered at slot `ALTAIR_FORK_SLOT`, where `ALTAIR_FORK_SLOT % SLOTS_PER_EPOCH == 0`.
 
 ### Upgrading the state
 
-After `process_slots` of Phase 0 finishes, if `state.slot == LIGHTCLIENT_PATCH_FORK_SLOT`, an irregular state change is made to upgrade to light-client patch.
+After `process_slots` of Phase 0 finishes, if `state.slot == ALTAIR_FORK_SLOT`, an irregular state change is made to upgrade to light-client patch.
 
 ```python
-def upgrade_to_lightclient_patch(pre: phase0.BeaconState) -> BeaconState:
+def upgrade_to_altair(pre: phase0.BeaconState) -> BeaconState:
     epoch = get_current_epoch(pre)
     post = BeaconState(
         genesis_time=pre.genesis_time,
         genesis_validators_root=pre.genesis_validators_root,
         slot=pre.slot,
         fork=Fork(
             previous_version=pre.fork.current_version,
-            current_version=LIGHTCLIENT_PATCH_FORK_VERSION,
+            current_version=ALTAIR_FORK_VERSION,
             epoch=epoch,
         ),
         # History