resolve merge conflicts

Author: gurukamath

.flake8

@@ -7,7 +7,7 @@ unshipped EIPs, even withdrawn and non-viable proposals.
 | EIP                                                                    | Opcode | Name               | Description                                                                  |
 |------------------------------------------------------------------------|--------|--------------------|------------------------------------------------------------------------------|
 | [101](https://eips.ethereum.org/EIPS/eip-101)                          | 0x5C   | tx.gas             | primordial account-abstraction support                                       |
-| [141](https://eips.ethereum.org/EIPS/eip-141)                          | 0xFE   | INVALID/ ABORT     | Designated invalid opcode. <br />(Adopted in practice, Not formally adopted) |
+| [141](https://eips.ethereum.org/EIPS/eip-141)                          | 0xFE   | INVALID/ABORT      | Designated invalid opcode. <br />(Adopted in practice, Not formally adopted) |
 | [615](https://eips.ethereum.org/EIPS/eip-615)                          | 0xB0   | JUMPTO             | static jump                                                                  |
 | [615](https://eips.ethereum.org/EIPS/eip-615)                          | 0xB1   | JUMPIF             | static conditional jump                                                      |
 | [615](https://eips.ethereum.org/EIPS/eip-615)                          | 0xB2   | JUMPV              | static jump table                                                            |
@@ -51,8 +51,8 @@ unshipped EIPs, even withdrawn and non-viable proposals.
 | [3508](https://eips.ethereum.org/EIPS/eip-3508)                        | 0x49   | ORIGINDATACOPY     | Bulk load transaction calldata                                               |
 | [3520](https://eips.ethereum.org/EIPS/eip-3520)                        | 0x4A   | ENTRYPOINT         | To address of transaction                                                    |
 | [4200](https://eips.ethereum.org/EIPS/eip-4200)                        | 0xE0   | RJUMP              | relative jump                                                                |
-| [4200](https://eips.ethereum.org/EIPS/eip-4200)                        | 0xE1   | RJUMI              | relative conditional jump                                                    |
-| [4200](https://eips.ethereum.org/EIPS/eip-4200)                        | 0xE2   | RJUMV              | relative jump table                                                          |
+| [4200](https://eips.ethereum.org/EIPS/eip-4200)                        | 0xE1   | RJUMPI             | relative conditional jump                                                    |
+| [4200](https://eips.ethereum.org/EIPS/eip-4200)                        | 0xE2   | RJUMPV             | relative jump table                                                          |
 | [4520](https://eips.ethereum.org/EIPS/eip-4520)                        | 0xEB   | -                  | Reserve for multi-byte opcodes                                               |
 | [4520](https://eips.ethereum.org/EIPS/eip-4520)                        | 0xEC   | -                  | Reserve for multi-byte opcodes                                               |
 | [4750](https://eips.ethereum.org/EIPS/eip-4750)                        | 0xE3   | CALLF              | EOF Subroutine Call                                                          |

lists/evm/proposed-opcodes.md

@@ -4,7 +4,7 @@
 Execution layer changes included in the Network Upgrade.
 
 * [EIP-1153: Transient storage opcodes](https://eips.ethereum.org/EIPS/eip-1153)
-* [EIP-4788: Beacon block root in the EVM ](https://eips.ethereum.org/EIPS/eip-4788)
+* [EIP-4788: Beacon block root in the EVM](https://eips.ethereum.org/EIPS/eip-4788)
 * [EIP-4844: Shard Blob Transactions](https://eips.ethereum.org/EIPS/eip-4844)
 * [EIP-5656: MCOPY - Memory copying instruction](https://eips.ethereum.org/EIPS/eip-5656)
 * [EIP-6780: SELFDESTRUCT only in same transaction](https://eips.ethereum.org/EIPS/eip-6780)

network-upgrades/mainnet-upgrades/cancun.md

@@ -199,4 +199,4 @@ Blocks with block numbers in the range [1_920_000, 1_920_009] **MUST** have `0x6
 
 ## Copyright
 
-Copyright and related rights waived via [CC0](https://creativecommons.org/publicdomain/zero/1.0/).
+Copyright and related rights waived via [CC0](https://creativecommons.org/publicdomain/zero/1.0/).

network-upgrades/mainnet-upgrades/dao-fork.md

@@ -286,17 +286,11 @@ fill = [
 ]
 
 lint = [
-    "isort==5.13.2",
+    "codespell==2.4.1",
     "mypy==1.17.0",
-    "black==23.12.0",
-    "flake8==6.1.0",
-    "flake8-bugbear==23.12.2",
-    "flake8-docstrings==1.7.0",
-    "flake8-spellcheck==0.28.0",
-    "flake8-unused-arguments==0.0.13",
+    "ruff==0.11.8",
     "vulture==2.14.0",
 ]
-
 tools = [
     "platformdirs>=4.2,<5",
 ]
@@ -309,7 +303,6 @@ optimized = [
     "ethash>=1.1.0,<2",
 ]
 
-
 [tool.setuptools.dynamic]
 version = { attr = "ethereum.__version__" }
 
@@ -332,14 +325,6 @@ ethereum-spec-fill = "cli.pytest_commands.fill:fill"
 "ethereum_spec_tools.docc:BeforeNode" = "ethereum_spec_tools.docc:render_before_after"
 "ethereum_spec_tools.docc:AfterNode" = "ethereum_spec_tools.docc:render_before_after"
 
-[tool.isort]
-profile = "black"
-multi_line_output = 3
-line_length = 79
-
-[tool.black]
-line-length = 79
-
 [tool.pytest.ini_options]
 markers = [
     "slow: marks tests as slow (deselect with '-m \"not slow\"')",
@@ -362,7 +347,6 @@ context = [
     "docc.search.context",
     "docc.html.context",
 ]
-
 discovery = [
     "docc.search.discover",
     "docc.html.discover",
@@ -371,15 +355,13 @@ discovery = [
     "docc.listing.discover",
     "docc.files.discover",
 ]
-
 build = [
     "docc.search.build",
     "ethereum_spec_tools.docc.build",
     "docc.files.build",
     "docc.listing.build",
     "docc.resources.build",
 ]
-
 transform = [
     "docc.python.transform",
     "docc.verbatim.transform",
@@ -401,7 +383,6 @@ excluded_references = [
 paths = [
     "src",
 ]
-
 excluded_paths = [
     "src/ethereum_optimized",
     "src/ethereum_spec_tools",
@@ -421,3 +402,121 @@ files = [
 [tool.docc.output]
 path = "docs"
 extension = ".html"
+
+[tool.vulture]
+exclude = ["tests/fixtures/", "eest_tests/"]
+ignore_names = ["pytest_*"]
+
+[tool.ruff]
+extend-exclude = [
+    ".cache/",
+    ".git/",
+    ".pytest_cache/",
+    ".ruff_cache/",
+    ".tox/",
+    ".venv/",
+    ".vscode/",
+    "tests/fixtures/*",
+    "tests/json_infra/fixtures/*",
+    "eest_tests/*",
+    "vulture_whitelist.py",
+]
+line-length = 79
+
+[tool.ruff.lint]
+select = [
+    "E", # pycodestyle errors
+    "F", # Pyflakes
+    "B", # flake8-bugbear
+    "W", # pycodestyle warnings
+    "I", # isort
+    "A", # flake8-builtins
+    "N", # pep8-naming
+    "ARG", # flake8-unused-arguments
+]
+fixable = [
+    "E", # pycodestyle errors
+    "F", # Pyflakes
+    "B", # flake8-bugbear
+    "W", # pycodestyle warnings
+    "I", # isort
+    "D", # pydocstyle
+]
+ignore = [
+# Common to STEEL
+    "D205",     # Missing blank line after summary
+    "D203",     # 1 blank line required before class docstring
+    "D212",     # Multi-line docstring summary should start at the first line
+    "D415",     # First line should end with a ".", "?", or "!"
+
+# Specific to EELS
+    "D107",     # Missing docstring in __init__
+    "D200",     # One-line docstring should fit on one line with quotes
+    "D205",     # 1 blank line required between summary and description
+    "D400",     # First line should end with a period
+    "D401",     # First line should be in imperative mood ("Do", not "Does")
+    "D410",     # Missing blank line after last section (Args, Returns, Raises)
+    "D411",     # Missing blank line before last section
+    "D412",     # No blank lines between sections
+    "D413",     # Missing blank line after last section (same as 410)
+    "D414",     # Section should end with a period
+    "D416",     # Section names should be in the correct order
+    "E203",     # Whitespace before ':'
+]
+
+[tool.ruff.lint.per-file-ignores]
+"tests/*" = [
+    "D100",         # Missing docstring in public module
+    "D101",         # Missing docstring in public class
+    "D103",         # Missing docstring in public function
+    "D104",         # Missing docstring in public package
+    "E501",         # Line too long
+]
+"src/ethereum_spec_tools/evm_tools/loaders/fork_loader.py" = [
+    "N802"          # Property names do not need to be lowercase
+]
+"src/ethereum_spec_tools/lint/*" = [
+    "N802"          # Special linting code absolved of function naming reqs
+]
+"src/ethereum/crypto/*" = [
+    "N806",         # Special crypto code absolved of variable naming reqs
+    "N802"          # Special crypto code absolved of function naming reqs
+]
+"src/ethereum_spec_tools/evm_tools/t8n/evm_trace/eip3155.py" = [
+    "N815"          # The traces must use camel case in JSON property names
+]
+"src/ethereum_spec_tools/evm_tools/t8n/evm_trace.py" = [
+    "N815"          # The traces must use camel case in JSON property names
+]
+
+[tool.ruff.lint.mccabe]
+# Set the maximum allowed cyclomatic complexity. C901 default is 10.
+max-complexity = 7
+
+[tool.codespell]
+builtin = "clear,code,usage"    # Built-in dictionaries to use
+skip = [                        # Don't check these files/folders
+    ".git/*",
+    ".tox/*",
+    ".venv/*",
+    "build/*",
+    "dist/*",
+    "*.pyc",
+    "ethereum_execution.egg-info/*",
+    "*.coverage*",
+    "__pycache__",
+    ".ruff_cache",
+    "fixtures.*",
+    "tests/fixtures",
+    "tests/json_infra/fixtures",
+    "eest_tests",
+    "src/ethereum_spec_tools/evm_tools/t8n" # Temporary while being re-written
+]
+count = true                    # Display counts of errors
+check-hidden = false            # Don't check hidden files (starting with .)
+
+[tool.uv]
+required-version = ">=0.7.0"
+
+[tool.uv.sources]
+"ethereum-spec-evm-resolver" = { git = "https://github.com/spencer-tb/ethereum-spec-evm-resolver", rev = "aec6a628b8d0f1c791a8378c5417a089566135ac" }

pyproject.toml

@@ -42,14 +42,14 @@ def add_to_bloom(bloom: bytearray, bloom_entry: Bytes) -> None:
     bloom_entry :
         An entry which is to be added to bloom filter.
     """
-    hash = keccak256(bloom_entry)
+    hashed = keccak256(bloom_entry)
 
     for idx in (0, 2, 4):
         # Obtain the least significant 11 bits from the pair of bytes
         # (16 bits), and set this bit in bloom bytearray.
         # The obtained bit is 0-indexed in the bloom filter from the least
         # significant bit to the most significant bit.
-        bit_to_set = Uint.from_be_bytes(hash[idx : idx + 2]) & Uint(0x07FF)
+        bit_to_set = Uint.from_be_bytes(hashed[idx : idx + 2]) & Uint(0x07FF)
         # Below is the index of the bit in the bytearray (where 0-indexed
         # byte is the most significant byte)
         bit_index = 0x07FF - int(bit_to_set)

src/ethereum/arrow_glacier/bloom.py

@@ -9,7 +9,7 @@
 Introduction
 ------------
 
-Types re-used throughout the specification, which are specific to Ethereum.
+Types reused throughout the specification, which are specific to Ethereum.
 """
 
 from dataclasses import dataclass

src/ethereum/arrow_glacier/fork_types.py

@@ -47,13 +47,13 @@
 #
 #   keccak256(RLP(b''))
 #       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501,SC10
+#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
 #
 # also:
 #
 #   keccak256(RLP(()))
 #       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501,SC10
+#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
 #
 # which is the sha3Uncles hash in block header with no uncles
 EMPTY_TRIE_ROOT = Root(

src/ethereum/arrow_glacier/trie.py

@@ -139,8 +139,8 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
     total_gas_cost = linear_cost + quadratic_cost
     try:
         return total_gas_cost
-    except ValueError:
-        raise OutOfGasError
+    except ValueError as e:
+        raise OutOfGasError from e
 
 
 def calculate_gas_extend_memory(

src/ethereum/arrow_glacier/vm/gas.py

@@ -46,13 +46,13 @@ def block_hash(evm: Evm) -> None:
         # Default hash to 0, if the block of interest is not yet on the chain
         # (including the block which has the current executing transaction),
         # or if the block's age is more than 256.
-        hash = b"\x00"
+        current_block_hash = b"\x00"
     else:
-        hash = evm.message.block_env.block_hashes[
+        current_block_hash = evm.message.block_env.block_hashes[
             -(current_block_number - block_number)
         ]
 
-    push(evm.stack, U256.from_be_bytes(hash))
+    push(evm.stack, U256.from_be_bytes(current_block_hash))
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)