Merge branch 'main' into refactor/ethereum/safe-proxy-heuristic

Author: fubuloubu

Dockerfile

@@ -21,25 +21,35 @@ WORKDIR /home/harambe/project
 # NOTE: In CI, you need to cache `uv.lock` (or create it if it doesn't exist)
 COPY pyproject.toml uv.lock ./
 
-# NOTE: Needed to mock version for `setuptools-scm` (pass at build time)
-ARG APE_VERSION
-ENV SETUPTOOLS_SCM_PRETEND_VERSION_FOR_ETH_APE=${APE_VERSION}
-
+# UV Configurations
+# NOTE: use system python (better for our images, that inherit from `python:$VERSION`)
+ENV UV_MANAGED_PYTHON=false
+# NOTE: skip installing dev-only dependencies
+ENV UV_NO_DEV=true
+# NOTE: use `uv.lock` that we loaded into build
+ENV UV_FROZEN=true
+# NOTE: installs everything as non-editable (faster)
+ENV UV_NO_EDITABLE=true
+# NOTE: improves load speed of dependencies
+ENV UV_COMPILE_BYTECODE=true
 # NOTE: link mode "copy" silences warnings about hard links in other commands
 ENV UV_LINK_MODE=copy
 
 # Install dependencies first
-# NOTE: --compile-bytecode improves load speed of dependencies
+# NOTE: --no-install-project so that we have our dependencies built first (speeds up incremental builds)
 RUN --mount=type=cache,target=/root/.cache/uv \
-    uv sync --frozen --no-install-project --no-editable --compile-bytecode
+    uv sync --no-install-project
+
+# NOTE: Needed to mock version for `setuptools-scm` (pass at build time)
+ARG APE_VERSION
+ENV SETUPTOOLS_SCM_PRETEND_VERSION_FOR_ETH_APE=${APE_VERSION}
 
 # Now copy Ape's source code over
 COPY src src
 
 # Install Ape using pre-installed dependencies
-# NOTE: --compile-bytecode improves load speed of dependencies
 RUN --mount=type=cache,target=/root/.cache/uv \
-    uv sync --frozen --no-editable --compile-bytecode
+    uv sync
 
 # Stage 2: Slim image (ape core only)
 
@@ -48,6 +58,7 @@ FROM python:${PYTHON_VERSION}-slim AS slim
 # NOTE: Add a bespoke user to run commands with
 RUN useradd --create-home --shell /bin/bash harambe
 WORKDIR /home/harambe/project
+RUN chown harambe:harambe .
 
 COPY --from=slim-builder --chown=harambe:harambe \
     /home/harambe/project/.venv /home/harambe/project/.venv
@@ -68,15 +79,15 @@ FROM slim-builder AS full-builder
 
 # Install recommended plugins
 RUN --mount=type=cache,target=/root/.cache/uv \
-    uv sync --frozen --no-editable --compile-bytecode --extra recommended-plugins
+    uv sync --extra recommended-plugins
 
 # Stage 4: Full image (slim with recommended plugins from full-builder)
 
 FROM slim AS full
 
 # Install anvil (for the Foundry plugin to be useful)
 # NOTE: Adds 33MB to build
-COPY --from=ghcr.io/foundry-rs/foundry:latest \
+COPY --from=ghcr.io/foundry-rs/foundry:stable \
     /usr/local/bin/anvil /home/harambe/.local/bin/anvil
 
 COPY --from=full-builder --chown=harambe:harambe \

pyproject.toml

