Merge branch 'master' into eip8025-clean-up

Author: frisitano

.gitignore

@@ -11,7 +11,6 @@ build/
 output/
 dist/
 
-.mypy_cache
 .pytest_cache
 .ruff_cache
 

Makefile

@@ -93,7 +93,7 @@ help-verbose:
 	@echo "    - mdformat: Formats markdown files"
 	@echo "    - codespell: Checks for spelling mistakes"
 	@echo "    - ruff: Python linter and formatter"
-	@echo "    - mypy: Static type checker for Python"
+	@echo "    - ty: Static type checker for Python"
 	@echo "    - Fork comments validation (scripts/check_fork_comments.py)"
 	@echo "    - Markdown headings validation (scripts/check_markdown_headings.py)"
 	@echo "    - Markdown note style fix (scripts/fix_note_style.py)"
@@ -257,8 +257,6 @@ serve_docs: _pyspec _copy_docs
 LINT_DIFF_BEFORE := .lint_diff_before
 LINT_DIFF_AFTER := .lint_diff_after
 MARKDOWN_FILES := $(shell find $(CURDIR) -name '*.md' -not -path '$(CURDIR)/.git/*' -not -path '$(CURDIR)/.venv/*')
-MYPY_PACKAGE_BASE := $(subst /,.,$(PYSPEC_DIR:$(CURDIR)/%=%))
-MYPY_SCOPE := $(foreach S,$(ALL_EXECUTABLE_SPEC_NAMES), -p $(MYPY_PACKAGE_BASE).eth_consensus_specs.$S)
 
 # Check for mistakes.
 lint: _pyspec
@@ -275,8 +273,9 @@ lint: _pyspec
 	@$(UV_RUN) ruff check --fix --quiet $(CURDIR)/tests $(CURDIR)/pysetup $(CURDIR)/specs
 	@$(UV_RUN) ruff format --quiet $(CURDIR)/tests $(CURDIR)/pysetup
 	@$(UV_RUN) ruff format --preview --quiet $(CURDIR)/specs
-	@output="$$($(UV_RUN) mypy $(MYPY_SCOPE) 2>&1)" || \
-		{ echo "$$output"; exit 1; }
+	@$(UV_RUN) ty check --no-progress \
+		$(PYSPEC_DIR)/eth_consensus_specs/*/mainnet.py \
+		$(PYSPEC_DIR)/eth_consensus_specs/*/minimal.py
 	@git diff > $(LINT_DIFF_AFTER)
 	@diff -q $(LINT_DIFF_BEFORE) $(LINT_DIFF_AFTER) >/dev/null 2>&1 || \
 		echo "$(BOLD)Note: make lint modified tracked files$(NORM)"

presets/mainnet/heze.yaml

@@ -9,5 +9,5 @@ INCLUSION_LIST_COMMITTEE_SIZE: 16
 # ---------------------------------------------------------------
 # 196,934 bytes, ~192 KiB
 MAX_SIGNED_EXECUTION_PAYLOAD_BID_SIZE_HEZE: 196934
-# 8,348 bytes, ~8 KiB
-MAX_SIGNED_INCLUSION_LIST_SIZE: 8348
+# 41,112 bytes, ~40 KiB
+MAX_SIGNED_INCLUSION_LIST_SIZE: 41112

presets/minimal/heze.yaml

@@ -9,5 +9,5 @@ INCLUSION_LIST_COMMITTEE_SIZE: 16
 # ---------------------------------------------------------------
 # 196,934 bytes, ~192 KiB
 MAX_SIGNED_EXECUTION_PAYLOAD_BID_SIZE_HEZE: 196934
-# 8,348 bytes, ~8 KiB
-MAX_SIGNED_INCLUSION_LIST_SIZE: 8348
+# 41,112 bytes, ~40 KiB
+MAX_SIGNED_INCLUSION_LIST_SIZE: 41112

pyproject.toml

