web3 7.0.0b6__tar.gz → 7.0.0b7__tar.gz

{web3-7.0.0b6/web3.egg-info → web3-7.0.0b7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: web3
-Version: 7.0.0b6
+Version: 7.0.0b7
 Summary: web3: A Python library for interacting with Ethereum
 Home-page: https://github.com/ethereum/web3.py
 Author: The Ethereum Foundation
@@ -51,8 +51,9 @@ 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-tester[py-evm]<0.12.0b1,>=0.11.0b1; extra == "dev"
-Requires-Dist: py-geth>=4.1.0; 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: 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"
@@ -62,9 +63,10 @@ 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.12.0b1,>=0.11.0b1; extra == "test"
-Requires-Dist: py-geth>=4.1.0; 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: 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.0b6 → web3-7.0.0b7}/ens/__init__.py

@@ -1,5 +1,3 @@
-# flake8: noqa
-
 from .async_ens import (
     AsyncENS,
 )
@@ -18,3 +16,16 @@ from .exceptions import (
     UnderfundedBid,
     UnownedName,
 )
+
+__all__ = [
+    "AsyncENS",
+    "BaseENS",
+    "ENS",
+    "AddressMismatch",
+    "BidTooLow",
+    "InvalidLabel",
+    "InvalidName",
+    "UnauthorizedError",
+    "UnderfundedBid",
+    "UnownedName",
+]

{web3-7.0.0b6 → web3-7.0.0b7}/setup.py

@@ -25,10 +25,13 @@ 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": [
-        "eth-tester[py-evm]>=0.11.0b1,<0.12.0b1",
-        "py-geth>=4.1.0",
+        "eth-tester[py-evm]>=0.11.0b1,<0.13.0b1",
+        "py-geth>=5.0.0b1",
         "pytest-asyncio>=0.18.1,<0.23",
         "pytest-mock>=1.10",
         "pytest-xdist>=2.4.0",
@@ -48,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.6",
+    version="7.0.0-beta.7",
     description="""web3: A Python library for interacting with Ethereum""",
     long_description=long_description,
     long_description_content_type="text/markdown",

{web3-7.0.0b6 → web3-7.0.0b7}/tests/beacon/test_async_beacon.py

@@ -3,17 +3,14 @@ from random import (
     randint,
 )
 
+from aiohttp.client_exceptions import (
+    InvalidURL,
+)
 import pytest_asyncio
 
-from web3._utils.request import (
-    _async_session_cache,
-)
 from web3.beacon import (
     AsyncBeacon,
 )
-from web3.exceptions import (
-    Web3ValueError,
-)
 
 # tested against lighthouse which uses port 5052 by default
 BASE_URL = "http://localhost:5052"
@@ -27,20 +24,22 @@ def _assert_valid_response(response):
 
 @pytest.fixture
 def async_beacon():
-    return AsyncBeacon(base_url=BASE_URL)
+    return AsyncBeacon(base_url=BASE_URL, request_timeout=30.0)
 
 
 @pytest_asyncio.fixture(autouse=True)
-async def _cleanup():
+async def _cleanup(async_beacon):
     yield
-    [await session.close() for _, session in _async_session_cache.items()]
-    _async_session_cache.clear()
+    [
+        await session.close()
+        for _, session in async_beacon._request_session_manager.session_cache.items()
+    ]
 
 
 # sanity check to make sure the positive test cases are valid
 @pytest.mark.asyncio
 async def test_async_cl_beacon_raises_exception_on_invalid_url(async_beacon):
-    with pytest.raises(Web3ValueError):
+    with pytest.raises(InvalidURL):
         await async_beacon._async_make_get_request(
             BASE_URL + "/eth/v1/beacon/nonexistent"
         )

{web3-7.0.0b6 → web3-7.0.0b7}/tests/beacon/test_beacon.py

