From 7cb7cb94ad00df6fe78775b656189643d896a993 Mon Sep 17 00:00:00 2001
From: alpharush <0xalpharush@protonmail.com>
Date: Thu, 15 Jun 2023 17:21:44 -0500
Subject: [PATCH 1/2] inform user if inheritance cannot be resolved (#1956)

* inform user if inheritance cannot be resolved

* lint

* update explanation
---
 .../slither_compilation_unit_solc.py           | 11 ++++++++++-
 .../contract_with_duplicate_names.sol          |  2 ++
 .../inheritance_resolution_error/import.sol    |  1 +
 tests/unit/core/test_error_messages.py         | 18 ++++++++++++++++++
 4 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 tests/unit/core/test_data/inheritance_resolution_error/contract_with_duplicate_names.sol
 create mode 100644 tests/unit/core/test_data/inheritance_resolution_error/import.sol
 create mode 100644 tests/unit/core/test_error_messages.py

diff --git a/slither/solc_parsing/slither_compilation_unit_solc.py b/slither/solc_parsing/slither_compilation_unit_solc.py
index f4258cd412..a739c6f97d 100644
--- a/slither/solc_parsing/slither_compilation_unit_solc.py
+++ b/slither/solc_parsing/slither_compilation_unit_solc.py
@@ -33,6 +33,10 @@
 logger.setLevel(logging.INFO)
 
 
+class InheritanceResolutionError(SlitherException):
+    pass
+
+
 def _handle_import_aliases(
     symbol_aliases: Dict, import_directive: Import, scope: FileScope
 ) -> None:
@@ -432,7 +436,12 @@ def parse_contracts(self) -> None:  # pylint: disable=too-many-statements,too-ma
                     target = contract_parser.underlying_contract.file_scope.get_contract_from_name(
                         contract_name
                     )
-                    assert target
+                    if target == contract_parser.underlying_contract:
+                        raise InheritanceResolutionError(
+                            "Could not resolve contract inheritance. This is likely caused by an import renaming that collides with existing names (see https://github.com/crytic/slither/issues/1758)."
+                            f"\n Try changing `contract {target}` ({target.source_mapping}) to a unique name."
+                        )
+                    assert target, f"Contract {contract_name} not found"
                     ancestors.append(target)
                 elif i in self._contracts_by_id:
                     ancestors.append(self._contracts_by_id[i])
diff --git a/tests/unit/core/test_data/inheritance_resolution_error/contract_with_duplicate_names.sol b/tests/unit/core/test_data/inheritance_resolution_error/contract_with_duplicate_names.sol
new file mode 100644
index 0000000000..d5c6816e2f
--- /dev/null
+++ b/tests/unit/core/test_data/inheritance_resolution_error/contract_with_duplicate_names.sol
@@ -0,0 +1,2 @@
+import {ERC20 as ERC20_1} from "./import.sol"; 
+contract ERC20 is ERC20_1 {}
\ No newline at end of file
diff --git a/tests/unit/core/test_data/inheritance_resolution_error/import.sol b/tests/unit/core/test_data/inheritance_resolution_error/import.sol
new file mode 100644
index 0000000000..e3221165aa
--- /dev/null
+++ b/tests/unit/core/test_data/inheritance_resolution_error/import.sol
@@ -0,0 +1 @@
+contract ERC20 {}
\ No newline at end of file
diff --git a/tests/unit/core/test_error_messages.py b/tests/unit/core/test_error_messages.py
new file mode 100644
index 0000000000..d0d915d56a
--- /dev/null
+++ b/tests/unit/core/test_error_messages.py
@@ -0,0 +1,18 @@
+from pathlib import Path
+import pytest
+
+
+from slither import Slither
+from slither.solc_parsing.slither_compilation_unit_solc import InheritanceResolutionError
+
+TEST_DATA_DIR = Path(__file__).resolve().parent / "test_data"
+INHERITANCE_ERROR_ROOT = Path(TEST_DATA_DIR, "inheritance_resolution_error")
+
+
+def test_inheritance_resolution_error(solc_binary_path) -> None:
+    with pytest.raises(InheritanceResolutionError):
+        solc_path = solc_binary_path("0.8.0")
+        Slither(
+            Path(INHERITANCE_ERROR_ROOT, "contract_with_duplicate_names.sol").as_posix(),
+            solc=solc_path,
+        )

From ccad54263de5802c9893bd6eb151aa68d1a2cb95 Mon Sep 17 00:00:00 2001
From: Simone <79767264+smonicas@users.noreply.github.com>
Date: Fri, 16 Jun 2023 00:21:59 +0200
Subject: [PATCH 2/2] Handle if crytic-compile returns an empty ast (#1961)

---
 slither/solc_parsing/slither_compilation_unit_solc.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/slither/solc_parsing/slither_compilation_unit_solc.py b/slither/solc_parsing/slither_compilation_unit_solc.py
index a739c6f97d..00ac3a5192 100644
--- a/slither/solc_parsing/slither_compilation_unit_solc.py
+++ b/slither/solc_parsing/slither_compilation_unit_solc.py
@@ -198,6 +198,13 @@ def _parse_enum(self, top_level_data: Dict, filename: str) -> None:
 
     # pylint: disable=too-many-branches,too-many-statements,too-many-locals
     def parse_top_level_from_loaded_json(self, data_loaded: Dict, filename: str) -> None:
+        if not data_loaded or data_loaded is None:
+            logger.error(
+                "crytic-compile returned an empty AST. "
+                "If you are trying to analyze a contract from etherscan or similar make sure it has source code available."
+            )
+            return
+
         if "nodeType" in data_loaded:
             self._is_compact_ast = True