fix(specs): Fix issues with new ruff + mypy rules after rebase

Author: fselmo

src/ethereum/forks/amsterdam/block_access_lists/builder.py

@@ -1,8 +1,5 @@
 """
-Block Access List Builder for EIP-7928
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This module implements the Block Access List builder that tracks all account
+Implements the Block Access List builder that tracks all account
 and storage accesses during block execution and constructs the final
 [`BlockAccessList`].
 

src/ethereum/forks/amsterdam/block_access_lists/rlp_types.py

@@ -1,13 +1,10 @@
 """
-RLP Types for EIP-7928 Block-Level Access Lists
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This module defines the RLP data structures for Block-Level Access Lists
+Defines the RLP data structures for Block-Level Access Lists
 as specified in EIP-7928. These structures enable efficient encoding and
 decoding of all accounts and storage locations accessed during block execution.
 
 The encoding follows the pattern:
-address -> field -> block_access_index -> change
+address -> field -> block_access_index -> change.
 """
 
 from dataclasses import dataclass
@@ -38,8 +35,8 @@
 @dataclass
 class StorageChange:
     """
-    Storage change: [block_access_index, new_value]
-    RLP encoded as a list
+    Storage change: [block_access_index, new_value].
+    RLP encoded as a list.
     """
 
     block_access_index: BlockAccessIndex
@@ -50,8 +47,8 @@ class StorageChange:
 @dataclass
 class BalanceChange:
     """
-    Balance change: [block_access_index, post_balance]
-    RLP encoded as a list
+    Balance change: [block_access_index, post_balance].
+    RLP encoded as a list.
     """
 
     block_access_index: BlockAccessIndex
@@ -62,8 +59,8 @@ class BalanceChange:
 @dataclass
 class NonceChange:
     """
-    Nonce change: [block_access_index, new_nonce]
-    RLP encoded as a list
+    Nonce change: [block_access_index, new_nonce].
+    RLP encoded as a list.
     """
 
     block_access_index: BlockAccessIndex
@@ -74,8 +71,8 @@ class NonceChange:
 @dataclass
 class CodeChange:
     """
-    Code change: [block_access_index, new_code]
-    RLP encoded as a list
+    Code change: [block_access_index, new_code].
+    RLP encoded as a list.
     """
 
     block_access_index: BlockAccessIndex
@@ -86,8 +83,8 @@ class CodeChange:
 @dataclass
 class SlotChanges:
     """
-    All changes to a single storage slot: [slot, [changes]]
-    RLP encoded as a list
+    All changes to a single storage slot: [slot, [changes]].
+    RLP encoded as a list.
     """
 
     slot: StorageKey
@@ -100,7 +97,7 @@ class AccountChanges:
     """
     All changes for a single account, grouped by field type.
     RLP encoded as: [address, storage_changes, storage_reads,
-    balance_changes, nonce_changes, code_changes]
+    balance_changes, nonce_changes, code_changes].
     """
 
     address: Address
@@ -127,7 +124,7 @@ class BlockAccessList:
     """
     Block-Level Access List for EIP-7928.
     Contains all addresses accessed during block execution.
-    RLP encoded as a list of AccountChanges
+    RLP encoded as a list of AccountChanges.
     """
 
     account_changes: Tuple[AccountChanges, ...]

src/ethereum/forks/amsterdam/block_access_lists/rlp_utils.py

@@ -1,7 +1,4 @@
 """
-Block Access List RLP Utilities for EIP-7928
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
 Utilities for working with Block Access Lists using RLP encoding,
 as specified in EIP-7928.
 

src/ethereum/forks/amsterdam/block_access_lists/tracker.py

@@ -1,17 +1,13 @@
 """
-Block Access List State Change Tracker for EIP-7928
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This module provides state change tracking functionality for building Block
+Provides state change tracking functionality for building Block
 Access Lists during transaction execution.
 
 The tracker integrates with the EVM execution to capture all state accesses
 and modifications, distinguishing between actual changes and no-op operations.
 It maintains a cache of pre-state values to enable accurate change detection
 throughout block execution.
 
-See [EIP-7928] for the full specification.
-
+See [EIP-7928] for the full specification
 [EIP-7928]: https://eips.ethereum.org/EIPS/eip-7928
 """
 