@@ -6,16 +6,13 @@ from random import (
 from requests import (
     Timeout,
 )
-
-from web3._utils.request import (
-    _session_cache,
+from requests.exceptions import (
+    InvalidURL,
 )
+
 from web3.beacon import (
     Beacon,
 )
-from web3.exceptions import (
-    Web3ValueError,
-)
 
 # tested against lighthouse which uses port 5052 by default
 BASE_URL = "http://localhost:5052"
@@ -32,15 +29,9 @@ def beacon():
     return Beacon(base_url=BASE_URL)
 
 
-@pytest.fixture(autouse=True)
-def _cleanup():
-    yield
-    _session_cache.clear()
-
-
 # sanity check to make sure the positive test cases are valid
 def test_cl_beacon_raises_exception_on_invalid_url(beacon):
-    with pytest.raises(Web3ValueError):
+    with pytest.raises(InvalidURL):
         beacon._make_get_request(BASE_URL + "/eth/v1/beacon/nonexistent")
 
 

{web3-7.0.0b6 → web3-7.0.0b7}/tests/core/conftest.py

@@ -119,7 +119,8 @@ def module_many_init_args():
 @pytest_asyncio.fixture
 async def async_w3():
     w3 = AsyncWeb3(AsyncEthereumTesterProvider())
-    w3.eth.default_account = await w3.eth.coinbase
+    accounts = await w3.eth.accounts
+    w3.eth.default_account = accounts[0]
     return w3
 
 
@@ -127,5 +128,6 @@ async def async_w3():
 async def async_w3_non_strict_abi():
     w3 = AsyncWeb3(AsyncEthereumTesterProvider())
     w3.strict_bytes_type_checking = False
-    w3.eth.default_account = await w3.eth.coinbase
+    accounts = await w3.eth.accounts
+    w3.eth.default_account = accounts[0]
     return w3

{web3-7.0.0b6 → web3-7.0.0b7}/tests/core/contracts/conftest.py

@@ -230,9 +230,7 @@ def event_contract(
     wait_for_block(w3)
 
     event_contract_factory = w3.eth.contract(**EVENT_CONTRACT_DATA)
-    deploy_txn_hash = event_contract_factory.constructor().transact(
-        {"from": w3.eth.coinbase, "gas": 1000000}
-    )
+    deploy_txn_hash = event_contract_factory.constructor().transact({"gas": 1000000})
     deploy_receipt = wait_for_transaction(w3, deploy_txn_hash)
     contract_address = address_conversion_func(deploy_receipt["contractAddress"])
 
@@ -251,7 +249,7 @@ def indexed_event_contract(
 
     indexed_event_contract_factory = w3.eth.contract(**INDEXED_EVENT_CONTRACT_DATA)
     deploy_txn_hash = indexed_event_contract_factory.constructor().transact(
-        {"from": w3.eth.coinbase, "gas": 1000000}
+        {"gas": 1000000}
     )
     deploy_receipt = wait_for_transaction(w3, deploy_txn_hash)
     contract_address = address_conversion_func(deploy_receipt["contractAddress"])

{web3-7.0.0b6 → web3-7.0.0b7}/tests/core/contracts/test_contract_constructor.py

@@ -218,10 +218,10 @@ def test_contract_constructor_build_transaction_no_constructor(
     w3, math_contract_factory, address_conversion_func
 ):
     txn_hash = math_contract_factory.constructor().transact(
-        {"from": address_conversion_func(w3.eth.accounts[0])}
+        {"from": address_conversion_func(w3.eth.default_account)}
     )
     txn = w3.eth.get_transaction(txn_hash)
-    nonce = w3.eth.get_transaction_count(w3.eth.coinbase)
+    nonce = w3.eth.get_transaction_count(w3.eth.default_account)
     unsent_txn = math_contract_factory.constructor().build_transaction({"nonce": nonce})
     assert txn["input"] == HexBytes(unsent_txn["data"])
 
@@ -235,10 +235,10 @@ def test_contract_constructor_build_transaction_without_arguments(
     w3, math_contract_factory, address_conversion_func
 ):
     txn_hash = math_contract_factory.constructor().transact(
-        {"from": address_conversion_func(w3.eth.accounts[0])}
+        {"from": address_conversion_func(w3.eth.default_account)}
     )
     txn = w3.eth.get_transaction(txn_hash)
-    nonce = w3.eth.get_transaction_count(w3.eth.coinbase)
+    nonce = w3.eth.get_transaction_count(w3.eth.default_account)
     unsent_txn = math_contract_factory.constructor().build_transaction({"nonce": nonce})
     assert txn["input"] == HexBytes(unsent_txn["data"])
 
@@ -266,9 +266,11 @@ def test_contract_constructor_build_transaction_with_arguments(
 ):
     txn_hash = non_strict_contract_with_constructor_args_factory.constructor(
         *constructor_args, **constructor_kwargs
-    ).transact({"from": address_conversion_func(w3_non_strict_abi.eth.accounts[0])})
+    ).transact({"from": address_conversion_func(w3_non_strict_abi.eth.default_account)})
     txn = w3_non_strict_abi.eth.get_transaction(txn_hash)
-    nonce = w3_non_strict_abi.eth.get_transaction_count(w3_non_strict_abi.eth.coinbase)
+    nonce = w3_non_strict_abi.eth.get_transaction_count(
+        w3_non_strict_abi.eth.default_account
+    )
     unsent_txn = non_strict_contract_with_constructor_args_factory.constructor(
         *constructor_args, **constructor_kwargs
     ).build_transaction({"nonce": nonce})
@@ -521,13 +523,11 @@ async def test_async_contract_constructor_build_transaction_to_field_error(
 async def test_async_contract_constructor_build_transaction_no_constructor(
     async_w3, async_math_contract_factory, address_conversion_func
 ):
-    async_w3_accounts = await async_w3.eth.accounts
     txn_hash = await async_math_contract_factory.constructor().transact(
-        {"from": address_conversion_func(async_w3_accounts[0])}
+        {"from": address_conversion_func(async_w3.eth.default_account)}
     )
     txn = await async_w3.eth.get_transaction(txn_hash)
-    async_w3_coinbase = await async_w3.eth.coinbase
-    nonce = await async_w3.eth.get_transaction_count(async_w3_coinbase)
+    nonce = await async_w3.eth.get_transaction_count(async_w3.eth.default_account)
     unsent_txn = await async_math_contract_factory.constructor().build_transaction(
         {"nonce": nonce}
     )
@@ -543,13 +543,11 @@ async def test_async_contract_constructor_build_transaction_no_constructor(
 async def test_async_contract_constructor_build_transaction_without_arguments(
     async_w3, async_math_contract_factory, address_conversion_func
 ):
-    async_w3_accounts = await async_w3.eth.accounts
     txn_hash = await async_math_contract_factory.constructor().transact(
-        {"from": address_conversion_func(async_w3_accounts[0])}
+        {"from": address_conversion_func(async_w3.eth.default_account)}
     )
     txn = await async_w3.eth.get_transaction(txn_hash)
-    async_w3_coinbase = await async_w3.eth.coinbase
-    nonce = await async_w3.eth.get_transaction_count(async_w3_coinbase)
+    nonce = await async_w3.eth.get_transaction_count(async_w3.eth.default_account)
     unsent_txn = await async_math_contract_factory.constructor().build_transaction(
         {"nonce": nonce}
     )
@@ -578,15 +576,21 @@ async def test_async_contract_constructor_build_transaction_with_arguments(
     constructor_kwargs,
     address_conversion_func,
 ):
-    async_w3_accounts = await async_w3_non_strict_abi.eth.accounts
     txn_hash = (
         await async_non_strict_constructor_with_args_contract_factory.constructor(
             *constructor_args, **constructor_kwargs
-        ).transact({"from": address_conversion_func(async_w3_accounts[0])})
+        ).transact(
+            {
+                "from": address_conversion_func(
+                    async_w3_non_strict_abi.eth.default_account
+                )
+            }
+        )
     )
     txn = await async_w3_non_strict_abi.eth.get_transaction(txn_hash)
-    async_w3_coinbase = await async_w3_non_strict_abi.eth.coinbase
-    nonce = await async_w3_non_strict_abi.eth.get_transaction_count(async_w3_coinbase)
+    nonce = await async_w3_non_strict_abi.eth.get_transaction_count(
+        async_w3_non_strict_abi.eth.default_account
+    )
     unsent_txn = (
         await async_non_strict_constructor_with_args_contract_factory.constructor(
             *constructor_args, **constructor_kwargs

{web3-7.0.0b6 → web3-7.0.0b7}/tests/core/contracts/test_contract_example.py

@@ -120,7 +120,8 @@ def async_eth_tester():
 @pytest_asyncio.fixture()
 async def async_w3():
     async_w3 = AsyncWeb3(AsyncEthereumTesterProvider())
-    async_w3.eth.default_account = await async_w3.eth.coinbase
+    accounts = await async_w3.eth.accounts
+    async_w3.eth.default_account = accounts[0]
     return async_w3
 
 
@@ -148,9 +149,6 @@ async def async_foo_contract(async_w3):
     #
     # }
 
-    async_eth_tester_accounts = await async_w3.eth.accounts
-    deploy_address = async_eth_tester_accounts[0]
-
     abi = """[{"anonymous":false,"inputs":[{"indexed":false,"name":"_bar","type":"string"}],"name":"barred","type":"event"},{"constant":false,"inputs":[{"name":"_bar","type":"string"}],"name":"setBar","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"inputs":[],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"constant":true,"inputs":[],"name":"bar","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"}]"""  # noqa: E501
     # This bytecode is the output of compiling with
     # solc version:0.5.3+commit.10d17f24.Emscripten.clang
@@ -161,13 +159,13 @@ async def async_foo_contract(async_w3):
     # issue a transaction to deploy the contract.
     tx_hash = await FooContract.constructor().transact(
         {
-            "from": deploy_address,
+            "from": async_w3.eth.default_account,
         }
     )
     # wait for the transaction to be mined
     tx_receipt = await async_w3.eth.wait_for_transaction_receipt(tx_hash, 180)
     # instantiate and return an instance of our contract.
-    return FooContract(tx_receipt.contractAddress)
+    return FooContract(tx_receipt["contractAddress"])
 
 
 @pytest.mark.asyncio
@@ -178,13 +176,11 @@ async def test_async_initial_greeting(async_foo_contract):
 
 @pytest.mark.asyncio
 async def test_async_can_update_greeting(async_w3, async_foo_contract):
-    async_eth_tester_accounts = await async_w3.eth.accounts
-    # send transaction that updates the greeting
     tx_hash = await async_foo_contract.functions.setBar(
         "testing contracts is easy",
     ).transact(
         {
-            "from": async_eth_tester_accounts[1],
+            "from": async_w3.eth.default_account,
         }
     )
     await async_w3.eth.wait_for_transaction_receipt(tx_hash, 180)
@@ -196,13 +192,12 @@ async def test_async_can_update_greeting(async_w3, async_foo_contract):
 
 @pytest.mark.asyncio
 async def test_async_updating_greeting_emits_event(async_w3, async_foo_contract):
-    async_eth_tester_accounts = await async_w3.eth.accounts
     # send transaction that updates the greeting
     tx_hash = await async_foo_contract.functions.setBar(
         "testing contracts is easy",
     ).transact(
         {
-            "from": async_eth_tester_accounts[1],
+            "from": async_w3.eth.default_account,
         }
     )
     receipt = await async_w3.eth.wait_for_transaction_receipt(tx_hash, 180)

{web3-7.0.0b6 → web3-7.0.0b7}/tests/core/contracts/test_contract_init.py

@@ -13,7 +13,9 @@ from web3.exceptions import (
 @pytest.fixture()
 def math_addr(math_contract_factory, address_conversion_func):
     w3 = math_contract_factory.w3
-    deploy_txn = math_contract_factory.constructor().transact({"from": w3.eth.coinbase})
+    deploy_txn = math_contract_factory.constructor().transact(
+        {"from": w3.eth.default_account}
+    )
     deploy_receipt = w3.eth.wait_for_transaction_receipt(deploy_txn)
     assert deploy_receipt is not None
     return address_conversion_func(deploy_receipt["contractAddress"])
@@ -28,7 +30,7 @@ def test_contract_with_unset_address(math_contract_factory):
 def test_contract_with_name_address(math_contract_factory, math_addr):
     with contract_ens_addresses(math_contract_factory, [("thedao.eth", math_addr)]):
         mc = math_contract_factory(address="thedao.eth")
-        caller = mc.w3.eth.coinbase
+        caller = mc.w3.eth.default_account
         assert mc.address == "thedao.eth"
         assert mc.functions.return13().call({"from": caller}) == 13
 
@@ -48,9 +50,8 @@ def test_contract_with_name_address_from_eth_contract(
             bytecode_runtime=math_contract_runtime,
         )
 
-        caller = mc.w3.eth.coinbase
         assert mc.address == "thedao.eth"
-        assert mc.functions.return13().call({"from": caller}) == 13
+        assert mc.functions.return13().call({"from": mc.w3.eth.default_account}) == 13
 
 
 def test_contract_with_name_address_changing(math_contract_factory, math_addr):
@@ -58,7 +59,7 @@ def test_contract_with_name_address_changing(math_contract_factory, math_addr):
     with contract_ens_addresses(math_contract_factory, [("thedao.eth", math_addr)]):
         mc = math_contract_factory(address="thedao.eth")
 
-    caller = mc.w3.eth.coinbase
+    caller = mc.w3.eth.default_account
     assert mc.address == "thedao.eth"
 
     # what happens when name returns no address at all

{web3-7.0.0b6 → web3-7.0.0b7}/tests/core/contracts/test_contract_transact_interface.py

@@ -89,7 +89,7 @@ def test_transacting_with_contract_with_arguments(
 
 
 def test_deploy_when_default_account_is_set(w3, string_contract_data):
-    w3.eth.default_account = w3.eth.accounts[1]
+    # default account for tests is set as the first account
     assert w3.eth.default_account is not empty
 
     StringContract = w3.eth.contract(**string_contract_data)
@@ -101,7 +101,7 @@ def test_deploy_when_default_account_is_set(w3, string_contract_data):
 
 
 def test_transact_when_default_account_is_set(w3, math_contract, transact):
-    w3.eth.default_account = w3.eth.accounts[1]
+    # default account for tests is set as the first account
     assert w3.eth.default_account is not empty
 
     txn_hash = transact(contract=math_contract, contract_function="incrementCounter")
@@ -392,8 +392,7 @@ async def test_async_transacting_with_contract_with_arguments(
 
 @pytest.mark.asyncio
 async def test_async_deploy_when_default_account_is_set(async_w3, string_contract_data):
-    async_w3_accounts = await async_w3.eth.accounts
-    async_w3.eth.default_account = async_w3_accounts[1]
+    # default account for tests is set as the first account
     assert async_w3.eth.default_account is not empty
 
     StringContract = async_w3.eth.contract(**string_contract_data)
@@ -408,8 +407,7 @@ async def test_async_deploy_when_default_account_is_set(async_w3, string_contrac
 async def test_async_transact_when_default_account_is_set(
     async_w3, async_math_contract, async_transact
 ):
-    async_w3_accounts = await async_w3.eth.accounts
-    async_w3.eth.default_account = async_w3_accounts[1]
+    # default account for tests is set as the first account
     assert async_w3.eth.default_account is not empty
 
     txn_hash = await async_transact(

{web3-7.0.0b6 → web3-7.0.0b7}/tests/core/contracts/test_extracting_event_data.py

@@ -1,6 +1,10 @@
+import copy
 import pytest
 import re
 
+from eth_abi.exceptions import (
+    InsufficientDataBytes,
+)
 from eth_utils import (
     is_same_address,
 )
@@ -1233,3 +1237,29 @@ def test_get_all_entries_with_nested_tuple_event_non_strict(
     assert log_entry.blockNumber == txn_receipt["blockNumber"]
     assert log_entry.transactionIndex == txn_receipt["transactionIndex"]
     assert is_same_address(log_entry.address, non_strict_emitter.address)
+
+
+def test_receipt_processing_catches_insufficientdatabytes_error_by_default(
+    w3, emitter, wait_for_transaction
+):
+    txn_hash = emitter.functions.logListArgs([b"13"], [b"54"]).transact()
+    txn_receipt = wait_for_transaction(w3, txn_hash)
+    event_instance = emitter.events.LogListArgs()
+
+    # web3 doesn't generate logs with non-standard lengths, so we have to do it manually
+    txn_receipt_dict = copy.deepcopy(txn_receipt)
+    txn_receipt_dict["logs"][0] = dict(txn_receipt_dict["logs"][0])
+    txn_receipt_dict["logs"][0]["data"] = txn_receipt_dict["logs"][0]["data"][:-8]
+
+    # WARN is default
+    assert len(event_instance.process_receipt(txn_receipt_dict)) == 0
+    assert len(event_instance.process_receipt(txn_receipt_dict, errors=WARN)) == 0
+    assert len(event_instance.process_receipt(txn_receipt_dict, errors=DISCARD)) == 0
+
+    # IGNORE includes the InsufficientDataBytes error in the log
+    assert len(event_instance.process_receipt(txn_receipt_dict, errors=IGNORE)) == 1
+
+    # STRICT raises an error to be caught
+    with pytest.raises(InsufficientDataBytes):
+        returned_log = event_instance.process_receipt(txn_receipt_dict, errors=STRICT)
+        assert len(returned_log) == 0

{web3-7.0.0b6 → web3-7.0.0b7}/tests/core/eth-module/test_accounts.py

@@ -27,6 +27,9 @@ from web3 import (
     AsyncWeb3,
     Web3,
 )
+from web3._utils.empty import (
+    Empty,
+)
 from web3.eth import (
     BaseEth,
 )
@@ -100,6 +103,10 @@ def w3():
     return Web3(EthereumTesterProvider())
 
 
+def test_eth_default_account_is_empty_by_default(w3):
+    assert isinstance(w3.eth.default_account, Empty)
+
+
 def test_eth_account_create_variation(acct):
     account1 = acct.create()
     account2 = acct.create()
@@ -132,7 +139,7 @@ def test_eth_account_from_key_seed_restrictions(acct):
 
 def test_eth_account_from_key_properties(acct, PRIVATE_BYTES):
     account = acct.from_key(PRIVATE_BYTES)
-    assert callable(account.signHash)
+    assert callable(account.unsafe_sign_hash)
     assert callable(account.sign_transaction)
     assert is_checksum_address(account.address)
     assert account.address == "0xa79F6f349C853F9Ea0B29636779ae3Cb4E3BA729"
@@ -141,7 +148,7 @@ def test_eth_account_from_key_properties(acct, PRIVATE_BYTES):
 
 def test_eth_account_create_properties(acct):
     account = acct.create()
-    assert callable(account.signHash)
+    assert callable(account.unsafe_sign_hash)
     assert callable(account.sign_transaction)
     assert is_checksum_address(account.address)
     assert isinstance(account.key, bytes) and len(account.key) == 32

{web3-7.0.0b6 → web3-7.0.0b7}/tests/core/eth-module/test_default_account_api.py

@@ -7,6 +7,8 @@ def wait_for_first_block(w3, wait_for_block):
 
 
 def test_uses_default_account_when_set(w3, wait_for_transaction):
+    current_default = w3.eth.default_account
+
     w3.eth.default_account = None
     assert w3.eth.default_account is None
 
@@ -25,6 +27,8 @@ def test_uses_default_account_when_set(w3, wait_for_transaction):
     txn = w3.eth.get_transaction(txn_hash)
     assert txn["from"] == w3.eth.accounts[3]
 
+    w3.eth.default_account = current_default
+
 
 def test_uses_given_from_address_when_provided(w3, wait_for_transaction):
     w3.eth.default_account = w3.eth.accounts[3]

{web3-7.0.0b6 → web3-7.0.0b7}/tests/core/eth-module/test_transactions.py

@@ -184,7 +184,7 @@ def test_unmined_transaction_wait_for_receipt(w3, request_mocker):
 
     txn_hash = w3.eth.send_transaction(
         {
-            "from": w3.eth.coinbase,
+            "from": w3.eth.default_account,
             "to": "0xd3CdA913deB6f67967B99D67aCDFa1712C293601",
             "value": 123457,
         }

{web3-7.0.0b6 → web3-7.0.0b7}/tests/core/filtering/conftest.py

@@ -64,13 +64,13 @@ def create_filter(request):
 # --- async --- #
 
 
-@pytest.fixture(
+@pytest_asyncio.fixture(
     scope="function",
     params=[True, False],
     ids=["LocalFilterMiddleware", "node_based_filter"],
 )
-def async_w3(request):
-    return _async_w3_fixture_logic(request)
+async def async_w3(request):
+    return await _async_w3_fixture_logic(request)
 
 
 @pytest.fixture

{web3-7.0.0b6 → web3-7.0.0b7}/tests/core/filtering/test_contract_data_filters.py

@@ -279,13 +279,13 @@ def event_loop():
     loop.close()
 
 
-@pytest.fixture(
+@pytest_asyncio.fixture(
     scope="module",
     params=[True, False],
     ids=["LocalFilterMiddleware", "node_based_filter"],
 )
-def async_w3(request):
-    return _async_w3_fixture_logic(request)
+async def async_w3(request):
+    return await _async_w3_fixture_logic(request)
 
 
 @pytest.fixture(scope="module")

{web3-7.0.0b6 → web3-7.0.0b7}/tests/core/filtering/test_contract_topic_filters.py

@@ -260,13 +260,13 @@ def event_loop():
     loop.close()
 
 
-@pytest.fixture(
+@pytest_asyncio.fixture(
     scope="module",
     params=[True, False],
     ids=["LocalFilterMiddleware", "node_based_filter"],
 )
-def async_w3(request):
-    return _async_w3_fixture_logic(request)
+async def async_w3(request):
+    return await _async_w3_fixture_logic(request)
 
 
 @pytest_asyncio.fixture(scope="module")

{web3-7.0.0b6 → web3-7.0.0b7}/tests/core/filtering/test_filter_against_pending_transactions.py

@@ -8,14 +8,14 @@ def test_sync_filter_against_pending_transactions(
     txn_filter = w3.eth.filter("pending")
     txn_1_hash = w3.eth.send_transaction(
         {
-            "from": w3.eth.coinbase,
+            "from": w3.eth.default_account,
             "to": "0xd3CdA913deB6f67967B99D67aCDFa1712C293601",
             "value": 12345,
         }
     )
     txn_2_hash = w3.eth.send_transaction(
         {
-            "from": w3.eth.coinbase,
+            "from": w3.eth.default_account,
             "to": "0xd3CdA913deB6f67967B99D67aCDFa1712C293601",
             "value": 54321,
         }
@@ -35,17 +35,16 @@ async def test_async_filter_against_pending_transactions(
     async_w3, async_wait_for_transaction
 ):
     txn_filter = await async_w3.eth.filter("pending")
-    async_w3_eth_coinbase = await async_w3.eth.coinbase
     txn_1_hash = await async_w3.eth.send_transaction(
         {
-            "from": async_w3_eth_coinbase,
+            "from": async_w3.eth.default_account,
             "to": "0xd3CdA913deB6f67967B99D67aCDFa1712C293601",
             "value": 12345,
         }
     )
     txn_2_hash = await async_w3.eth.send_transaction(
         {
-            "from": async_w3_eth_coinbase,
+            "from": async_w3.eth.default_account,
             "to": "0xd3CdA913deB6f67967B99D67aCDFa1712C293601",
             "value": 54321,
         }