@@ -13,7 +13,7 @@ requires-python = ">=3.12, <3.15"
 urls = { homepage = "https://github.com/ethereum/consensus-specs" }
 dependencies = [
   "blake3==1.0.9",
-  "eth-ssz-specs==0.0.1.dev2",
+  "eth-ssz-specs==0.1.0",
   "eth-utils==6.0.0",
   "frozendict==2.4.7",
   "lru-dict==1.4.1",
@@ -45,8 +45,8 @@ lint = [
   "mdformat-gfm==1.0.0",
   "mdformat-toc==0.5.0",
   "mdformat==1.0.0",
-  "mypy==2.3.1",
   "ruff-md==0.16.2",
+  "ty==0.0.77",
 ]
 docs = [
   "mdx-truly-sane-lists==1.3",
@@ -76,14 +76,6 @@ specs = ["**/*.md"]
 pythonpath = ["."]
 testpaths = ["tests"]
 
-[tool.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
-
 [tool.ruff]
 line-length = 100
 namespace-packages = ["scripts"]
@@ -148,7 +140,8 @@ ignore = [
 
 [tool.ruff.lint.per-file-ignores]
 "**/*.md" = [
-  "F821", # https://docs.astral.sh/ruff/rules/undefined-name/
+  "F821",   # https://docs.astral.sh/ruff/rules/undefined-name/
+  "FBT003", # https://docs.astral.sh/ruff/rules/boolean-positional-value-in-call/
 ]
 "!specs/**" = [
   "ARG", # https://docs.astral.sh/ruff/rules/#flake8-unused-arguments-arg

pysetup/md_to_spec.py

@@ -307,7 +307,7 @@ def _process_table(self, table: Table) -> None:
             # It is a constant variable or a preset_dep_constant_vars
             else:
                 if name == "ENDIANNESS":
-                    # Deal with mypy Literal typing check
+                    # Deal with Literal typing check
                     value_def = _parse_value(name, value, type_hint="Final")
                 if any(k in value for k in self.preset) or any(
                     k in value for k in self.spec["preset_dep_constant_vars"]

pysetup/spec_builders/altair.py

@@ -27,7 +27,7 @@ def sundry_functions(cls) -> str:
         return """
 def compute_merkle_proof(object: SSZObject,
                          index: GeneralizedIndex) -> list[Bytes32]:
-    return build_proof(object, index)"""
+    return [Bytes32(chunk) for chunk in build_proof(object, index)]"""
 
     @classmethod
     def hardcoded_ssz_dep_constants(cls) -> dict[str, str]:
@@ -61,6 +61,7 @@ def deprecate_functions(cls) -> set[str]:
             "get_matching_head_attestations",
             "get_matching_source_attestations",
             "get_matching_target_attestations",
+            "get_pending_attesting_indices",
             "get_proposer_reward",
             "get_source_deltas",
             "get_target_deltas",

pysetup/spec_builders/bellatrix.py

@@ -21,8 +21,8 @@ def sundry_functions(cls) -> str:
 ExecutionState = Any
 
 
-def get_pow_block(hash: Bytes32) -> Optional[PowBlock]:
-    return PowBlock(block_hash=hash, parent_hash=Bytes32(), total_difficulty=Uint256(0))
+def get_pow_block(hash: Hash32) -> Optional[PowBlock]:
+    return PowBlock(block_hash=hash, parent_hash=Hash32(), total_difficulty=Uint256(0))
 
 
 def validator_is_connected(validator_index: ValidatorIndex) -> bool:

pysetup/spec_builders/capella.py

@@ -24,13 +24,21 @@ def deprecate_containers(cls) -> set[str]:
             "HistoricalBatch",
         }
 
+    @classmethod
+    def deprecate_constants(cls) -> set[str]:
+        return {
+            "SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY",
+        }
+
     @classmethod
     def deprecate_functions(cls) -> set[str]:
         return {
             "get_terminal_pow_block",
+            "is_execution_block",
             "is_execution_enabled",
             "is_merge_transition_block",
             "is_merge_transition_complete",
+            "is_optimistic_candidate_block",
             "process_historical_roots_update",
             "upgrade_to_bellatrix",
             "validate_merge_block",

pysetup/spec_builders/eip8148.py

@@ -11,3 +11,9 @@ def imports(cls, preset_name: str):
         return f"""
 from eth_consensus_specs.heze import {preset_name} as heze
 """
+
+    @classmethod
+    def deprecate_functions(cls) -> set[str]:
+        return {
+            "upgrade_to_heze",
+        }