web3 7.0.0b3__py3-none-any.whl → 7.0.0b4__py3-none-any.whl

web3/providers/persistent/request_processor.py

@@ -15,6 +15,9 @@ from web3._utils.caching import (
     RequestInformation,
     generate_cache_key,
 )
+from web3.exceptions import (
+    Web3ValueError,
+)
 from web3.types import (
     RPCEndpoint,
     RPCResponse,
@@ -136,9 +139,9 @@ class RequestProcessor:
     ) -> RequestInformation:
         if "method" in response and response["method"] == "eth_subscription":
             if "params" not in response:
-                raise ValueError("Subscription response must have params field")
+                raise Web3ValueError("Subscription response must have params field")
             if "subscription" not in response["params"]:
-                raise ValueError(
+                raise Web3ValueError(
                     "Subscription response params must have subscription field"
                 )
 
@@ -266,7 +269,7 @@ class RequestProcessor:
             )
         else:
             if not cache_key:
-                raise ValueError(
+                raise Web3ValueError(
                     "Must provide cache key when popping a non-subscription response."
                 )
 
@@ -283,10 +286,7 @@ class RequestProcessor:
     # request processor class methods
 
     def clear_caches(self) -> None:
-        """
-        Clear the request processor caches.
-        """
-
+        """Clear the request processor caches."""
         self._request_information_cache.clear()
         self._request_response_cache.clear()
         self._subscription_response_queue = asyncio.Queue(

web3/providers/persistent/websocket.py

@@ -71,9 +71,9 @@ class WebSocketProvider(PersistentConnectionProvider):
         # `PersistentConnectionProvider` kwargs can be passed through
         **kwargs: Any,
     ) -> None:
-        self.endpoint_uri = URI(endpoint_uri)
-        if self.endpoint_uri is None:
-            self.endpoint_uri = get_default_endpoint()
+        self.endpoint_uri = (
+            URI(endpoint_uri) if endpoint_uri is not None else get_default_endpoint()
+        )
 
         if not any(
             self.endpoint_uri.startswith(prefix)

web3/providers/rpc/async_rpc.py

@@ -20,6 +20,10 @@ from eth_utils import (
     to_dict,
 )
 
+from web3._utils.empty import (
+    Empty,
+    empty,
+)
 from web3._utils.http import (
     construct_user_agent,
 )
@@ -54,9 +58,9 @@ class AsyncHTTPProvider(AsyncJSONBaseProvider):
         self,
         endpoint_uri: Optional[Union[URI, str]] = None,
         request_kwargs: Optional[Any] = None,
-        exception_retry_configuration: Optional[
-            ExceptionRetryConfiguration
-        ] = ExceptionRetryConfiguration(errors=(ClientError, TimeoutError)),
+        exception_retry_configuration: Union[
+            ExceptionRetryConfiguration, Empty
+        ] = empty,
     ) -> None:
         if endpoint_uri is None:
             self.endpoint_uri = get_default_http_endpoint()
@@ -64,7 +68,7 @@ class AsyncHTTPProvider(AsyncJSONBaseProvider):
             self.endpoint_uri = URI(endpoint_uri)
 
         self._request_kwargs = request_kwargs or {}
-        self.exception_retry_configuration = exception_retry_configuration
+        self._exception_retry_configuration = exception_retry_configuration
 
         super().__init__()
 
@@ -74,12 +78,25 @@ class AsyncHTTPProvider(AsyncJSONBaseProvider):
     def __str__(self) -> str:
         return f"RPC connection {self.endpoint_uri}"
 
+    @property
+    def exception_retry_configuration(self) -> ExceptionRetryConfiguration:
+        if isinstance(self._exception_retry_configuration, Empty):
+            self._exception_retry_configuration = ExceptionRetryConfiguration(
+                errors=(ClientError, TimeoutError)
+            )
+        return self._exception_retry_configuration
+
+    @exception_retry_configuration.setter
+    def exception_retry_configuration(
+        self, value: Union[ExceptionRetryConfiguration, Empty]
+    ) -> None:
+        self._exception_retry_configuration = value
+
     @to_dict
     def get_request_kwargs(self) -> Iterable[Tuple[str, Any]]:
         if "headers" not in self._request_kwargs:
             yield "headers", self.get_request_headers()
-        for key, value in self._request_kwargs.items():
-            yield key, value
+        yield from self._request_kwargs.items()
 
     def get_request_headers(self) -> Dict[str, str]:
         return {

web3/providers/rpc/rpc.py

@@ -18,6 +18,10 @@ from eth_utils import (
 )
 import requests
 
+from web3._utils.empty import (
+    Empty,
+    empty,
+)
 from web3._utils.http import (
     construct_user_agent,
 )
@@ -51,26 +55,16 @@ if TYPE_CHECKING:
 class HTTPProvider(JSONBaseProvider):
     logger = logging.getLogger("web3.providers.HTTPProvider")
     endpoint_uri = None
-
-    _request_args = None
     _request_kwargs = None
 
-    exception_retry_configuration: Optional[ExceptionRetryConfiguration] = None
-
     def __init__(
         self,
         endpoint_uri: Optional[Union[URI, str]] = None,
         request_kwargs: Optional[Any] = None,
         session: Optional[Any] = None,
-        exception_retry_configuration: Optional[ExceptionRetryConfiguration] = (
-            ExceptionRetryConfiguration(
-                errors=(
-                    ConnectionError,
-                    requests.HTTPError,
-                    requests.Timeout,
-                )
-            )
-        ),
+        exception_retry_configuration: Union[
+            ExceptionRetryConfiguration, Empty
+        ] = empty,
     ) -> None:
         if endpoint_uri is None:
             self.endpoint_uri = get_default_http_endpoint()
@@ -78,7 +72,7 @@ class HTTPProvider(JSONBaseProvider):
             self.endpoint_uri = URI(endpoint_uri)
 
         self._request_kwargs = request_kwargs or {}
-        self.exception_retry_configuration = exception_retry_configuration
+        self._exception_retry_configuration = exception_retry_configuration
 
         if session:
             cache_and_return_session(self.endpoint_uri, session)
@@ -88,12 +82,29 @@ class HTTPProvider(JSONBaseProvider):
     def __str__(self) -> str:
         return f"RPC connection {self.endpoint_uri}"
 
+    @property
+    def exception_retry_configuration(self) -> ExceptionRetryConfiguration:
+        if isinstance(self._exception_retry_configuration, Empty):
+            self._exception_retry_configuration = ExceptionRetryConfiguration(
+                errors=(
+                    ConnectionError,
+                    requests.HTTPError,
+                    requests.Timeout,
+                )
+            )
+        return self._exception_retry_configuration
+
+    @exception_retry_configuration.setter
+    def exception_retry_configuration(
+        self, value: Union[ExceptionRetryConfiguration, Empty]
+    ) -> None:
+        self._exception_retry_configuration = value
+
     @to_dict
     def get_request_kwargs(self) -> Iterable[Tuple[str, Any]]:
         if "headers" not in self._request_kwargs:
             yield "headers", self.get_request_headers()
-        for key, value in self._request_kwargs.items():
-            yield key, value
+        yield from self._request_kwargs.items()
 
     def get_request_headers(self) -> Dict[str, str]:
         return {

web3/testing.py

@@ -12,21 +12,21 @@ from web3.module import (
 
 class Testing(Module):
     def timeTravel(self, timestamp: int) -> None:
-        return self.w3.manager.request_blocking(RPC.testing_timeTravel, [timestamp])
+        self.w3.manager.request_blocking(RPC.testing_timeTravel, [timestamp])
 
     def mine(self, num_blocks: int = 1) -> None:
-        return self.w3.manager.request_blocking(RPC.evm_mine, [num_blocks])
+        self.w3.manager.request_blocking(RPC.evm_mine, [num_blocks])
 
     def snapshot(self) -> int:
         self.last_snapshot_idx = self.w3.manager.request_blocking(RPC.evm_snapshot, [])
         return self.last_snapshot_idx
 
     def reset(self) -> None:
-        return self.w3.manager.request_blocking(RPC.evm_reset, [])
+        self.w3.manager.request_blocking(RPC.evm_reset, [])
 
     def revert(self, snapshot_idx: Optional[int] = None) -> None:
         if snapshot_idx is None:
             revert_target = self.last_snapshot_idx
         else:
             revert_target = snapshot_idx
-        return self.w3.manager.request_blocking(RPC.evm_revert, [revert_target])
+        self.w3.manager.request_blocking(RPC.evm_revert, [revert_target])

web3/tools/benchmark/main.py

@@ -120,20 +120,20 @@ def main(logger: logging.Logger, num_calls: int) -> None:
                 {
                     "name": "eth_gasPrice",
                     "params": {},
-                    "exec": lambda: w3_http.eth.gas_price,
-                    "async_exec": lambda: async_w3_http.eth.gas_price,
+                    "exec": lambda w3_http=w3_http: w3_http.eth.gas_price,
+                    "async_exec": lambda async_w3_http=async_w3_http: async_w3_http.eth.gas_price,  # noqa: E501
                 },
                 {
                     "name": "eth_sendTransaction",
                     "params": {},
-                    "exec": lambda: w3_http.eth.send_transaction(
+                    "exec": lambda w3_http=w3_http, coinbase=coinbase: w3_http.eth.send_transaction(  # noqa: E501
                         {
                             "to": "0xd3CdA913deB6f67967B99D67aCDFa1712C293601",
                             "from": coinbase,
                             "value": Wei(1),
                         }
                     ),
-                    "async_exec": lambda: async_w3_http.eth.send_transaction(
+                    "async_exec": lambda async_w3_http=async_w3_http, async_coinbase=async_coinbase: async_w3_http.eth.send_transaction(  # noqa: E501
                         {
                             "to": "0xd3CdA913deB6f67967B99D67aCDFa1712C293601",
                             "from": async_coinbase,
@@ -144,18 +144,22 @@ def main(logger: logging.Logger, num_calls: int) -> None:
                 {
                     "name": "eth_blockNumber",
                     "params": {},
-                    "exec": lambda: w3_http.eth.block_number,
-                    "async_exec": lambda: async_w3_http.eth.block_number,
+                    "exec": lambda w3_http=w3_http: w3_http.eth.block_number,
+                    "async_exec": lambda async_w3_http=async_w3_http: async_w3_http.eth.block_number,  # noqa: E501
                 },
                 {
                     "name": "eth_getBlock",
                     "params": {},
-                    "exec": lambda: w3_http.eth.get_block(1),
-                    "async_exec": lambda: async_w3_http.eth.get_block(1),
+                    "exec": lambda w3_http=w3_http: w3_http.eth.get_block(1),
+                    "async_exec": lambda async_w3_http=async_w3_http: async_w3_http.eth.get_block(  # noqa: E501
+                        1
+                    ),
                 },
             ]
 
-            def benchmark(method: Dict[str, Any]) -> None:
+            def benchmark(
+                method: Dict[str, Any], loop: asyncio.AbstractEventLoop = loop
+            ) -> None:
                 outcomes: Dict[str, Union[str, float]] = defaultdict(lambda: "N/A")
                 outcomes["name"] = method["name"]
                 outcomes["HTTPProvider"] = sync_benchmark(

web3/tools/benchmark/utils.py

@@ -17,7 +17,7 @@ def wait_for_socket(ipc_path: str, timeout: int = 30) -> None:
             sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
             sock.connect(ipc_path)
             sock.settimeout(timeout)
-        except (FileNotFoundError, socket.error):
+        except OSError:
             time.sleep(0.01)
         else:
             break

web3/tracing.py

@@ -53,10 +53,10 @@ class Tracing(Module):
         self._default_block = value
 
     def trace_replay_transaction_munger(
-        self,
-        block_identifier: Union[_Hash32, BlockIdentifier],
-        mode: TraceMode = ["trace"],
+        self, block_identifier: Union[_Hash32, BlockIdentifier], mode: TraceMode = None
     ) -> Tuple[Union[BlockIdentifier, _Hash32], TraceMode]:
+        if mode is None:
+            mode = ["trace"]
         return (block_identifier, mode)
 
     trace_replay_transaction: Method[Callable[..., BlockTrace]] = Method(
@@ -86,9 +86,11 @@ class Tracing(Module):
     def trace_call_munger(
         self,
         transaction: TxParams,
-        mode: TraceMode = ["trace"],
+        mode: TraceMode = None,
         block_identifier: Optional[BlockIdentifier] = None,
     ) -> Tuple[TxParams, TraceMode, BlockIdentifier]:
+        if mode is None:
+            mode = ["trace"]
         if "from" not in transaction and is_checksum_address(
             self.w3.eth.default_account
         ):
@@ -105,8 +107,10 @@ class Tracing(Module):
     )
 
     def trace_transactions_munger(
-        self, raw_transaction: HexStr, mode: TraceMode = ["trace"]
+        self, raw_transaction: HexStr, mode: TraceMode = None
     ) -> Tuple[HexStr, TraceMode]:
+        if mode is None:
+            mode = ["trace"]
         return raw_transaction, mode
 
     trace_raw_transaction: Method[Callable[..., BlockTrace]] = Method(

web3/types.py

@@ -5,10 +5,12 @@ from typing import (
     Coroutine,
     Dict,
     List,
+    Literal,
     NewType,
     Optional,
     Sequence,
     Type,
+    TypedDict,
     TypeVar,
     Union,
 )
@@ -25,9 +27,7 @@ from hexbytes import (
 )
 
 from web3._utils.compat import (
-    Literal,
     NotRequired,
-    TypedDict,
 )
 from web3._utils.function_identifiers import (
     FallbackFn,
@@ -165,6 +165,8 @@ TxData = TypedDict(
 TxParams = TypedDict(
     "TxParams",
     {
+        "accessList": AccessList,
+        "blobVersionedHashes": Sequence[Union[str, HexStr, bytes, HexBytes]],
         "chainId": int,
         "data": Union[bytes, HexStr],
         # addr or ens
@@ -172,6 +174,7 @@ TxParams = TypedDict(
         "gas": int,
         # legacy pricing
         "gasPrice": Wei,
+        "maxFeePerBlobGas": Union[str, Wei],
         # dynamic fee pricing
         "maxFeePerGas": Union[str, Wei],
         "maxPriorityFeePerGas": Union[str, Wei],
@@ -185,15 +188,11 @@ TxParams = TypedDict(
 )
 
 
-WithdrawalData = TypedDict(
-    "WithdrawalData",
-    {
-        "index": int,
-        "validator_index": int,
-        "address": ChecksumAddress,
-        "amount": Gwei,
-    },
-)
+class WithdrawalData(TypedDict):
+    index: int
+    validator_index: int
+    address: ChecksumAddress
+    amount: Gwei
 
 
 class BlockData(TypedDict, total=False):
@@ -220,6 +219,9 @@ class BlockData(TypedDict, total=False):
     uncles: Sequence[HexBytes]
     withdrawals: Sequence[WithdrawalData]
     withdrawalsRoot: HexBytes
+    parentBeaconBlockRoot: HexBytes
+    blobGasUsed: int
+    excessBlobGas: int
 
     # ExtraDataToPOAMiddleware replaces extraData w/ proofOfAuthorityData
     proofOfAuthorityData: HexBytes
@@ -340,17 +342,12 @@ class FeeHistory(TypedDict):
     reward: List[List[Wei]]
 
 
-StateOverrideParams = TypedDict(
-    "StateOverrideParams",
-    {
-        "balance": Optional[Wei],
-        "nonce": Optional[int],
-        "code": Optional[Union[bytes, HexStr]],
-        "state": Optional[Dict[HexStr, HexStr]],
-        "stateDiff": Optional[Dict[HexStr, HexStr]],
-    },
-    total=False,
-)
+class StateOverrideParams(TypedDict, total=False):
+    balance: Optional[Wei]
+    nonce: Optional[int]
+    code: Optional[Union[bytes, HexStr]]
+    state: Optional[Dict[HexStr, HexStr]]
+    stateDiff: Optional[Dict[HexStr, HexStr]]
 
 
 StateOverride = Dict[ChecksumAddress, StateOverrideParams]

{web3-7.0.0b3.dist-info → web3-7.0.0b4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: web3
-Version: 7.0.0b3
+Version: 7.0.0b4
 Summary: web3.py
 Home-page: https://github.com/ethereum/web3.py
 Author: The Ethereum Foundation
@@ -20,12 +20,12 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp >=3.7.4.post0
-Requires-Dist: eth-abi >=4.0.0
-Requires-Dist: eth-account >=0.8.0
+Requires-Dist: eth-abi >=5.0.1
+Requires-Dist: eth-account >=0.12.0
 Requires-Dist: eth-hash[pycryptodome] >=0.5.1
-Requires-Dist: eth-typing >=3.0.0
+Requires-Dist: eth-typing >=4.0.0
 Requires-Dist: eth-utils >=4.0.0
-Requires-Dist: hexbytes <0.4.0,>=0.1.0
+Requires-Dist: hexbytes >=1.2.0
 Requires-Dist: pydantic >=2.4.0
 Requires-Dist: requests >=2.16.0
 Requires-Dist: typing-extensions >=4.0.1
@@ -33,46 +33,31 @@ Requires-Dist: websockets >=10.0.0
 Requires-Dist: pyunormalize >=15.0.0
 Requires-Dist: pywin32 >=223 ; platform_system == "Windows"
 Provides-Extra: dev
-Requires-Dist: eth-tester[py-evm] ==v0.10.0-b.3 ; extra == 'dev'
+Requires-Dist: eth-tester[py-evm] <0.12.0b1,>=0.11.0b1 ; extra == 'dev'
 Requires-Dist: py-geth >=4.1.0 ; extra == 'dev'
-Requires-Dist: black >=22.1.0 ; extra == 'dev'
-Requires-Dist: blocklint >=0.2.4 ; extra == 'dev'
-Requires-Dist: flake8 ==3.8.3 ; extra == 'dev'
-Requires-Dist: isort >=5.11.0 ; extra == 'dev'
-Requires-Dist: mypy ==1.4.1 ; extra == 'dev'
-Requires-Dist: types-setuptools >=57.4.4 ; extra == 'dev'
-Requires-Dist: types-requests >=2.26.1 ; extra == 'dev'
 Requires-Dist: sphinx >=5.3.0 ; extra == 'dev'
 Requires-Dist: sphinx-rtd-theme >=1.0.0 ; extra == 'dev'
 Requires-Dist: towncrier <22,>=21 ; extra == 'dev'
+Requires-Dist: build >=0.9.0 ; extra == 'dev'
 Requires-Dist: bumpversion ; extra == 'dev'
 Requires-Dist: flaky >=3.7.0 ; extra == 'dev'
 Requires-Dist: hypothesis >=3.31.2 ; extra == 'dev'
-Requires-Dist: pytest >=7.0.0 ; extra == 'dev'
+Requires-Dist: pre-commit >=3.4.0 ; extra == 'dev'
 Requires-Dist: pytest-asyncio <0.23,>=0.18.1 ; extra == 'dev'
 Requires-Dist: pytest-mock >=1.10 ; extra == 'dev'
 Requires-Dist: pytest-watch >=4.2 ; extra == 'dev'
 Requires-Dist: pytest-xdist >=1.29 ; extra == 'dev'
+Requires-Dist: pytest >=7.0.0 ; extra == 'dev'
 Requires-Dist: setuptools >=38.6.0 ; extra == 'dev'
 Requires-Dist: tox >=3.18.0 ; extra == 'dev'
 Requires-Dist: tqdm >4.32 ; extra == 'dev'
 Requires-Dist: twine >=1.13 ; extra == 'dev'
-Requires-Dist: build >=0.9.0 ; extra == 'dev'
-Requires-Dist: importlib-metadata <5.0 ; (python_version < "3.8") and extra == 'dev'
 Provides-Extra: docs
 Requires-Dist: sphinx >=5.3.0 ; extra == 'docs'
 Requires-Dist: sphinx-rtd-theme >=1.0.0 ; extra == 'docs'
 Requires-Dist: towncrier <22,>=21 ; extra == 'docs'
-Provides-Extra: linter
-Requires-Dist: black >=22.1.0 ; extra == 'linter'
-Requires-Dist: blocklint >=0.2.4 ; extra == 'linter'
-Requires-Dist: flake8 ==3.8.3 ; extra == 'linter'
-Requires-Dist: isort >=5.11.0 ; extra == 'linter'
-Requires-Dist: mypy ==1.4.1 ; extra == 'linter'
-Requires-Dist: types-setuptools >=57.4.4 ; extra == 'linter'
-Requires-Dist: types-requests >=2.26.1 ; extra == 'linter'
 Provides-Extra: tester
-Requires-Dist: eth-tester[py-evm] ==v0.10.0-b.3 ; extra == 'tester'
+Requires-Dist: eth-tester[py-evm] <0.12.0b1,>=0.11.0b1 ; extra == 'tester'
 Requires-Dist: py-geth >=4.1.0 ; extra == 'tester'
 
 # web3.py
@@ -83,9 +68,9 @@ Requires-Dist: py-geth >=4.1.0 ; extra == 'tester'
 
 A Python library for interacting with Ethereum.
 
--   Python 3.8+ support
+- Python 3.8+ support
 
----
+______________________________________________________________________
 
 ## Quickstart
 
@@ -103,6 +88,6 @@ guidelines for [contributing](https://web3py.readthedocs.io/en/latest/contributi
 then check out issues that are labeled
 [Good First Issue](https://github.com/ethereum/web3.py/issues?q=is%3Aissue+is%3Aopen+label%3A%22Good+First+Issue%22).
 
----
+______________________________________________________________________
 
 #### Questions on implementation or usage? Join the conversation on [discord](https://discord.gg/GHryRvPB84).