Transition types

.github/workflows/gh-pages.yaml

@@ -33,7 +33,7 @@ jobs:
 
       - name: Upload Pages Artifact
         id: artifact
-        uses: actions/upload-pages-artifact@v2
+        uses: actions/upload-pages-artifact@v3
         with:
           path: .tox/docs
 
@@ -46,6 +46,7 @@ jobs:
     permissions:
       pages: write
       id-token: write
+      actions: read
 
     environment:
       name: github-pages
@@ -54,4 +55,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4

.github/workflows/test.yaml

@@ -41,11 +41,11 @@ jobs:
 
       - name: Run Tox (CPython)
         if: "${{ !startsWith(matrix.py, 'pypy') }}"
-        run: tox -e static,optimized,py3
+        run: tox -e optimized,py3
 
       - name: Run Tox (PyPy)
         if: "${{ startsWith(matrix.py, 'pypy') }}"
-        run: tox -e pypy3
+        run: tox -e static,pypy3
         env:
           PYPY_GC_MAX: "10G"
 

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
-name = ethereum
-description = Ethereum specification, provided as a Python package for tooling and testing
+name = ethereum-execution
+description = Ethereum execution layer specification, provided as a Python package for tooling and testing
 long_description = file: README.md
 long_description_content_type = text/markdown
 version = attr: ethereum.__version__
@@ -9,6 +9,12 @@ license_files =
     LICENSE.md
 classifiers =
     License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: Implementation :: PyPy
+    Programming Language :: Python :: Implementation :: CPython
+    Intended Audience :: Developers
+    Natural Language :: English
 
 [options]
 packages =
@@ -104,6 +110,12 @@ packages =
     ethereum/cancun/vm
     ethereum/cancun/vm/instructions
     ethereum/cancun/vm/precompiled_contracts
+    ethereum/prague
+    ethereum/prague/utils
+    ethereum/prague/vm
+    ethereum/prague/vm/instructions
+    ethereum/prague/vm/precompiled_contracts
+    ethereum/prague/vm/precompiled_contracts/bls12_381
 
 
 package_dir =
@@ -113,10 +125,10 @@ python_requires = >=3.10
 install_requires =
     pycryptodome>=3,<4
     coincurve>=20,<21
-    typing_extensions>=4
-    py_ecc @ git+https://github.com/petertdavies/py_ecc.git@127184f4c57b1812da959586d0fe8f43bb1a2389
+    typing_extensions>=4.2
+    py-ecc>=8.0.0b2,<9
     ethereum-types>=0.2.1,<0.3
-    ethereum-rlp>=0.1.1,<0.2
+    ethereum-rlp>=0.1.2,<0.2
 
 [options.package_data]
 ethereum =
@@ -163,7 +175,7 @@ test =
 lint =
     types-setuptools>=68.1.0.1,<69
     isort==5.13.2
-    mypy==1.14.1
+    mypy==1.15.0
     black==23.12.0
     flake8==6.1.0
     flake8-bugbear==23.12.2
@@ -179,7 +191,7 @@ doc =
 
 optimized =
     rust-pyspec-glue>=0.0.9,<0.1.0
-    ethash @ git+https://github.com/chfast/ethash.git@e08bd0fadb8785f7ccf1e2fb07b75f54fe47f92e
+    ethash>=1.1.0,<2
 
 [flake8]
 dictionaries=en_US,python,technical

src/ethereum/__init__.py

@@ -18,7 +18,7 @@
 """
 import sys
 
-__version__ = "0.1.0"
+__version__ = "1.17.0rc6.dev1"
 
 #
 #  Ensure we can reach 1024 frames of recursion

src/ethereum/arrow_glacier/blocks.py

@@ -9,15 +9,25 @@
 chain.
 """
 from dataclasses import dataclass
-from typing import Tuple, Union
+from typing import Annotated, Optional, Tuple, Union
 
