web3 7.5.0__py3-none-any.whl → 7.6.0__py3-none-any.whl

web3/_utils/abi.py

@@ -63,6 +63,7 @@ from eth_utils import (
     decode_hex,
     filter_abi_by_type,
     get_abi_input_names,
+    get_abi_input_types,
     is_bytes,
     is_list_like,
     is_string,
@@ -76,6 +77,10 @@ from eth_utils.toolz import (
     pipe,
 )
 
+from web3._utils.abi_element_identifiers import (
+    FallbackFn,
+    ReceiveFn,
+)
 from web3._utils.decorators import (
     reject_recursive_repeats,
 )
@@ -92,6 +97,7 @@ from web3.exceptions import (
     Web3ValueError,
 )
 from web3.types import (
+    ABIElementIdentifier,
     TReturn,
 )
 
@@ -117,9 +123,13 @@ def exclude_indexed_event_inputs(event_abi: ABIEvent) -> Sequence[ABIComponentIn
     return [arg for arg in event_abi["inputs"] if arg["indexed"] is False]
 
 
+def filter_by_types(types: Collection[str], contract_abi: ABI) -> Sequence[ABIElement]:
+    return [abi_element for abi_element in contract_abi if abi_element["type"] in types]
+
+
 def filter_by_argument_name(
     argument_names: Collection[str], contract_abi: ABI
-) -> List[ABIElement]:
+) -> Sequence[ABIElement]:
     """
     Return a list of each ``ABIElement`` which contain arguments matching provided
     names.
@@ -139,6 +149,54 @@ def filter_by_argument_name(
     return abis_with_matching_args
 
 
+def filter_by_argument_type(
+    argument_types: Collection[str], contract_abi: ABI
+) -> List[ABIElement]:
+    """
+    Return a list of each ``ABIElement`` which contain arguments matching provided
+    types.
+    """
+    abis_with_matching_args = []
+    for abi_element in contract_abi:
+        try:
+            abi_arg_types = get_abi_input_types(abi_element)
+
+            if set(argument_types).intersection(abi_arg_types) == set(argument_types):
+                abis_with_matching_args.append(abi_element)
+        except ValueError:
+            # fallback or receive functions do not have arguments
+            # proceed to next ABIElement
+            continue
+
+    return abis_with_matching_args
+
+
+def get_name_from_abi_element_identifier(
+    abi_element_identifier: ABIElementIdentifier,
+) -> str:
+    if abi_element_identifier in ["fallback", FallbackFn]:
+        return "fallback"
+    elif abi_element_identifier in ["receive", ReceiveFn]:
+        return "receive"
+    elif is_text(abi_element_identifier):
+        return str(abi_element_identifier).split("(")[0]
+    else:
+        raise Web3TypeError("Unsupported function identifier")
+
+
+def get_abi_element_signature(
+    abi_element_identifier: ABIElementIdentifier,
+    abi_element_argument_types: Optional[Sequence[str]] = None,
+) -> str:
+    element_name = get_name_from_abi_element_identifier(abi_element_identifier)
+    argument_types = ",".join(abi_element_argument_types or [])
+
+    if element_name in ["fallback", "receive"]:
+        return element_name
+
+    return f"{element_name}({argument_types})"
+
+
 class AddressEncoder(encoding.AddressEncoder):
     @classmethod
     def validate_value(cls, value: Any) -> None:

web3/_utils/contract_sources/contract_data/event_contracts.py

@@ -4,8 +4,8 @@ Compiled with Solidity v0.8.28.
 """
 
 # source: web3/_utils/contract_sources/EventContracts.sol:EventContract
-EVENT_CONTRACT_BYTECODE = "0x6080604052348015600e575f5ffd5b5061017a8061001c5f395ff3fe608060405234801561000f575f5ffd5b5060043610610029575f3560e01c80635818fad71461002d575b5f5ffd5b610047600480360381019061004291906100f1565b610049565b005b7ff70fe689e290d8ce2b2a388ac28db36fbb0e16a6d89c6804c461f65a1b40bb1581604051610078919061012b565b60405180910390a17f56d2ef3c5228bf5d88573621e325a4672ab50e033749a601e4f4a5e1dce905d4816040516100af919061012b565b60405180910390a150565b5f5ffd5b5f819050919050565b6100d0816100be565b81146100da575f5ffd5b50565b5f813590506100eb816100c7565b92915050565b5f60208284031215610106576101056100ba565b5b5f610113848285016100dd565b91505092915050565b610125816100be565b82525050565b5f60208201905061013e5f83018461011c565b9291505056fea2646970667358221220ffb25fdd3a92ed8f87f68da4885d8c0f5e6fd2edeafb3d1cab0da0f2683b846b64736f6c634300081c0033"  # noqa: E501
-EVENT_CONTRACT_RUNTIME = "0x608060405234801561000f575f5ffd5b5060043610610029575f3560e01c80635818fad71461002d575b5f5ffd5b610047600480360381019061004291906100f1565b610049565b005b7ff70fe689e290d8ce2b2a388ac28db36fbb0e16a6d89c6804c461f65a1b40bb1581604051610078919061012b565b60405180910390a17f56d2ef3c5228bf5d88573621e325a4672ab50e033749a601e4f4a5e1dce905d4816040516100af919061012b565b60405180910390a150565b5f5ffd5b5f819050919050565b6100d0816100be565b81146100da575f5ffd5b50565b5f813590506100eb816100c7565b92915050565b5f60208284031215610106576101056100ba565b5b5f610113848285016100dd565b91505092915050565b610125816100be565b82525050565b5f60208201905061013e5f83018461011c565b9291505056fea2646970667358221220ffb25fdd3a92ed8f87f68da4885d8c0f5e6fd2edeafb3d1cab0da0f2683b846b64736f6c634300081c0033"  # noqa: E501
+EVENT_CONTRACT_BYTECODE = "0x6080604052348015600e575f5ffd5b5061017a8061001c5f395ff3fe608060405234801561000f575f5ffd5b5060043610610029575f3560e01c80635818fad71461002d575b5f5ffd5b610047600480360381019061004291906100f1565b610049565b005b7ff70fe689e290d8ce2b2a388ac28db36fbb0e16a6d89c6804c461f65a1b40bb1581604051610078919061012b565b60405180910390a17f56d2ef3c5228bf5d88573621e325a4672ab50e033749a601e4f4a5e1dce905d4816040516100af919061012b565b60405180910390a150565b5f5ffd5b5f819050919050565b6100d0816100be565b81146100da575f5ffd5b50565b5f813590506100eb816100c7565b92915050565b5f60208284031215610106576101056100ba565b5b5f610113848285016100dd565b91505092915050565b610125816100be565b82525050565b5f60208201905061013e5f83018461011c565b9291505056fea26469706673582212200e015f231e61081fe45f12e0f685c07278b70c9a1af144d2c6a7a0c7b6e61bab64736f6c634300081c0033"  # noqa: E501
+EVENT_CONTRACT_RUNTIME = "0x608060405234801561000f575f5ffd5b5060043610610029575f3560e01c80635818fad71461002d575b5f5ffd5b610047600480360381019061004291906100f1565b610049565b005b7ff70fe689e290d8ce2b2a388ac28db36fbb0e16a6d89c6804c461f65a1b40bb1581604051610078919061012b565b60405180910390a17f56d2ef3c5228bf5d88573621e325a4672ab50e033749a601e4f4a5e1dce905d4816040516100af919061012b565b60405180910390a150565b5f5ffd5b5f819050919050565b6100d0816100be565b81146100da575f5ffd5b50565b5f813590506100eb816100c7565b92915050565b5f60208284031215610106576101056100ba565b5b5f610113848285016100dd565b91505092915050565b610125816100be565b82525050565b5f60208201905061013e5f83018461011c565b9291505056fea26469706673582212200e015f231e61081fe45f12e0f685c07278b70c9a1af144d2c6a7a0c7b6e61bab64736f6c634300081c0033"  # noqa: E501
 EVENT_CONTRACT_ABI = [
     {
         "anonymous": False,
@@ -49,8 +49,8 @@ EVENT_CONTRACT_DATA = {
 
 
 # source: web3/_utils/contract_sources/EventContracts.sol:IndexedEventContract
-INDEXED_EVENT_CONTRACT_BYTECODE = "0x6080604052348015600e575f5ffd5b506101708061001c5f395ff3fe608060405234801561000f575f5ffd5b5060043610610029575f3560e01c80635818fad71461002d575b5f5ffd5b610047600480360381019061004291906100e7565b610049565b005b807ff70fe689e290d8ce2b2a388ac28db36fbb0e16a6d89c6804c461f65a1b40bb1560405160405180910390a27f56d2ef3c5228bf5d88573621e325a4672ab50e033749a601e4f4a5e1dce905d4816040516100a59190610121565b60405180910390a150565b5f5ffd5b5f819050919050565b6100c6816100b4565b81146100d0575f5ffd5b50565b5f813590506100e1816100bd565b92915050565b5f602082840312156100fc576100fb6100b0565b5b5f610109848285016100d3565b91505092915050565b61011b816100b4565b82525050565b5f6020820190506101345f830184610112565b9291505056fea2646970667358221220c54729ba3e926e84d8497888e2dc66bd33efa5e4ebcd95e323dc53eb183500cc64736f6c634300081c0033"  # noqa: E501
-INDEXED_EVENT_CONTRACT_RUNTIME = "0x608060405234801561000f575f5ffd5b5060043610610029575f3560e01c80635818fad71461002d575b5f5ffd5b610047600480360381019061004291906100e7565b610049565b005b807ff70fe689e290d8ce2b2a388ac28db36fbb0e16a6d89c6804c461f65a1b40bb1560405160405180910390a27f56d2ef3c5228bf5d88573621e325a4672ab50e033749a601e4f4a5e1dce905d4816040516100a59190610121565b60405180910390a150565b5f5ffd5b5f819050919050565b6100c6816100b4565b81146100d0575f5ffd5b50565b5f813590506100e1816100bd565b92915050565b5f602082840312156100fc576100fb6100b0565b5b5f610109848285016100d3565b91505092915050565b61011b816100b4565b82525050565b5f6020820190506101345f830184610112565b9291505056fea2646970667358221220c54729ba3e926e84d8497888e2dc66bd33efa5e4ebcd95e323dc53eb183500cc64736f6c634300081c0033"  # noqa: E501
+INDEXED_EVENT_CONTRACT_BYTECODE = "0x6080604052348015600e575f5ffd5b506101708061001c5f395ff3fe608060405234801561000f575f5ffd5b5060043610610029575f3560e01c80635818fad71461002d575b5f5ffd5b610047600480360381019061004291906100e7565b610049565b005b807ff70fe689e290d8ce2b2a388ac28db36fbb0e16a6d89c6804c461f65a1b40bb1560405160405180910390a27f56d2ef3c5228bf5d88573621e325a4672ab50e033749a601e4f4a5e1dce905d4816040516100a59190610121565b60405180910390a150565b5f5ffd5b5f819050919050565b6100c6816100b4565b81146100d0575f5ffd5b50565b5f813590506100e1816100bd565b92915050565b5f602082840312156100fc576100fb6100b0565b5b5f610109848285016100d3565b91505092915050565b61011b816100b4565b82525050565b5f6020820190506101345f830184610112565b9291505056fea264697066735822122038d1b44cbd4d6a31971aab3eaac7933f03b5db859486e34c7a6fd33fb9b2091e64736f6c634300081c0033"  # noqa: E501
+INDEXED_EVENT_CONTRACT_RUNTIME = "0x608060405234801561000f575f5ffd5b5060043610610029575f3560e01c80635818fad71461002d575b5f5ffd5b610047600480360381019061004291906100e7565b610049565b005b807ff70fe689e290d8ce2b2a388ac28db36fbb0e16a6d89c6804c461f65a1b40bb1560405160405180910390a27f56d2ef3c5228bf5d88573621e325a4672ab50e033749a601e4f4a5e1dce905d4816040516100a59190610121565b60405180910390a150565b5f5ffd5b5f819050919050565b6100c6816100b4565b81146100d0575f5ffd5b50565b5f813590506100e1816100bd565b92915050565b5f602082840312156100fc576100fb6100b0565b5b5f610109848285016100d3565b91505092915050565b61011b816100b4565b82525050565b5f6020820190506101345f830184610112565b9291505056fea264697066735822122038d1b44cbd4d6a31971aab3eaac7933f03b5db859486e34c7a6fd33fb9b2091e64736f6c634300081c0033"  # noqa: E501
 INDEXED_EVENT_CONTRACT_ABI = [
     {
         "anonymous": False,
@@ -91,3 +91,48 @@ INDEXED_EVENT_CONTRACT_DATA = {
     "bytecode_runtime": INDEXED_EVENT_CONTRACT_RUNTIME,
     "abi": INDEXED_EVENT_CONTRACT_ABI,
 }
+
+
+# source: web3/_utils/contract_sources/EventContracts.sol:AmbiguousEventNameContract
+AMBIGUOUS_EVENT_NAME_CONTRACT_BYTECODE = "0x6080604052348015600e575f5ffd5b506102728061001c5f395ff3fe608060405234801561000f575f5ffd5b5060043610610029575f3560e01c80635818fad71461002d575b5f5ffd5b61004760048036038101906100429190610119565b610049565b005b7f56d2ef3c5228bf5d88573621e325a4672ab50e033749a601e4f4a5e1dce905d4816040516100789190610153565b60405180910390a17fe466ad4edc182e32048f6e723b179ae20d1030f298fcfa1e9ad4a759b5a63112816040516020016100b29190610153565b6040516020818303038152906040526100ca906101ae565b6040516100d79190610223565b60405180910390a150565b5f5ffd5b5f819050919050565b6100f8816100e6565b8114610102575f5ffd5b50565b5f81359050610113816100ef565b92915050565b5f6020828403121561012e5761012d6100e2565b5b5f61013b84828501610105565b91505092915050565b61014d816100e6565b82525050565b5f6020820190506101665f830184610144565b92915050565b5f81519050919050565b5f819050602082019050919050565b5f819050919050565b5f6101998251610185565b80915050919050565b5f82821b905092915050565b5f6101b88261016c565b826101c284610176565b90506101cd8161018e565b9250602082101561020d576102087fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff836020036008026101a2565b831692505b5050919050565b61021d81610185565b82525050565b5f6020820190506102365f830184610214565b9291505056fea2646970667358221220b00fa945245be24cc68c14582f357e7d83cfa8fcd440eabf93e87592563e3df064736f6c634300081c0033"  # noqa: E501
+AMBIGUOUS_EVENT_NAME_CONTRACT_RUNTIME = "0x608060405234801561000f575f5ffd5b5060043610610029575f3560e01c80635818fad71461002d575b5f5ffd5b61004760048036038101906100429190610119565b610049565b005b7f56d2ef3c5228bf5d88573621e325a4672ab50e033749a601e4f4a5e1dce905d4816040516100789190610153565b60405180910390a17fe466ad4edc182e32048f6e723b179ae20d1030f298fcfa1e9ad4a759b5a63112816040516020016100b29190610153565b6040516020818303038152906040526100ca906101ae565b6040516100d79190610223565b60405180910390a150565b5f5ffd5b5f819050919050565b6100f8816100e6565b8114610102575f5ffd5b50565b5f81359050610113816100ef565b92915050565b5f6020828403121561012e5761012d6100e2565b5b5f61013b84828501610105565b91505092915050565b61014d816100e6565b82525050565b5f6020820190506101665f830184610144565b92915050565b5f81519050919050565b5f819050602082019050919050565b5f819050919050565b5f6101998251610185565b80915050919050565b5f82821b905092915050565b5f6101b88261016c565b826101c284610176565b90506101cd8161018e565b9250602082101561020d576102087fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff836020036008026101a2565b831692505b5050919050565b61021d81610185565b82525050565b5f6020820190506102365f830184610214565b9291505056fea2646970667358221220b00fa945245be24cc68c14582f357e7d83cfa8fcd440eabf93e87592563e3df064736f6c634300081c0033"  # noqa: E501
+AMBIGUOUS_EVENT_NAME_CONTRACT_ABI = [
+    {
+        "anonymous": False,
+        "inputs": [
+            {
+                "indexed": False,
+                "internalType": "uint256",
+                "name": "arg0",
+                "type": "uint256",
+            }
+        ],
+        "name": "LogSingleArg",
+        "type": "event",
+    },
+    {
+        "anonymous": False,
+        "inputs": [
+            {
+                "indexed": False,
+                "internalType": "bytes32",
+                "name": "arg0",
+                "type": "bytes32",
+            }
+        ],
+        "name": "LogSingleArg",
+        "type": "event",
+    },
+    {
+        "inputs": [{"internalType": "uint256", "name": "_arg0", "type": "uint256"}],
+        "name": "logTwoEvents",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function",
+    },
+]
+AMBIGUOUS_EVENT_NAME_CONTRACT_DATA = {
+    "bytecode": AMBIGUOUS_EVENT_NAME_CONTRACT_BYTECODE,
+    "bytecode_runtime": AMBIGUOUS_EVENT_NAME_CONTRACT_RUNTIME,
+    "abi": AMBIGUOUS_EVENT_NAME_CONTRACT_ABI,
+}

web3/_utils/contracts.py

@@ -1,3 +1,4 @@
+import copy
 import functools
 from typing import (
     TYPE_CHECKING,
@@ -47,13 +48,11 @@ from hexbytes import (
 
 from web3._utils.abi import (
     filter_by_argument_name,
+    get_abi_element_signature,
+    get_name_from_abi_element_identifier,
     map_abi_data,
     named_tree,
 )
-from web3._utils.abi_element_identifiers import (
-    FallbackFn,
-    ReceiveFn,
-)
 from web3._utils.blocks import (
     is_hex_encoded_block_hash,
 )
@@ -79,6 +78,8 @@ from web3.types import (
     ABIElementIdentifier,
     BlockIdentifier,
     BlockNumber,
+    TContractEvent,
+    TContractFn,
     TxParams,
 )
 from web3.utils.abi import (
@@ -182,6 +183,18 @@ def prepare_transaction(
     """
     fn_args = fn_args or []
     fn_kwargs = fn_kwargs or {}
+
+    if not fn_args and not fn_kwargs and "(" not in str(abi_element_identifier):
+        abi_element_identifier = get_abi_element_signature(abi_element_identifier)
+
+    if abi_element_identifier in [
+        "fallback()",
+        "receive()",
+    ]:
+        abi_element_identifier = get_name_from_abi_element_identifier(
+            abi_element_identifier
+        )
+
     if abi_callable is None:
         abi_callable = cast(
             ABICallable,
@@ -227,11 +240,12 @@ def encode_transaction_data(
     kwargs: Optional[Any] = None,
 ) -> HexStr:
     info_abi: ABIElement
-    if abi_element_identifier is FallbackFn:
+    abi_element_name = get_name_from_abi_element_identifier(abi_element_identifier)
+    if abi_element_name == "fallback":
         info_abi, info_selector, info_arguments = get_fallback_function_info(
             contract_abi, cast(ABIFallback, abi_callable)
         )
-    elif abi_element_identifier is ReceiveFn:
+    elif abi_element_name == "receive":
         info_abi, info_selector, info_arguments = get_receive_function_info(
             contract_abi, cast(ABIReceive, abi_callable)
         )
@@ -378,4 +392,31 @@ async def async_parse_block_identifier_int(
         if block_num < 0:
             raise BlockNumberOutOfRange
     return BlockNumber(block_num)
-    return BlockNumber(block_num)
+
+
+def copy_contract_function(
+    contract_function: TContractFn, *args: Any, **kwargs: Any
+) -> TContractFn:
+    """
+    Copy a contract function instance.
+    """
+    clone = copy.copy(contract_function)
+    clone.args = args or tuple()
+    clone.kwargs = kwargs or dict()
+
+    clone._set_function_info()
+    return clone
+
+
+def copy_contract_event(
+    contract_event: TContractEvent, *args: Any, **kwargs: Any
+) -> TContractEvent:
+    """
+    Copy a contract function instance.
+    """
+    clone = copy.copy(contract_event)
+    clone.args = args or tuple()
+    clone.kwargs = kwargs or dict()
+
+    clone._set_event_info()
+    return clone

web3/_utils/method_formatters.py

@@ -836,6 +836,7 @@ def subscription_formatter(value: Any) -> Union[HexBytes, HexStr, Dict[str, Any]
 PYTHONIC_RESULT_FORMATTERS: Dict[RPCEndpoint, Callable[..., Any]] = {
     # Eth
     RPC.eth_accounts: apply_list_to_array_formatter(to_checksum_address),
+    RPC.eth_blobBaseFee: to_integer_if_hex,
     RPC.eth_blockNumber: to_integer_if_hex,
     RPC.eth_chainId: to_integer_if_hex,
     RPC.eth_call: HexBytes,

web3/_utils/module_testing/eth_module.py

@@ -1841,6 +1841,12 @@ class AsyncEthModuleTest:
         assert len(accounts) != 0
         assert all(is_checksum_address(account) for account in accounts)
 
+    @pytest.mark.asyncio
+    async def test_async_eth_blob_base_fee(self, async_w3: "AsyncWeb3") -> None:
+        blob_base_fee = await async_w3.eth.blob_base_fee
+        assert is_integer(blob_base_fee)
+        assert blob_base_fee >= 0
+
     @pytest.mark.asyncio
     async def test_async_eth_get_logs_without_logs(
         self, async_w3: "AsyncWeb3", async_block_with_txn_with_log: BlockData
@@ -2613,6 +2619,11 @@ class EthModuleTest:
         assert len(accounts) != 0
         assert all(is_checksum_address(account) for account in accounts)
 
+    def test_eth_blob_base_fee(self, w3: "Web3") -> None:
+        blob_base_fee = w3.eth.blob_base_fee
+        assert is_integer(blob_base_fee)
+        assert blob_base_fee >= 0
+
     def test_eth_block_number(self, w3: "Web3") -> None:
         block_number = w3.eth.block_number
         assert is_integer(block_number)

web3/_utils/rpc_abi.py

@@ -48,6 +48,7 @@ class RPC:
 
     # eth
     eth_accounts = RPCEndpoint("eth_accounts")
+    eth_blobBaseFee = RPCEndpoint("eth_blobBaseFee")
     eth_blockNumber = RPCEndpoint("eth_blockNumber")
     eth_call = RPCEndpoint("eth_call")
     eth_createAccessList = RPCEndpoint("eth_createAccessList")

web3/_utils/validation.py

@@ -79,6 +79,9 @@ def validate_abi(abi: ABI) -> None:
     if not all(is_dict(e) for e in abi):
         raise Web3ValueError("'abi' is not a list of dictionaries")
 
+    if not all("type" in e for e in abi):
+        raise Web3ValueError("'abi' must contain a list of elements each with a type")
+
     functions = filter_abi_by_type("function", abi)
     selectors = groupby(compose(encode_hex, function_abi_to_4byte_selector), functions)
     duplicates = valfilter(lambda funcs: len(funcs) > 1, selectors)