web3 7.0.0b8__py3-none-any.whl → 7.1.0__py3-none-any.whl

web3/middleware/base.py

@@ -40,6 +40,14 @@ class Web3Middleware:
     def __init__(self, w3: Union["AsyncWeb3", "Web3"]) -> None:
         self._w3 = w3
 
+    def __hash__(self) -> int:
+        return hash(f"{self.__class__.__name__}({str(self.__dict__)})")
+
+    def __eq__(self, other: Any) -> bool:
+        if not isinstance(other, Web3Middleware):
+            return False
+        return self.__hash__() == other.__hash__()
+
     # -- sync -- #
 
     def wrap_make_request(self, make_request: "MakeRequestFn") -> "MakeRequestFn":

web3/middleware/filter.py

@@ -167,7 +167,7 @@ def iter_latest_block(
 
     while True:
         latest_block = w3.eth.block_number
-        if is_bounded_range and latest_block > to_block:
+        if is_bounded_range and latest_block > cast(BlockNumber, to_block):
             yield None
         #  No new blocks since last iteration.
         if _last is not None and _last == latest_block:
@@ -255,7 +255,7 @@ class RequestLogs:
         if from_block is None or from_block == "latest":
             self._from_block = BlockNumber(w3.eth.block_number + 1)
         elif is_string(from_block) and is_hex(from_block):
-            self._from_block = BlockNumber(hex_to_integer(from_block))
+            self._from_block = BlockNumber(hex_to_integer(cast(HexStr, from_block)))
         else:
             self._from_block = from_block
         self._to_block = to_block
@@ -272,7 +272,7 @@ class RequestLogs:
         elif self._to_block == "latest":
             to_block = self.w3.eth.block_number
         elif is_string(self._to_block) and is_hex(self._to_block):
-            to_block = BlockNumber(hex_to_integer(self._to_block))
+            to_block = BlockNumber(hex_to_integer(cast(HexStr, self._to_block)))
         else:
             to_block = self._to_block
 

web3/middleware/signing.py

@@ -19,6 +19,9 @@ from eth_account import (
 from eth_account.signers.local import (
     LocalAccount,
 )
+from eth_account.types import (
+    TransactionDictType as EthAccountTxParams,
+)
 from eth_keys.datatypes import (
     PrivateKey,
 )
@@ -211,7 +214,9 @@ class SignAndSendRawMiddlewareBuilder(Web3MiddlewareBuilder):
                 return method, params
             else:
                 account = self._accounts[to_checksum_address(tx_from)]
-                raw_tx = account.sign_transaction(filled_transaction).raw_transaction
+                raw_tx = account.sign_transaction(
+                    cast(EthAccountTxParams, filled_transaction)
+                ).raw_transaction
 
                 return (
                     RPCEndpoint("eth_sendRawTransaction"),

web3/scripts/install_pre_releases.py

@@ -0,0 +1,33 @@
+"""
+The goal of this script is to install the latest versions, including pre-releases, for
+libraries that we maintain (and therefore control the release process) during our CI
+runs. This helps us test pre-releases before they cause any issues once stable versions
+are released.
+"""
+
+import subprocess
+import sys
+
+ETHEREUM_LIBRARIES = [
+    "eth-account",
+    "eth-abi",
+    "eth-account",
+    "eth-hash[pycryptodome]",
+    "eth-typing",
+    "eth-utils",
+    "hexbytes",
+    "eth-tester[py-evm]",
+    "py-geth",
+]
+
+
+def install_eth_pre_releases() -> None:
+    for lib in ETHEREUM_LIBRARIES:
+        print(f"Installing {lib} with `--pre` and `-U`")
+        subprocess.check_call(
+            [sys.executable, "-m", "pip", "install", "--pre", "-U", lib]
+        )
+
+
+if __name__ == "__main__":
+    install_eth_pre_releases()

web3/scripts/parse_pygeth_version.py

@@ -0,0 +1,16 @@
+import re
+
+
+def get_pygeth_version() -> str:
+    with open("setup.py") as f:
+        setup_contents = f.read()
+    version_match = re.search(r"py-geth\s*([><=~!]+)\s*([\d.]+)", setup_contents)
+    if version_match:
+        return "".join(version_match.group(1, 2))
+    else:
+        raise ValueError("py-geth not found in setup.py")
+
+
+if __name__ == "__main__":
+    version = get_pygeth_version()
+    print(version)

web3/types.py

@@ -27,13 +27,13 @@ from hexbytes import (
     HexBytes,
 )
 
-from web3._utils.compat import (
-    NotRequired,
-)
-from web3._utils.function_identifiers import (
+from web3._utils.abi_element_identifiers import (
     FallbackFn,
     ReceiveFn,
 )
+from web3._utils.compat import (
+    NotRequired,
+)
 
 if TYPE_CHECKING:
     from web3.contract.async_contract import AsyncContractFunction  # noqa: F401
@@ -53,7 +53,7 @@ BlockParams = Literal["latest", "earliest", "pending", "safe", "finalized"]
 BlockIdentifier = Union[BlockParams, BlockNumber, Hash32, HexStr, HexBytes, int]
 LatestBlockParam = Literal["latest"]
 
-FunctionIdentifier = Union[str, Type[FallbackFn], Type[ReceiveFn]]
+ABIElementIdentifier = Union[str, Type[FallbackFn], Type[ReceiveFn]]
 
 # bytes, hexbytes, or hexstr representing a 32 byte hash
 _Hash32 = Union[Hash32, HexBytes, HexStr]
@@ -75,46 +75,6 @@ class AccessListEntry(TypedDict):
 AccessList = NewType("AccessList", Sequence[AccessListEntry])
 
 
-# todo: move these to eth_typing once web3 is type hinted
-class ABIEventParams(TypedDict, total=False):
-    indexed: bool
-    name: str
-    type: str
-
-
-class ABIEvent(TypedDict, total=False):
-    anonymous: bool
-    inputs: Sequence["ABIEventParams"]
-    name: str
-    type: Literal["event"]
-
-
-class ABIFunctionComponents(TypedDict, total=False):
-    components: Sequence["ABIFunctionComponents"]
-    name: str
-    type: str
-
-
-class ABIFunctionParams(TypedDict, total=False):
-    components: Sequence["ABIFunctionComponents"]
-    name: str
-    type: str
-
-
-class ABIFunction(TypedDict, total=False):
-    constant: bool
-    inputs: Sequence["ABIFunctionParams"]
-    name: str
-    outputs: Sequence["ABIFunctionParams"]
-    payable: bool
-    stateMutability: Literal["pure", "view", "nonpayable", "payable"]
-    type: Literal["function", "constructor", "fallback", "receive"]
-
-
-ABIElement = Union[ABIFunction, ABIEvent]
-ABI = Sequence[Union[ABIFunction, ABIEvent]]
-
-
 class EventData(TypedDict):
     address: ChecksumAddress
     args: Dict[str, Any]

web3/utils/__init__.py

@@ -3,11 +3,35 @@ NOTE: This is a public utility module. Any changes to these utility methods woul
 classify as breaking changes.
 """
 
-from .abi import (
+from eth_utils.abi import (
+    abi_to_signature,
+    collapse_if_tuple,
+    event_abi_to_log_topic,
+    event_signature_to_log_topic,
+    filter_abi_by_name,
+    filter_abi_by_type,
+    function_abi_to_4byte_selector,
+    function_signature_to_4byte_selector,
     get_abi_input_names,
+    get_abi_input_types,
     get_abi_output_names,
+    get_abi_output_types,
+    get_aligned_abi_inputs,
+    get_all_event_abis,
+    get_all_function_abis,
+    get_normalized_abi_inputs,
+)
+from .abi import (  # NOQA
+    check_if_arguments_can_be_encoded,
+    get_abi_element_info,
+    get_abi_element,
+    get_event_abi,
+    get_event_log_topics,
+    log_topic_to_bytes,
+)
+from .address import (
+    get_create_address,
 )
-from .address import get_create_address
 from .async_exception_handling import (
     async_handle_offchain_lookup,
 )
@@ -19,10 +43,30 @@ from .exception_handling import (
 )
 
 __all__ = [
-    "SimpleCache",
-    "async_handle_offchain_lookup",
+    "abi_to_signature",
+    "collapse_if_tuple",
+    "event_abi_to_log_topic",
+    "event_signature_to_log_topic",
+    "filter_abi_by_name",
+    "filter_abi_by_type",
+    "function_abi_to_4byte_selector",
+    "function_signature_to_4byte_selector",
     "get_abi_input_names",
+    "get_abi_input_types",
     "get_abi_output_names",
+    "get_abi_output_types",
+    "get_aligned_abi_inputs",
+    "get_all_event_abis",
+    "get_all_function_abis",
+    "get_normalized_abi_inputs",
+    "check_if_arguments_can_be_encoded",
+    "get_abi_element_info",
+    "get_abi_element",
+    "get_event_abi",
+    "get_event_log_topics",
+    "log_topic_to_bytes",
     "get_create_address",
+    "async_handle_offchain_lookup",
+    "SimpleCache",
     "handle_offchain_lookup",
 ]