fix: issue where wouldn't use expected URI in .fork context (ApeWor…

…X#1940)

.pre-commit-config.yaml

@@ -10,7 +10,7 @@ repos:
       - id: isort
 
 -   repo: https://github.com/psf/black
-    rev: 24.1.1
+    rev: 24.2.0
     hooks:
       - id: black
         name: black

setup.py

@@ -19,7 +19,7 @@
         "hypothesis-jsonschema==0.19.0",  # JSON Schema fuzzer extension
     ],
     "lint": [
-        "black>=24.1.1,<25",  # Auto-formatter and linter
+        "black>=24.2.0,<25",  # Auto-formatter and linter
         "mypy>=1.8.0,<2",  # Static type analyzer
         "types-PyYAML",  # Needed due to mypy typeshed
         "types-requests",  # Needed due to mypy typeshed

src/ape/managers/networks.py

@@ -109,7 +109,7 @@ def fork(
             raise NetworkError(f"Unable to fork network '{self.network.name}'.") from err
 
         provider_settings = provider_settings or {}
-
+        fork_settings = {}
         if block_number is not None:
             # Negative block_number means relative to HEAD
             if block_number < 0:
@@ -120,14 +120,15 @@ def fork(
                     raise NetworkError("Unable to fork past genesis block.")
 
             # Ensure block_number is set in config for this network
-            _dict_overlay(
-                provider_settings,
-                {
-                    "fork": {
-                        self.ecosystem.name: {self.network.name: {"block_number": block_number}}
-                    }
-                },
-            )
+            fork_settings["block_number"] = block_number
+
+        if uri := self.provider.connection_str:
+            fork_settings["upstream_provider"] = uri
+
+        _dict_overlay(
+            provider_settings,
+            {"fork": {self.ecosystem.name: {self.network.name: fork_settings}}},
+        )
 
         shared_kwargs: dict = {"provider_settings": provider_settings, "disconnect_after": True}
         return (

tests/functional/conftest.py

@@ -707,7 +707,7 @@ def mock_sepolia(ethereum, eth_tester_provider, vyper_contract_instance):
     network.
     """
     # Ensuring contract exists before hack.
-    # This allow the nework to be past genesis which is more realistic.
+    # This allow the network to be past genesis which is more realistic.
     _ = vyper_contract_instance
     eth_tester_provider.network.name = "sepolia"
     yield eth_tester_provider.network

tests/functional/geth/test_network_manager.py

@@ -0,0 +1,39 @@
+import pytest
+
+from ape.api.networks import LOCAL_NETWORK_NAME
+from tests.conftest import geth_process_test
+
+
+@pytest.fixture
+def mock_geth_sepolia(ethereum, geth_provider, geth_contract):
+    """
+    Temporarily tricks Ape into thinking the local network
+    is Sepolia so we can test features that require a live
+    network.
+    """
+    # Ensuring contract exists before hack.
+    # This allow the network to be past genesis which is more realistic.
+    _ = geth_contract
+    geth_provider.network.name = "sepolia"
+    yield geth_provider.network
+    geth_provider.network.name = LOCAL_NETWORK_NAME
+
+
+@geth_process_test
+def test_fork_upstream_provider(networks, mock_geth_sepolia, geth_provider, mock_fork_provider):
+    uri = "http://example.com/node"
+    orig = geth_provider.provider_settings.get("uri")
+    geth_provider.provider_settings["uri"] = uri
+    try:
+        with networks.fork():
+            call = mock_fork_provider.partial_call
+
+        settings = call[1]["provider_settings"]["fork"]["ethereum"]["sepolia"]
+        actual = settings["upstream_provider"]
+        assert actual == uri
+    finally:
+        # Restore.
+        if orig:
+            geth_provider.provider_settings["uri"] = orig
+        else:
+            del geth_provider.provider_settings["uri"]

tests/functional/test_network_manager.py

@@ -359,7 +359,8 @@ def test_fork_with_positive_block_number(networks, mock_sepolia, mock_fork_provi
     with networks.fork(block_number=block_id):
         call = mock_fork_provider.partial_call
 
-    actual = call[1]["provider_settings"]["fork"]["ethereum"]["sepolia"]["block_number"]
+    settings = call[1]["provider_settings"]["fork"]["ethereum"]["sepolia"]
+    actual = settings["block_number"]
     assert actual == block_id