Merge branch 'main' into main

fubuloubu · web-flow · commit b200d2d98438 · 2025-11-24T00:49:09.000-03:00
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -79,15 +79,8 @@ jobs:
           with:
               python-version: ${{ matrix.python-version }}
 
-        - name: Setup Go
-          uses: actions/setup-go@v5
-          with:
-            go-version: '^1.20.7'
-
         - name: Install Geth
-          uses: gacts/install-geth-tools@v1
-          with:
-            version: 1.15.6
+          uses: ApeWorX/geth-action@v1
 
         - name: Setup Ape
           uses: ApeWorX/github-action@v3
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 [![Pypi.org][pypi-badge]][pypi-url]
-[![Apache licensed][licence-badge]][licence-url]
+[![Apache licensed][license-badge]][license-url]
 [![Build Status][actions-badge]][actions-url]
+[![Contributing][contributing-badge]][contributing-url]
 [![Discord chat][discord-badge]][discord-url]
 [![Twitter][twitter-badge]][twitter-url]
 
@@ -133,10 +134,12 @@ Install 3rd party plugins at your own risk.
 [actions-url]: https://github.com/ApeWorX/ape/actions?query=branch%3Amain+event%3Apush
 [compile-guide]: https://docs.apeworx.io/ape/stable/userguides/compile.html
 [console-guide]: https://docs.apeworx.io/ape/stable/userguides/console.html
+[contributing-badge]: https://img.shields.io/badge/CONTRIBUTING-guidelines-brightgreen?style=flat-square
+[contributing-url]: https://github.com/ApeWorX/ape?tab=contributing-ov-file
 [discord-badge]: https://img.shields.io/discord/922917176040640612.svg?logo=discord&style=flat-square
 [discord-url]: https://discord.gg/apeworx
-[licence-badge]: https://img.shields.io/github/license/ApeWorX/ape?color=blue
-[licence-url]: https://github.com/ApeWorX/ape/blob/main/LICENSE
+[license-badge]: https://img.shields.io/github/license/ApeWorX/ape?color=blue
+[license-url]: https://github.com/ApeWorX/ape?tab=License-1-ov-file
 [logging-guide]: https://docs.apeworx.io/ape/stable/userguides/logging.html
 [networks-guide]: https://docs.apeworx.io/ape/stable/userguides/networks.html
 [projects-guide]: https://docs.apeworx.io/ape/stable/userguides/projects.html
diff --git a/setup.py b/setup.py
@@ -119,7 +119,7 @@
         "eth-typing>=3.5.2,<6",
         "eth-utils>=2.1.0,<6",
         "hexbytes>=1.2.0,<2",
-        "py-geth>=5.4.0,<6",
+        "py-geth>=6.2.0,<7",
         "trie>=3.0.1,<4",  # Peer: stricter pin needed for uv support.
         "web3[tester]>=7.12.1,<8",
         # ** Dependencies maintained by ApeWorX **