@@ -53,7 +53,7 @@ dependencies = [
     "python-dateutil>=2.8.2,<3",
     "PyYAML>=5.1,<7",
     "requests>=2.28.1,<3",
-    "rich>=13.9,<14",
+    "rich>=14.3.3,<15",
     "SQLAlchemy>=1.4.35",
     "toml; python_version<'3.11'",
     "tqdm>=4.67,<5.0",

src/ape/api/accounts.py

@@ -354,7 +354,7 @@ def deploy(
             raise TypeError(
                 "contract argument must be a ContractContainer type, "
                 "such as 'project.MyContract' where 'MyContract' is the name of "
-                "a contract in your project."
+                f"a contract in your project. Got type={type(contract)}"
             )
 
         bytecode = contract.contract_type.deployment_bytecode

src/ape/api/providers.py

@@ -21,7 +21,7 @@
 from ethpm_types import MethodABI
 from pydantic import Field, computed_field, field_serializer, model_validator
 
-from ape.api.networks import NetworkAPI
+from ape.api.networks import NetworkAPI, ProviderContextManager
 from ape.api.query import BlockTransactionQuery
 from ape.api.transactions import ReceiptAPI, TransactionAPI
 from ape.exceptions import (
@@ -311,6 +311,38 @@ def disconnect(self):
         Disconnect from a provider, such as tear-down a process or quit an HTTP session.
         """
 
+    def connection(
+        self,
+        disconnect_after: bool = False,
+        disconnect_on_exit: bool = True,
+    ) -> ProviderContextManager:
+        """
+        Use this provider in a temporary context. Connects on enter and disconnects
+        on exit. Equivalent to :meth:`~ape.managers.networks.NetworkManager.parse_network_choice`
+        but for a provider instance that has already been resolved.
+
+        Usage example::
+
+            provider = networks.ethereum.mainnet.get_provider("infura")
+            with provider.connection():
+                ...
+
+        Args:
+            disconnect_after (bool): Set to ``True`` to force a disconnect after ending
+              the context. Defaults to ``False`` so the connection can be reused, such
+              as in a multi-chain scenario.
+            disconnect_on_exit (bool): Whether to disconnect on the exit of the python
+              session. Defaults to ``True``.
+
+        Returns:
+            :class:`~ape.api.networks.ProviderContextManager`
+        """
+        return ProviderContextManager(
+            provider=self,
+            disconnect_after=disconnect_after,
+            disconnect_on_exit=disconnect_on_exit,
+        )
+
     @property
     def ipc_path(self) -> Path | None:
         """

src/ape/cli/commands.py

@@ -28,10 +28,19 @@ def get_param_from_ctx(ctx: "Context", param: str) -> Any | None:
 
 def parse_network(ctx: "Context") -> "ProviderContextManager | None":
     from ape.api.providers import ProviderAPI
+    from ape.cli.options import NETWORK_META_KEY
     from ape.utils.basemodel import ManagerAccessMixin as access
 
     interactive = get_param_from_ctx(ctx, "interactive")
 
+    # Handle if already parsed by the network_option callback. Preferred
+    # location is ``ctx.meta`` so we don't collide with user-owned ``ctx.obj``
+    # (e.g. when a command chains ``click.make_pass_decorator(...)`` that
+    # replaces ``ctx.obj`` with a typed container).
+    network_meta = ctx.meta.get(NETWORK_META_KEY)
+    if network_meta and (provider := network_meta.get("provider")) is not None:
+        return provider.network.use_provider(provider, disconnect_on_exit=not interactive)
+
     # Handle if already parsed (as when using network-option)
     if ctx.obj and "provider" in ctx.obj:
         provider = ctx.obj["provider"]

src/ape/cli/options.py

@@ -322,6 +322,9 @@ def _get_requested_networks(function, network_object_names):
     return [x for x in command_kwargs if x in network_object_names]
 
 
+NETWORK_META_KEY = "__ape_network__"
+
+
 def _update_context_with_network(ctx, provider, requested_network_objects):
     choice_classes = {
         "ecosystem": provider.network.ecosystem,
@@ -336,22 +339,12 @@ def _update_context_with_network(ctx, provider, requested_network_objects):
         ctx.params[item] = instance
 
     if isinstance(ctx.command, ConnectedProviderCommand):
-        # Place all values, regardless of request in
-        # the context. This helps the Ape CLI backend.
-        if ctx.obj is None:
-            # Happens when using commands that don't use the
-            # Ape context or any context.
-            ctx.obj = {}
-
-        for choice, obj in choice_classes.items():
-            try:
-                ctx.obj[choice] = obj
-            except Exception:
-                # This would only happen if using an unusual context object.
-                raise Abort(
-                    "Cannot use connected-provider command type(s) "
-                    "with non key-settable context object."
-                )
+        # Place all values, regardless of request, in ``ctx.meta`` so that
+        # ``parse_network`` (and ``ctx.obj`` consumers that use
+        # :meth:`click.Context.ensure_object`) can all coexist. ``ctx.obj`` is
+        # owned by the caller's code; ``ctx.meta`` is Click's cross-cutting
+        # scratch space and is safe for us to write to.
+        ctx.meta.setdefault(NETWORK_META_KEY, {}).update(choice_classes)
 
 
 def _get_provider(value, default, keep_as_choice_str):

src/ape/managers/chain.py

@@ -924,11 +924,12 @@ def isolate(self):
                 receipt = contract.fooBar(sender=owner)
         """
 
-        snapshot = None
         try:
             snapshot = self.snapshot()
         except APINotImplementedError:
-            logger.warning("Provider does not support snapshotting.")
+            logger.error("Failed to create snapsho: Provider does not support snapshotting.")
+            snapshot = None
+
         pending = self.pending_timestamp
 
         start_ecosystem_name = self.provider.network.ecosystem.name
@@ -937,30 +938,31 @@ def isolate(self):
 
         try:
             yield
-        finally:
-            if snapshot is None:
-                logger.error("Failed to create snapshot.")
-                return
+        except Exception:
+            pass  # NOTE: Handle cleanup after any exceptions in yielded context
 
-            end_ecosystem_name = self.provider.network.ecosystem.name
-            end_network_name = self.provider.network.name
-            end_provider_name = self.provider.name
+        if snapshot is None:
+            return
 
-            if (
-                start_ecosystem_name != end_ecosystem_name
-                or start_network_name != end_network_name
-                or start_provider_name != end_provider_name
-            ):
-                logger.warning("Provider changed before isolation completed.")
-                return
+        end_ecosystem_name = self.provider.network.ecosystem.name
+        end_network_name = self.provider.network.name
+        end_provider_name = self.provider.name
 
-            self.chain_manager.restore(snapshot)
+        if (
+            start_ecosystem_name != end_ecosystem_name
+            or start_network_name != end_network_name
+            or start_provider_name != end_provider_name
+        ):
+            logger.warning("Provider changed before isolation completed.")
+            return
 
-            try:
-                self.pending_timestamp = pending
-            except APINotImplementedError:
-                # Provider does not support time travel.
-                pass
+        self.chain_manager.restore(snapshot)
+
+        try:
+            self.pending_timestamp = pending
+        except APINotImplementedError:
+            # Provider does not support time travel.
+            pass
 
     def mine(
         self,

src/ape_ethereum/provider.py

@@ -781,10 +781,10 @@ def _eth_call(
 
             vm_err = self.get_virtual_machine_error(
                 err,
-                trace=lambda: _lazy_call_trace.trace,
+                trace=lambda: None if skip_trace else _lazy_call_trace.trace,
                 contract_address=contract_address,
-                source_traceback=lambda: _lazy_call_trace.source_traceback,
-                set_ape_traceback=raise_on_revert,
+                source_traceback=lambda: None if skip_trace else _lazy_call_trace.source_traceback,
+                set_ape_traceback=raise_on_revert and not skip_trace,
             )
             if raise_on_revert:
                 raise vm_err.with_ape_traceback() from err

tests/functional/test_accounts.py

@@ -330,9 +330,9 @@ def test_deploy(owner, contract_container, clean_contract_caches):
 
 @explorer_test
 @pytest.mark.timeout(360)
-def test_deploy_and_publish_local_network(owner, contract_container):
+def test_deploy_and_publish_local_network(owner, minimal_proxy_container):
     with pytest.raises(ProjectError, match="Can only publish deployments on a live network"):
-        owner.deploy(contract_container, 0, publish=True)
+        owner.deploy(minimal_proxy_container, publish=True)
 
 
 @explorer_test

tests/functional/test_cli.py

@@ -873,6 +873,7 @@ def test_get_param_from_ctx(mocker):
 
 def test_parse_network_when_interactive_and_no_param(mocker):
     ctx = mocker.MagicMock()
+    ctx.meta = {}
     ctx.params = {"interactive": True}
     ctx.parent = None
     network_ctx = parse_network(ctx)
@@ -883,6 +884,7 @@ def test_parse_network_when_interactive_and_no_param(mocker):
 
 def test_parse_network_when_interactive_and_str_param(mocker):
     ctx = mocker.MagicMock()
+    ctx.meta = {}
     ctx.params = {"interactive": True, "network": "ethereum:local:test"}
     network_ctx = parse_network(ctx)
     assert network_ctx is not None
@@ -892,6 +894,7 @@ def test_parse_network_when_interactive_and_str_param(mocker):
 
 def test_parse_network_when_interactive_and_class_param(mocker, eth_tester_provider):
     ctx = mocker.MagicMock()
+    ctx.meta = {}
     ctx.params = {"interactive": True, "network": eth_tester_provider}
     network_ctx = parse_network(ctx)
     assert network_ctx is not None
@@ -901,6 +904,7 @@ def test_parse_network_when_interactive_and_class_param(mocker, eth_tester_provi
 
 def test_parse_network_when_explicit_none(mocker):
     ctx = mocker.MagicMock()
+    ctx.meta = {}
     ctx.params = {"network": _NONE_NETWORK}
     network_ctx = parse_network(ctx)
     assert network_ctx is None