Bump alysis dependency, relock, and fix ruff errors

Author: fjarri

docs/changelog.rst

@@ -2,6 +2,18 @@ Changelog
 ---------
 
 
+0.8.2 (in development)
+~~~~~~~~~~~~~~~~~~~~~~
+
+Added
+^^^^^
+
+- Hash methods for ABI types. (PR_81_)
+
+
+.. _PR_81: https://github.com/fjarri-eth/pons/pull/81
+
+
 0.8.1 (2024-11-12)
 ~~~~~~~~~~~~~~~~~~
 

docs/conf.py

@@ -76,5 +76,6 @@
 intersphinx_mapping = {
     "python": ("https://docs.python.org/3", None),
     "eth_account": ("https://eth-account.readthedocs.io/en/v0.13.0/", None),
+    "eth_typing": ("https://eth-typing.readthedocs.io/en/stable/", None),
     "ethereum_rpc": ("https://ethereum-rpc.readthedocs.io/en/v0.1.0", None),
 }

pdm.lock

@@ -47,7 +47,7 @@
 )
 from ._http_provider_server import HTTPProviderServer
 from ._local_provider import LocalProvider, SnapshotID
-from ._provider import HTTPProvider, ProtocolError, Provider, Unreachable
+from ._provider import HTTPProvider, ProtocolError, Provider, Unreachable, JSON
 from ._signer import AccountSigner, Signer
 from ._utils import get_create2_address, get_create_address
 
@@ -71,34 +71,35 @@
     "ContractPanic",
     "CycleFallback",
     "DeployedContract",
+    "EVMVersion",
     "Either",
     "Error",
-    "EVMVersion",
-    "LocalProvider",
     "Event",
     "EventFilter",
     "Fallback",
     "FallbackProvider",
     "FallbackStrategy",
     "FallbackStrategyFactory",
+    "JSON",
     "HTTPProvider",
+    "HTTPProviderServer",
+    "LocalProvider",
     "Method",
     "MethodCall",
     "MultiMethod",
     "Mutability",
     "PriorityFallback",
     "ProtocolError",
-    "ProviderError",
     "Provider",
+    "ProviderError",
     "Receive",
     "RemoteError",
-    "HTTPProviderServer",
     "Signer",
     "SnapshotID",
     "TransactionFailed",
     "Unreachable",
     "abi",
     "compile_contract_file",
-    "get_create_address",
     "get_create2_address",
+    "get_create_address",
 ]

pons/__init__.py

@@ -147,6 +147,9 @@ def _denormalize(self, val: ABIType) -> int:
     def __eq__(self, other: object) -> bool:
         return isinstance(other, UInt) and self._bits == other._bits
 
+    def __hash__(self) -> int:
+        return hash((type(self), self._bits))
+
 
 class Int(Type):
     """Corresponds to the Solidity ``int<bits>`` type."""
@@ -183,6 +186,9 @@ def _denormalize(self, val: ABIType) -> int:
     def __eq__(self, other: object) -> bool:
         return isinstance(other, Int) and self._bits == other._bits
 
+    def __hash__(self) -> int:
+        return hash((type(self), self._bits))
+
 
 class Bytes(Type):
     """Corresponds to the Solidity ``bytes<size>`` type."""
@@ -199,8 +205,7 @@ def canonical_form(self) -> str:
     def _check_val(self, val: Any) -> bytes:
         if not isinstance(val, bytes):
             raise TypeError(
-                f"`{self.canonical_form}` must correspond to a bytestring, "
-                f"got {type(val).__name__}"
+                f"`{self.canonical_form}` must correspond to a bytestring, got {type(val).__name__}"
             )
         if self._size is not None and len(val) != self._size:
             raise ValueError(f"Expected {self._size} bytes, got {len(val)}")
@@ -236,6 +241,9 @@ def decode_from_topic(self, val: bytes) -> None | bytes:
     def __eq__(self, other: object) -> bool:
         return isinstance(other, Bytes) and self._size == other._size
 
