chore: bump eth pydantic types (#125)

Author: antazoey

ape_foundry/provider.py

@@ -26,7 +26,7 @@
 from ape.utils import cached_property
 from ape_ethereum.provider import Web3Provider
 from ape_test import ApeTestConfig
-from eth_pydantic_types import HashBytes32, HexBytes
+from eth_pydantic_types import HexBytes, HexBytes32
 from eth_typing import HexStr
 from eth_utils import add_0x_prefix, is_0x_prefixed, is_hex, to_hex
 from pydantic import field_validator, model_validator
@@ -41,6 +41,7 @@
     from web3.middleware import ExtraDataToPOAMiddleware  # type: ignore
 except ImportError:
     from web3.middleware import geth_poa_middleware as ExtraDataToPOAMiddleware  # type: ignore
+
 from web3.middleware.validation import MAX_EXTRADATA_LENGTH
 from yarl import URL
 
@@ -141,6 +142,7 @@ class FoundryProvider(SubprocessProvider, Web3Provider, TestProviderAPI):
     attempted_ports: list[int] = []
     cached_chain_id: Optional[int] = None
     _did_warn_wrong_node = False
+    _disconnected: Optional[bool] = None
 
     @property
     def unlocked_accounts(self) -> list["AddressType"]:
@@ -258,7 +260,7 @@ def ws_uri(self) -> str:
 
     @property
     def is_connected(self) -> bool:
-        if self._host in ("auto", None):
+        if self._disconnected is True or self._host in ("auto", None):
             # Hasn't tried yet.
             return False
 
@@ -299,7 +301,7 @@ def connect(self):
         Start the foundry process and verify it's up and accepting connections.
         **NOTE**: Must set port before calling 'super().connect()'.
         """
-
+        self._disconnected = False
         if "APE_FOUNDRY_HOST" in os.environ:
             self._host = os.environ["APE_FOUNDRY_HOST"]
 
@@ -452,6 +454,7 @@ def disconnect(self):
         self._web3 = None
         self._host = None
         super().disconnect()
+        self._disconnected = True
 
     def build_command(self) -> list[str]:
         cmd = [
@@ -665,8 +668,8 @@ def set_storage(self, address: "AddressType", slot: int, value: HexBytes):
             "anvil_setStorageAt",
             [
                 address,
-                to_hex(HashBytes32.__eth_pydantic_validate__(slot)),
-                to_hex(HashBytes32.__eth_pydantic_validate__(value)),
+                to_hex(HexBytes32.__eth_pydantic_validate__(slot)),
+                to_hex(HexBytes32.__eth_pydantic_validate__(value)),
             ],
         )
 

pyproject.toml

@@ -41,6 +41,7 @@ force_grid_wrap = 0
 include_trailing_comma = true
 multi_line_output = 3
 use_parentheses = true
+skip = ["version.py"]
 
 [tool.mdformat]
 number = true

setup.py

@@ -10,7 +10,7 @@
         "pytest-mock",  # For creating mocks
         "pytest-benchmark",  # For performance tests
         "hypothesis>=6.2.0,<7.0",  # Strategy-based fuzzer
-        "ape-alchemy",  # For running fork tests
+        "ape-alchemy>=0.8.9",  # For running fork tests
         "ape-polygon",  # For running polygon fork tests
         "ape-optimism",  # For Optimism integration tests
     ],
@@ -74,13 +74,13 @@
     url="https://github.com/ApeWorX/ape-foundry",
     include_package_data=True,
     install_requires=[
-        "eth-ape>=0.8.21,<0.9",
-        "ethpm-types>=0.6.19,<0.7",
-        "eth_pydantic_types>=0.1.3,<0.2",
+        "eth-ape>=0.8.34,<0.9",
+        "eth_pydantic_types>=0.2.0,<0.3",
         "evm-trace>=0.2.3,<0.3",
+        "ethpm-types>=0.6.19,<0.7",
+        "hexbytes>=0.3.1,<2",
         "web3>=6.20.1,<8",
         "yarl>=1.9.2,<2",
-        "hexbytes>=0.3.1,<2",
     ],
     python_requires=">=3.9,<4",
     extras_require=extras_require,

tests/conftest.py

@@ -246,7 +246,9 @@ def contract_a(owner, connected_provider, get_contract_type):
         ContractContainer(get_contract_type("contract_b")), contract_c.address
     )
     contract_a = owner.deploy(
-        ContractContainer(get_contract_type("contract_a")), contract_b.address, contract_c.address
+        ContractContainer(get_contract_type("contract_a")),
+        contract_b.address,
+        contract_c.address,
     )
     return contract_a
 

tests/test_fork_provider.py

@@ -142,7 +142,11 @@ def test_contract_revert_no_message(owner, mainnet_fork_contract_instance, mainn
 
 @pytest.mark.fork
 def test_transaction_contract_as_sender(
-    mainnet_fork_contract_instance, owner, contract_container, mainnet_fork_provider, convert
+    mainnet_fork_contract_instance,
+    owner,
+    contract_container,
+    mainnet_fork_provider,
+    convert,
 ):
     # Set balance so test wouldn't normally fail from lack of funds
     contract = owner.deploy(contract_container)

tests/test_provider.py

@@ -8,7 +8,7 @@
 from ape.exceptions import ContractLogicError, TransactionError, VirtualMachineError
 from ape_ethereum.trace import Trace
 from ape_ethereum.transactions import TransactionStatusEnum, TransactionType
-from eth_pydantic_types import HashBytes32
+from eth_pydantic_types import HexBytes32
 from eth_utils import to_hex, to_int
 from evm_trace import CallType
 from hexbytes import HexBytes
@@ -429,7 +429,7 @@ def test_send_transaction_when_no_error_and_receipt_fails(
 
     try:
         # NOTE: Value is meaningless.
-        tx_hash = HashBytes32.__eth_pydantic_validate__(123**36)
+        tx_hash = HexBytes32.__eth_pydantic_validate__(123**36)
 
         # Sending tx "works" meaning no vm error.
         mock_web3.eth.send_raw_transaction.return_value = tx_hash

tests/test_trace.py

@@ -21,7 +21,10 @@
 MAINNET_TXN_HASH = "0xb7d7f1d5ce7743e821d3026647df486f517946ef1342a1ae93c96e4a8016eab7"
 EXPECTED_MAP = {
     MAINNET_TXN_HASH: (MAINNET_TRACE_FIRST_10_LINES, MAINNET_TRACE_LAST_10_LINES),
-    MAINNET_FAIL_TXN_HASH: (MAINNET_FAIL_TRACE_FIRST_10_LINES, MAINNET_FAIL_TRACE_LAST_10_LINES),
+    MAINNET_FAIL_TXN_HASH: (
+        MAINNET_FAIL_TRACE_FIRST_10_LINES,
+        MAINNET_FAIL_TRACE_LAST_10_LINES,
+    ),
 }
 BASE_CONTRACTS_PATH = Path(__file__).parent / "data" / "contracts" / "ethereum"