+from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
+from typing_extensions import TypeAlias
+
+from ethereum.exceptions import InvalidBlock
+from ethereum.london import blocks as previous_blocks
 
 from ..crypto.hash import Hash32
 from .fork_types import Address, Bloom, Root
-from .transactions import LegacyTransaction
+from .transactions import (
+    AccessListTransaction,
+    FeeMarketTransaction,
+    LegacyTransaction,
+    Transaction,
+)
 
 
 @slotted_freezable
@@ -45,6 +55,49 @@ class Header:
     base_fee_per_gas: Uint
 
 
+AnyHeader: TypeAlias = Union[previous_blocks.AnyHeader, Header]
+"""
+Represents all headers that may have appeared in the blockchain before or in
+the current fork.
+"""
+
+
+def decode_header(raw_header: rlp.Simple) -> AnyHeader:
+    """
+    Convert `raw_header` from raw sequences and bytes to a structured block
+    header.
+
+    Checks `raw_header` against this fork's `FORK_CRITERIA`, and if it belongs
+    to this fork, decodes it accordingly. If not, this function forwards to the
+    preceding fork where the process is repeated.
+    """
+    from . import FORK_CRITERIA
+
+    # First, ensure that `raw_header` is not `bytes` (and is therefore a
+    # sequence.)
+    if isinstance(raw_header, bytes):
+        raise InvalidBlock("header is bytes, expected sequence")
+
+    # Next, extract the block number and timestamp (which are always at index 8
+    # and 11 respectively.)
+    raw_number = raw_header[8]
+    if not isinstance(raw_number, bytes):
+        raise InvalidBlock("header number is sequence, expected bytes")
+    number = Uint.from_be_bytes(raw_number)
+
+    raw_timestamp = raw_header[11]
+    if not isinstance(raw_timestamp, bytes):
+        raise InvalidBlock("header timestamp is sequence, expected bytes")
+    timestamp = U256.from_be_bytes(raw_timestamp)
+
+    # Finally, check if this header belongs to this fork.
+    if FORK_CRITERIA.check(number, timestamp):
+        return rlp.deserialize_to(Header, raw_header)
+
+    # If it doesn't, forward to the preceding fork.
+    return previous_blocks.decode_header(raw_header)
+
+
 @slotted_freezable
 @dataclass
 class Block:
@@ -54,7 +107,14 @@ class Block:
 
     header: Header
     transactions: Tuple[Union[Bytes, LegacyTransaction], ...]
-    ommers: Tuple[Header, ...]
+    ommers: Tuple[Annotated[AnyHeader, rlp.With(decode_header)], ...]
+
+
+AnyBlock: TypeAlias = Union[previous_blocks.AnyBlock, Block]
+"""
+Represents all blocks that may have appeared in the blockchain before or in the
+current fork.
+"""
 
 
 @slotted_freezable
@@ -80,3 +140,36 @@ class Receipt:
     cumulative_gas_used: Uint
     bloom: Bloom
     logs: Tuple[Log, ...]
+
+
+def encode_receipt(tx: Transaction, receipt: Receipt) -> Union[Bytes, Receipt]:
+    """
+    Encodes a receipt.
+    """
+    if isinstance(tx, AccessListTransaction):
+        return b"\x01" + rlp.encode(receipt)
+    elif isinstance(tx, FeeMarketTransaction):
+        return b"\x02" + rlp.encode(receipt)
+    else:
+        return receipt
+
+
+def decode_receipt(receipt: Union[Bytes, Receipt]) -> Receipt:
+    """
+    Decodes a receipt.
+    """
+    if isinstance(receipt, Bytes):
+        assert receipt[0] in (1, 2)
+        return rlp.decode_to(Receipt, receipt[1:])
+    else:
+        return receipt
+
+
+def header_base_fee_per_gas(header: AnyHeader) -> Optional[Uint]:
+    """
+    Returns the `base_fee_per_gas` of the given header, or `None` for headers
+    without that field.
+    """
+    if isinstance(header, Header):
+        return header.base_fee_per_gas
+    return previous_blocks.header_base_fee_per_gas(header)