+    def __hash__(self) -> int:
+        return hash((type(self), self._size))
+
 
 class AddressType(Type):
     """
@@ -250,8 +258,7 @@ def canonical_form(self) -> str:
     def _normalize(self, val: Any) -> str:
         if not isinstance(val, Address):
             raise TypeError(
-                f"`address` must correspond to an `Address`-type value, "
-                f"got {type(val).__name__}"
+                f"`address` must correspond to an `Address`-type value, got {type(val).__name__}"
             )
         return val.checksum
 
@@ -263,6 +270,9 @@ def _denormalize(self, val: ABIType) -> Address:
     def __eq__(self, other: object) -> bool:
         return isinstance(other, AddressType)
 
+    def __hash__(self) -> int:
+        return hash(type(self))
+
 
 class String(Type):
     """Corresponds to the Solidity ``string`` type."""
@@ -299,6 +309,9 @@ def decode_from_topic(self, _val: bytes) -> None:
     def __eq__(self, other: object) -> bool:
         return isinstance(other, String)
 
+    def __hash__(self) -> int:
+        return hash(type(self))
+
 
 class Bool(Type):
     """Corresponds to the Solidity ``bool`` type."""
@@ -323,6 +336,9 @@ def _denormalize(self, val: ABIType) -> bool:
     def __eq__(self, other: object) -> bool:
         return isinstance(other, Bool)
 
+    def __hash__(self) -> int:
+        return hash(type(self))
+
 
 class Array(Type):
     """Corresponds to the Solidity array (``[<size>]``) type."""
@@ -366,6 +382,9 @@ def __eq__(self, other: object) -> bool:
             and self._size == other._size
         )
 
+    def __hash__(self) -> int:
+        return hash((type(self), self._element_type, self._size))
+
 
 class Struct(Type):
     """Corresponds to the Solidity struct type."""
@@ -426,6 +445,9 @@ def __eq__(self, other: object) -> bool:
             and list(self._fields) == list(other._fields)
         )
 
+    def __hash__(self) -> int:
+        return hash((type(self), tuple(self._fields.items())))
+
 
 _UINT_RE = re.compile(r"uint(\d+)")
 _INT_RE = re.compile(r"int(\d+)")

pons/_abi_types.py

@@ -2,12 +2,11 @@
 from contextlib import asynccontextmanager, contextmanager
 from dataclasses import dataclass
 from enum import Enum
-from typing import Any, ParamSpec, TypeVar, cast
+from typing import TYPE_CHECKING, Any, ParamSpec, TypeVar, cast
 
 import anyio
 from compages import StructuringError
 from ethereum_rpc import (
-    JSON,
     Address,
     Amount,
     Block,
@@ -46,6 +45,9 @@
 from ._provider import InvalidResponse, Provider, ProviderSession
 from ._signer import Signer
 
+if TYPE_CHECKING:  # pragma: no cover
+    from eth_account.types import TransactionDictType
+
 
 @dataclass
 class BlockFilter:
@@ -329,7 +331,7 @@ async def eth_get_transaction_by_hash(self, tx_hash: TxHash) -> None | TxInfo:
         # Need an explicit cast, mypy doesn't work with union types correctly.
         # See https://github.com/python/mypy/issues/16935
         return cast(
-            None | TxInfo,
+            "None | TxInfo",
             await rpc_call(
                 self._provider_session,
                 "eth_getTransactionByHash",
@@ -343,7 +345,7 @@ async def eth_get_transaction_receipt(self, tx_hash: TxHash) -> None | TxReceipt
         # Need an explicit cast, mypy doesn't work with union types correctly.
         # See https://github.com/python/mypy/issues/16935
         return cast(
-            None | TxReceipt,
+            "None | TxReceipt",
             await rpc_call(
                 self._provider_session,
                 "eth_getTransactionReceipt",
@@ -505,7 +507,7 @@ async def eth_get_block_by_hash(
         # Need an explicit cast, mypy doesn't work with union types correctly.
         # See https://github.com/python/mypy/issues/16935
         return cast(
-            None | BlockInfo,
+            "None | BlockInfo",
             await rpc_call(
                 self._provider_session,
                 "eth_getBlockByHash",
@@ -522,7 +524,7 @@ async def eth_get_block_by_number(
         # Need an explicit cast, mypy doesn't work with union types correctly.
         # See https://github.com/python/mypy/issues/16935
         return cast(
-            None | BlockInfo,
+            "None | BlockInfo",
             await rpc_call(
                 self._provider_session,
                 "eth_getBlockByNumber",
@@ -552,7 +554,7 @@ async def broadcast_transfer(
         max_tip = min(Amount.gwei(1), max_gas_price)
         nonce = await self.eth_get_transaction_count(signer.address, BlockLabel.PENDING)
         tx = cast(
-            dict[str, JSON],
+            "TransactionDictType",
             unstructure(
                 Type2Transaction(
                     chain_id=chain_id,
@@ -622,7 +624,7 @@ async def deploy(
         max_tip = min(Amount.gwei(1), max_gas_price)
         nonce = await self.eth_get_transaction_count(signer.address, BlockLabel.PENDING)
         tx = cast(
-            dict[str, JSON],
+            "TransactionDictType",
             unstructure(
                 Type2Transaction(
                     chain_id=chain_id,
@@ -680,7 +682,7 @@ async def broadcast_transact(
         max_tip = min(Amount.gwei(1), max_gas_price)
         nonce = await self.eth_get_transaction_count(signer.address, BlockLabel.PENDING)
         tx = cast(
-            dict[str, JSON],
+            "TransactionDictType",
             unstructure(
                 Type2Transaction(
                     chain_id=chain_id,
@@ -854,7 +856,7 @@ async def iter_blocks(self, poll_interval: int = 1) -> AsyncIterator[BlockHash]:
             for block_hash in block_hashes:
                 # We can't ensure it statically, since `eth_getFilterChanges` return type depends
                 # on the filter passed to it.
-                yield cast(BlockHash, block_hash)
+                yield cast("BlockHash", block_hash)
             await anyio.sleep(poll_interval)
 
     async def iter_pending_transactions(self, poll_interval: int = 1) -> AsyncIterator[TxHash]:
@@ -865,7 +867,7 @@ async def iter_pending_transactions(self, poll_interval: int = 1) -> AsyncIterat
             for tx_hash in tx_hashes:
                 # We can't ensure it statically, since `eth_getFilterChanges` return type depends
                 # on the filter passed to it.
-                yield cast(TxHash, tx_hash)
+                yield cast("TxHash", tx_hash)
             await anyio.sleep(poll_interval)
 
     async def iter_events(
@@ -891,5 +893,5 @@ async def iter_events(
             for log_entry in log_entries:
                 # We can't ensure it statically, since `eth_getFilterChanges` return type depends
                 # on the filter passed to it.
-                yield event_filter.decode_log_entry(cast(LogEntry, log_entry))
+                yield event_filter.decode_log_entry(cast("LogEntry", log_entry))
             await anyio.sleep(poll_interval)

pons/_client.py

@@ -437,7 +437,7 @@ def _add_method(self, method: Method) -> None:
     def with_method(self, method: Method) -> "MultiMethod":
         """Returns a new ``MultiMethod`` with the given method included."""
         new_mm = MultiMethod(*self._methods.values())
-        new_mm._add_method(method)  # noqa: SLF001
+        new_mm._add_method(method)
         return new_mm
 
     def __call__(self, *args: Any, **kwds: Any) -> "MethodCall":

pons/_contract_abi.py

@@ -39,8 +39,8 @@ def __init__(self, weights: list[int]):
     def get_provider_order(self) -> list[int]:
         if self._counter == self._weights[0]:
             self._counter = 0
-            self._providers = self._providers[1:] + [self._providers[0]]
-            self._weights = self._weights[1:] + [self._weights[0]]
+            self._providers = [*self._providers[1:], self._providers[0]]
+            self._weights = [*self._weights[1:], self._weights[0]]
 
         self._counter += 1
         return list(self._providers)

pons/_fallback_provider.py

@@ -10,13 +10,12 @@
 from starlette.requests import Request
 from starlette.responses import JSONResponse, Response
 from starlette.routing import Route
-from trio_typing import TaskStatus
 
 from ._provider import JSON, HTTPProvider, Provider
 
 
 def parse_request(request: JSON) -> tuple[JSON, str, list[JSON]]:
-    request = cast(dict[str, JSON], request)
+    request = cast("dict[str, JSON]", request)
     request_id = request["id"]
     method = request["method"]
     if not isinstance(method, str):
@@ -77,7 +76,7 @@ def make_app(provider: Provider) -> ASGIFramework:
 
     # We don't have a typing package shared between Starlette and Hypercorn,
     # so this will have to do
-    return cast(ASGIFramework, app)
+    return cast("ASGIFramework", app)
 
 
 class HTTPProviderServer:
@@ -94,7 +93,7 @@ def __init__(self, provider: Provider, host: str = "127.0.0.1", port: int = 8888
         self._shutdown_finished = trio.Event()
         self.http_provider = HTTPProvider(f"http://{self._host}:{self._port}")
 
-    async def __call__(self, *, task_status: TaskStatus[None] = trio.TASK_STATUS_IGNORED) -> None:
+    async def __call__(self, *, task_status: trio.TaskStatus = trio.TASK_STATUS_IGNORED) -> None:
         """
         Starts the server in an external event loop.
         Useful for the cases when it needs to run in parallel with other servers or clients.