src/ethereum_spec_tools/evm_tools/loaders/fork_loader.py

@@ -131,19 +131,19 @@ def signing_hash_155(self) -> Any:
 
     @property
     def build_block_access_list(self) -> Any:
-        """Build function of the fork"""
+        """Build function of the fork."""
         return self._module("block_access_lists").build_block_access_list
 
     @property
     def compute_block_access_list_hash(self) -> Any:
-        """compute_block_access_list_hash function of the fork"""
+        """compute_block_access_list_hash function of the fork."""
         return self._module(
             "block_access_lists"
         ).compute_block_access_list_hash
 
     @property
     def set_block_access_index(self) -> Any:
-        """set_block_access_index function of the fork"""
+        """set_block_access_index function of the fork."""
         return self._module("block_access_lists").set_block_access_index
 
     @property

tests/json_infra/block_access_lists/test_bal_implementation.py

@@ -8,6 +8,7 @@
 - Edge cases and error handling
 """
 
+from typing import Dict
 from unittest.mock import MagicMock, patch
 
 import pytest
@@ -24,6 +25,7 @@
     add_storage_write,
     add_touched_account,
     build_block_access_list,
+    track_address_access,
 )
 from ethereum.forks.amsterdam.block_access_lists.rlp_types import (
     MAX_CODE_CHANGES,
@@ -38,6 +40,9 @@
     track_nonce_change,
     track_storage_write,
 )
+from ethereum.forks.amsterdam.fork_types import Address
+from ethereum.forks.amsterdam.state import State
+from ethereum.forks.amsterdam.trie import Trie
 
 
 class TestBALCore:
@@ -199,7 +204,7 @@ def test_tracker_set_block_access_index(self) -> None:
         builder = BlockAccessListBuilder()
         tracker = StateChangeTracker(builder)
 
-        set_block_access_index(tracker, 5)
+        set_block_access_index(tracker, Uint(5))
         assert tracker.current_block_access_index == 5
         # Pre-storage cache should be cleared for new block access index
         assert tracker.pre_storage_cache == {}
@@ -239,7 +244,7 @@ def test_tracker_storage_write_actual_change(
         """Test tracking storage write with actual change."""
         builder = BlockAccessListBuilder()
         tracker = StateChangeTracker(builder)
-        tracker.current_block_access_index = 1
+        tracker.current_block_access_index = Uint(1)
 
         mock_state = MagicMock()
         address = Bytes20(b"\x01" * 20)
@@ -269,7 +274,7 @@ def test_tracker_storage_write_no_change(
         """Test tracking storage write with no actual change."""
         builder = BlockAccessListBuilder()
         tracker = StateChangeTracker(builder)
-        tracker.current_block_access_index = 1
+        tracker.current_block_access_index = Uint(1)
 
         mock_state = MagicMock()
         address = Bytes20(b"\x01" * 20)
@@ -289,7 +294,7 @@ def test_tracker_balance_change(self) -> None:
         """Test tracking balance changes."""
         builder = BlockAccessListBuilder()
         tracker = StateChangeTracker(builder)
-        tracker.current_block_access_index = 2
+        tracker.current_block_access_index = Uint(2)
 
         address = Bytes20(b"\x01" * 20)
         new_balance = U256(1000)
@@ -308,7 +313,7 @@ def test_tracker_nonce_change(self) -> None:
         """Test tracking nonce changes."""
         builder = BlockAccessListBuilder()
         tracker = StateChangeTracker(builder)
-        tracker.current_block_access_index = 3
+        tracker.current_block_access_index = Uint(3)
 
         address = Bytes20(b"\x01" * 20)
         new_nonce = U64(10)
@@ -326,7 +331,7 @@ def test_tracker_code_change(self) -> None:
         """Test tracking code changes."""
         builder = BlockAccessListBuilder()
         tracker = StateChangeTracker(builder)
-        tracker.current_block_access_index = 1
+        tracker.current_block_access_index = Uint(1)
 
         address = Bytes20(b"\x01" * 20)
         new_code = Bytes(b"\x60\x80\x60\x40")
@@ -624,11 +629,10 @@ class TestValueCalls:
     """Test value call scenarios including 0 ETH calls."""
 
     def test_zero_eth_value_call_tracks_address_without_balance(self) -> None:
-        """Test that 0 ETH calls track recipient address without balance changes."""
-        from ethereum.forks.amsterdam.block_access_lists.tracker import (
-            track_address_access,
-        )
-
+        """
+        Test that 0 ETH calls track recipient address without
+        balance changes.
+        """
         builder = BlockAccessListBuilder()
         tracker = StateChangeTracker(builder)
         set_block_access_index(tracker, Uint(1))
@@ -651,7 +655,10 @@ def test_zero_eth_value_call_tracks_address_without_balance(self) -> None:
         assert recipient_found
 
     def test_nonzero_eth_value_call_tracks_with_balance(self) -> None:
-        """Test that non-zero ETH calls track addresses with balance changes."""
+        """
+        Test that non-zero ETH calls track addresses with balance
+        changes.
+        """
         builder = BlockAccessListBuilder()
         tracker = StateChangeTracker(builder)
         set_block_access_index(tracker, Uint(1))
@@ -683,10 +690,6 @@ def test_nonzero_eth_value_call_tracks_with_balance(self) -> None:
 
     def test_multiple_zero_eth_calls_deduplication(self) -> None:
         """Test that multiple 0 ETH calls to same address are deduplicated."""
-        from ethereum.forks.amsterdam.block_access_lists.tracker import (
-            track_address_access,
-        )
-
         builder = BlockAccessListBuilder()
         tracker = StateChangeTracker(builder)
         set_block_access_index(tracker, Uint(1))
@@ -740,8 +743,8 @@ def test_storage_write_becomes_read_on_revert(
         begin_call_frame(tracker)
 
         # Mock state for storage operations
-        class MockState:
-            _storage_tries = {}
+        class MockState(State):
+            _storage_tries: Dict[Address, Trie[Bytes32, U256]] = {}
 
         state = MockState()
 
@@ -778,7 +781,10 @@ class MockState:
         assert account_found
 
     def test_balance_changes_removed_on_revert(self) -> None:
-        """Test that balance changes are removed on revert but address remains."""
+        """
+        Test that balance changes are removed on revert but address
+        remains.
+        """
         from ethereum.forks.amsterdam.block_access_lists.tracker import (
             begin_call_frame,
             rollback_call_frame,
@@ -813,7 +819,10 @@ def test_balance_changes_removed_on_revert(self) -> None:
         assert account_found
 
     def test_nested_call_frames_with_partial_revert(self) -> None:
-        """Test nested call frames where inner frame reverts but outer succeeds."""
+        """
+        Test nested call frames where inner frame reverts but outer
+        succeeds.
+        """
         from ethereum.forks.amsterdam.block_access_lists.tracker import (
             begin_call_frame,
             commit_call_frame,

tests/json_infra/block_access_lists/test_rlp.py

@@ -1,3 +1,5 @@
+"""Tests for RLP encoding and decoding of Cancun-specific objects."""
+
 import pytest
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes8, Bytes32
@@ -174,6 +176,7 @@
     ],
 )
 def test_cancun_rlp(rlp_object: rlp.Extended) -> None:
+    """Test RLP encoding and decoding for various Cancun objects."""
     encoded = rlp.encode(rlp_object)
     assert rlp.decode_to(type(rlp_object), encoded) == rlp_object
 
@@ -182,5 +185,6 @@ def test_cancun_rlp(rlp_object: rlp.Extended) -> None:
     "tx", [legacy_transaction, access_list_transaction, transaction_1559]
 )
 def test_transaction_encoding(tx: Transaction) -> None:
+    """Test transaction RLP encoding and decoding."""
     encoded = encode_transaction(tx)
     assert decode_transaction(encoded) == tx