feat: support web3.py v7 (in addition to v6)

setup.py

@@ -118,15 +118,14 @@
         "urllib3>=2.0.0,<3",
         "watchdog>=3.0,<4",
         # ** Dependencies maintained by Ethereum Foundation **
-        # All version pins dependent on web3[tester]
-        "eth-abi",
-        "eth-account",
-        "eth-typing>=3.5.2,<4",
-        "eth-utils",
-        "hexbytes",
+        "eth-abi>=5.1.0,<6",
+        "eth-account>=0.13.4,<0.14",
+        "eth-typing>=5.0.1,<6",
+        "eth-utils>=5.1.0,<6",
+        "hexbytes>=1.2.1,<2",
         "py-geth>=5.1.0,<6",
         "trie>=3.0.1,<4",  # Peer: stricter pin needed for uv support.
-        "web3[tester]>=6.17.2,<7",
+        "web3[tester]>=7.6.0,<8",
         # ** Dependencies maintained by ApeWorX **
         "eip712>=0.2.10,<0.3",
         "ethpm-types>=0.6.19,<0.7",

src/ape_accounts/accounts.py

@@ -255,7 +255,7 @@ def sign_raw_msghash(self, msghash: HexBytes) -> Optional[MessageSignature]:
         # Also, we have already warned the user about the safety.
         with warnings.catch_warnings():
             warnings.simplefilter("ignore")
-            signed_msg = EthAccount.signHash(msghash, self.__key)
+            signed_msg = EthAccount.unsafe_sign_hash(msghash, self.__key)
 
         return MessageSignature(
             v=signed_msg.v,

src/ape_ethereum/provider.py

@@ -19,9 +19,7 @@
 from evmchains import PUBLIC_CHAIN_META, get_random_rpc
 from pydantic.dataclasses import dataclass
 from requests import HTTPError
-from web3 import HTTPProvider, IPCProvider, Web3
-from web3 import WebsocketProvider as WebSocketProvider
-from web3._utils.http import construct_user_agent
+from web3 import HTTPProvider, IPCProvider, Web3, WebSocketProvider
 from web3.exceptions import ContractLogicError as Web3ContractLogicError
 from web3.exceptions import (
     ExtraDataLengthError,
@@ -30,7 +28,7 @@
     TransactionNotFound,
 )
 from web3.gas_strategies.rpc import rpc_gas_price_strategy
-from web3.middleware import geth_poa_middleware as ExtraDataToPOAMiddleware
+from web3.middleware import ExtraDataToPOAMiddleware
 from web3.middleware.validation import MAX_EXTRADATA_LENGTH
 from web3.providers import AutoProvider
 from web3.providers.auto import load_provider_from_environment
@@ -1326,9 +1324,7 @@ class EthereumNodeProvider(Web3Provider, ABC):
     name: str = "node"
 
     # NOTE: Appends user-agent to base User-Agent string.
-    request_header: dict = {
-        "User-Agent": construct_user_agent(str(HTTPProvider)),
-    }
+    request_header: dict = {}
 
     @property
     def uri(self) -> str:

src/ape_node/provider.py

@@ -13,7 +13,7 @@
 from pydantic import field_validator
 from pydantic_settings import SettingsConfigDict
 from requests.exceptions import ConnectionError
-from web3.middleware import geth_poa_middleware as ExtraDataToPOAMiddleware
+from web3.middleware import ExtraDataToPOAMiddleware
 
 from ape.api.config import PluginConfig
 from ape.api.providers import SubprocessProvider, TestProviderAPI

src/ape_test/accounts.py

@@ -166,7 +166,7 @@ def sign_transaction(
     def sign_raw_msghash(self, msghash: HexBytes) -> MessageSignature:
         with warnings.catch_warnings():
             warnings.simplefilter("ignore")
-            signed_msg = EthAccount.signHash(msghash, self.private_key)
+            signed_msg = EthAccount.unsafe_sign_hash(msghash, self.private_key)
 
         return MessageSignature(
             v=signed_msg.v,

tests/functional/geth/test_provider.py

@@ -11,7 +11,7 @@
 from web3 import AutoProvider, Web3
 from web3.exceptions import ContractLogicError as Web3ContractLogicError
 from web3.exceptions import ExtraDataLengthError
-from web3.middleware import geth_poa_middleware as ExtraDataToPOAMiddleware
+from web3.middleware import ExtraDataToPOAMiddleware
 from web3.providers import HTTPProvider
 
 from ape.exceptions import (