@@ -106,7 +105,11 @@ async def __call__(self, *, task_status: TaskStatus[None] = trio.TASK_STATUS_IGN
         config.worker_class = "trio"
         app = make_app(self._provider)
         await serve(
-            app, config, shutdown_trigger=self._shutdown_event.wait, task_status=task_status
+            app,
+            config,
+            shutdown_trigger=self._shutdown_event.wait,
+            # That's what hypercorn API declares, but it's the same type as `trio.TaskStatus`
+            task_status=cast("trio._core._run._TaskStatus", task_status),  # noqa: SLF001
         )
         self._shutdown_finished.set()
 

pons/_http_provider_server.py

@@ -1,13 +1,16 @@
 from abc import ABC, abstractmethod
-from collections.abc import AsyncIterator, Mapping
+from collections.abc import AsyncIterator, Mapping, Sequence
 from contextlib import asynccontextmanager
 from http import HTTPStatus
 from json import JSONDecodeError
 from typing import cast
 
 import httpx
 from compages import StructuringError
-from ethereum_rpc import JSON, RPCError, structure
+from ethereum_rpc import RPCError, structure
+
+JSON = None | bool | int | float | str | Sequence["JSON"] | Mapping[str, "JSON"]
+"""Values serializable to JSON."""
 
 
 class InvalidResponse(Exception):
@@ -129,7 +132,7 @@ async def rpc(self, method: str, *args: JSON) -> JSON:
 
         if not isinstance(response_json, Mapping):
             raise InvalidResponse(f"RPC response must be a dictionary, got: {response_json}")
-        response_json = cast(Mapping[str, JSON], response_json)
+        response_json = cast("Mapping[str, JSON]", response_json)
 
         # Note that the Eth-side errors (e.g. transaction having been reverted)
         # will have the HTTP status 200, so we are checking for the "error" field first.