Bump alysis dependency, relock, and fix ruff errors

fjarri · fjarri · commit 339a7b27e1a5 · 2025-09-15T11:45:45.000-07:00
diff --git a/docs/changelog.rst b/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)
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/pdm.lock b/pdm.lock
diff --git a/pons/__init__.py b/pons/__init__.py
@@ -71,34 +71,34 @@
     "ContractPanic",
     "CycleFallback",
     "DeployedContract",
+    "EVMVersion",
     "Either",
     "Error",
-    "EVMVersion",
-    "LocalProvider",
     "Event",
     "EventFilter",
     "Fallback",
     "FallbackProvider",
     "FallbackStrategy",
     "FallbackStrategyFactory",
     "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",
 ]
diff --git a/pons/_abi_types.py b/pons/_abi_types.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+)")
diff --git a/pons/_client.py b/pons/_client.py
@@ -329,7 +329,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 +343,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 +505,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 +522,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 +552,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],
+            "dict[str, JSON]",
             unstructure(
                 Type2Transaction(
                     chain_id=chain_id,
@@ -622,7 +622,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],
+            "dict[str, JSON]",
             unstructure(
                 Type2Transaction(
                     chain_id=chain_id,
@@ -680,7 +680,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],
+            "dict[str, JSON]",
             unstructure(
                 Type2Transaction(
                     chain_id=chain_id,
@@ -854,7 +854,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 +865,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 +891,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)
diff --git a/pons/_contract_abi.py b/pons/_contract_abi.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":
diff --git a/pons/_fallback_provider.py b/pons/_fallback_provider.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)
diff --git a/pons/_http_provider_server.py b/pons/_http_provider_server.py
@@ -16,7 +16,7 @@
 
 
 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 +77,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:
diff --git a/pons/_provider.py b/pons/_provider.py
@@ -129,7 +129,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.
diff --git a/pyproject.toml b/pyproject.toml
@@ -28,7 +28,7 @@ compiler = [
     "py-solc-x>=2",
 ]
 local-provider = [
-    "alysis>=0.5.0",
+    "alysis>=0.6.0",
     "starlette",
     "hypercorn",
 ]
@@ -98,14 +98,10 @@ ignore = [
     "C408",
     # It's never a problem unless you mutate function arguments (which is rarely a good idea).
     "B008",
-    # The type of `self` is derived automatically.
-    "ANN101",
     # We use `Any` quite a bit because we need to accept a lot of third-party unnormalized input.
     "ANN401",
     # The return type of `__init__` is derived automatically.
     "ANN204",
-    # The type of `cls` in classmethods is derived automatically.
-    "ANN102",
     # Doesn't mesh well with the way `black` puts the final parenthesis on a separate line
     # in functions with one parameter and a long argument.
     "COM812",
diff --git a/tests/test_abi_types.py b/tests/test_abi_types.py
@@ -23,6 +23,9 @@ def test_uint():
     assert abi.uint(8) == abi.uint(8)
     assert abi.uint(8) != abi.uint(16)
 
+    assert hash(abi.uint(8)) == hash(abi.uint(8))
+    assert hash(abi.uint(8)) != hash(abi.uint(256))
+
     for bit_size in [-1, 0, 255, 512]:
         with pytest.raises(ValueError, match=f"Incorrect `uint` bit size: {bit_size}"):
             abi.uint(bit_size)
@@ -51,6 +54,9 @@ def test_int():
     assert abi.int(8) == abi.int(8)
     assert abi.int(8) != abi.int(16)
 
+    assert hash(abi.int(8)) == hash(abi.int(8))
+    assert hash(abi.int(8)) != hash(abi.int(256))
+
     for bit_size in [-1, 0, 255, 512]:
         with pytest.raises(ValueError, match=f"Incorrect `int` bit size: {bit_size}"):
             abi.int(bit_size)
@@ -83,6 +89,9 @@ def test_bytes():
     assert abi.bytes(8) == abi.bytes(8)
     assert abi.bytes(8) != abi.bytes(16)
 
+    assert hash(abi.bytes(8)) == hash(abi.bytes(8))
+    assert hash(abi.bytes(8)) != hash(abi.bytes(3))
+
     for size in [-1, 0, 33]:
         with pytest.raises(ValueError, match=f"Incorrect `bytes` size: {size}"):
             abi.bytes(size)
@@ -102,6 +111,8 @@ def test_address():
 
     assert abi.address.canonical_form == "address"
 
+    assert hash(abi.address) == hash(abi.address)
+
     with pytest.raises(
         TypeError, match="`address` must correspond to an `Address`-type value, got str"
     ):
@@ -117,6 +128,8 @@ def test_string():
 
     assert abi.string.canonical_form == "string"
 
+    assert hash(abi.string) == hash(abi.string)
+
     with pytest.raises(
         TypeError, match="`string` must correspond to a `str`-type value, got bytes"
     ):
@@ -129,6 +142,8 @@ def test_bool():
 
     assert abi.bool.canonical_form == "bool"
 
+    assert hash(abi.bool) == hash(abi.bool)
+
     with pytest.raises(TypeError, match="`bool` must correspond to a `bool`-type value, got int"):
         abi.bool._normalize(1)
 
@@ -145,6 +160,11 @@ def test_array():
     assert abi.uint(8)[...] == abi.uint(8)[...]
     assert abi.uint(8)[...] != abi.uint(8)[2]
 
+    assert hash(abi.uint(8)[2]) == hash(abi.uint(8)[2])
+    assert hash(abi.uint(8)[...]) == hash(abi.uint(8)[...])
+    assert hash(abi.uint(8)[2]) != hash(abi.uint(8)[3])
+    assert hash(abi.uint(8)[2]) != hash(abi.uint(8)[...])
+
     with pytest.raises(TypeError, match="Expected an iterable, got int"):
         abi.uint(8)[1]._normalize(1)
     with pytest.raises(ValueError, match="Expected 2 elements, got 3"):
@@ -167,6 +187,9 @@ def test_struct():
     assert s1 == s1_copy
     assert s1 != s2
 
+    assert hash(s1) == hash(s1_copy)
+    assert hash(s1) != hash(s2)
+
     with pytest.raises(TypeError, match="Expected an iterable, got int"):
         s1._normalize(1)
     with pytest.raises(ValueError, match="Expected 2 elements, got 3"):
diff --git a/tests/test_client.py b/tests/test_client.py
diff --git a/tests/test_fallback_provider.py b/tests/test_fallback_provider.py
diff --git a/tests/test_provider.py b/tests/test_provider.py
diff --git a/tests/test_signer.py b/tests/test_signer.py
