web3 7.14.0__py3-none-any.whl → 8.0.0b1__py3-none-any.whl

web3/contract/contract.py

@@ -2,12 +2,8 @@ from typing import (
     TYPE_CHECKING,
     Any,
     Callable,
-    Dict,
     Iterable,
-    List,
-    Optional,
     Sequence,
-    Type,
     cast,
 )
 
@@ -106,10 +102,10 @@ class ContractEvent(BaseContractEvent):
     @combomethod
     def get_logs(
         self,
-        argument_filters: Optional[Dict[str, Any]] = None,
-        from_block: Optional[BlockIdentifier] = None,
-        to_block: Optional[BlockIdentifier] = None,
-        block_hash: Optional[HexBytes] = None,
+        argument_filters: dict[str, Any] | None = None,
+        from_block: BlockIdentifier | None = None,
+        to_block: BlockIdentifier | None = None,
+        block_hash: HexBytes | None = None,
     ) -> Iterable[EventData]:
         """
         Get events for this contract instance using eth_getLogs API.
@@ -200,11 +196,11 @@ class ContractEvent(BaseContractEvent):
     def create_filter(
         self,
         *,  # PEP 3102
-        argument_filters: Optional[Dict[str, Any]] = None,
-        from_block: Optional[BlockIdentifier] = None,
+        argument_filters: dict[str, Any] | None = None,
+        from_block: BlockIdentifier | None = None,
         to_block: BlockIdentifier = "latest",
-        address: Optional[ChecksumAddress] = None,
-        topics: Optional[Sequence[Any]] = None,
+        address: ChecksumAddress | None = None,
+        topics: Sequence[Any] | None = None,
     ) -> LogFilter:
         """
         Create filter object that tracks logs emitted by this contract event.
@@ -239,7 +235,7 @@ class ContractEvent(BaseContractEvent):
 
 class ContractEvents(BaseContractEvents[ContractEvent]):
     def __init__(
-        self, abi: ABI, w3: "Web3", address: Optional[ChecksumAddress] = None
+        self, abi: ABI, w3: "Web3", address: ChecksumAddress | None = None
     ) -> None:
         super().__init__(abi, w3, ContractEvent, address)
 
@@ -250,10 +246,10 @@ class ContractFunction(BaseContractFunction):
 
     def call(
         self,
-        transaction: Optional[TxParams] = None,
-        block_identifier: Optional[BlockIdentifier] = None,
-        state_override: Optional[StateOverride] = None,
-        ccip_read_enabled: Optional[bool] = None,
+        transaction: TxParams | None = None,
+        block_identifier: BlockIdentifier | None = None,
+        state_override: StateOverride | None = None,
+        ccip_read_enabled: bool | None = None,
     ) -> Any:
         """
         Execute a contract function call using the `eth_call` interface.
@@ -304,7 +300,7 @@ class ContractFunction(BaseContractFunction):
             **self.kwargs or {},
         )
 
-    def transact(self, transaction: Optional[TxParams] = None) -> HexBytes:
+    def transact(self, transaction: TxParams | None = None) -> HexBytes:
         setup_transaction = self._transact(transaction)
         abi_element_identifier = abi_to_signature(self.abi)
 
@@ -321,9 +317,9 @@ class ContractFunction(BaseContractFunction):
 
     def estimate_gas(
         self,
-        transaction: Optional[TxParams] = None,
-        block_identifier: Optional[BlockIdentifier] = None,
-        state_override: Optional[StateOverride] = None,
+        transaction: TxParams | None = None,
+        block_identifier: BlockIdentifier | None = None,
+        state_override: StateOverride | None = None,
     ) -> int:
         setup_transaction = self._estimate_gas(transaction)
         abi_element_identifier = abi_to_signature(self.abi)
@@ -340,7 +336,7 @@ class ContractFunction(BaseContractFunction):
             **self.kwargs or {},
         )
 
-    def build_transaction(self, transaction: Optional[TxParams] = None) -> TxParams:
+    def build_transaction(self, transaction: TxParams | None = None) -> TxParams:
         built_transaction = self._build_transaction(transaction)
         abi_element_identifier = abi_to_signature(self.abi)
 
@@ -359,7 +355,7 @@ class ContractFunction(BaseContractFunction):
     def get_fallback_function(
         abi: ABI,
         w3: "Web3",
-        address: Optional[ChecksumAddress] = None,
+        address: ChecksumAddress | None = None,
     ) -> "ContractFunction":
         if abi and fallback_func_abi_exists(abi):
             fallback_abi = filter_abi_by_type("fallback", abi)[0]
@@ -377,7 +373,7 @@ class ContractFunction(BaseContractFunction):
     def get_receive_function(
         abi: ABI,
         w3: "Web3",
-        address: Optional[ChecksumAddress] = None,
+        address: ChecksumAddress | None = None,
     ) -> "ContractFunction":
         if abi and receive_func_abi_exists(abi):
             receive_abi = filter_abi_by_type("receive", abi)[0]
@@ -397,8 +393,8 @@ class ContractFunctions(BaseContractFunctions[ContractFunction]):
         self,
         abi: ABI,
         w3: "Web3",
-        address: Optional[ChecksumAddress] = None,
-        decode_tuples: Optional[bool] = False,
+        address: ChecksumAddress | None = None,
+        decode_tuples: bool | None = False,
     ) -> None:
         super().__init__(abi, w3, ContractFunction, address, decode_tuples)
 
@@ -412,7 +408,7 @@ class Contract(BaseContract):
     # Instance of :class:`ContractEvents` presenting available Event ABIs
     events: ContractEvents = None
 
-    def __init__(self, address: Optional[ChecksumAddress] = None) -> None:
+    def __init__(self, address: ChecksumAddress | None = None) -> None:
         """
         Create a new smart contract proxy object.
         :param address: Contract address as 0x hex string
