web3 7.4.0__tar.gz → 7.5.0__tar.gz

{web3-7.4.0/web3.egg-info → web3-7.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: web3
-Version: 7.4.0
+Version: 7.5.0
 Summary: web3: A Python library for interacting with Ethereum
 Home-page: https://github.com/ethereum/web3.py
 Author: The Ethereum Foundation
@@ -17,6 +17,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.8, <4
 Description-Content-Type: text/markdown
 License-File: LICENSE

{web3-7.4.0 → web3-7.5.0}/setup.py

@@ -55,7 +55,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.4.0",
+    version="7.5.0",
     description="""web3: A Python library for interacting with Ethereum""",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -100,5 +100,6 @@ setup(
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
     ],
 )

{web3-7.4.0 → web3-7.5.0}/tests/core/contracts/conftest.py

@@ -217,6 +217,28 @@ def non_strict_emitter(
     return emitter_contract
 
 
+@pytest.fixture
+def emitter(
+    w3,
+    emitter_contract_data,
+    wait_for_transaction,
+    wait_for_block,
+    address_conversion_func,
+):
+    emitter_contract_factory = w3.eth.contract(**emitter_contract_data)
+
+    wait_for_block(w3)
+    deploy_txn_hash = emitter_contract_factory.constructor().transact({"gas": 30029121})
+    deploy_receipt = wait_for_transaction(w3, deploy_txn_hash)
+    contract_address = address_conversion_func(deploy_receipt["contractAddress"])
+
+    bytecode = w3.eth.get_code(contract_address)
+    assert bytecode == emitter_contract_factory.bytecode_runtime
+    _emitter = emitter_contract_factory(address=contract_address)
+    assert _emitter.address == contract_address
+    return _emitter
+
+
 # --- event contract --- #
 
 
@@ -760,3 +782,27 @@ def async_call(request):
 @pytest.fixture
 def async_estimate_gas(request):
     return async_partial(async_invoke_contract, api_call_desig="estimate_gas")
+
+
+@pytest_asyncio.fixture
+async def async_emitter(
+    async_w3,
+    emitter_contract_data,
+    async_wait_for_transaction,
+    async_wait_for_block,
+    address_conversion_func,
+):
+    async_emitter_contract_factory = async_w3.eth.contract(**emitter_contract_data)
+
+    await async_wait_for_block(async_w3)
+    deploy_txn_hash = await async_emitter_contract_factory.constructor().transact(
+        {"gas": 10000000}
+    )
+    deploy_receipt = await async_wait_for_transaction(async_w3, deploy_txn_hash)
+    contract_address = address_conversion_func(deploy_receipt["contractAddress"])
+
+    bytecode = await async_w3.eth.get_code(contract_address)
+    assert bytecode == async_emitter_contract_factory.bytecode_runtime
+    _emitter = async_emitter_contract_factory(address=contract_address)
+    assert _emitter.address == contract_address
+    return _emitter

{web3-7.4.0 → web3-7.5.0}/tests/core/contracts/test_contract_ambiguous_functions.py

@@ -133,6 +133,53 @@ def test_find_or_get_functions_by_type(w3, method, args, repr_func, expected):
     assert repr_func(function) == expected
 
 
+def test_get_function_by_name(w3):
+    FUNCTION_NAME_OVERLAP_ABI = [
+        {
+            "anonymous": False,
+            "inputs": [],
+            "name": "increment",
+            "type": "function",
+        },
+        {
+            "anonymous": False,
+            "inputs": [],
+            "name": "incrementCount",
+            "type": "function",
+        },
+    ]
+    contract = w3.eth.contract(abi=FUNCTION_NAME_OVERLAP_ABI)
+
+    increment_func = contract.get_function_by_name("increment")
+    increment_count_func = contract.get_function_by_name("incrementCount")
+    assert repr(increment_func) == "<Function increment()>"
+    assert repr(increment_count_func) == "<Function incrementCount()>"
+
+
+def test_get_event_by_name(w3):
+    EVENT_NAME_OVERLAP_ABI = [
+        {
+            "anonymous": False,
+            "inputs": [],
+            "name": "Deposit",
+            "type": "event",
+        },
+        {
+            "anonymous": False,
+            "inputs": [],
+            "name": "Deposited",
+            "type": "event",
+        },
+    ]
+    contract = w3.eth.contract(abi=EVENT_NAME_OVERLAP_ABI)
+
+    deposit_event = contract.get_event_by_name("Deposit")
+    deposited_event = contract.get_event_by_name("Deposited")
+
+    assert repr(deposit_event) == "<Event Deposit()>"
+    assert repr(deposited_event) == "<Event Deposited()>"
+
+
 @pytest.mark.parametrize(
     "method,args,expected_message,expected_error",
     (

web3-7.5.0/tests/core/contracts/test_contract_events.py

@@ -0,0 +1,145 @@
+import pytest
+from typing import (
+    Any,
+    Callable,
+    Sequence,
+)
+
+from eth_typing import (
+    ABIEvent,
+)
+from eth_utils.toolz import (
+    compose,
+    curry,
+)
+
+from web3 import (
+    Web3,
+)
+from web3.contract.async_contract import (
+    AsyncContractEvent,
+)
+from web3.contract.contract import (
+    Contract,
+    ContractEvent,
+)
+
+map_repr = compose(list, curry(map, repr))
+
+
+@pytest.mark.parametrize(
+    "method,args,repr_func,expected",
+    (
+        (
+            "all_events",
+            (),
+            map_repr,
+            [
+                "<Event LogSingleArg(uint256)>",
+                "<Event LogSingleWithIndex(uint256)>",
+            ],
+        ),
+        (
+            "get_event_by_signature",
+            ("LogSingleArg(uint256)",),
+            repr,
+            "<Event LogSingleArg(uint256)>",
+        ),
+        (
+            "find_events_by_name",
+            ("LogSingleArg",),
+            map_repr,
+            [
+                "<Event LogSingleArg(uint256)>",
+            ],
+        ),
+        (
+            "get_event_by_name",
+            ("LogSingleArg",),
+            repr,
+            "<Event LogSingleArg(uint256)>",
+        ),
+        (
+            "find_events_by_selector",
+            (
+                b"\xf7\x0f\xe6\x89\xe2\x90\xd8\xce+*8\x8a\xc2\x8d\xb3o\xbb\x0e\x16\xa6\xd8\x9ch\x04\xc4a\xf6Z\x1b@\xbb\x15",  # noqa: E501
+            ),
+            map_repr,
+            [
+                "<Event LogSingleWithIndex(uint256)>",
+            ],
+        ),
+        (
+            "get_event_by_selector",
+            (
+                b"\xf7\x0f\xe6\x89\xe2\x90\xd8\xce+*8\x8a\xc2\x8d\xb3o\xbb\x0e\x16\xa6\xd8\x9ch\x04\xc4a\xf6Z\x1b@\xbb\x15",  # noqa: E501
+            ),
+            repr,
+            "<Event LogSingleWithIndex(uint256)>",
+        ),
+        (
+            "get_event_by_selector",
+            (0xF70FE689E290D8CE2B2A388AC28DB36FBB0E16A6D89C6804C461F65A1B40BB15,),
+            repr,
+            "<Event LogSingleWithIndex(uint256)>",
+        ),
+        (
+            "get_event_by_selector",
+            ("0xf70fe689e290d8ce2b2a388ac28db36fbb0e16a6d89c6804c461f65a1b40bb15",),
+            repr,
+            "<Event LogSingleWithIndex(uint256)>",
+        ),
+        (
+            "get_event_by_topic",
+            ("0x56d2ef3c5228bf5d88573621e325a4672ab50e033749a601e4f4a5e1dce905d4",),
+            repr,
+            "<Event LogSingleArg(uint256)>",
+        ),
+    ),
+)
+def test_find_or_get_events_by_type(
+    w3: "Web3",
+    method: str,
+    args: Sequence[str],
+    repr_func: Callable[[Any], str],
+    expected: str,
+    event_contract: "Contract",
+) -> None:
+    contract = w3.eth.contract(abi=event_contract.abi)
+    contract_event = getattr(contract, method)(*args)
+    assert repr_func(contract_event) == expected
+
+
+def test_find_events_by_identifier(w3: "Web3", event_contract: "Contract") -> None:
+    def callable_check(event_abi: ABIEvent) -> bool:
+        return event_abi["name"] == "LogSingleArg"
+
+    contract_events = event_contract.find_events_by_identifier(
+        event_contract.abi, w3, event_contract.address, callable_check
+    )
+    assert [repr(evt) for evt in contract_events] == ["<Event LogSingleArg(uint256)>"]
+
+
+def test_get_event_by_identifier(w3: "Web3", event_contract: "Contract") -> None:
+    contract_event = event_contract.get_event_by_identifier(
+        [event_contract.events.LogSingleArg], "LogSingleArg"
+    )
+    assert repr(contract_event) == "<Event LogSingleArg(uint256)>"
+
+
+def test_events_iterator(math_contract):
+    all_events = math_contract.all_events()
+    events_iter = math_contract.events
+
+    for event, expected_event in zip(iter(events_iter), all_events):
+        assert isinstance(event, ContractEvent)
+        assert event.name == expected_event.name
+
+
+def test_async_events_iterator(async_math_contract):
+    all_events = async_math_contract.all_events()
+    events_iter = async_math_contract.events
+
+    for event, expected_event in zip(iter(events_iter), all_events):
+        assert isinstance(event, AsyncContractEvent)
+        assert event.name == expected_event.name

{web3-7.4.0 → web3-7.5.0}/tests/core/contracts/test_extracting_event_data.py

@@ -40,28 +40,6 @@ def dup_txn_receipt(w3, indexed_event_contract, wait_for_transaction, event_cont
     return wait_for_transaction(w3, dup_txn_hash)
 
 
-@pytest.fixture
-def emitter(
-    w3,
-    emitter_contract_data,
-    wait_for_transaction,
-    wait_for_block,
-    address_conversion_func,
-):
-    emitter_contract_factory = w3.eth.contract(**emitter_contract_data)
-
-    wait_for_block(w3)
-    deploy_txn_hash = emitter_contract_factory.constructor().transact({"gas": 30029121})
-    deploy_receipt = wait_for_transaction(w3, deploy_txn_hash)
-    contract_address = address_conversion_func(deploy_receipt["contractAddress"])
-
-    bytecode = w3.eth.get_code(contract_address)
-    assert bytecode == emitter_contract_factory.bytecode_runtime
-    _emitter = emitter_contract_factory(address=contract_address)
-    assert _emitter.address == contract_address
-    return _emitter
-
-
 @pytest.mark.parametrize(
     "contract_fn,event_name,call_args,expected_args",
     (
@@ -128,7 +106,7 @@ def test_event_data_extraction(
     assert len(txn_receipt["logs"]) == 1
     log_entry = txn_receipt["logs"][0]
 
-    event_abi = emitter._get_event_abi(event_name)
+    event_abi = emitter.get_event_by_name(event_name).abi
 
     event_topic = getattr(emitter_contract_log_topics, event_name)
     is_anonymous = event_abi["anonymous"]
@@ -335,7 +313,7 @@ def test_event_data_extraction_bytes(
     log_entry = txn_receipt["logs"][0]
 
     event_name = "LogListArgs"
-    event_abi = emitter._get_event_abi(event_name)
+    event_abi = emitter.get_event_by_name(event_name).abi
 
     event_topic = getattr(emitter_contract_log_topics, event_name)
 
@@ -386,7 +364,7 @@ def test_event_data_extraction_bytes_non_strict(
     log_entry = txn_receipt["logs"][0]
 
     event_name = "LogListArgs"
-    event_abi = non_strict_emitter._get_event_abi(event_name)
+    event_abi = non_strict_emitter.get_event_by_name(event_name).abi
 
     event_topic = getattr(emitter_contract_log_topics, event_name)
 
@@ -431,7 +409,7 @@ def test_dynamic_length_argument_extraction(
     assert len(txn_receipt["logs"]) == 1
     log_entry = txn_receipt["logs"][0]
 
-    event_abi = emitter._get_event_abi("LogDynamicArgs")
+    event_abi = emitter.get_event_by_name("LogDynamicArgs").abi
 
     event_topic = emitter_contract_log_topics.LogDynamicArgs
     assert event_topic in log_entry["topics"]
@@ -466,7 +444,7 @@ def test_argument_extraction_strict_bytes_types(
     log_entry = txn_receipt["logs"][0]
     assert len(log_entry["topics"]) == 2
 
-    event_abi = emitter._get_event_abi("LogListArgs")
+    event_abi = emitter.get_event_by_name("LogListArgs").abi
 
     event_topic = emitter_contract_log_topics.LogListArgs
     assert event_topic in log_entry["topics"]
@@ -548,11 +526,88 @@ def test_contract_event_get_logs_sorted_by_log_index(w3, emitter, request_mocker
         logs = emitter.events.LogNoArguments().get_logs()
 
         sorted_logs = sorted(
-            emitter.events.LogNoArguments().get_logs(),
+            emitter.events.LogNoArguments.get_logs(),
             key=lambda log: log["logIndex"],
         )
         sorted_logs = sorted(
-            emitter.events.LogNoArguments().get_logs(),
+            emitter.events.LogNoArguments.get_logs(),
+            key=lambda log: log["blockNumber"],
+        )
+
+    assert len(logs) == 4
+    assert logs == sorted_logs
+
+
+@pytest.mark.asyncio
+async def test_async_contract_event_get_logs_sorted_by_log_index(
+    async_w3, async_emitter, request_mocker
+):
+    get_logs_response = [
+        {
+            "type": "mined",
+            "logIndex": 10,
+            "transactionIndex": 0,
+            "transactionHash": "0xaef7f312d863780b861d8c38984b2a33f77e9508810735e2b042143f7f189f83",  # noqa: E501
+            "blockHash": "0x2200ec3324fdaca4ee2f4629489d2d06fb28108dae61b63b84ef39702e2b64e7",  # noqa: E501
+            "blockNumber": 3,
+            "address": "0xF2E246BB76DF876Cef8b38ae84130F4F55De395b",
+            "data": "0x",
+            "topics": [
+                "0x1e86022f78f8d04f8e3dfd13a2bdb280403e6632877c0dbee5e4eeb259908a5c"
+            ],
+        },
+        {
+            "type": "mined",
+            "logIndex": 0,
+            "transactionIndex": 0,
+            "transactionHash": "0x61e57bb1b5af14ca1b0964a84fb640bf39927961f26311a6450475a749e00cbb",  # noqa: E501
+            "blockHash": "0x73dd9a3b0f581689ebd67adea0debe05672a334c723379dc506fb71a666c1754",  # noqa: E501
+            "blockNumber": 4,
+            "address": "0xF2E246BB76DF876Cef8b38ae84130F4F55De395b",
+            "data": "0x",
+            "topics": [
+                "0x1e86022f78f8d04f8e3dfd13a2bdb280403e6632877c0dbee5e4eeb259908a5c"
+            ],
+        },
+        {
+            "type": "mined",
+            "logIndex": 123,
+            "transactionIndex": 0,
+            "transactionHash": "0x61e57bb1b5af14ca1b0964a84fb640bf39927961f26311a6450475a749e00cbb",  # noqa: E501
+            "blockHash": "0x73dd9a3b0f581689ebd67adea0debe05672a334c723379dc506fb71a666c1754",  # noqa: E501
+            "blockNumber": 1,
+            "address": "0xF2E246BB76DF876Cef8b38ae84130F4F55De395b",
+            "data": "0x",
+            "topics": [
+                "0x1e86022f78f8d04f8e3dfd13a2bdb280403e6632877c0dbee5e4eeb259908a5c"
+            ],
+        },
+        {
+            "type": "mined",
+            "logIndex": 54,
+            "transactionIndex": 0,
+            "transactionHash": "0x61e57bb1b5af14ca1b0964a84fb640bf39927961f26311a6450475a749e00cbb",  # noqa: E501
+            "blockHash": "0x73dd9a3b0f581689ebd67adea0debe05672a334c723379dc506fb71a666c1754",  # noqa: E501
+            "blockNumber": 1,
+            "address": "0xF2E246BB76DF876Cef8b38ae84130F4F55De395b",
+            "data": "0x",
+            "topics": [
+                "0x1e86022f78f8d04f8e3dfd13a2bdb280403e6632877c0dbee5e4eeb259908a5c"
+            ],
+        },
+    ]
+
+    async with request_mocker(
+        async_w3, mock_results={"eth_getLogs": lambda *_: get_logs_response}
+    ):
+        logs = await async_emitter.events.LogNoArguments().get_logs()
+
+        sorted_logs = sorted(
+            await async_emitter.events.LogNoArguments.get_logs(),
+            key=lambda log: log["logIndex"],
+        )
+        sorted_logs = sorted(
+            await async_emitter.events.LogNoArguments.get_logs(),
             key=lambda log: log["blockNumber"],
         )
 
@@ -773,6 +828,7 @@ def test_contract_event_get_logs_sorted_by_log_index(w3, emitter, request_mocker
         ),
     ),
 )
+@pytest.mark.parametrize("event_is_instance", (True, False))
 def test_event_rich_log(
     w3,
     emitter,
@@ -784,6 +840,7 @@ def test_event_rich_log(
     call_args,
     process_receipt,
     expected_args,
+    event_is_instance,
 ):
     emitter_fn = emitter.functions[contract_fn]
     if hasattr(emitter_contract_event_ids, event_name):
@@ -796,14 +853,19 @@ def test_event_rich_log(
         txn_hash = emitter_fn(*call_args).transact()
     txn_receipt = wait_for_transaction(w3, txn_hash)
 
-    event_instance = emitter.events[event_name]()
+    if event_is_instance:
+        event_object = emitter.events[event_name]()
+    elif not event_is_instance:
+        event_object = emitter.events[event_name]
+    else:
+        raise Exception("Unreachable!")
 
     if process_receipt:
-        processed_logs = event_instance.process_receipt(txn_receipt)
+        processed_logs = event_object.process_receipt(txn_receipt)
         assert len(processed_logs) == 1
         rich_log = processed_logs[0]
     elif not process_receipt:
-        rich_log = event_instance.process_log(txn_receipt["logs"][0])
+        rich_log = event_object.process_log(txn_receipt["logs"][0])
     else:
         raise Exception("Unreachable!")
 
@@ -819,7 +881,7 @@ def test_event_rich_log(
 
     quiet_event = emitter.events["LogBytes"]
     with pytest.warns(UserWarning, match=warning_msg):
-        empty_rich_log = quiet_event().process_receipt(txn_receipt)
+        empty_rich_log = quiet_event.process_receipt(txn_receipt)
         assert empty_rich_log == tuple()
 
 
@@ -1036,6 +1098,7 @@ def test_event_rich_log(
         ),
     ),
 )
+@pytest.mark.parametrize("event_is_instance", (True, False))
 def test_event_rich_log_non_strict(
     w3_non_strict_abi,
     non_strict_emitter,
@@ -1047,6 +1110,7 @@ def test_event_rich_log_non_strict(
     call_args,
     process_receipt,
     expected_args,
+    event_is_instance,
 ):
     emitter_fn = non_strict_emitter.functions[contract_fn]
     if hasattr(emitter_contract_event_ids, event_name):
@@ -1059,14 +1123,19 @@ def test_event_rich_log_non_strict(
         txn_hash = emitter_fn(*call_args).transact()
     txn_receipt = wait_for_transaction(w3_non_strict_abi, txn_hash)
 
-    event_instance = non_strict_emitter.events[event_name]()
+    if event_is_instance:
+        event_object = non_strict_emitter.events[event_name]()
+    elif not event_is_instance:
+        event_object = non_strict_emitter.events[event_name]
+    else:
+        raise Exception("Unreachable!")
 
     if process_receipt:
-        processed_logs = event_instance.process_receipt(txn_receipt)
+        processed_logs = event_object.process_receipt(txn_receipt)
         assert len(processed_logs) == 1
         rich_log = processed_logs[0]
     elif not process_receipt:
-        rich_log = event_instance.process_log(txn_receipt["logs"][0])
+        rich_log = event_object.process_log(txn_receipt["logs"][0])
     else:
         raise Exception("Unreachable!")
 
@@ -1082,7 +1151,7 @@ def test_event_rich_log_non_strict(
 
     quiet_event = non_strict_emitter.events["LogBytes"]
     with pytest.warns(UserWarning, match=warning_msg):
-        empty_rich_log = quiet_event().process_receipt(txn_receipt)
+        empty_rich_log = quiet_event.process_receipt(txn_receipt)
         assert empty_rich_log == tuple()
 
 
@@ -1093,7 +1162,7 @@ def test_event_rich_log_with_byte_args(
     txn_hash = emitter.functions.logListArgs([b"13"], [b"54"]).transact()
     txn_receipt = wait_for_transaction(w3, txn_hash)
 
-    event_instance = emitter.events.LogListArgs()
+    event_instance = emitter.events.LogListArgs
 
     if process_receipt:
         processed_logs = event_instance.process_receipt(txn_receipt)
@@ -1122,7 +1191,7 @@ def test_event_rich_log_with_byte_args(
 def test_receipt_processing_with_discard_flag(
     event_contract, indexed_event_contract, dup_txn_receipt, wait_for_transaction
 ):
-    event_instance = indexed_event_contract.events.LogSingleWithIndex()
+    event_instance = indexed_event_contract.events.LogSingleWithIndex
 
     returned_logs = event_instance.process_receipt(dup_txn_receipt, errors=DISCARD)
     assert returned_logs == ()
@@ -1131,7 +1200,7 @@ def test_receipt_processing_with_discard_flag(
 def test_receipt_processing_with_ignore_flag(
     event_contract, indexed_event_contract, dup_txn_receipt, wait_for_transaction
 ):
-    event_instance = indexed_event_contract.events.LogSingleWithIndex()
+    event_instance = indexed_event_contract.events.LogSingleWithIndex
 
     returned_logs = event_instance.process_receipt(dup_txn_receipt, errors=IGNORE)
     assert len(returned_logs) == 2
@@ -1155,7 +1224,7 @@ def test_receipt_processing_with_ignore_flag(
 
 
 def test_receipt_processing_with_warn_flag(indexed_event_contract, dup_txn_receipt):
-    event_instance = indexed_event_contract.events.LogSingleWithIndex()
+    event_instance = indexed_event_contract.events.LogSingleWithIndex
 
     with pytest.warns(UserWarning, match="Expected 1 log topics.  Got 0"):
         returned_logs = event_instance.process_receipt(dup_txn_receipt, errors=WARN)
@@ -1163,21 +1232,21 @@ def test_receipt_processing_with_warn_flag(indexed_event_contract, dup_txn_recei
 
 
 def test_receipt_processing_with_strict_flag(indexed_event_contract, dup_txn_receipt):
-    event_instance = indexed_event_contract.events.LogSingleWithIndex()
+    event_instance = indexed_event_contract.events.LogSingleWithIndex
 
     with pytest.raises(LogTopicError, match="Expected 1 log topics.  Got 0"):
         event_instance.process_receipt(dup_txn_receipt, errors=STRICT)
 
 
 def test_receipt_processing_with_invalid_flag(indexed_event_contract, dup_txn_receipt):
-    event_instance = indexed_event_contract.events.LogSingleWithIndex()
+    event_instance = indexed_event_contract.events.LogSingleWithIndex
 
     with pytest.raises(Web3AttributeError, match="Error flag must be one of: "):
         event_instance.process_receipt(dup_txn_receipt, errors="not-a-flag")
 
 
 def test_receipt_processing_with_no_flag(indexed_event_contract, dup_txn_receipt):
-    event_instance = indexed_event_contract.events.LogSingleWithIndex()
+    event_instance = indexed_event_contract.events.LogSingleWithIndex
 
     with pytest.warns(UserWarning, match="Expected 1 log topics.  Got 0"):
         returned_log = event_instance.process_receipt(dup_txn_receipt)
@@ -1185,7 +1254,7 @@ def test_receipt_processing_with_no_flag(indexed_event_contract, dup_txn_receipt
 
 
 def test_single_log_processing_with_errors(indexed_event_contract, dup_txn_receipt):
-    event_instance = indexed_event_contract.events.LogSingleWithIndex()
+    event_instance = indexed_event_contract.events.LogSingleWithIndex
 
     with pytest.raises(LogTopicError, match="Expected 1 log topics.  Got 0"):
         event_instance.process_log(dup_txn_receipt["logs"][0])
@@ -1244,7 +1313,7 @@ def test_receipt_processing_catches_insufficientdatabytes_error_by_default(
 ):
     txn_hash = emitter.functions.logListArgs([b"13"], [b"54"]).transact()
     txn_receipt = wait_for_transaction(w3, txn_hash)
-    event_instance = emitter.events.LogListArgs()
+    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)

{web3-7.4.0 → web3-7.5.0}/tests/core/contracts/test_extracting_event_data_old.py

@@ -9,28 +9,6 @@ from web3._utils.events import (
 )
 
 
-@pytest.fixture()
-def emitter(
-    w3,
-    emitter_contract_data,
-    wait_for_transaction,
-    wait_for_block,
-    address_conversion_func,
-):
-    emitter_contract_factory = w3.eth.contract(**emitter_contract_data)
-
-    wait_for_block(w3)
-    deploy_txn_hash = emitter_contract_factory.constructor().transact({"gas": 10000000})
-    deploy_receipt = wait_for_transaction(w3, deploy_txn_hash)
-    contract_address = address_conversion_func(deploy_receipt["contractAddress"])
-
-    bytecode = w3.eth.get_code(contract_address)
-    assert bytecode == emitter_contract_factory.bytecode_runtime
-    _emitter = emitter_contract_factory(address=contract_address)
-    assert _emitter.address == contract_address
-    return _emitter
-
-
 @pytest.mark.parametrize(
     "contract_fn,event_name,call_args,expected_args",
     (
@@ -97,7 +75,7 @@ def test_event_data_extraction(
     assert len(txn_receipt["logs"]) == 1
     log_entry = txn_receipt["logs"][0]
 
-    event_abi = emitter._get_event_abi(event_name)
+    event_abi = emitter.get_event_by_name(event_name).abi
 
     event_topic = getattr(emitter_contract_log_topics, event_name)
     is_anonymous = event_abi["anonymous"]
@@ -132,7 +110,7 @@ def test_dynamic_length_argument_extraction(
     assert len(txn_receipt["logs"]) == 1
     log_entry = txn_receipt["logs"][0]
 
-    event_abi = emitter._get_event_abi("LogDynamicArgs")
+    event_abi = emitter.get_event_by_name("LogDynamicArgs").abi
 
     event_topic = emitter_contract_log_topics.LogDynamicArgs
     assert event_topic in log_entry["topics"]