Merge branch 'dev' into delete-trailing-whitespace

ethereum · Dec 2, 2024 · e519845 · e519845
2 parents 959d592 + bc7f927
commit e519845
Show file tree

Hide file tree

Showing 87 changed files with 2,292 additions and 509 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -44,19 +44,6 @@ commands:
           venv_name: v25-pyspec
           reqs_checksum: cache-{{ checksum "setup.py" }}-{{ checksum "requirements_preinstallation.txt" }}
           venv_path: ./venv
-  restore_deposit_contract_tester_cached_venv:
-    description: "Restore the venv from cache for the deposit contract tester"
-    steps:
-      - restore_cached_venv:
-          venv_name: v23-deposit-contract-tester
-          reqs_checksum: cache-{{ checksum "setup.py" }}-{{ checksum "requirements_preinstallation.txt" }}-{{ checksum "solidity_deposit_contract/web3_tester/requirements.txt" }}
-  save_deposit_contract_tester_cached_venv:
-    description: "Save the venv to cache for later use of the deposit contract tester"
-    steps:
-      - save_cached_venv:
-          venv_name: v23-deposit-contract-tester
-          reqs_checksum: cache-{{ checksum "setup.py" }}-{{ checksum "requirements_preinstallation.txt" }}-{{ checksum "solidity_deposit_contract/web3_tester/requirements.txt" }}
-          venv_path: ./solidity_deposit_contract/web3_tester/venv
 jobs:
   checkout_specs:
     docker:
@@ -226,71 +213,6 @@ jobs:
       - run:
           name: Run linter for test generators
           command: make lint_generators