@@ -459,8 +455,8 @@ class Contract(BaseContract):
 
     @classmethod
     def factory(
-        cls, w3: "Web3", class_name: Optional[str] = None, **kwargs: Any
-    ) -> Type[Self]:
+        cls, w3: "Web3", class_name: str | None = None, **kwargs: Any
+    ) -> type[Self]:
         kwargs["w3"] = w3
 
         normalizers = {
@@ -472,7 +468,7 @@ class Contract(BaseContract):
         }
 
         contract = cast(
-            Type[Self],
+            type[Self],
             PropertyCheckingFactory(
                 class_name or cls.__name__,
                 (cls,),
@@ -536,9 +532,9 @@ class Contract(BaseContract):
         w3: "Web3",
         address: ChecksumAddress,
         callable_check: Callable[..., Any],
-    ) -> List["ContractFunction"]:
+    ) -> list["ContractFunction"]:
         return cast(
-            List["ContractFunction"],
+            list["ContractFunction"],
             find_functions_by_identifier(
                 contract_abi, w3, address, callable_check, ContractFunction
             ),
@@ -557,7 +553,7 @@ class Contract(BaseContract):
         w3: "Web3",
         address: ChecksumAddress,
         callable_check: Callable[..., Any],
-    ) -> List["ContractEvent"]:
+    ) -> list["ContractEvent"]:
         return find_events_by_identifier(
             contract_abi, w3, address, callable_check, ContractEvent
         )
@@ -578,11 +574,11 @@ class ContractCaller(BaseContractCaller):
         abi: ABI,
         w3: "Web3",
         address: ChecksumAddress,
-        transaction: Optional[TxParams] = None,
+        transaction: TxParams | None = None,
         block_identifier: BlockIdentifier = None,
-        ccip_read_enabled: Optional[bool] = None,
-        decode_tuples: Optional[bool] = False,
-        contract_functions: Optional[ContractFunctions] = None,
+        ccip_read_enabled: bool | None = None,
+        decode_tuples: bool | None = False,
+        contract_functions: ContractFunctions | None = None,
     ) -> None:
         super().__init__(abi, w3, address, decode_tuples=decode_tuples)
 
@@ -608,9 +604,9 @@ class ContractCaller(BaseContractCaller):
 
     def __call__(
         self,
-        transaction: Optional[TxParams] = None,
+        transaction: TxParams | None = None,
         block_identifier: BlockIdentifier = None,
-        ccip_read_enabled: Optional[bool] = None,
+        ccip_read_enabled: bool | None = None,
     ) -> "ContractCaller":
         if transaction is None:
             transaction = {}