diff --git a/src/ape/api/address.py b/src/ape/api/address.py
@@ -251,7 +251,7 @@ def prepare_transaction(self, txn: "TransactionAPI", **kwargs) -> "TransactionAP
         ):
             raise AccountsError(
                 f"Transfer value meets or exceeds account balance "
-                f"for account '{self.address}' on chain '{self.provider.chain_id}' "
+                f"for account '{self.address}' on chain '{self.chain_manager.chain_id}' "
                 f"using provider '{self.provider.name}'.\n"
                 "Are you using the correct account / chain / provider combination?\n"
                 f"(transfer_value={txn.total_transfer_value}, balance={self.balance})."
diff --git a/src/ape/api/networks.py b/src/ape/api/networks.py
@@ -123,12 +123,11 @@ class EcosystemAPI(ExtraAttributesMixin, BaseInterfaceModel):
     """The default network of the ecosystem, such as ``local``."""
 
     @model_validator(mode="after")
-    @classmethod
-    def _validate_ecosystem(cls, model):
-        headers = RPCHeaders(**model.request_header)
-        headers["User-Agent"] = f"ape-{model.name}"
-        model.request_header = dict(**headers)
-        return model
+    def _validate_ecosystem(self):
+        headers = RPCHeaders(**self.request_header)
+        headers["User-Agent"] = f"ape-{self.name}"
+        self.request_header = dict(**headers)
+        return self
 
     @log_instead_of_fail(default="<EcosystemAPI>")
     def __repr__(self) -> str:
@@ -1042,7 +1041,9 @@ def explorer(self) -> Optional["ExplorerAPI"]:
         Returns:
             :class:`ape.api.explorers.ExplorerAPI`, optional
         """
-        chain_id = None if self.network_manager.active_provider is None else self.provider.chain_id
+        chain_id = (
+            None if self.network_manager.active_provider is None else self.chain_manager.chain_id
+        )
         for plugin_name, plugin_tuple in self._plugin_explorers:
             ecosystem_name, network_name, explorer_class = plugin_tuple
 
diff --git a/src/ape/managers/_contractscache.py b/src/ape/managers/_contractscache.py
@@ -421,7 +421,7 @@ def _get_errors(
         self, address: AddressType, chain_id: Optional[int] = None
     ) -> set[type[CustomError]]:
         if chain_id is None and self.network_manager.active_provider is not None:
-            chain_id = self.provider.chain_id
+            chain_id = self.chain_manager.chain_id
         elif chain_id is None:
             return set()
 
@@ -438,7 +438,7 @@ def _cache_error(
         self, address: AddressType, error: type[CustomError], chain_id: Optional[int] = None
     ):
         if chain_id is None and self.network_manager.active_provider is not None:
-            chain_id = self.provider.chain_id
+            chain_id = self.chain_manager.chain_id
         elif chain_id is None:
             return
 
diff --git a/src/ape/managers/chain.py b/src/ape/managers/chain.py
@@ -605,7 +605,6 @@ def revert_to_block(self, block_number: int):
         Args:
             block_number (int): The block number to revert to.
         """
-
         self._hash_to_receipt_map = {
             h: r for h, r in self._hash_to_receipt_map.items() if r.block_number <= block_number
         }
@@ -821,7 +820,7 @@ def snapshot(self) -> "SnapshotID":
         Returns:
             :class:`~ape.types.SnapshotID`: The snapshot ID.
         """
-        chain_id = self.provider.chain_id
+        chain_id = self.chain_manager.chain_id
         snapshot_id = self.provider.snapshot()
         if snapshot_id not in self._snapshots[chain_id]:
             self._snapshots[chain_id].append(snapshot_id)
@@ -843,7 +842,7 @@ def restore(self, snapshot_id: Optional["SnapshotID"] = None):
             snapshot_id (Optional[:class:`~ape.types.SnapshotID`]): The snapshot ID. Defaults
               to the most recent snapshot ID.
         """
-        chain_id = self.provider.chain_id
+        chain_id = self.chain_manager.chain_id
         if snapshot_id is None and not self._snapshots[chain_id]:
             raise ChainError("There are no snapshots to revert to.")
         elif snapshot_id is None:
diff --git a/src/ape/pytest/fixtures.py b/src/ape/pytest/fixtures.py
@@ -648,7 +648,7 @@ def restore_snapshot(self, scope: Scope):
         if snapshot_id is None:
             return
 
-        elif snapshot_id not in self.chain_snapshots[self.provider.chain_id]:
+        elif snapshot_id not in self.chain_snapshots[self.chain_manager.chain_id]:
             # Still clear out.
             self.snapshots.clear_snapshot_id(scope)
             return
@@ -662,6 +662,8 @@ def restore_snapshot(self, scope: Scope):
             )
             # To avoid trying again
             self.supported = False
+        except Exception as err:
+            logger.error(f"Unhandled error with restoring snapshot: {err}")
 
         self.snapshots.clear_snapshot_id(scope)
 
diff --git a/src/ape_accounts/accounts.py b/src/ape_accounts/accounts.py
@@ -88,7 +88,7 @@ def sign_authorization(
         nonce: Optional[int] = None,
     ) -> Optional[MessageSignature]:
         if chain_id is None:
-            chain_id = self.provider.chain_id
+            chain_id = self.chain_manager.chain_id
 
         signed_authorization = EthAccount.sign_authorization(
             dict(
@@ -172,7 +172,7 @@ def set_delegate(self, contract: Union[BaseAddress, AddressType, str], **txn_kwa
         sig = self.sign_authorization(contract_address, nonce=self.nonce + 1)
         auth = Authorization.from_signature(
             address=contract_address,
-            chain_id=self.provider.chain_id,
+            chain_id=self.chain_manager.chain_id,
             # NOTE: `tx` uses `self.nonce`
             nonce=self.nonce + 1,
             signature=sig,
@@ -190,7 +190,7 @@ def set_delegate(self, contract: Union[BaseAddress, AddressType, str], **txn_kwa
     def remove_delegate(self, **txn_kwargs):
         sig = self.sign_authorization(ZERO_ADDRESS, nonce=self.nonce + 1)
         auth = Authorization.from_signature(
-            chain_id=self.provider.chain_id,
+            chain_id=self.chain_manager.chain_id,
             address=ZERO_ADDRESS,
             # NOTE: `tx` uses `self.nonce`
             nonce=self.nonce + 1,
diff --git a/src/ape_ethereum/ecosystem.py b/src/ape_ethereum/ecosystem.py
@@ -963,7 +963,7 @@ def create_transaction(self, **kwargs) -> "TransactionAPI":
             tx_data["chainId"] = int(chain_id, 16)
 
         elif chain_id is None and self.network_manager.active_provider is not None:
-            tx_data["chainId"] = self.provider.chain_id
+            tx_data["chainId"] = self.chain_manager.chain_id
 
         if "input" in tx_data:
             tx_data["data"] = tx_data.pop("input")
diff --git a/src/ape_ethereum/multicall/handlers.py b/src/ape_ethereum/multicall/handlers.py
@@ -66,8 +66,8 @@ def use_multicall():
         provider = cls.network_manager.provider
         provider.set_code(MULTICALL3_ADDRESS, MULTICALL3_CODE)
 
-        if provider.chain_id not in SUPPORTED_CHAINS:
-            SUPPORTED_CHAINS.append(provider.chain_id)
+        if cls.chain_manager.chain_id not in SUPPORTED_CHAINS:
+            SUPPORTED_CHAINS.append(cls.chain_manager.chain_id)
 
         return multicall
 
@@ -85,7 +85,10 @@ def contract(self) -> ContractInstance:
                 contract_type=ContractType.model_validate(MULTICALL3_CONTRACT_TYPE),
             )
 
-        if self.provider.chain_id not in self.supported_chains and contract.code != MULTICALL3_CODE:
+        if (
+            self.chain_manager.chain_id not in self.supported_chains
+            and contract.code != MULTICALL3_CODE
+        ):
             # NOTE: 2nd condition allows for use in local test deployments and fork networks
             raise UnsupportedChainError()
 
diff --git a/src/ape_ethereum/transactions.py b/src/ape_ethereum/transactions.py
@@ -146,11 +146,10 @@ class StaticFeeTransaction(BaseTransaction):
     max_fee: Optional[HexInt] = Field(default=None, exclude=True)  # type: ignore
 
     @model_validator(mode="after")
-    @classmethod
-    def calculate_read_only_max_fee(cls, tx):
+    def calculate_read_only_max_fee(self):
         # Work-around: we cannot use a computed field to override a non-computed field.
-        tx.max_fee = (tx.gas_limit or 0) * (tx.gas_price or 0)
-        return tx
+        self.max_fee = (self.gas_limit or 0) * (self.gas_price or 0)
+        return self
 
 
 class AccessListTransaction(StaticFeeTransaction):
diff --git a/src/ape_node/provider.py b/src/ape_node/provider.py
@@ -167,7 +167,6 @@ def __init__(
         kwargs_ctor: dict = {
             "data_dir": self.data_dir,
             "geth_executable": executable[0],
-            "network_id": f"{chain_id}",
         }
         if hostname is not None:
             kwargs_ctor["rpc_addr"] = hostname
@@ -199,7 +198,6 @@ def __init__(
         geth_kwargs = construct_test_chain_kwargs(**kwargs_ctor)
         if is_reth:
             geth_kwargs.pop("max_peers", None)
-            geth_kwargs.pop("network_id", None)
             geth_kwargs.pop("no_discover", None)
 
             # NOTE: --verbosity _is_ available in reth, but it is a different type (flag only).
@@ -219,6 +217,10 @@ def __init__(
         self._clean()
 
         geth_kwargs["dev_mode"] = True
+
+        # Does not work with --dev mode.
+        geth_kwargs.pop("network_id", None)
+
         hd_path = hd_path or DEFAULT_TEST_HD_PATH
 
         if generate_accounts:
diff --git a/tests/functional/test_trace.py b/tests/functional/test_trace.py
@@ -246,6 +246,8 @@ def test_transaction_trace_provider_does_not_implement_client_version(
     mock_weird_node = mocker.MagicMock()
     mock_weird_node.client_version.side_effect = AttributeError
     mock_weird_node.network = ethereum.local
+    mock_weird_node.chain_id = chain.chain_id
+    mock_weird_node.get_block.side_effect = chain.provider.get_block
 
     class HackyTransactionTrace(TransactionTrace):
         def _discover_calltrace_approach(self) -> CallTreeNode:
