web3 7.12.0__tar.gz → 7.12.1__tar.gz

{web3-7.12.0/web3.egg-info → web3-7.12.1}/PKG-INFO

@@ -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 → web3-7.12.1}/pyproject.toml

@@ -127,7 +127,7 @@ name = "Removals"
 showcontent = true
 
 [tool.bumpversion]
-current_version = "7.12.0"
+current_version = "7.12.1"
 parse = """
     (?P<major>\\d+)
     \\.(?P<minor>\\d+)

{web3-7.12.0 → web3-7.12.1}/setup.py

@@ -55,7 +55,7 @@ with open("./README.md") as readme:
 setup(
     name="web3",
     # *IMPORTANT*: Don't manually change the version here. See Contributing docs for the release process.
-    version="7.12.0",
+    version="7.12.1",
     description="""web3: A Python library for interacting with Ethereum""",
     long_description=long_description,
     long_description_content_type="text/markdown",

{web3-7.12.0 → web3-7.12.1}/tests/core/eth-module/test_accounts.py

@@ -264,6 +264,7 @@ def test_eth_account_sign(
     acct, message_text, key, expected_bytes, expected_hash, v, r, s, signature
 ):
     message = encode_defunct(text=message_text)
+    assert message.body == expected_bytes
     signed_message = Web3.keccak(
         b"\x19Ethereum Signed Message:\n"
         + bytes(f"{len(message.body)}", encoding="utf-8")
@@ -357,9 +358,9 @@ def test_eth_account_sign(
         ),
         (
             {
-                "gas": 100000,
-                "maxFeePerGas": 2000000000,
-                "maxPriorityFeePerGas": 2000000000,
+                "gas": "0x186a0",
+                "maxFeePerGas": "0x77359400",
+                "maxPriorityFeePerGas": "0x77359400",
                 "data": "0x5544",
                 "nonce": "0x2",
                 "to": "0x96216849c49358B10257cb55b28eA603c874b05E",

{web3-7.12.0 → web3-7.12.1}/tests/integration/go_ethereum/conftest.py

@@ -35,7 +35,7 @@ from .utils import (
 )
 
 KEYFILE_PW = "web3py-test"
-GETH_FIXTURE_ZIP = "geth-1.15.11-fixture.zip"
+GETH_FIXTURE_ZIP = "geth-1.16.0-fixture.zip"
 
 
 @pytest.fixture
@@ -106,8 +106,8 @@ def base_geth_command_arguments(geth_binary, datadir):
 
 @pytest.fixture
 def geth_zipfile_version(get_geth_version):
-    # TODO: Remove support for 1.13.x in next major version
-    if get_geth_version.major == 1 and get_geth_version.minor in [13, 14, 15]:
+    # TODO: Remove support for 13 + 14 in next major version
+    if get_geth_version.major == 1 and get_geth_version.minor in [13, 14, 15, 16]:
         return GETH_FIXTURE_ZIP
     raise AssertionError("Unsupported geth version")
 

{web3-7.12.0 → web3-7.12.1}/tests/integration/go_ethereum/test_goethereum_http.py

@@ -7,6 +7,7 @@ import pytest_asyncio
 
 from web3 import (
     AsyncWeb3,
+    AutoProvider,
     Web3,
 )
 from web3._utils.module_testing.go_ethereum_admin_module import (
@@ -102,8 +103,17 @@ class TestGoEthereumDebugModuleTest(GoEthereumDebugModuleTest):
 
 class TestGoEthereumEthModuleTest(GoEthereumEthModuleTest):
     def test_auto_provider_batching(self, auto_w3: "Web3") -> None:
-        # test that batch_requests doesn't error out when using the auto provider
-        auto_w3.batch_requests()
+        with auto_w3.batch_requests() as batch:
+            assert isinstance(auto_w3.provider, AutoProvider)
+            assert auto_w3.provider._is_batching
+            assert auto_w3.provider._batching_context is not None
+            batch.add(auto_w3.eth.get_block("latest"))
+            batch.add(auto_w3.eth.get_block("earliest"))
+            batch.add(auto_w3.eth.get_block("pending"))
+            results = batch.execute()
+
+        assert not auto_w3.provider._is_batching
+        assert len(results) == 3
 
 
 class TestGoEthereumNetModuleTest(GoEthereumNetModuleTest):

{web3-7.12.0 → web3-7.12.1}/tests/integration/go_ethereum/test_goethereum_ipc.py

@@ -7,6 +7,7 @@ import pytest_asyncio
 from web3 import (
     AsyncIPCProvider,
     AsyncWeb3,
+    AutoProvider,
     Web3,
 )
 from web3._utils.module_testing.persistent_connection_provider import (
@@ -81,8 +82,17 @@ class TestGoEthereumDebugModuleTest(GoEthereumDebugModuleTest):
 
 class TestGoEthereumEthModuleTest(GoEthereumEthModuleTest):
     def test_auto_provider_batching(self, auto_w3: "Web3") -> None:
-        # test that batch_requests doesn't error out when using the auto provider
-        auto_w3.batch_requests()
+        with auto_w3.batch_requests() as batch:
+            assert isinstance(auto_w3.provider, AutoProvider)
+            assert auto_w3.provider._is_batching
+            assert auto_w3.provider._batching_context is not None
+            batch.add(auto_w3.eth.get_block("latest"))
+            batch.add(auto_w3.eth.get_block("earliest"))
+            batch.add(auto_w3.eth.get_block("pending"))
+            results = batch.execute()
+
+        assert not auto_w3.provider._is_batching
+        assert len(results) == 3
 
 
 class TestGoEthereumNetModuleTest(GoEthereumNetModuleTest):

{web3-7.12.0 → web3-7.12.1}/tests/integration/go_ethereum/test_goethereum_legacy_ws.py

@@ -33,8 +33,8 @@ def _geth_command_arguments(base_geth_command_arguments, geth_version):
             "--ipcdisable",
             "--allow-insecure-unlock",
         )
-        if geth_version.minor not in [13, 14, 15]:
-            # TODO: remove support for 1.13.x in next major version
+        if geth_version.minor not in [13, 14, 15, 16]:
+            # TODO: remove support for 13 + 14 in next major version
             raise AssertionError("Unsupported Geth version")
     else:
         raise AssertionError("Unsupported Geth version")

{web3-7.12.0 → web3-7.12.1}/tests/integration/go_ethereum/test_goethereum_ws/conftest.py

@@ -20,8 +20,8 @@ def _geth_command_arguments(base_geth_command_arguments, geth_version):
             "*",
             "--ipcdisable",
         )
-        if geth_version.minor not in [13, 14, 15]:
-            # TODO: remove support for 1.13.x in the next major release
+        if geth_version.minor not in [13, 14, 15, 16]:
+            # TODO: remove support for 13 + 14 in the next major release
             raise AssertionError("Unsupported Geth version")
     else:
         raise AssertionError("Unsupported Geth version")

{web3-7.12.0 → web3-7.12.1}/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-7.12.0 → web3-7.12.1}/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-7.12.0 → web3-7.12.1}/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-7.12.0 → web3-7.12.1}/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 → web3-7.12.1/web3.egg-info}/PKG-INFO

@@ -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 → web3-7.12.1}/web3.egg-info/SOURCES.txt

@@ -14,9 +14,11 @@ ens/contract_data.py
 ens/ens.py
 ens/exceptions.py
 ens/utils.py
+ens/specs/.DS_Store
 ens/specs/nf.json
 ens/specs/normalization_spec.json
 scripts/release/test_package.py
+tests/.DS_Store
 tests/__init__.py
 tests/conftest.py
 tests/utils.py
@@ -165,6 +167,7 @@ tests/core/web3-module/test_keccak.py
 tests/core/web3-module/test_providers.py
 tests/core/web3-module/test_strict_bytes_type_checking.py
 tests/core/web3-module/test_web3_inheritance.py
+tests/ens/.DS_Store
 tests/ens/conftest.py
 tests/ens/test_ens.py
 tests/ens/test_get_registry.py
@@ -177,10 +180,11 @@ tests/ens/test_utils.py
 tests/ens/test_wildcard_resolution.py
 tests/ens/normalization/normalization_tests.json
 tests/ens/normalization/test_normalize_name_ensip15.py
+tests/integration/.DS_Store
 tests/integration/README.md
 tests/integration/common.py
 tests/integration/conftest.py
-tests/integration/geth-1.15.11-fixture.zip
+tests/integration/geth-1.16.0-fixture.zip
 tests/integration/test_ethereum_tester.py
 tests/integration/generate_fixtures/common.py
 tests/integration/generate_fixtures/go_ethereum.py