web3 7.0.0b2__py3-none-any.whl → 7.7.0__py3-none-any.whl

web3/_utils/transactions.py

@@ -1,7 +1,9 @@
 import math
 from typing import (
     TYPE_CHECKING,
+    Dict,
     List,
+    Literal,
     Optional,
     Union,
     cast,
@@ -19,9 +21,6 @@ from hexbytes import (
     HexBytes,
 )
 
-from web3._utils.compat import (
-    Literal,
-)
 from web3._utils.utility_methods import (
     all_in_dict,
     any_in_dict,
@@ -29,6 +28,10 @@ from web3._utils.utility_methods import (
 from web3.constants import (
     DYNAMIC_FEE_TXN_PARAMS,
 )
+from web3.exceptions import (
+    Web3AttributeError,
+    Web3ValueError,
+)
 from web3.types import (
     BlockIdentifier,
     TxData,
@@ -49,6 +52,8 @@ TX_PARAM_LITERALS = Literal[
     "nonce",
     "chainId",
     "accessList",
+    "maxFeePerBlobGas",
+    "blobVersionedHashes",
 ]
 
 VALID_TRANSACTION_PARAMS: List[TX_PARAM_LITERALS] = [
@@ -64,19 +69,23 @@ VALID_TRANSACTION_PARAMS: List[TX_PARAM_LITERALS] = [
     "data",
     "nonce",
     "chainId",
+    "maxFeePerBlobGas",
+    "blobVersionedHashes",
 ]
 
 TRANSACTION_DEFAULTS = {
     "value": 0,
     "data": b"",
-    "gas": lambda w3, tx: w3.eth.estimate_gas(tx),
-    "gasPrice": lambda w3, tx: w3.eth.generate_gas_price(tx),
+    "gas": lambda w3, tx, _defaults: w3.eth.estimate_gas(tx),
+    "gasPrice": lambda w3, tx, _defaults: w3.eth.generate_gas_price(tx),
+    "maxPriorityFeePerGas": lambda w3, _tx, _defaults: w3.eth.max_priority_fee,
     "maxFeePerGas": (
-        lambda w3, tx: w3.eth.max_priority_fee
-        + (2 * w3.eth.get_block("latest")["baseFeePerGas"])
+        lambda w3, tx, defaults: (
+            tx.get("maxPriorityFeePerGas", defaults.get("maxPriorityFeePerGas"))
+            + (2 * w3.eth.get_block("latest")["baseFeePerGas"])
+        )
     ),
-    "maxPriorityFeePerGas": lambda w3, tx: w3.eth.max_priority_fee,
-    "chainId": lambda w3, tx: w3.eth.chain_id,
+    "chainId": lambda w3, _tx, _defaults: w3.eth.chain_id,
 }
 
 if TYPE_CHECKING:
@@ -103,7 +112,7 @@ def fill_nonce(w3: "Web3", transaction: TxParams) -> TxParams:
 @curry
 def fill_transaction_defaults(w3: "Web3", transaction: TxParams) -> TxParams:
     """
-    if w3 is None, fill as much as possible while offline
+    If w3 is None, fill as much as possible while offline
     """
     strategy_based_gas_price = w3.eth.generate_gas_price(transaction)
     is_dynamic_fee_transaction = strategy_based_gas_price is None and (
@@ -111,7 +120,7 @@ def fill_transaction_defaults(w3: "Web3", transaction: TxParams) -> TxParams:
         or any_in_dict(DYNAMIC_FEE_TXN_PARAMS, transaction)
     )
 
-    defaults = {}
+    defaults: Dict[str, Union[bytes, int]] = {}
     for key, default_getter in TRANSACTION_DEFAULTS.items():
         if key not in transaction:
             if (
@@ -126,10 +135,10 @@ def fill_transaction_defaults(w3: "Web3", transaction: TxParams) -> TxParams:
 
             if callable(default_getter):
                 if w3 is None:
-                    raise ValueError(
+                    raise Web3ValueError(
                         f"You must specify a '{key}' value in the transaction"
                     )
-                default_val = default_getter(w3, transaction)
+                default_val = default_getter(w3, transaction, defaults)
             else:
                 default_val = default_getter
 
@@ -140,9 +149,7 @@ def fill_transaction_defaults(w3: "Web3", transaction: TxParams) -> TxParams:
 def get_block_gas_limit(
     w3: "Web3", block_identifier: Optional[BlockIdentifier] = None
 ) -> int:
-    if block_identifier is None:
-        block_identifier = w3.eth.block_number
-    block = w3.eth.get_block(block_identifier)
+    block = w3.eth.get_block(block_identifier or "latest")
     return block["gasLimit"]
 
 
@@ -156,9 +163,9 @@ def get_buffered_gas_estimate(
     gas_limit = get_block_gas_limit(w3)
 
     if gas_estimate > gas_limit:
-        raise ValueError(
-            "Contract does not appear to be deployable within the "
-            f"current network gas limits.  Estimated: {gas_estimate}. "
+        raise Web3ValueError(
+            "Gas estimate for transaction is higher than current network gas limits. "
+            f"Transaction could not be sent. Estimated: {gas_estimate}. "
             f"Current gas limit: {gas_limit}"
         )
 
@@ -168,7 +175,7 @@ def get_buffered_gas_estimate(
 def get_required_transaction(w3: "Web3", transaction_hash: _Hash32) -> TxData:
     current_transaction = w3.eth.get_transaction(transaction_hash)
     if not current_transaction:
-        raise ValueError(
+        raise Web3ValueError(
             f"Supplied transaction with hash {transaction_hash!r} does not exist"
         )
     return current_transaction
@@ -200,7 +207,7 @@ def extract_valid_transaction_params(transaction_params: TxData) -> TxParams:
                 msg = 'failure to handle this transaction due to both "input: {}" and'
                 msg += ' "data: {}" are populated. You need to resolve this conflict.'
                 err_vals = (transaction_params["input"], extracted_params["data"])
-                raise AttributeError(msg.format(*err_vals))
+                raise Web3AttributeError(msg.format(*err_vals))
             else:
                 return extracted_params
         else:
@@ -219,7 +226,7 @@ def extract_valid_transaction_params(transaction_params: TxData) -> TxParams:
 def assert_valid_transaction_params(transaction_params: TxParams) -> None:
     for param in transaction_params:
         if param not in VALID_TRANSACTION_PARAMS:
-            raise ValueError(f"{param} is not a valid transaction parameter")
+            raise Web3ValueError(f"{param} is not a valid transaction parameter")
 
 
 def prepare_replacement_transaction(
@@ -229,14 +236,14 @@ def prepare_replacement_transaction(
     gas_multiplier: float = 1.125,
 ) -> TxParams:
     if original_transaction["blockHash"] is not None:
-        raise ValueError(
+        raise Web3ValueError(
             f'Supplied transaction with hash {original_transaction["hash"]!r} '
             "has already been mined"
         )
     if "nonce" in replacement_transaction and (
         replacement_transaction["nonce"] != original_transaction["nonce"]
     ):
-        raise ValueError(
+        raise Web3ValueError(
             "Supplied nonce in new_transaction must match the pending transaction"
         )
 
@@ -255,7 +262,7 @@ def prepare_replacement_transaction(
         and original_transaction["gasPrice"] is not None
     ):
         if replacement_transaction["gasPrice"] <= original_transaction["gasPrice"]:
-            raise ValueError(
+            raise Web3ValueError(
                 "Supplied gas price must exceed existing transaction gas price"
             )
 

web3/_utils/type_conversion.py

@@ -10,6 +10,10 @@ from eth_utils import (
     to_hex,
 )
 
+from web3.exceptions import (
+    Web3ValueError,
+)
+
 
 def to_hex_if_bytes(val: Union[HexStr, str, bytes, bytearray]) -> HexStr:
     """
@@ -17,7 +21,7 @@ def to_hex_if_bytes(val: Union[HexStr, str, bytes, bytearray]) -> HexStr:
     meant to work with bytes and hex strings.
     """
     if isinstance(val, str) and not val.startswith("0x"):
-        raise ValueError(f"Expected a hex string. Got: {val!r}")
+        raise Web3ValueError(f"Expected a hex string. Got: {val!r}")
 
     return to_hex(val) if isinstance(val, (bytes, bytearray)) else to_hex(hexstr=val)
 

web3/_utils/validation.py

@@ -5,10 +5,14 @@ from typing import (
 )
 
 from eth_typing import (
+    ABI,
+    ABIFunction,
     HexStr,
     TypeStr,
 )
 from eth_utils import (
+    abi_to_signature,
+    filter_abi_by_type,
     function_abi_to_4byte_selector,
     is_0x_prefixed,
     is_binary_address,
@@ -38,8 +42,6 @@ from ens.utils import (
     is_valid_ens_name,
 )
 from web3._utils.abi import (
-    abi_to_signature,
-    filter_by_type,
     is_address_type,
     is_array_type,
     is_bool_type,
@@ -53,10 +55,8 @@ from web3._utils.abi import (
 )
 from web3.exceptions import (
     InvalidAddress,
-)
-from web3.types import (
-    ABI,
-    ABIFunction,
+    Web3TypeError,
+    Web3ValueError,
 )
 
 
@@ -74,16 +74,19 @@ def validate_abi(abi: ABI) -> None:
     Helper function for validating an ABI
     """
     if not is_list_like(abi):
-        raise ValueError("'abi' is not a list")
+        raise Web3ValueError("'abi' is not a list")
 
     if not all(is_dict(e) for e in abi):
-        raise ValueError("'abi' is not a list of dictionaries")
+        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_by_type("function", abi)
+    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)
     if duplicates:
-        raise ValueError(
+        raise Web3ValueError(
             "Abi contains functions with colliding selectors. "
             f"Functions {_prepare_selector_collision_msg(duplicates)}"
         )
@@ -94,7 +97,7 @@ def validate_abi_type(abi_type: TypeStr) -> None:
     Helper function for validating an abi_type
     """
     if not is_recognized_type(abi_type):
-        raise ValueError(f"Unrecognized abi_type: {abi_type}")
+        raise Web3ValueError(f"Unrecognized abi_type: {abi_type}")
 
 
 def validate_abi_value(abi_type: TypeStr, value: Any) -> None:
@@ -107,12 +110,12 @@ def validate_abi_value(abi_type: TypeStr, value: Any) -> None:
         specified_length = length_of_array_type(abi_type)
         if specified_length is not None:
             if specified_length < 1:
-                raise TypeError(
+                raise Web3TypeError(
                     f"Invalid abi-type: {abi_type}. Length of fixed sized "
                     "arrays must be greater than 0."
                 )
             if specified_length != len(value):
-                raise TypeError(
+                raise Web3TypeError(
                     "The following array length does not the length specified"
                     f"by the abi-type, {abi_type}: {value}"
                 )
@@ -138,14 +141,14 @@ def validate_abi_value(abi_type: TypeStr, value: Any) -> None:
             if is_0x_prefixed(value):
                 return
             else:
-                raise TypeError(
+                raise Web3TypeError(
                     "ABI values of abi-type 'bytes' must be either"
                     "a python3 'bytes' object or an '0x' prefixed string."
                 )
     elif is_string_type(abi_type) and is_string(value):
         return
 
-    raise TypeError(f"The following abi value is not a '{abi_type}': {value}")
+    raise Web3TypeError(f"The following abi value is not a '{abi_type}': {value}")
 
 
 def is_not_address_string(value: Any) -> bool:
@@ -173,7 +176,7 @@ def validate_address(value: Any) -> None:
         return
 
     if not isinstance(value, str):
-        raise TypeError(f"Address {value} must be provided as a string")
+        raise Web3TypeError(f"Address {value} must be provided as a string")
     if not is_hex_address(value):
         raise InvalidAddress(
             "Address must be 20 bytes, as a hex string with a 0x prefix", value
@@ -204,7 +207,7 @@ def has_one_val(*args: Any, **kwargs: Any) -> bool:
 
 def assert_one_val(*args: Any, **kwargs: Any) -> None:
     if not has_one_val(*args, **kwargs):
-        raise TypeError(
+        raise Web3TypeError(
             "Exactly one of the passed values can be specified. "
             f"Instead, values were: {args!r}, {kwargs!r}"
         )

web3/beacon/__init__.py

@@ -1,2 +1,7 @@
 from .async_beacon import AsyncBeacon
 from .beacon import Beacon
+
+__all__ = [
+    "AsyncBeacon",
+    "Beacon",
+]

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/beacon/async_beacon.py

@@ -1,16 +1,20 @@
 from typing import (
     Any,
     Dict,
+    List,
+    Optional,
 )
 
+from aiohttp import (
+    ClientTimeout,
+)
 from eth_typing import (
     URI,
     HexStr,
 )
 
-from web3._utils.request import (
-    async_get_response_from_get_request,
-    async_json_make_get_request,
+from web3._utils.http_session_manager import (
+    HTTPSessionManager,
 )
 from web3.beacon.api_endpoints import (
     GET_ATTESTATIONS,
@@ -18,6 +22,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,
@@ -63,10 +68,15 @@ class AsyncBeacon:
     ) -> None:
         self.base_url = base_url
         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 async_json_make_get_request(uri, timeout=self.request_timeout)
+        return await self._request_session_manager.async_json_make_get_request(
+            uri, params=params, timeout=ClientTimeout(self.request_timeout)
+        )
 
     # [ BEACON endpoints ]
 
@@ -208,7 +218,9 @@ class AsyncBeacon:
 
     async def get_health(self) -> int:
         url = URI(self.base_url + GET_HEALTH)
-        response = await async_get_response_from_get_request(url)
+        response = (
+            await self._request_session_manager.async_get_response_from_get_request(url)
+        )
         return response.status
 
     async def get_version(self) -> Dict[str, Any]:
@@ -216,3 +228,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/beacon/beacon.py

@@ -1,6 +1,8 @@
 from typing import (
     Any,
     Dict,
+    List,
+    Optional,
 )
 
 from eth_typing import (
@@ -8,9 +10,8 @@ from eth_typing import (
     HexStr,
 )
 
-from web3._utils.request import (
-    get_response_from_get_request,
-    json_make_get_request,
+from web3._utils.http_session_manager import (
+    HTTPSessionManager,
 )
 from web3.beacon.api_endpoints import (
     GET_ATTESTATIONS,
@@ -18,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,
@@ -61,10 +63,15 @@ class Beacon:
     ) -> None:
         self.base_url = base_url
         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 json_make_get_request(uri, timeout=self.request_timeout)
+        return self._request_session_manager.json_make_get_request(
+            uri, params=params, timeout=self.request_timeout
+        )
 
     # [ BEACON endpoints ]
 
@@ -196,7 +203,7 @@ class Beacon:
 
     def get_health(self) -> int:
         url = URI(self.base_url + GET_HEALTH)
-        response = get_response_from_get_request(url)
+        response = self._request_session_manager.get_response_from_get_request(url)
         return response.status_code
 
     def get_version(self) -> Dict[str, Any]:
@@ -204,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/contract/__init__.py

@@ -7,3 +7,10 @@ from web3.contract.contract import (
     ContractCaller,
     ContractConstructor,
 )
+
+__all__ = [
+    "AsyncContract",
+    "AsyncContractCaller",
+    "Contract",
+    "ContractConstructor",
+]