web3 7.0.0b9__tar.gz → 7.1.0__tar.gz

{web3-7.0.0b9/web3.egg-info → web3-7.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: web3
-Version: 7.0.0b9
+Version: 7.1.0
 Summary: web3: A Python library for interacting with Ethereum
 Home-page: https://github.com/ethereum/web3.py
 Author: The Ethereum Foundation
@@ -20,13 +20,13 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8, <4
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiohttp>=3.7.4.post0
 Requires-Dist: eth-abi>=5.0.1
 Requires-Dist: eth-account>=0.13.1
 Requires-Dist: eth-hash[pycryptodome]>=0.5.1
-Requires-Dist: eth-typing>=5.0.0b3
-Requires-Dist: eth-utils>=5.0.0b1
+Requires-Dist: eth-typing>=5.0.0
+Requires-Dist: eth-utils>=5.0.0
 Requires-Dist: hexbytes>=1.2.0
+Requires-Dist: aiohttp>=3.7.4.post0
 Requires-Dist: pydantic>=2.4.0
 Requires-Dist: pywin32>=223; platform_system == "Windows"
 Requires-Dist: requests>=2.23.0
@@ -53,9 +53,8 @@ Requires-Dist: sphinx>=6.0.0; extra == "dev"
 Requires-Dist: sphinx-autobuild>=2021.3.14; extra == "dev"
 Requires-Dist: sphinx_rtd_theme>=1.0.0; extra == "dev"
 Requires-Dist: towncrier<22,>=21; extra == "dev"
-Requires-Dist: eth-account>=0.13.0; extra == "dev"
 Requires-Dist: eth-tester[py-evm]<0.13.0b1,>=0.11.0b1; extra == "dev"
-Requires-Dist: py-geth>=5.0.0b1; extra == "dev"
+Requires-Dist: py-geth>=5.0.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-xdist>=2.4.0; extra == "dev"
@@ -65,10 +64,9 @@ Requires-Dist: sphinx>=6.0.0; extra == "docs"
 Requires-Dist: sphinx-autobuild>=2021.3.14; extra == "docs"
 Requires-Dist: sphinx_rtd_theme>=1.0.0; extra == "docs"
 Requires-Dist: towncrier<22,>=21; extra == "docs"
-Requires-Dist: eth-account>=0.13.0; extra == "docs"
 Provides-Extra: test
 Requires-Dist: eth-tester[py-evm]<0.13.0b1,>=0.11.0b1; extra == "test"
-Requires-Dist: py-geth>=5.0.0b1; extra == "test"
+Requires-Dist: py-geth>=5.0.0; extra == "test"
 Requires-Dist: pytest-asyncio<0.23,>=0.18.1; extra == "test"
 Requires-Dist: pytest-mock>=1.10; extra == "test"
 Requires-Dist: pytest-xdist>=2.4.0; extra == "test"

{web3-7.0.0b9 → web3-7.1.0}/setup.py

@@ -26,13 +26,12 @@ extras_require = {
         "sphinx-autobuild>=2021.3.14",
         "sphinx_rtd_theme>=1.0.0",
         "towncrier>=21,<22",
-        # web3 will work but emit warnings with eth-account>=0.12.2,
-        # but doctests fail between 0.12.2 and 0.13.0
-        "eth-account>=0.13.0",
     ],
     "test": [
+        # Note: ethereum-maintained libraries in this list should be added to the
+        # `install_pre_releases.py` script.
         "eth-tester[py-evm]>=0.11.0b1,<0.13.0b1",
-        "py-geth>=5.0.0b1",
+        "py-geth>=5.0.0",
         "pytest-asyncio>=0.18.1,<0.23",
         "pytest-mock>=1.10",
         "pytest-xdist>=2.4.0",
@@ -52,7 +51,7 @@ with open("./README.md") as readme:
 setup(
     name="web3",
     # *IMPORTANT*: Don't manually change the version here. Use `make bump`, as described in readme
-    version="7.0.0-beta.9",
+    version="7.1.0",
     description="""web3: A Python library for interacting with Ethereum""",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -61,13 +60,15 @@ setup(
     url="https://github.com/ethereum/web3.py",
     include_package_data=True,
     install_requires=[
-        "aiohttp>=3.7.4.post0",
+        # Note: ethereum-maintained libraries in this list should be added to the
+        # `install_pre_releases.py` script.
         "eth-abi>=5.0.1",
         "eth-account>=0.13.1",
         "eth-hash[pycryptodome]>=0.5.1",
-        "eth-typing>=5.0.0b3",
-        "eth-utils>=5.0.0b1",
+        "eth-typing>=5.0.0",
+        "eth-utils>=5.0.0",
         "hexbytes>=1.2.0",
+        "aiohttp>=3.7.4.post0",
         "pydantic>=2.4.0",
         "pywin32>=223;platform_system=='Windows'",
         "requests>=2.23.0",

{web3-7.0.0b9 → web3-7.1.0}/tests/beacon/test_async_beacon.py

@@ -267,3 +267,16 @@ async def test_async_cl_node_get_version(async_beacon):
 async def test_async_cl_node_get_syncing(async_beacon):
     response = await async_beacon.get_syncing()
     _assert_valid_response(response)
+
+
+# Blob endpoint tests
+
+
+@pytest.mark.asyncio
+async def test_async_cl_node_get_blob_sidecars(async_beacon):
+    response = await async_beacon.get_blob_sidecars("head")
+    _assert_valid_response(response)
+
+    # test with indices
+    with_indices = await async_beacon.get_blob_sidecars("head", [0, 1])
+    _assert_valid_response(with_indices)

{web3-7.0.0b9 → web3-7.1.0}/tests/beacon/test_beacon.py

@@ -223,3 +223,15 @@ def test_cl_node_get_version(beacon):
 def test_cl_node_get_syncing(beacon):
     response = beacon.get_syncing()
     _assert_valid_response(response)
+
+
+# Blob endpoint tests
+
+
+def test_cl_node_get_blob_sidecars(beacon):
+    response = beacon.get_blob_sidecars("head")
+    _assert_valid_response(response)
+
+    # test with indices
+    with_indices = beacon.get_blob_sidecars("head", [0, 1])
+    _assert_valid_response(with_indices)

{web3-7.0.0b9 → web3-7.1.0}/tests/core/contracts/test_contract_build_transaction.py

@@ -53,6 +53,20 @@ def test_build_transaction_with_contract_no_arguments(
     }
 
 
+def test_build_transaction_with_contract_no_arguments_no_parens(
+    w3, math_contract, build_transaction
+):
+    txn = math_contract.functions.incrementCounter.build_transaction()
+    assert dissoc(txn, "gas") == {
+        "to": math_contract.address,
+        "data": "0x5b34b966",
+        "value": 0,
+        "maxFeePerGas": 2750000000,
+        "maxPriorityFeePerGas": 10**9,
+        "chainId": 131277322940537,
+    }
+
+
 def test_build_transaction_with_contract_fallback_function(
     w3, fallback_function_contract
 ):
@@ -309,6 +323,21 @@ async def test_async_build_transaction_with_contract_no_arguments(
     }
 
 
+@pytest.mark.asyncio
+async def test_async_build_transaction_with_contract_no_arguments_no_parens(
+    async_w3, async_math_contract, async_build_transaction
+):
+    txn = await async_math_contract.functions.incrementCounter.build_transaction()
+    assert dissoc(txn, "gas") == {
+        "to": async_math_contract.address,
+        "data": "0x5b34b966",
+        "value": 0,
+        "maxFeePerGas": 2750000000,
+        "maxPriorityFeePerGas": 10**9,
+        "chainId": 131277322940537,
+    }
+
+
 @pytest.mark.asyncio
 async def test_async_build_transaction_with_contract_fallback_function(
     async_w3, async_fallback_function_contract

{web3-7.0.0b9 → web3-7.1.0}/tests/core/contracts/test_contract_call_interface.py

@@ -145,6 +145,10 @@ def test_call_with_no_arguments(math_contract, call):
     assert result == 13
 
 
+def test_call_no_arguments_no_parens(math_contract):
+    assert math_contract.functions.return13.call() == 13
+
+
 def test_call_with_one_argument(math_contract, call):
     result = call(contract=math_contract, contract_function="multiply7", func_args=[3])
     assert result == 21
@@ -2287,6 +2291,12 @@ async def test_async_call_with_no_arguments(async_math_contract, call):
     assert result == 13
 
 
+@pytest.mark.asyncio
+async def test_async_call_with_no_arguments_no_parens(async_math_contract, call):
+    result = await async_math_contract.functions.return13.call()
+    assert result == 13
+
+
 @pytest.mark.asyncio
 async def test_async_call_with_one_argument(async_math_contract, call):
     result = await async_math_contract.functions.multiply7(3).call()

{web3-7.0.0b9 → web3-7.1.0}/tests/core/contracts/test_contract_estimate_gas.py

@@ -18,6 +18,19 @@ def test_contract_estimate_gas(w3, math_contract, estimate_gas, transact):
     assert abs(gas_estimate - gas_used) < 21000
 
 
+def test_estimate_gas_can_be_called_without_parens(
+    w3, math_contract, estimate_gas, transact
+):
+    gas_estimate = math_contract.functions.incrementCounter.estimate_gas()
+
+    txn_hash = transact(contract=math_contract, contract_function="incrementCounter")
+
+    txn_receipt = w3.eth.wait_for_transaction_receipt(txn_hash)
+    gas_used = txn_receipt.get("gasUsed")
+
+    assert abs(gas_estimate - gas_used) < 21000
+
+
 def test_contract_fallback_estimate_gas(w3, fallback_function_contract):
     gas_estimate = fallback_function_contract.fallback.estimate_gas()
 
@@ -197,6 +210,24 @@ async def test_async_estimate_gas_accepts_latest_block(
     assert abs(gas_estimate - gas_used) < 21000
 
 
+@pytest.mark.asyncio
+async def test_async_estimate_gas_can_be_called_without_parens(
+    async_w3, async_math_contract, async_transact
+):
+    gas_estimate = await async_math_contract.functions.counter.estimate_gas(
+        block_identifier="latest"
+    )
+
+    txn_hash = await async_transact(
+        contract=async_math_contract, contract_function="incrementCounter"
+    )
+
+    txn_receipt = await async_w3.eth.wait_for_transaction_receipt(txn_hash)
+    gas_used = txn_receipt.get("gasUsed")
+
+    assert abs(gas_estimate - gas_used) < 21000
+
+
 @pytest.mark.asyncio
 async def test_async_estimate_gas_block_identifier_unique_estimates(
     async_w3, async_math_contract, async_transact

{web3-7.0.0b9 → web3-7.1.0}/tests/core/contracts/test_contract_transact_interface.py

@@ -285,6 +285,17 @@ def test_receive_contract_with_fallback_function(receive_function_contract, call
     assert final_value == "receive"
 
 
+def test_contract_can_transact_without_fn_parens(w3, math_contract, call):
+    initial_value = call(contract=math_contract, contract_function="counter")
+    txn_hash = math_contract.functions.incrementCounter.transact()
+    txn_receipt = w3.eth.wait_for_transaction_receipt(txn_hash)
+    assert txn_receipt is not None
+
+    final_value = call(contract=math_contract, contract_function="counter")
+
+    assert final_value - initial_value == 1
+
+
 @pytest.mark.asyncio
 async def test_async_transacting_with_contract_no_arguments(
     async_w3, async_math_contract, async_transact, async_call
@@ -306,6 +317,25 @@ async def test_async_transacting_with_contract_no_arguments(
     assert final_value - initial_value == 1
 
 
+@pytest.mark.asyncio
+async def test_async_transacting_with_contract_no_arguments_no_parens(
+    async_w3, async_math_contract, async_transact, async_call
+):
+    initial_value = await async_call(
+        contract=async_math_contract, contract_function="counter"
+    )
+
+    txn_hash = await async_math_contract.functions.incrementCounter.transact()
+    txn_receipt = await async_w3.eth.wait_for_transaction_receipt(txn_hash)
+    assert txn_receipt is not None
+
+    final_value = await async_call(
+        contract=async_math_contract, contract_function="counter"
+    )
+
+    assert final_value - initial_value == 1
+
+
 @pytest.mark.asyncio
 async def test_async_transact_not_sending_ether_to_nonpayable_function(
     async_w3, async_payable_tester_contract, async_transact, async_call

web3-7.1.0/tests/core/middleware/test_middleware.py

@@ -0,0 +1,81 @@
+import pytest
+
+from web3 import (
+    Web3,
+)
+from web3.exceptions import (
+    Web3ValueError,
+)
+from web3.middleware import (
+    FormattingMiddlewareBuilder,
+    Web3Middleware,
+)
+
+
+class TestMiddleware(Web3Middleware):
+    def response_processor(self, method, response):
+        if method == "eth_blockNumber":
+            response["result"] = 1234
+
+        return response
+
+
+class TestMiddleware2(Web3Middleware):
+    def response_processor(self, method, response):
+        if method == "eth_blockNumber":
+            response["result"] = 4321
+
+        return response
+
+
+def test_middleware_class_eq_magic_method():
+    w3_a = Web3()
+    w3_b = Web3()
+
+    mw1w3_a = TestMiddleware(w3_a)
+    assert mw1w3_a is not None
+    assert mw1w3_a != ""
+
+    mw1w3_a_equal = TestMiddleware(w3_a)
+    assert mw1w3_a == mw1w3_a_equal
+
+    mw2w3_a = TestMiddleware2(w3_a)
+    mw1w3_b = TestMiddleware(w3_b)
+    assert mw1w3_a != mw2w3_a
+    assert mw1w3_a != mw1w3_b
+
+
+def test_unnamed_middleware_are_given_unique_keys(w3):
+    request_formatting_middleware = FormattingMiddlewareBuilder.build(
+        request_formatters={lambda x: x}
+    )
+    request_formatting_middleware2 = FormattingMiddlewareBuilder.build(
+        request_formatters={lambda x: x if x else None}
+    )
+    result_formatting_middleware = FormattingMiddlewareBuilder.build(
+        result_formatters={lambda x: x}
+    )
+    error_formatting_middleware = FormattingMiddlewareBuilder.build(
+        error_formatters={lambda x: x}
+    )
+
+    # adding different middleware should not cause an error
+    w3.middleware_onion.add(request_formatting_middleware)
+    w3.middleware_onion.add(request_formatting_middleware2)
+    w3.middleware_onion.add(result_formatting_middleware)
+    w3.middleware_onion.add(error_formatting_middleware)
+    assert isinstance(w3.eth.block_number, int)
+
+    with pytest.raises(Web3ValueError):
+        # adding the same middleware again should cause an error
+        w3.middleware_onion.add(request_formatting_middleware)
+
+
+def test_unnamed_class_middleware_are_given_unique_keys(w3):
+    w3.middleware_onion.add(TestMiddleware)
+    w3.middleware_onion.add(TestMiddleware2)
+    assert isinstance(w3.eth.block_number, int)
+
+    with pytest.raises(Web3ValueError):
+        # adding the same middleware again should cause an error
+        w3.middleware_onion.add(TestMiddleware)

{web3-7.0.0b9 → web3-7.1.0}/tests/core/test_library_files.py

@@ -11,9 +11,7 @@ DEFAULT_EXCEPTIONS = (
 
 def test_no_default_exceptions_are_raised_within_web3py():
     for root, dirs, files in os.walk(WEB3_PATH):
-        if "module_testing" in dirs:
-            dirs.remove("module_testing")
-            continue
+        [dirs.remove(dir_) for dir_ in dirs if dir_ in ("scripts", "module_testing")]
         for file in files:
             if file.endswith(".py"):
                 file_path = os.path.join(root, file)

{web3-7.0.0b9 → web3-7.1.0}/tests/integration/generate_fixtures/go_ethereum.py

@@ -2,10 +2,10 @@ import contextlib
 import json
 import os
 import pprint
+import re
 import shutil
 import socket
 import subprocess
-import sys
 import time
 
 import common
@@ -361,6 +361,32 @@ def setup_chain_state(w3):
     return geth_fixture
 
 
+def update_circleci_geth_version(new_version):
+    file_path = "./.circleci/config.yml"
+    with open(file_path) as file:
+        lines = file.readlines()
+
+    replaced = False
+    for i, line in enumerate(lines):
+        if "geth_version:" in line:
+            if "default:" in lines[i + 1]:
+                lines[i + 1] = f'    default: "{new_version}"\n'
+                replaced = True
+                break
+
+    if not replaced:
+        raise ValueError("`geth_version` for circleci not found / replaced.")
+
+    with open(file_path, "w") as file:
+        file.writelines(lines)
+    print(f"Updated geth_version to {new_version}")
+
+
 if __name__ == "__main__":
-    fixture_dir = sys.argv[1]
-    generate_go_ethereum_fixture(fixture_dir)
+    geth_binary = os.environ.get("GETH_BINARY", None)
+    if not geth_binary:
+        raise ValueError("GETH_BINARY not set. Cannot generate geth fixture.")
+
+    geth_version = re.search(r"geth-v([\d.]+)/", geth_binary).group(1)
+    generate_go_ethereum_fixture(f"./tests/integration/geth-{geth_version}-fixture")
+    update_circleci_geth_version(geth_version)

{web3-7.0.0b9 → web3-7.1.0}/web3/beacon/api_endpoints.py

@@ -26,6 +26,9 @@ GET_BLINDED_BLOCKS = "/eth/v1/beacon/blinded_blocks/{0}"
 # rewards
 GET_REWARDS = "/eth/v1/beacon/rewards/blocks/{0}"
 
+# blobs
+GET_BLOB_SIDECARS = "/eth/v1/beacon/blob_sidecars/{0}"
+
 # light client
 GET_LIGHT_CLIENT_BOOTSTRAP_STRUCTURE = "/eth/v1/beacon/light_client/bootstrap/{0}"
 GET_LIGHT_CLIENT_UPDATES = "/eth/v1/beacon/light_client/updates"

{web3-7.0.0b9 → web3-7.1.0}/web3/beacon/async_beacon.py

@@ -1,6 +1,8 @@
 from typing import (
     Any,
     Dict,
+    List,
+    Optional,
 )
 
 from eth_typing import (
@@ -17,6 +19,7 @@ from web3.beacon.api_endpoints import (
     GET_BEACON_HEADS,
     GET_BEACON_STATE,
     GET_BLINDED_BLOCKS,
+    GET_BLOB_SIDECARS,
     GET_BLOCK,
     GET_BLOCK_ATTESTATIONS,
     GET_BLOCK_HEADER,
@@ -64,10 +67,12 @@ class AsyncBeacon:
         self.request_timeout = request_timeout
         self._request_session_manager = HTTPSessionManager()
 
-    async def _async_make_get_request(self, endpoint_uri: str) -> Dict[str, Any]:
+    async def _async_make_get_request(
+        self, endpoint_uri: str, params: Optional[Dict[str, str]] = None
+    ) -> Dict[str, Any]:
         uri = URI(self.base_url + endpoint_uri)
         return await self._request_session_manager.async_json_make_get_request(
-            uri, timeout=self.request_timeout
+            uri, params=params, timeout=self.request_timeout
         )
 
     # [ BEACON endpoints ]
@@ -220,3 +225,14 @@ class AsyncBeacon:
 
     async def get_syncing(self) -> Dict[str, Any]:
         return await self._async_make_get_request(GET_SYNCING)
+
+    # [ BLOB endpoints ]
+
+    async def get_blob_sidecars(
+        self, block_id: str, indices: Optional[List[int]] = None
+    ) -> Dict[str, Any]:
+        indices_param = {"indices": ",".join(map(str, indices))} if indices else None
+        return await self._async_make_get_request(
+            GET_BLOB_SIDECARS.format(block_id),
+            params=indices_param,
+        )

{web3-7.0.0b9 → web3-7.1.0}/web3/beacon/beacon.py

@@ -1,6 +1,8 @@
 from typing import (
     Any,
     Dict,
+    List,
+    Optional,
 )
 
 from eth_typing import (
@@ -17,6 +19,7 @@ from web3.beacon.api_endpoints import (
     GET_BEACON_HEADS,
     GET_BEACON_STATE,
     GET_BLINDED_BLOCKS,
+    GET_BLOB_SIDECARS,
     GET_BLOCK,
     GET_BLOCK_ATTESTATIONS,
     GET_BLOCK_HEADER,
@@ -62,10 +65,12 @@ class Beacon:
         self.request_timeout = request_timeout
         self._request_session_manager = HTTPSessionManager()
 
-    def _make_get_request(self, endpoint_url: str) -> Dict[str, Any]:
+    def _make_get_request(
+        self, endpoint_url: str, params: Optional[Dict[str, str]] = None
+    ) -> Dict[str, Any]:
         uri = URI(self.base_url + endpoint_url)
         return self._request_session_manager.json_make_get_request(
-            uri, timeout=self.request_timeout
+            uri, params=params, timeout=self.request_timeout
         )
 
     # [ BEACON endpoints ]
@@ -206,3 +211,14 @@ class Beacon:
 
     def get_syncing(self) -> Dict[str, Any]:
         return self._make_get_request(GET_SYNCING)
+
+    # [ BLOB endpoints ]
+
+    def get_blob_sidecars(
+        self, block_id: str, indices: Optional[List[int]] = None
+    ) -> Dict[str, Any]:
+        indices_param = {"indices": ",".join(map(str, indices))} if indices else None
+        return self._make_get_request(
+            GET_BLOB_SIDECARS.format(block_id),
+            params=indices_param,
+        )

{web3-7.0.0b9 → web3-7.1.0}/web3/contract/async_contract.py

@@ -319,8 +319,8 @@ class AsyncContractFunction(BaseContractFunction):
             state_override,
             ccip_read_enabled,
             self.decode_tuples,
-            *self.args,
-            **self.kwargs,
+            *self.args or (),
+            **self.kwargs or {},
         )
 
     async def transact(self, transaction: Optional[TxParams] = None) -> HexBytes:
@@ -332,8 +332,8 @@ class AsyncContractFunction(BaseContractFunction):
             setup_transaction,
             self.contract_abi,
             self.abi,
-            *self.args,
-            **self.kwargs,
+            *self.args or (),
+            **self.kwargs or {},
         )
 
     async def estimate_gas(
@@ -352,8 +352,8 @@ class AsyncContractFunction(BaseContractFunction):
             self.abi,
             block_identifier,
             state_override,
-            *self.args,
-            **self.kwargs,
+            *self.args or (),
+            **self.kwargs or {},
         )
 
     async def build_transaction(
@@ -367,8 +367,8 @@ class AsyncContractFunction(BaseContractFunction):
             built_transaction,
             self.contract_abi,
             self.abi,
-            *self.args,
-            **self.kwargs,
+            *self.args or (),
+            **self.kwargs or {},
         )
 
     @staticmethod

{web3-7.0.0b9 → web3-7.1.0}/web3/contract/contract.py

@@ -318,12 +318,13 @@ class ContractFunction(BaseContractFunction):
             state_override,
             ccip_read_enabled,
             self.decode_tuples,
-            *self.args,
-            **self.kwargs,
+            *self.args or (),
+            **self.kwargs or {},
         )
 
     def transact(self, transaction: Optional[TxParams] = None) -> HexBytes:
         setup_transaction = self._transact(transaction)
+
         return transact_with_contract_function(
             self.address,
             self.w3,
@@ -331,8 +332,8 @@ class ContractFunction(BaseContractFunction):
             setup_transaction,
             self.contract_abi,
             self.abi,
-            *self.args,
-            **self.kwargs,
+            *self.args or (),
+            **self.kwargs or {},
         )
 
     def estimate_gas(
@@ -351,12 +352,13 @@ class ContractFunction(BaseContractFunction):
             self.abi,
             block_identifier,
             state_override,
-            *self.args,
-            **self.kwargs,
+            *self.args or (),
+            **self.kwargs or {},
         )
 
     def build_transaction(self, transaction: Optional[TxParams] = None) -> TxParams:
         built_transaction = self._build_transaction(transaction)
+
         return build_transaction_for_function(
             self.address,
             self.w3,
@@ -364,8 +366,8 @@ class ContractFunction(BaseContractFunction):
             built_transaction,
             self.contract_abi,
             self.abi,
-            *self.args,
-            **self.kwargs,
+            *self.args or (),
+            **self.kwargs or {},
         )
 
     @staticmethod