Type fixes for pyright

.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

@@ -49,9 +49,10 @@ jobs:
         env:
           PYPY_GC_MAX: "10G"
 
-      - name: Upload coverage to Codecov
+      - name: Upload coverage reports to Codecov
         if: "${{ !startsWith(matrix.py, 'pypy') }}"
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v5
         with:
           files: .tox/coverage.xml
           flags: unittests
+          token: ${{ secrets.CODECOV_TOKEN }}

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,8 +125,8 @@ 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
 
@@ -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

@@ -11,13 +11,19 @@
 from dataclasses import dataclass
 from typing import 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 ..crypto.hash import Hash32
 from .fork_types import Address, Bloom, Root
-from .transactions import LegacyTransaction
+from .transactions import (
+    AccessListTransaction,
+    FeeMarketTransaction,
+    LegacyTransaction,
+    Transaction,
+)
 
 
 @slotted_freezable
@@ -80,3 +86,26 @@ 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