diff --git a/setup.py b/setup.py index 2a3a65f98d..8942c833fb 100644 --- a/setup.py +++ b/setup.py @@ -126,7 +126,7 @@ "hexbytes", "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", diff --git a/src/ape_accounts/accounts.py b/src/ape_accounts/accounts.py index 7dd0bae941..47d4949e9b 100644 --- a/src/ape_accounts/accounts.py +++ b/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, diff --git a/src/ape_ethereum/provider.py b/src/ape_ethereum/provider.py index eba0c2d3cc..95cd239977 100644 --- a/src/ape_ethereum/provider.py +++ b/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: diff --git a/src/ape_node/provider.py b/src/ape_node/provider.py index e7b49415ac..ccffadf44a 100644 --- a/src/ape_node/provider.py +++ b/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 diff --git a/src/ape_test/accounts.py b/src/ape_test/accounts.py index 43c46a29fd..c2490d34bc 100644 --- a/src/ape_test/accounts.py +++ b/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, diff --git a/tests/functional/geth/test_provider.py b/tests/functional/geth/test_provider.py index 3b7a8bee7c..05e0f1cc6a 100644 --- a/tests/functional/geth/test_provider.py +++ b/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 (