-  build_deposit_contract:
-    docker:
-      - image: ethereum/solc:0.6.11-alpine
-    steps:
-      - checkout
-      - run:
-          name: Install build essentials
-          command: |
-            apk update
-            apk add git make
-      - run:
-          name: Compile the contract
-          command: |
-            make compile_deposit_contract
-            git diff --color --exit-code
-      - persist_to_workspace:
-          root: .
-          paths:
-            - ./solidity_deposit_contract/deposit_contract.json
-            - ./build/combined.json
-            - ./solidity_deposit_contract/lib
-  test_deposit_contract:
-    docker:
-      - image: nixorg/nix:circleci
-    steps:
-      - checkout
-      - restore_cache:
-          key: nix-store-test-v2
-      - attach_workspace:
-          at: /tmp/
-      - run:
-          name: Test the contract
-          command: |
-            mkdir build
-            cp -r /tmp/build/* build
-            cp -r /tmp/solidity_deposit_contract/lib/* ./solidity_deposit_contract/lib
-            cp -r /tmp/solidity_deposit_contract/deposit_contract.json ./solidity_deposit_contract/deposit_contract.json
-            nix-shell --command 'make test_deposit_contract' ./solidity_deposit_contract/shell.nix
-      - save_cache:
-          key: nix-store-test-v2
-          paths:
-            - /nix
-  install_deposit_contract_web3_tester:
-    docker:
-      - image: cimg/python:3.12.4
-    working_directory: ~/specs-repo
-    steps:
-      - restore_cache:
-          key: v3-specs-repo-{{ .Branch }}-{{ .Revision }}
-      - restore_deposit_contract_tester_cached_venv
-      - run:
-          name: Install deposit contract tester requirements
-          command: make install_deposit_contract_web3_tester
-      - save_deposit_contract_tester_cached_venv
-  test_deposit_contract_web3_tests:
-    docker:
-      - image: cimg/python:3.12.4
-    working_directory: ~/specs-repo
-    steps:
-      - restore_cache:
-          key: v3-specs-repo-{{ .Branch }}-{{ .Revision }}
-      - restore_deposit_contract_tester_cached_venv
-      - run:
-          name: Run deposit contract test with web3.py
-          command: make test_deposit_contract_web3_tests
 workflows:
   version: 2.1
   test_spec:
@@ -328,17 +250,3 @@ workflows:
       - lint:
           requires:
             - install_pyspec_test
-      # NOTE: Since phase 0 has been launched, we disabled the deposit contract tests.
-      # - install_deposit_contract_web3_tester:
-      #     requires:
-      #       - checkout_specs
-      # - test_deposit_contract_web3_tests:
-      #     requires:
-      #       - install_deposit_contract_web3_tester
-  build_and_test_deposit_contract:
-    jobs:
-      - build_deposit_contract
-      # NOTE: Since phase 0 has been launched, we disabled the deposit contract tests.
-      # - test_deposit_contract:
-      #     requires:
-      #       - build_deposit_contract
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -122,3 +122,18 @@ jobs:
         with:
           name: test-reports-${{ matrix.version }}
           path: tests/core/pyspec/test-reports
+
+  gen-modcheck:
+   runs-on: [self-hosted-ghr-custom, size-s-x64, profile-consensusSpecs]
+   steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12.4'
+          cache: ''
+      - name: Install pyspec requirements
+        run: make install_test
+      - name: Run generators with --modcheck
+        run: make generate_tests modcheck=true
diff --git a/Makefile b/Makefile
@@ -8,10 +8,6 @@ ETH2SPEC_MODULE_DIR = $(PY_SPEC_DIR)/eth2spec
 TEST_REPORT_DIR = $(PY_SPEC_DIR)/test-reports
 TEST_VECTOR_DIR = ../consensus-spec-tests/tests
 GENERATOR_DIR = ./tests/generators
-SOLIDITY_DEPOSIT_CONTRACT_DIR = ./solidity_deposit_contract
-SOLIDITY_DEPOSIT_CONTRACT_SOURCE = ${SOLIDITY_DEPOSIT_CONTRACT_DIR}/deposit_contract.sol
-SOLIDITY_FILE_NAME = deposit_contract.json
-DEPOSIT_CONTRACT_TESTER_DIR = ${SOLIDITY_DEPOSIT_CONTRACT_DIR}/web3_tester
 CONFIGS_DIR = ./configs
 TEST_PRESET_TYPE ?= minimal
 # Collect a list of generator names
@@ -45,20 +41,12 @@ COV_HTML_OUT_DIR=$(PY_SPEC_DIR)/$(COV_HTML_OUT)
 COV_INDEX_FILE=$(COV_HTML_OUT_DIR)/index.html
 
 CURRENT_DIR = ${CURDIR}
-LINTER_CONFIG_FILE = $(CURRENT_DIR)/linter.ini
 GENERATOR_ERROR_LOG_FILE = $(CURRENT_DIR)/$(TEST_VECTOR_DIR)/testgen_error_log.txt
 
 SCRIPTS_DIR = ${CURRENT_DIR}/scripts
 
-export DAPP_SKIP_BUILD:=1
-export DAPP_SRC:=$(SOLIDITY_DEPOSIT_CONTRACT_DIR)
-export DAPP_LIB:=$(SOLIDITY_DEPOSIT_CONTRACT_DIR)/lib
-export DAPP_JSON:=build/combined.json
-
 .PHONY: clean partial_clean all test citest lint generate_tests pyspec install_test open_cov \
-        install_deposit_contract_tester test_deposit_contract install_deposit_contract_compiler \
-        compile_deposit_contract test_compile_deposit_contract check_toc \
-        detect_generator_incomplete detect_generator_error_log
+        check_toc detect_generator_incomplete detect_generator_error_log
 
 all: $(PY_SPEC_ALL_TARGETS)
 
@@ -162,33 +150,16 @@ codespell:
 
 lint: pyspec
 	. venv/bin/activate; cd $(PY_SPEC_DIR); \
-	flake8  --config $(LINTER_CONFIG_FILE) ./eth2spec \
-	&& python -m pylint --rcfile $(LINTER_CONFIG_FILE) $(PYLINT_SCOPE) \
-	&& python -m mypy --config-file $(LINTER_CONFIG_FILE) $(MYPY_SCOPE)
+	flake8  --config $(CURRENT_DIR)/flake8.ini ./eth2spec \
+	&& python -m pylint --rcfile $(CURRENT_DIR)/pylint.ini $(PYLINT_SCOPE) \
+	&& python -m mypy --config-file $(CURRENT_DIR)/mypy.ini $(MYPY_SCOPE)
 
 lint_generators: pyspec
 	. venv/bin/activate; cd $(TEST_GENERATORS_DIR); \
-	flake8 --config $(LINTER_CONFIG_FILE)
-
-compile_deposit_contract:
-	@cd $(SOLIDITY_DEPOSIT_CONTRACT_DIR)
-	@git submodule update --recursive --init
-	@solc --metadata-literal --optimize --optimize-runs 5000000 --bin --abi --combined-json=abi,bin,bin-runtime,srcmap,srcmap-runtime,ast,metadata,storage-layout --overwrite -o build $(SOLIDITY_DEPOSIT_CONTRACT_SOURCE) $(SOLIDITY_DEPOSIT_CONTRACT_DIR)/tests/deposit_contract.t.sol
-	@/bin/echo -n '{"abi": ' > $(SOLIDITY_FILE_NAME)
-	@cat build/DepositContract.abi >> $(SOLIDITY_FILE_NAME)
-	@/bin/echo -n ', "bytecode": "0x' >> $(SOLIDITY_FILE_NAME)
-	@cat build/DepositContract.bin >> $(SOLIDITY_FILE_NAME)
-	@/bin/echo -n '"}' >> $(SOLIDITY_FILE_NAME)
-
-test_deposit_contract:
-	dapp test -v --fuzz-runs 5
-
-install_deposit_contract_web3_tester:
-	cd $(DEPOSIT_CONTRACT_TESTER_DIR); python3 -m venv venv; . venv/bin/activate; python3 -m pip install -r requirements.txt
+	flake8 --config $(CURRENT_DIR)/flake8.ini
 
-test_deposit_contract_web3_tests:
-	cd $(DEPOSIT_CONTRACT_TESTER_DIR); . venv/bin/activate; \
-	python3 -m pytest .
+# If set to true, it will not run generator tests.
+modcheck ?= false
 
 # Runs a generator, identified by param 1
 define run_generator
@@ -208,7 +179,7 @@ define run_generator
 	. venv/bin/activate; \
 	pip3 install ../../../dist/eth2spec-*.whl; \
 	pip3 install 'eth2spec[generator]'; \
-	python3 main.py -o $(CURRENT_DIR)/$(TEST_VECTOR_DIR); \
+	python3 main.py -o $(CURRENT_DIR)/$(TEST_VECTOR_DIR) $(if $(filter true,$(modcheck)),--modcheck); \
 	echo "generator $(1) finished"
 endef
 

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ This repository hosts the current Ethereum proof-of-stake specifications. Discus
 
 [![GitHub release](https://img.shields.io/github/v/release/ethereum/consensus-specs)](https://github.com/ethereum/consensus-specs/releases/) [![PyPI version](https://badge.fury.io/py/eth2spec.svg)](https://badge.fury.io/py/eth2spec) [![testgen](https://github.com/ethereum/consensus-specs/actions/workflows/generate_vectors.yml/badge.svg?branch=dev&event=schedule)](https://github.com/ethereum/consensus-specs/actions/workflows/generate_vectors.yml)
 
-Core specifications for Ethereum proof-of-stake clients can be found in [specs](specs/). These are divided into features.
+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.
 
 ### Stable Specifications
@@ -27,7 +27,7 @@ Features are researched and developed in parallel, and then consolidated into se
 
 | Seq. | Code Name | Fork Epoch | Specs |
 | - | - | - | - |
-| 5 | **Electra** | TBD | <ul><li>Core</li><ul><li>[Beacon Chain changes](specs/electra/beacon-chain.md)</li><li>[Electra fork](specs/electra/fork.md)</li></ul><li>Additions</li><ul><li>[Light client sync protocol changes](specs/electra/light-client/sync-protocol.md) ([fork](specs/electra/light-client/fork.md), [full node](specs/electra/light-client/full-node.md), [networking](specs/electra/light-client/p2p-interface.md))</li><li>[Honest validator guide changes](specs/electra/validator.md)</li><li>[P2P networking](specs/electra/p2p-interface.md)</li></ul></ul> |
+| 5 | **Electra** | TBD | <ul><li>Core</li><ul><li>[Beacon Chain changes](specs/electra/beacon-chain.md)</li><li>[Electra fork](specs/electra/fork.md)</li></ul><li>Additions</li><ul><li>[Light client sync protocol changes](specs/electra/light-client/sync-protocol.md) ([fork](specs/electra/light-client/fork.md), [networking](specs/electra/light-client/p2p-interface.md))</li><li>[Honest validator guide changes](specs/electra/validator.md)</li><li>[P2P networking](specs/electra/p2p-interface.md)</li></ul></ul> |
 
 ### Outdated Specifications
 

diff --git a/configs/mainnet.yaml b/configs/mainnet.yaml
@@ -165,6 +165,9 @@ DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
 MAX_REQUEST_DATA_COLUMN_SIDECARS: 16384
 SAMPLES_PER_SLOT: 8
 CUSTODY_REQUIREMENT: 4
+MAX_BLOBS_PER_BLOCK_EIP7594: 8
+# `MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_EIP7594`
+MAX_REQUEST_BLOB_SIDECARS_EIP7594: 1024
 
 # [New in Electra:EIP7251]
 MIN_PER_EPOCH_CHURN_LIMIT_ELECTRA: 128000000000 # 2**7 * 10**9 (= 128,000,000,000)

diff --git a/configs/minimal.yaml b/configs/minimal.yaml
@@ -164,6 +164,9 @@ DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
 MAX_REQUEST_DATA_COLUMN_SIDECARS: 16384
 SAMPLES_PER_SLOT: 8
 CUSTODY_REQUIREMENT: 4
+MAX_BLOBS_PER_BLOCK_EIP7594: 8
+# `MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_EIP7594`
+MAX_REQUEST_BLOB_SIDECARS_EIP7594: 1024
 
 # [New in Electra:EIP7251]
 MIN_PER_EPOCH_CHURN_LIMIT_ELECTRA: 64000000000 # 2**6 * 10**9 (= 64,000,000,000)

diff --git a/flake8.ini b/flake8.ini
@@ -0,0 +1,3 @@
+[flake8]
+ignore = E252,W504,W503
+max-line-length = 120
diff --git a/linter.ini b/linter.ini
diff --git a/mypy.ini b/mypy.ini
@@ -0,0 +1,7 @@
+[mypy]
+disallow_incomplete_defs = True
+disallow_untyped_defs = True
+warn_unused_ignores = True
+warn_unused_configs = True
+warn_redundant_casts = True
+ignore_missing_imports = True
diff --git a/pylint.ini b/pylint.ini
@@ -0,0 +1,3 @@
+[MESSAGES CONTROL]
+disable = all
+enable = unused-argument
diff --git a/pysetup/md_doc_paths.py b/pysetup/md_doc_paths.py
@@ -22,7 +22,7 @@
     DENEB: CAPELLA,
     ELECTRA: DENEB,
     WHISK: CAPELLA,
-    EIP7594: DENEB,
+    EIP7594: ELECTRA,
     EIP6800: DENEB,
     EIP7732: ELECTRA,
 }

diff --git a/pysetup/spec_builders/eip7594.py b/pysetup/spec_builders/eip7594.py
@@ -10,7 +10,7 @@ class EIP7594SpecBuilder(BaseSpecBuilder):
     @classmethod
     def imports(cls, preset_name: str):
         return f'''
-from eth2spec.deneb import {preset_name} as deneb
+from eth2spec.electra import {preset_name} as electra
 '''
 
 

diff --git a/pysetup/spec_builders/electra.py b/pysetup/spec_builders/electra.py
@@ -10,7 +10,7 @@ class ElectraSpecBuilder(BaseSpecBuilder):
     def imports(cls, preset_name: str):
         return f'''
 from eth2spec.deneb import {preset_name} as deneb
-from eth2spec.utils.ssz.ssz_impl import serialize
+from eth2spec.utils.ssz.ssz_impl import ssz_serialize, ssz_deserialize
 '''
 
     @classmethod
@@ -30,7 +30,7 @@ class NoopExecutionEngine(ExecutionEngine):
     def notify_new_payload(self: ExecutionEngine,
                            execution_payload: ExecutionPayload,
                            parent_beacon_block_root: Root,
-                           execution_requests_list: list[bytes]) -> bool:
+                           execution_requests_list: Sequence[bytes]) -> bool:
         return True
 
     def notify_forkchoice_updated(self: ExecutionEngine,

diff --git a/setup.py b/setup.py
@@ -561,7 +561,7 @@ def run(self):
     python_requires=">=3.9, <4",
     extras_require={
         "test": ["pytest>=4.4", "pytest-cov", "pytest-xdist"],
-        "lint": ["flake8==5.0.4", "mypy==0.981", "pylint==2.15.3"],
+        "lint": ["flake8==5.0.4", "mypy==0.981", "pylint==3.3.1"],
         "generator": ["setuptools>=72.0.0", "pytest>4.4", "python-snappy==0.7.3", "filelock", "pathos==0.3.0"],
         "docs": ["mkdocs==1.4.2", "mkdocs-material==9.1.5", "mdx-truly-sane-lists==1.3",  "mkdocs-awesome-pages-plugin==2.8.0"]
     },
@@ -572,7 +572,7 @@ def run(self):
         "py_ecc==6.0.0",
         "milagro_bls_binding==1.9.0",
         "remerkleable==0.1.28",
-        "trie==2.0.2",
+        "trie>=3,<4",
         RUAMEL_YAML_VERSION,
         "lru-dict==1.2.0",
         MARKO_VERSION,

diff --git a/solidity_deposit_contract/Makefile b/solidity_deposit_contract/Makefile
@@ -0,0 +1,42 @@
+SOLIDITY_FILE_NAME = deposit_contract.json
+SOLIDITY_DEPOSIT_CONTRACT_SOURCE = deposit_contract.sol
+DEPOSIT_CONTRACT_TESTER_DIR = web3_tester
+
+export DAPP_SKIP_BUILD:=1
+export DAPP_SRC:=$(CURDIR)
+export DAPP_LIB:=$(CURDIR)/lib
+export DAPP_JSON:=build/combined.json
+
+all: \
+	compile_deposit_contract \
+	install_deposit_contract_web3_tester \
+	test_deposit_contract_web3_tests
+
+compile_deposit_contract:
+	@git submodule update --recursive --init
+	@solc --metadata-literal --optimize --optimize-runs 5000000 --bin --abi \
+		--combined-json=abi,bin,bin-runtime,srcmap,srcmap-runtime,ast,metadata,storage-layout \
+		--overwrite -o build $(SOLIDITY_DEPOSIT_CONTRACT_SOURCE) tests/deposit_contract.t.sol
+	@/bin/echo -n '{"abi": ' > $(SOLIDITY_FILE_NAME)
+	@cat build/DepositContract.abi >> $(SOLIDITY_FILE_NAME)
+	@/bin/echo -n ', "bytecode": "0x' >> $(SOLIDITY_FILE_NAME)
+	@cat build/DepositContract.bin >> $(SOLIDITY_FILE_NAME)
+	@/bin/echo -n '"}' >> $(SOLIDITY_FILE_NAME)
+
+test_deposit_contract:
+	@dapp test -v --fuzz-runs 5
+
+install_deposit_contract_web3_tester:
+	@cd $(DEPOSIT_CONTRACT_TESTER_DIR); \
+	python3 -m venv venv; \
+	source venv/bin/activate; \
+	python3 -m pip install -r ../../requirements_preinstallation.txt; \
+	python3 -m pip install -r requirements.txt
+
+test_deposit_contract_web3_tests:
+	@cd $(DEPOSIT_CONTRACT_TESTER_DIR); \
+	source venv/bin/activate; \
+	python3 -m pytest .
+
+clean:
+	@git clean -fdx