fix: issue connecting to some random nodes from evmchains (#127)

Author: antazoey

ape_foundry/provider.py

@@ -778,11 +778,10 @@ def fork_url(self) -> str:
     def connect(self):
         super().connect()
 
-        # If using the provider config for upstream_provider,
-        # set the network one in this session, so other features work in core.
         with self.forked_network.use_upstream_provider() as upstream_provider:
+            upstream_genesis_block = None
             try:
-                upstream_genesis_block_hash = upstream_provider.get_block(0).hash
+                upstream_genesis_block = upstream_provider.get_block(0)
             except ExtraDataLengthError as err:
                 if isinstance(upstream_provider, Web3Provider):
                     logger.error(
@@ -791,15 +790,20 @@ def connect(self):
                     upstream_provider.web3.middleware_onion.inject(
                         ExtraDataToPOAMiddleware, layer=0
                     )
-                    upstream_genesis_block_hash = upstream_provider.get_block(0).hash
+                    upstream_genesis_block = upstream_provider.get_block(0)
                 else:
                     raise FoundryProviderError(f"Unable to get genesis block: {err}.") from err
 
-        if self.get_block(0).hash != upstream_genesis_block_hash:
-            logger.warning(
-                "Upstream network has mismatching genesis block. "
-                "This could be an issue with foundry."
-            )
+            except Exception:
+                logger.error("Unable to get genesis block for upstream provider.")
+
+        if upstream_genesis_block is not None:
+            genesis_block = self.get_block(0)
+            if genesis_block.hash != upstream_genesis_block.hash:
+                logger.warning(
+                    "Upstream network has mismatching genesis block. "
+                    "This could be an issue with foundry."
+                )
 
     def build_command(self) -> list[str]:
         if not self.fork_url:

tests/test_fork_provider.py

@@ -7,6 +7,7 @@
 from ape_ethereum.ecosystem import NETWORKS
 
 from ape_foundry import FoundryNetworkConfig
+from ape_foundry.provider import FoundryForkProvider
 
 TESTS_DIRECTORY = Path(__file__).parent
 TEST_ADDRESS = "0xd8da6bf26964af9d7eed9e03e53415d37aa96045"
@@ -183,6 +184,29 @@ def test_connect_to_polygon(networks, owner, contract_container):
         assert isinstance(contract, ContractInstance)  # Didn't fail
 
 
+@pytest.mark.fork
+def test_connect_light_client(mocker, networks, owner, contract_container):
+    """
+    Ensures if we can't detect mismatch, it is OK.
+    """
+    mock_network = mocker.MagicMock()
+    provider = FoundryForkProvider(name="foundry", network=networks.ethereum.local)
+    provider.network = mock_network
+    mock_web3 = mocker.MagicMock()
+    provider._web3 = mock_web3
+
+    # Set up a mock connection context for the upstream provider.
+    mock_ctx = mocker.MagicMock()
+    mock_upstream_provider = mocker.MagicMock()
+    mock_ctx.__enter__.return_value = mock_upstream_provider
+    mock_network.use_upstream_provider.return_value = mock_ctx
+
+    # Make it fail like a light client might.
+    mock_upstream_provider.get_block.side_effect = Exception
+
+    provider.connect()  # No error.
+
+
 @pytest.mark.fork
 @pytest.mark.parametrize("network,port", [("amoy", 9878), ("mainnet", 9879)])
 def test_provider_settings(networks, network, port):