Resolve conflicts

.circleci/config.yml

@@ -116,7 +116,7 @@ jobs:
           command: make citest fork=altair
       - store_test_results:
           path: tests/core/pyspec/test-reports
-  test-merge:
+  test-bellatrix:
     docker:
       - image: circleci/python:3.8
     working_directory: ~/specs-repo
@@ -126,7 +126,7 @@ jobs:
       - restore_pyspec_cached_venv
       - run:
           name: Run py-tests
-          command: make citest fork=merge
+          command: make citest fork=bellatrix
       - store_test_results:
           path: tests/core/pyspec/test-reports
   test-capella:
@@ -254,7 +254,7 @@ workflows:
       - test-altair:
           requires:
             - install_pyspec_test
-      - test-merge:
+      - test-bellatrix:
           requires:
             - install_pyspec_test
       - test-capella:

.gitignore

@@ -17,7 +17,7 @@ consensus-spec-tests/
 # Dynamically built from Markdown spec
 tests/core/pyspec/eth2spec/phase0/
 tests/core/pyspec/eth2spec/altair/
-tests/core/pyspec/eth2spec/merge/
+tests/core/pyspec/eth2spec/bellatrix/
 tests/core/pyspec/eth2spec/capella/
 
 # coverage reports

Makefile

@@ -24,7 +24,7 @@ GENERATOR_VENVS = $(patsubst $(GENERATOR_DIR)/%, $(GENERATOR_DIR)/%venv, $(GENER
 #$(info $$GENERATOR_TARGETS is [${GENERATOR_TARGETS}])
 
 MARKDOWN_FILES = $(wildcard $(SPEC_DIR)/phase0/*.md) $(wildcard $(SPEC_DIR)/altair/*.md) $(wildcard $(SSZ_DIR)/*.md) \
-                 $(wildcard $(SPEC_DIR)/merge/*.md) \
+                 $(wildcard $(SPEC_DIR)/bellatrix/*.md) \
                  $(wildcard $(SPEC_DIR)/custody/*.md) \
                  $(wildcard $(SPEC_DIR)/das/*.md) \
                  $(wildcard $(SPEC_DIR)/sharding/*.md)
@@ -59,7 +59,7 @@ partial_clean:
 	rm -rf $(DEPOSIT_CONTRACT_TESTER_DIR)/.pytest_cache
 	rm -rf $(ETH2SPEC_MODULE_DIR)/phase0
 	rm -rf $(ETH2SPEC_MODULE_DIR)/altair
-	rm -rf $(ETH2SPEC_MODULE_DIR)/merge
+	rm -rf $(ETH2SPEC_MODULE_DIR)/bellatrix
 	rm -rf $(COV_HTML_OUT_DIR)
 	rm -rf $(TEST_REPORT_DIR)
 	rm -rf eth2spec.egg-info dist build
@@ -97,12 +97,12 @@ install_test:
 # Testing against `minimal` config by default
 test: pyspec
 	. venv/bin/activate; cd $(PY_SPEC_DIR); \
-	python3 -m pytest -n 4 --disable-bls --cov=eth2spec.phase0.minimal --cov=eth2spec.altair.minimal --cov=eth2spec.merge.minimal --cov-report="html:$(COV_HTML_OUT)" --cov-branch eth2spec
+	python3 -m pytest -n 4 --disable-bls --cov=eth2spec.phase0.minimal --cov=eth2spec.altair.minimal --cov=eth2spec.bellatrix.minimal --cov-report="html:$(COV_HTML_OUT)" --cov-branch eth2spec
 
 # Testing against `minimal` config by default
 find_test: pyspec
 	. venv/bin/activate; cd $(PY_SPEC_DIR); \
-	python3 -m pytest -k=$(K) --disable-bls --cov=eth2spec.phase0.minimal --cov=eth2spec.altair.minimal --cov=eth2spec.merge.minimal --cov-report="html:$(COV_HTML_OUT)" --cov-branch eth2spec
+	python3 -m pytest -k=$(K) --disable-bls --cov=eth2spec.phase0.minimal --cov=eth2spec.altair.minimal --cov=eth2spec.bellatrix.minimal --cov-report="html:$(COV_HTML_OUT)" --cov-branch eth2spec
 
 citest: pyspec
 	mkdir -p tests/core/pyspec/test-reports/eth2spec;
@@ -129,11 +129,11 @@ check_toc: $(MARKDOWN_FILES:=.toc)
 codespell:
 	codespell . --skip ./.git -I .codespell-whitelist
 
-# TODO: add future merge, sharding, etc. packages to linting.
+# TODO: add future protocol upgrade patch packages to linting.
 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.altair -p eth2spec.merge -p eth2spec.capella
+	&& mypy --config-file $(LINTER_CONFIG_FILE) -p eth2spec.phase0 -p eth2spec.altair -p eth2spec.bellatrix -p eth2spec.capella
 
 lint_generators: pyspec
 	. venv/bin/activate; cd $(TEST_GENERATORS_DIR); \

README.md

@@ -33,24 +33,24 @@ The current features are:
 * [Honest Validator guide changes](specs/altair/validator.md)
 * [P2P Networking](specs/altair/p2p-interface.md)
 
-### Merge
+### Bellatrix (as known as The Merge)
 
-The merge is still actively in development. The exact specification has not been formally accepted as final and details are still subject to change.
+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](https://ethresear.ch/t/the-eth1-eth2-transition/6265)
-  * [ethereum.org](https://ethereum.org) high-level description of the merge [here](https://ethereum.org/en/eth2/docking/)
+  * 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/merge/beacon-chain.md)
-  * [Merge fork](specs/merge/fork.md)
-  * [Fork Choice changes](specs/merge/fork-choice.md)
-  * [Validator additions](specs/merge/validator.md)
-  * [Client settings](specs/merge/client-settings.md)
-  * [P2P Networking](specs/merge/p2p-interface.md)
+  * [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)
+  * [Client settings](specs/bellatrix/client-settings.md)
+  * [P2P Networking](specs/bellatrix/p2p-interface.md)
 
 ### Sharding
 
-Sharding follows the merge, and is divided into three parts:
+Sharding follows Bellatrix, and is divided into three parts:
 
 * Sharding base functionality - In early engineering phase
   * [Beacon Chain changes](specs/sharding/beacon-chain.md)

configs/mainnet.yaml

@@ -34,9 +34,9 @@ GENESIS_DELAY: 604800
 # Altair
 ALTAIR_FORK_VERSION: 0x01000000
 ALTAIR_FORK_EPOCH: 74240  # Oct 27, 2021, 10:56:23am UTC
-# Merge
-MERGE_FORK_VERSION: 0x02000000
-MERGE_FORK_EPOCH: 18446744073709551615
+# Bellatrix
+BELLATRIX_FORK_VERSION: 0x02000000
+BELLATRIX_FORK_EPOCH: 18446744073709551615
 # Capella
 CAPELLA_FORK_VERSION: 0x03000000
 CAPELLA_FORK_EPOCH: 18446744073709551615

configs/minimal.yaml

@@ -33,9 +33,9 @@ GENESIS_DELAY: 300
 # Altair
 ALTAIR_FORK_VERSION: 0x01000001
 ALTAIR_FORK_EPOCH: 18446744073709551615
-# Merge
-MERGE_FORK_VERSION: 0x02000001
-MERGE_FORK_EPOCH: 18446744073709551615
+# Bellatrix
+BELLATRIX_FORK_VERSION: 0x02000001
+BELLATRIX_FORK_EPOCH: 18446744073709551615
 # Capella
 CAPELLA_FORK_VERSION: 0x03000001
 CAPELLA_FORK_EPOCH: 18446744073709551615

presets/mainnet/altair.yaml

@@ -22,3 +22,5 @@ EPOCHS_PER_SYNC_COMMITTEE_PERIOD: 256
 # ---------------------------------------------------------------
 # 1
 MIN_SYNC_COMMITTEE_PARTICIPANTS: 1
+# SLOTS_PER_EPOCH * EPOCHS_PER_SYNC_COMMITTEE_PERIOD (= 32 * 256)
+UPDATE_TIMEOUT: 8192

presets/mainnet/merge.yaml → presets/mainnet/bellatrix.yaml

@@ -1,13 +1,13 @@
-# Mainnet preset - The Merge
+# Mainnet preset - Bellatrix
 
 # Updated penalty values
 # ---------------------------------------------------------------
 # 2**24 (= 16,777,216)
-INACTIVITY_PENALTY_QUOTIENT_MERGE: 16777216
+INACTIVITY_PENALTY_QUOTIENT_BELLATRIX: 16777216
 # 2**5 (= 32)
-MIN_SLASHING_PENALTY_QUOTIENT_MERGE: 32
+MIN_SLASHING_PENALTY_QUOTIENT_BELLATRIX: 32
 # 3
-PROPORTIONAL_SLASHING_MULTIPLIER_MERGE: 3
+PROPORTIONAL_SLASHING_MULTIPLIER_BELLATRIX: 3
 
 # Execution
 # ---------------------------------------------------------------

presets/minimal/altair.yaml

@@ -22,3 +22,5 @@ EPOCHS_PER_SYNC_COMMITTEE_PERIOD: 8
 # ---------------------------------------------------------------
 # 1
 MIN_SYNC_COMMITTEE_PARTICIPANTS: 1
+# SLOTS_PER_EPOCH * EPOCHS_PER_SYNC_COMMITTEE_PERIOD (= 8 * 8)
+UPDATE_TIMEOUT: 64

presets/minimal/merge.yaml → presets/minimal/bellatrix.yaml

@@ -1,13 +1,13 @@
-# Minimal preset - The Merge
+# Minimal preset - Bellatrix
 
 # Updated penalty values
 # ---------------------------------------------------------------
 # 2**24 (= 16,777,216)
-INACTIVITY_PENALTY_QUOTIENT_MERGE: 16777216
+INACTIVITY_PENALTY_QUOTIENT_BELLATRIX: 16777216
 # 2**5 (= 32)
-MIN_SLASHING_PENALTY_QUOTIENT_MERGE: 32
+MIN_SLASHING_PENALTY_QUOTIENT_BELLATRIX: 32
 # 3
-PROPORTIONAL_SLASHING_MULTIPLIER_MERGE: 3
+PROPORTIONAL_SLASHING_MULTIPLIER_BELLATRIX: 3
 
 # Execution
 # ---------------------------------------------------------------

setup.py

@@ -40,9 +40,10 @@ def installPackage(package: str):
 # Definitions in context.py
 PHASE0 = 'phase0'
 ALTAIR = 'altair'
-MERGE = 'merge'
+BELLATRIX = 'bellatrix'
 CAPELLA = 'capella'
 
+
 # The helper functions that are used when defining constants
 CONSTANT_DEP_SUNDRY_CONSTANTS_FUNCTIONS = '''
 def ceillog2(x: int) -> uint64:
@@ -488,10 +489,10 @@ def implement_optimizations(cls, functions: Dict[str, str]) -> Dict[str, str]:
         return super().implement_optimizations(functions)
 
 #
-# MergeSpecBuilder
+# BellatrixSpecBuilder
 #
-class MergeSpecBuilder(AltairSpecBuilder):
-    fork: str = MERGE
+class BellatrixSpecBuilder(AltairSpecBuilder):
+    fork: str = BELLATRIX
 
     @classmethod
     def imports(cls, preset_name: str):
@@ -552,19 +553,19 @@ def hardcoded_custom_type_dep_constants(cls) -> str:
 #
 # CapellaSpecBuilder
 #
-class CapellaSpecBuilder(MergeSpecBuilder):
+class CapellaSpecBuilder(BellatrixSpecBuilder):
     fork: str = CAPELLA
 
     @classmethod
     def imports(cls, preset_name: str):
         return super().imports(preset_name) + f'''
-from eth2spec.merge import {preset_name} as merge
+from eth2spec.bellatrix import {preset_name} as bellatrix
 '''
 
 
 spec_builders = {
     builder.fork: builder
-    for builder in (Phase0SpecBuilder, AltairSpecBuilder, MergeSpecBuilder, CapellaSpecBuilder)
+    for builder in (Phase0SpecBuilder, AltairSpecBuilder, BellatrixSpecBuilder, CapellaSpecBuilder)
 }
 
 
@@ -697,6 +698,7 @@ def combine_dicts(old_dict: Dict[str, T], new_dict: Dict[str, T]) -> Dict[str, T
     'uint8', 'uint16', 'uint32', 'uint64', 'uint128', 'uint256',
     'bytes', 'byte', 'ByteList', 'ByteVector',
     'Dict', 'dict', 'field', 'ceillog2', 'floorlog2', 'Set',
+    'Optional',
 ]
 
 
@@ -859,14 +861,14 @@ def finalize_options(self):
         if len(self.md_doc_paths) == 0:
             print("no paths were specified, using default markdown file paths for pyspec"
                   " build (spec fork: %s)" % self.spec_fork)
-            if self.spec_fork in (PHASE0, ALTAIR, MERGE, CAPELLA):
+            if self.spec_fork in (PHASE0, ALTAIR, BELLATRIX, CAPELLA):
                 self.md_doc_paths = """
                     specs/phase0/beacon-chain.md
                     specs/phase0/fork-choice.md
                     specs/phase0/validator.md
                     specs/phase0/weak-subjectivity.md
                 """
-            if self.spec_fork in (ALTAIR, MERGE, CAPELLA):
+            if self.spec_fork in (ALTAIR, BELLATRIX, CAPELLA):
                 self.md_doc_paths += """
                     specs/altair/beacon-chain.md
                     specs/altair/bls.md
@@ -875,12 +877,12 @@ def finalize_options(self):
                     specs/altair/p2p-interface.md
                     specs/altair/sync-protocol.md
                 """
-            if self.spec_fork in (MERGE, CAPELLA):
+            if self.spec_fork in (BELLATRIX, CAPELLA):
                 self.md_doc_paths += """
-                    specs/merge/beacon-chain.md
-                    specs/merge/fork.md
-                    specs/merge/fork-choice.md
-                    specs/merge/validator.md
+                    specs/bellatrix/beacon-chain.md
+                    specs/bellatrix/fork.md
+                    specs/bellatrix/fork-choice.md
+                    specs/bellatrix/validator.md
                 """
             if self.spec_fork == CAPELLA:
                 self.md_doc_paths += """