web3 7.12.0__py3-none-any.whl → 7.12.1__py3-none-any.whl

web3/_utils/module_testing/eth_module.py

@@ -724,8 +724,6 @@ class AsyncEthModuleTest:
         keyfile_account_pkey: HexStr,
         async_math_contract: "AsyncContract",
     ) -> None:
-        # TODO: remove blockNumber block_id from eth_call and eth_getCode calls once
-        #  geth behavior for "latest" seems stable again.
         keyfile_account = async_w3.eth.account.from_key(keyfile_account_pkey)
 
         chain_id = await async_w3.eth.chain_id
@@ -757,13 +755,9 @@ class AsyncEthModuleTest:
         signed = keyfile_account.sign_transaction(txn)
         tx_hash = await async_w3.eth.send_raw_transaction(signed.raw_transaction)
         get_tx = await async_w3.eth.get_transaction(tx_hash)
-        tx_receipt = await async_w3.eth.wait_for_transaction_receipt(
-            tx_hash, timeout=10
-        )
+        await async_w3.eth.wait_for_transaction_receipt(tx_hash)
 
-        code = await async_w3.eth.get_code(
-            keyfile_account.address, block_identifier=tx_receipt["blockNumber"]
-        )
+        code = await async_w3.eth.get_code(keyfile_account.address)
         assert code.to_0x_hex() == f"0xef0100{async_math_contract.address[2:].lower()}"
         delegated = async_w3.eth.contract(
             address=keyfile_account.address, abi=async_math_contract.abi
@@ -772,7 +766,7 @@ class AsyncEthModuleTest:
         # assert the math counter is increased by 1337 only in delegated acct
         assert await async_math_contract.functions.counter().call() == math_counter
         delegated_call = await delegated.functions.counter().call(
-            block_identifier=tx_receipt["blockNumber"]
+            block_identifier="latest"
         )
         assert delegated_call == math_counter + 1337
 
@@ -803,13 +797,9 @@ class AsyncEthModuleTest:
 
         # test eth_sendTransaction
         reset_tx_hash = await async_w3.eth.send_transaction(reset_code_txn)
-        reset_tx_receipt = await async_w3.eth.wait_for_transaction_receipt(
-            reset_tx_hash, timeout=10
-        )
+        await async_w3.eth.wait_for_transaction_receipt(reset_tx_hash, timeout=10)
 
-        reset_code = await async_w3.eth.get_code(
-            keyfile_account.address, reset_tx_receipt["blockNumber"]
-        )
+        reset_code = await async_w3.eth.get_code(keyfile_account.address)
         assert reset_code == HexBytes("0x")
 
     @pytest.mark.asyncio
@@ -3875,8 +3865,6 @@ class EthModuleTest:
     def test_sign_authorization_send_raw_and_send_set_code_transactions(
         self, w3: "Web3", keyfile_account_pkey: HexStr, math_contract: "Contract"
     ) -> None:
-        # TODO: remove blockNumber block_id from eth_call and eth_getCode calls once
-        #  geth behavior for "latest" seems stable again.
         keyfile_account = w3.eth.account.from_key(keyfile_account_pkey)
 
         chain_id = w3.eth.chain_id
@@ -3906,28 +3894,18 @@ class EthModuleTest:
 
         # test eth_sendRawTransaction
         signed = keyfile_account.sign_transaction(txn)
-        tx_hash = w3.eth.send_raw_transaction(signed.raw_transaction)
-        get_tx = w3.eth.get_transaction(tx_hash)
-        receipt = w3.eth.wait_for_transaction_receipt(tx_hash, timeout=10)
+        w3.eth.send_raw_transaction(signed.raw_transaction)
+        get_tx = w3.eth.get_transaction(signed.hash)
+        w3.eth.wait_for_transaction_receipt(signed.hash)
 
-        code = w3.eth.get_code(
-            keyfile_account.address, block_identifier=receipt["blockNumber"]
-        )
+        code = w3.eth.get_code(keyfile_account.address)
         assert code.to_0x_hex() == f"0xef0100{math_contract.address[2:].lower()}"
         delegated = w3.eth.contract(
             address=keyfile_account.address, abi=math_contract.abi
         )
         # assert the math counter is increased by 1337 only in delegated acct
-        assert (
-            math_contract.functions.counter().call(
-                block_identifier=receipt["blockNumber"]
-            )
-            == math_counter
-        )
-        assert (
-            delegated.functions.counter().call(block_identifier=receipt["blockNumber"])
-            == math_counter + 1337
-        )
+        assert math_contract.functions.counter().call() == math_counter
+        assert delegated.functions.counter().call() == math_counter + 1337
 
         assert len(get_tx["authorizationList"]) == 1
         get_auth = get_tx["authorizationList"][0]
@@ -3938,7 +3916,7 @@ class EthModuleTest:
         assert isinstance(get_auth["r"], HexBytes)
         assert isinstance(get_auth["s"], HexBytes)
 
-        # reset storage value and code
+        # reset code
         reset_auth = {
             "chainId": chain_id,
             "address": "0x" + ("00" * 20),
@@ -3956,13 +3934,9 @@ class EthModuleTest:
 
         # test eth_sendTransaction
         reset_tx_hash = w3.eth.send_transaction(reset_code_txn)
-        reset_tx_receipt = w3.eth.wait_for_transaction_receipt(
-            reset_tx_hash, timeout=10
-        )
+        w3.eth.wait_for_transaction_receipt(reset_tx_hash)
 
-        reset_code = w3.eth.get_code(
-            keyfile_account.address, block_identifier=reset_tx_receipt["blockNumber"]
-        )
+        reset_code = w3.eth.get_code(keyfile_account.address)
         assert reset_code == HexBytes("0x")
 
     def test_eth_call(self, w3: "Web3", math_contract: "Contract") -> None:

web3/manager.py

@@ -254,9 +254,9 @@ class RequestManager:
         """
         Context manager for making batch requests
         """
-        if isinstance(self.provider, AutoProvider):
-            self.provider = self.provider._get_active_provider(use_cache=True)
-        if not isinstance(self.provider, (AsyncJSONBaseProvider, JSONBaseProvider)):
+        if not isinstance(
+            self.provider, (AsyncJSONBaseProvider, JSONBaseProvider, AutoProvider)
+        ):
             raise Web3TypeError("Batch requests are not supported by this provider.")
         return RequestBatcher(self.w3)
 

web3/providers/auto.py

@@ -3,6 +3,7 @@ from typing import (
     Any,
     Callable,
     Dict,
+    List,
     Optional,
     Sequence,
     Tuple,
@@ -21,9 +22,9 @@ from web3.exceptions import (
     CannotHandleRequest,
 )
 from web3.providers import (
-    BaseProvider,
     HTTPProvider,
     IPCProvider,
+    JSONBaseProvider,
     LegacyWebSocketProvider,
 )
 from web3.types import (
@@ -35,7 +36,7 @@ HTTP_SCHEMES = {"http", "https"}
 WS_SCHEMES = {"ws", "wss"}
 
 
-def load_provider_from_environment() -> BaseProvider:
+def load_provider_from_environment() -> Optional[JSONBaseProvider]:
     uri_string = URI(os.environ.get("WEB3_PROVIDER_URI", ""))
     if not uri_string:
         return None
@@ -45,7 +46,7 @@ def load_provider_from_environment() -> BaseProvider:
 
 def load_provider_from_uri(
     uri_string: URI, headers: Optional[Dict[str, Tuple[str, str]]] = None
-) -> BaseProvider:
+) -> JSONBaseProvider:
     uri = urlparse(uri_string)
     if uri.scheme == "file":
         return IPCProvider(uri.path)
@@ -60,7 +61,7 @@ def load_provider_from_uri(
         )
 
 
-class AutoProvider(BaseProvider):
+class AutoProvider(JSONBaseProvider):
     default_providers = (
         load_provider_from_environment,
         IPCProvider,
@@ -72,7 +73,7 @@ class AutoProvider(BaseProvider):
     def __init__(
         self,
         potential_providers: Optional[
-            Sequence[Union[Callable[..., BaseProvider], Type[BaseProvider]]]
+            Sequence[Union[Callable[..., JSONBaseProvider], Type[JSONBaseProvider]]]
         ] = None,
     ) -> None:
         """
@@ -83,6 +84,7 @@ class AutoProvider(BaseProvider):
         in an attempt to find an active node. The list will default to
         :attribute:`default_providers`.
         """
+        super().__init__()
         if potential_providers:
             self._potential_providers = potential_providers
         else:
@@ -94,6 +96,14 @@ class AutoProvider(BaseProvider):
         except OSError:
             return self._proxy_request(method, params, use_cache=False)
 
+    def make_batch_request(
+        self, requests: List[Tuple[RPCEndpoint, Any]]
+    ) -> Union[List[RPCResponse], RPCResponse]:
+        try:
+            return self._proxy_batch_request(requests)
+        except OSError:
+            return self._proxy_batch_request(requests, use_cache=False)
+
     def is_connected(self, show_traceback: bool = False) -> bool:
         provider = self._get_active_provider(use_cache=True)
         return provider is not None and provider.is_connected(show_traceback)
@@ -110,7 +120,19 @@ class AutoProvider(BaseProvider):
 
         return provider.make_request(method, params)
 
-    def _get_active_provider(self, use_cache: bool) -> Optional[BaseProvider]:
+    def _proxy_batch_request(
+        self, requests: List[Tuple[RPCEndpoint, Any]], use_cache: bool = True
+    ) -> Union[List[RPCResponse], RPCResponse]:
+        provider = self._get_active_provider(use_cache)
+        if provider is None:
+            raise CannotHandleRequest(
+                "Could not discover provider while making batch request: "
+                f"requests:{requests}\n"
+            )
+
+        return provider.make_batch_request(requests)
+
+    def _get_active_provider(self, use_cache: bool) -> Optional[JSONBaseProvider]:
         if use_cache and self._active_provider is not None:
             return self._active_provider
 

web3/providers/ipc.py

@@ -59,7 +59,7 @@ def get_ipc_socket(ipc_path: str, timeout: float = 2.0) -> socket.socket:
         return sock
 
 
-class PersistantSocket:
+class PersistentSocket:
     sock = None
 
     def __init__(self, ipc_path: str) -> None:
@@ -157,7 +157,7 @@ class IPCProvider(JSONBaseProvider):
 
         self.timeout = timeout
         self._lock = threading.Lock()
-        self._socket = PersistantSocket(self.ipc_path)
+        self._socket = PersistentSocket(self.ipc_path)
 
     def __str__(self) -> str:
         return f"<{self.__class__.__name__} {self.ipc_path}>"

{web3-7.12.0.dist-info → web3-7.12.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: web3
-Version: 7.12.0
+Version: 7.12.1
 Summary: web3: A Python library for interacting with Ethereum
 Home-page: https://github.com/ethereum/web3.py
 Author: The Ethereum Foundation

{web3-7.12.0.dist-info → web3-7.12.1.dist-info}/RECORD

@@ -9,6 +9,7 @@ ens/contract_data.py,sha256=CZa7Uxzq6rT-KonwHHM_wo-5ry0j1DMbikgEaP27Uy8,148602
 ens/ens.py,sha256=-avaYLLwUAPj8cYxP5fcH5h9aVabG5xuvBkwh5yTbMQ,21722
 ens/exceptions.py,sha256=5h-t3G-lwYchYe4JgHaxD_a_llh56sS6qzo9Rpa0S0o,2442
 ens/utils.py,sha256=ql6Kqe_dmbr4K6p0YO5Gr8b9XdfMRLe9dnjNv1mrWYI,9318
+ens/specs/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
 ens/specs/nf.json,sha256=tPXKzdhgu9gqNi0UhKC1kzPqSBgy4yHm5TL19RQHBqU,49038
 ens/specs/normalization_spec.json,sha256=8mmjBj4OoYCn7pD4P7hqKP_qy6rpYzpyRinSH3CCP9M,3171499
 web3/__init__.py,sha256=P11QAEV_GYoZq9ij8gDzFx5tKzJY2aMXG-keg2Lg1xs,1277
@@ -18,7 +19,7 @@ web3/exceptions.py,sha256=GMIrWTkYDR0jtvtdOlgl_s6fctTibW4Ytw4So5BY4uE,9584
 web3/geth.py,sha256=xVBZWSksBo2ipesAN9V5hzDc_te7kU8ueicFdvpkSO4,7370
 web3/logs.py,sha256=ROs-mDMH_ZOecE7hfbWA5yp27G38FbLjX4lO_WtlZxQ,198
 web3/main.py,sha256=eVdSh7m_iBMf3au0Aj49TZ7NSaRbN1Ccsng9Fuu8dME,16162
-web3/manager.py,sha256=OgcUP8RxBZc_uU3HEqNOcVdj2BnlPQenxHXbWiJE1co,22784
+web3/manager.py,sha256=hzIrl70WWIupgEbBBQlB11l89uHHU1xCKowKgBngkqU,22689
 web3/method.py,sha256=BCYend146F5Q149VB2VN11_Z3x8y0lJZH8ShF_VxwV4,8682
 web3/module.py,sha256=CDlnDrrWzkCJtd3gzHZ972l-6En6IyFEWwB7TXkHHLM,5617
 web3/net.py,sha256=Y3vPzHWVFkfHEZoJxjDOt4tp5ERmZrMuyi4ZFOLmIeA,1562
@@ -89,7 +90,7 @@ web3/_utils/contract_sources/contract_data/storage_contract.py,sha256=ARz6J3Gmsn
 web3/_utils/contract_sources/contract_data/string_contract.py,sha256=sk6TWvzH7GkRxwioXFm2a7J99riySqipn2EQhfYdzLY,11228
 web3/_utils/contract_sources/contract_data/tuple_contracts.py,sha256=7RlKfKRVXhjJN1j7D4YlQM6BswK3c0VaSxcnPVwAgcg,23176
 web3/_utils/module_testing/__init__.py,sha256=Xr_S46cjr0mypD_Y4ZbeF1EJ-XWfNxWUks5ykhzN10c,485
-web3/_utils/module_testing/eth_module.py,sha256=g1gB35A97W2rCyWDLnM_9h_C0KuXAUbUSmReiHRK6AU,197426
+web3/_utils/module_testing/eth_module.py,sha256=g4NW9m6jU5IXjWxp0Cl3UoVB3mC1FrHLt3ljztpZx4I,196504
 web3/_utils/module_testing/go_ethereum_admin_module.py,sha256=_c-6SyzZkfAJ-7ySXUpw9FEr4cg-ShRdAGSAHWanCtY,3406
 web3/_utils/module_testing/go_ethereum_debug_module.py,sha256=BP1UjK-5ewkYMilvW9jtZX5Mc9BGh3QlJWPXqDNWizU,4144
 web3/_utils/module_testing/go_ethereum_txpool_module.py,sha256=5f8XL8-2x3keyGRaITxMQYl9oQzjgqGn8zobB-j9BPs,1176
@@ -131,9 +132,9 @@ web3/middleware/stalecheck.py,sha256=oWRA69BGIbNGjHSnUVOBnoxOYJZYjzRzlqqL5RRlnzk
 web3/middleware/validation.py,sha256=QxActrJk_zsXXiwpadP2MUjZBS5E50OJOtUwVrm9XVo,4280
 web3/providers/__init__.py,sha256=YkcSzE9AubvSp-UfvJjyCrdepvziysbqeq2LT0ImDoc,936
 web3/providers/async_base.py,sha256=vCx4SAHPSACrRps4KZ36xgjAMQxKXqXsYB8jACodwWo,8241
-web3/providers/auto.py,sha256=Zx3CHKoRkmiw3Jte2BLNPiJAFd8rDXNGfA3XtxZvHgc,3465
+web3/providers/auto.py,sha256=9Jacts6375zHEG969lm5LOdmnhG4kJFnh4jMYOySQWU,4300
 web3/providers/base.py,sha256=mTLfK5gZzykzfjVkb6QHROFAAeE6ZdS6J6IPfqZr_e4,6876
-web3/providers/ipc.py,sha256=pYx79r5aR4gC109Oun33UWd6HKg1bzBehr75i3lBC8g,6518
+web3/providers/ipc.py,sha256=Rc0x4cW3NietQz0BjOygs78GzVGqgz0fHFZM6HalpVg,6518
 web3/providers/legacy_websocket.py,sha256=uQb5SmoFPFI809q_2iRhDEo5SkSW3T9tYXuf48stp9A,4744
 web3/providers/eth_tester/__init__.py,sha256=UggyBQdeAyjy1awATW1933jkJcpqqaUYUQEFAQnA2o0,163
 web3/providers/eth_tester/defaults.py,sha256=QQUdqqrkcN1AKW7WEY1A5RiPc_fmlHCLmdgB-5iY7Dc,12622
@@ -164,8 +165,8 @@ web3/utils/async_exception_handling.py,sha256=OoKbLNwWcY9dxLCbOfxcQPSB1OxWraNqcw
 web3/utils/caching.py,sha256=miulUjLOjlOfTux8HWBklpRIa6_fVNTVFHIWcbZt27o,2591
 web3/utils/exception_handling.py,sha256=n-MtO5LNzJDVzHTzO6olzfb2_qEVtVRvink0ixswg-Y,2917
 web3/utils/subscriptions.py,sha256=RnqwQL3ekkMyCrbx-jVf6EaEkihyXTbb1LBonBHAJ_g,8617
-web3-7.12.0.dist-info/licenses/LICENSE,sha256=ENGC4gSn0kYaC_mlaXOEwCKmA6W7Z9MeSemc5O2k-h0,1095
-web3-7.12.0.dist-info/METADATA,sha256=aYgiaFPo3N-8UA9Hr6ITnmEjbXd-FafOwsCRKb56c-c,5621
-web3-7.12.0.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-web3-7.12.0.dist-info/top_level.txt,sha256=iwupuJh7wgypXrpk_awszyri3TahRr5vxSphNyvt1bU,9
-web3-7.12.0.dist-info/RECORD,,
+web3-7.12.1.dist-info/licenses/LICENSE,sha256=ENGC4gSn0kYaC_mlaXOEwCKmA6W7Z9MeSemc5O2k-h0,1095
+web3-7.12.1.dist-info/METADATA,sha256=00yj0K9jQg20LN-vIHDfMORXEzT8hQJOrl8VCIGjLq8,5621
+web3-7.12.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+web3-7.12.1.dist-info/top_level.txt,sha256=iwupuJh7wgypXrpk_awszyri3TahRr5vxSphNyvt1bU,9
+web3-7.12.1.dist-info/RECORD,,

{web3-7.12.0.dist-info → web3-7.12.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any