@@ -631,11 +627,11 @@ class ContractConstructor(BaseContractConstructor):
     w3: "Web3"
 
     @combomethod
-    def transact(self, transaction: Optional[TxParams] = None) -> HexBytes:
+    def transact(self, transaction: TxParams | None = None) -> HexBytes:
         return self.w3.eth.send_transaction(self._get_transaction(transaction))
 
     @combomethod
-    def build_transaction(self, transaction: Optional[TxParams] = None) -> TxParams:
+    def build_transaction(self, transaction: TxParams | None = None) -> TxParams:
         """
         Build the transaction dictionary without sending
         """
@@ -645,8 +641,8 @@ class ContractConstructor(BaseContractConstructor):
     @combomethod
     def estimate_gas(
         self,
-        transaction: Optional[TxParams] = None,
-        block_identifier: Optional[BlockIdentifier] = None,
+        transaction: TxParams | None = None,
+        block_identifier: BlockIdentifier | None = None,
     ) -> int:
         transaction = self._estimate_gas(transaction)
 

web3/contract/utils.py

@@ -3,11 +3,7 @@ from typing import (
     TYPE_CHECKING,
     Any,
     Callable,
-    List,
-    Optional,
     Sequence,
-    Tuple,
-    Type,
     Union,
     cast,
 )
@@ -89,7 +85,7 @@ def format_contract_call_return_data_curried(
     decode_tuples: bool,
     fn_abi: ABICallable,
     abi_element_identifier: ABIElementIdentifier,
-    normalizers: Tuple[Callable[..., Any], ...],
+    normalizers: tuple[Callable[..., Any], ...],
     output_types: Sequence[TypeStr],
     return_data: Any,
 ) -> Any:
@@ -123,15 +119,15 @@ def format_contract_call_return_data_curried(
 def call_contract_function(
     w3: "Web3",
     address: ChecksumAddress,
-    normalizers: Tuple[Callable[..., Any], ...],
+    normalizers: tuple[Callable[..., Any], ...],
     abi_element_identifier: ABIElementIdentifier,
     transaction: TxParams,
-    block_id: Optional[BlockIdentifier] = None,
-    contract_abi: Optional[ABI] = None,
-    abi_callable: Optional[ABICallable] = None,
-    state_override: Optional[StateOverride] = None,
-    ccip_read_enabled: Optional[bool] = None,
-    decode_tuples: Optional[bool] = False,
+    block_id: BlockIdentifier | None = None,
+    contract_abi: ABI | None = None,
+    abi_callable: ABICallable | None = None,
+    state_override: StateOverride | None = None,
+    ccip_read_enabled: bool | None = None,
+    decode_tuples: bool | None = False,
     *args: Any,
     **kwargs: Any,
 ) -> Any:
@@ -240,10 +236,10 @@ def call_contract_function(
 def transact_with_contract_function(
     address: ChecksumAddress,
     w3: "Web3",
-    abi_element_identifier: Optional[ABIElementIdentifier] = None,
-    transaction: Optional[TxParams] = None,
-    contract_abi: Optional[ABI] = None,
-    fn_abi: Optional[ABIFunction] = None,
+    abi_element_identifier: ABIElementIdentifier | None = None,
+    transaction: TxParams | None = None,
+    contract_abi: ABI | None = None,
+    fn_abi: ABIFunction | None = None,
     *args: Any,
     **kwargs: Any,
 ) -> HexBytes:
@@ -269,12 +265,12 @@ def transact_with_contract_function(
 def estimate_gas_for_function(
     address: ChecksumAddress,
     w3: "Web3",
-    abi_element_identifier: Optional[ABIElementIdentifier] = None,
-    transaction: Optional[TxParams] = None,
-    contract_abi: Optional[ABI] = None,
-    fn_abi: Optional[ABIFunction] = None,
-    block_identifier: Optional[BlockIdentifier] = None,
-    state_override: Optional[StateOverride] = None,
+    abi_element_identifier: ABIElementIdentifier | None = None,
+    transaction: TxParams | None = None,
+    contract_abi: ABI | None = None,
+    fn_abi: ABIFunction | None = None,
+    block_identifier: BlockIdentifier | None = None,
+    state_override: StateOverride | None = None,
     *args: Any,
     **kwargs: Any,
 ) -> int:
@@ -301,10 +297,10 @@ def estimate_gas_for_function(
 def build_transaction_for_function(
     address: ChecksumAddress,
     w3: "Web3",
-    abi_element_identifier: Optional[ABIElementIdentifier] = None,
-    transaction: Optional[TxParams] = None,
-    contract_abi: Optional[ABI] = None,
-    fn_abi: Optional[ABIFunction] = None,
+    abi_element_identifier: ABIElementIdentifier | None = None,
+    transaction: TxParams | None = None,
+    contract_abi: ABI | None = None,
+    fn_abi: ABIFunction | None = None,
     *args: Any,
     **kwargs: Any,
 ) -> TxParams:
@@ -335,8 +331,8 @@ def find_functions_by_identifier(
     w3: Union["Web3", "AsyncWeb3[Any]"],
     address: ChecksumAddress,
     callable_check: Callable[..., Any],
-    function_type: Type[TContractFn],
-) -> List[TContractFn]:
+    function_type: type[TContractFn],
+) -> list[TContractFn]:
     """
     Given a contract ABI, return a list of TContractFunction instances.
     """
@@ -379,8 +375,8 @@ def find_events_by_identifier(
     w3: Union["Web3", "AsyncWeb3[Any]"],
     address: ChecksumAddress,
     callable_check: Callable[..., Any],
-    event_type: Type[TContractEvent],
-) -> List[TContractEvent]:
+    event_type: type[TContractEvent],
+) -> list[TContractEvent]:
     """
     Given a contract ABI, return a list of TContractEvent instances.
     """
@@ -420,15 +416,15 @@ def get_event_by_identifier(
 async def async_call_contract_function(
     async_w3: "AsyncWeb3[Any]",
     address: ChecksumAddress,
-    normalizers: Tuple[Callable[..., Any], ...],
+    normalizers: tuple[Callable[..., Any], ...],
     abi_element_identifier: ABIElementIdentifier,
     transaction: TxParams,
-    block_id: Optional[BlockIdentifier] = None,
-    contract_abi: Optional[ABI] = None,
-    fn_abi: Optional[ABIFunction] = None,
-    state_override: Optional[StateOverride] = None,
-    ccip_read_enabled: Optional[bool] = None,
-    decode_tuples: Optional[bool] = False,
+    block_id: BlockIdentifier | None = None,
+    contract_abi: ABI | None = None,
+    fn_abi: ABIFunction | None = None,
+    state_override: StateOverride | None = None,
+    ccip_read_enabled: bool | None = None,
+    decode_tuples: bool | None = False,
     *args: Any,
     **kwargs: Any,
 ) -> Any:
@@ -535,10 +531,10 @@ async def async_call_contract_function(
 async def async_transact_with_contract_function(
     address: ChecksumAddress,
     async_w3: "AsyncWeb3[Any]",
-    abi_element_identifier: Optional[ABIElementIdentifier] = None,
-    transaction: Optional[TxParams] = None,
-    contract_abi: Optional[ABI] = None,
-    fn_abi: Optional[ABIFunction] = None,
+    abi_element_identifier: ABIElementIdentifier | None = None,
+    transaction: TxParams | None = None,
+    contract_abi: ABI | None = None,
+    fn_abi: ABIFunction | None = None,
     *args: Any,
     **kwargs: Any,
 ) -> HexBytes:
@@ -564,12 +560,12 @@ async def async_transact_with_contract_function(
 async def async_estimate_gas_for_function(
     address: ChecksumAddress,
     async_w3: "AsyncWeb3[Any]",
-    abi_element_identifier: Optional[ABIElementIdentifier] = None,
-    transaction: Optional[TxParams] = None,
-    contract_abi: Optional[ABI] = None,
-    fn_abi: Optional[ABIFunction] = None,
-    block_identifier: Optional[BlockIdentifier] = None,
-    state_override: Optional[StateOverride] = None,
+    abi_element_identifier: ABIElementIdentifier | None = None,
+    transaction: TxParams | None = None,
+    contract_abi: ABI | None = None,
+    fn_abi: ABIFunction | None = None,
+    block_identifier: BlockIdentifier | None = None,
+    state_override: StateOverride | None = None,
     *args: Any,
     **kwargs: Any,
 ) -> int:
@@ -598,10 +594,10 @@ async def async_estimate_gas_for_function(
 async def async_build_transaction_for_function(
     address: ChecksumAddress,
     async_w3: "AsyncWeb3[Any]",
-    abi_element_identifier: Optional[ABIElementIdentifier] = None,
-    transaction: Optional[TxParams] = None,
-    contract_abi: Optional[ABI] = None,
-    fn_abi: Optional[ABIFunction] = None,
+    abi_element_identifier: ABIElementIdentifier | None = None,
+    transaction: TxParams | None = None,
+    contract_abi: ABI | None = None,
+    fn_abi: ABIFunction | None = None,
     *args: Any,
     **kwargs: Any,
 ) -> TxParams:

web3/datastructures.py

@@ -2,22 +2,17 @@ from collections import (
     OrderedDict,
 )
 from collections.abc import (
-    Hashable,
+    MutableMapping,
+    ValuesView,
 )
 from typing import (
     Any,
     Callable,
-    Dict,
+    Hashable,
     Iterator,
-    List,
     Mapping,
-    MutableMapping,
-    Optional,
     Sequence,
-    Tuple,
     TypeVar,
-    Union,
-    ValuesView,
     cast,
 )
 
@@ -47,7 +42,7 @@ class ReadableAttributeDict(Mapping[TKey, TValue]):
     """
 
     def __init__(
-        self, dictionary: Dict[TKey, TValue], *args: Any, **kwargs: Any
+        self, dictionary: dict[TKey, TValue], *args: Any, **kwargs: Any
     ) -> None:
         # type ignored on 46/50 b/c dict() expects str index type not TKey
         self.__dict__ = dict(dictionary)  # type: ignore
@@ -139,7 +134,7 @@ def tupleize_lists_nested(d: Mapping[TKey, TValue]) -> AttributeDict[TKey, TValu
     Other unhashable types found will raise a TypeError
     """
 
-    def _to_tuple(value: Union[List[Any], Tuple[Any, ...]]) -> Any:
+    def _to_tuple(value: list[Any] | tuple[Any, ...]) -> Any:
         return tuple(_to_tuple(i) if isinstance(i, (list, tuple)) else i for i in value)
 
     ret = dict()
@@ -174,7 +169,7 @@ class NamedElementOnion(Mapping[TKey, TValue]):
             else:
                 self.add(*element)
 
-    def add(self, element: TValue, name: Optional[TKey] = None) -> None:
+    def add(self, element: TValue, name: TKey | None = None) -> None:
         if name is None:
             name = cast(TKey, element)
 
@@ -191,7 +186,7 @@ class NamedElementOnion(Mapping[TKey, TValue]):
         self._queue[name] = element
 
     def inject(
-        self, element: TValue, name: Optional[TKey] = None, layer: Optional[int] = None
+        self, element: TValue, name: TKey | None = None, layer: int | None = None
     ) -> None:
         """
         Inject a named element to an arbitrary layer in the onion.
@@ -296,7 +291,7 @@ class NamedElementOnion(Mapping[TKey, TValue]):
             return NotImplemented
         combined = self._queue.copy()
         combined.update(other._queue)
-        return NamedElementOnion(cast(List[Any], combined.items()))
+        return NamedElementOnion(cast(list[Any], combined.items()))
 
     def __contains__(self, element: Any) -> bool:
         element_name = self._build_name(element)
@@ -310,7 +305,7 @@ class NamedElementOnion(Mapping[TKey, TValue]):
         return len(self._queue)
 
     def __reversed__(self) -> Iterator[TValue]:
-        elements = cast(List[Any], self._queue.values())
+        elements = cast(list[Any], self._queue.values())
         if not isinstance(elements, Sequence):
             elements = list(elements)
         return iter(elements)
@@ -324,7 +319,7 @@ class NamedElementOnion(Mapping[TKey, TValue]):
             elements = list(elements)  # type: ignore
         return reversed(elements)
 
-    def as_tuple_of_middleware(self) -> Tuple[TValue, ...]:
+    def as_tuple_of_middleware(self) -> tuple[TValue, ...]:
         """
         Helps with type hinting since we return `Iterator[TKey]` type, though it's
         actually a `Iterator[TValue]` type, for the `__iter__()` method. This is in