fix: src id bug

ApeWorX · Jun 11, 2024 · 0adbf0f · 0adbf0f
1 parent 165821c
commit 0adbf0f
Showing 1 changed file with 28 additions and 22 deletions.
diff --git a/ape_vyper/compiler.py b/ape_vyper/compiler.py
@@ -16,7 +16,7 @@
 from ape.api.compiler import CompilerAPI
 from ape.exceptions import ContractLogicError
 from ape.logging import logger
-from ape.managers.project import ProjectManager
+from ape.managers.project import ProjectManager, LocalProject
 from ape.types import ContractSourceCoverage, ContractType, SourceTraceback
 from ape.utils import cached_property, get_relative_path, pragma_str_to_specifier_set
 from ape.utils._github import _GithubClient
@@ -485,7 +485,7 @@ def get_dependencies(
         self, project: Optional[ProjectManager] = None
     ) -> dict[str, ProjectManager]:
         pm = project or self.local_project
-        config = self.get_config(pm)
+        config = self.get_config(project=pm)
         dependencies: dict[str, ProjectManager] = {}
         handled: set[str] = set()
 
@@ -501,7 +501,7 @@ def get_dependencies(
 
             dependency = pm.dependencies.get_dependency(name, _version)
             dep_id = f"{dependency.name}_{dependency.version}"
-            if dep_id in handled:
+            if dep_id in handled or (isinstance(dependency.project, LocalProject) and dependency.project.path == pm.path):
                 continue
 
             handled.add(dep_id)
@@ -520,7 +520,7 @@ def get_dependencies(
         # Add auto-remapped dependencies.
         for dependency in pm.dependencies.specified:
             dep_id = f"{dependency.name}_{dependency.version}"
-            if dep_id in handled:
+            if dep_id in handled or (isinstance(dependency.project, LocalProject) and dependency.project.path == pm.path):
                 continue
 
             handled.add(dep_id)
@@ -704,19 +704,25 @@ def compile(
                             if match := re.search(DEV_MSG_PATTERN, line):
                                 dev_messages[line_no] = match.group(1).strip()
 
-                        contract_type = ContractType(
-                            ast=ast,
-                            contractName=name,
-                            sourceId=f"{get_relative_path(Path(source_id), pm.path)}",
-                            deploymentBytecode={"bytecode": evm["bytecode"]["object"]},
-                            runtimeBytecode={"bytecode": bytecode["object"]},
-                            abi=output["abi"],
-                            sourcemap=compressed_src_map,
-                            pcmap=pcmap,
-                            userdoc=output["userdoc"],
-                            devdoc=output["devdoc"],
-                            dev_messages=dev_messages,
-                        )
+                        source_id_path = Path(source_id)
+                        if source_id_path.is_absolute():
+                            final_source_id = f"{get_relative_path(Path(source_id), pm.path)}"
+                        else:
+                            final_source_id = source_id
+
+                        contract_type = ContractType.model_validate({
+                            "ast": ast,
+                            "contractName": name,
+                            "sourceId": final_source_id,
+                            "deploymentBytecode": {"bytecode": evm["bytecode"]["object"]},
+                            "runtimeBytecode": {"bytecode": bytecode["object"]},
+                            "abi": output["abi"],
+                            "sourcemap": compressed_src_map,
+                            "pcmap": pcmap,
+                            "userdoc": output["userdoc"],
+                            "devdoc": output["devdoc"],
+                            "dev_messages": dev_messages,
+                        })
                         contract_types.append(contract_type)
                         contract_versions[name] = (vyper_version, settings_key)
                         yield contract_type
@@ -779,12 +785,12 @@ def compile_code(
             raise VyperCompileError(str(err)) from err
 
         output = result.get("<stdin>", {})
-        return ContractType(
-            abi=output["abi"],
-            deploymentBytecode={"bytecode": output["bytecode"]},
-            runtimeBytecode={"bytecode": output["bytecode_runtime"]},
+        return ContractType.model_validate({
+            "abi": output["abi"],
+            "deploymentBytecode": {"bytecode": output["bytecode"]},
+            "runtimeBytecode": {"bytecode": output["bytecode_runtime"]},
             **kwargs,
-        )
+        })
 
     def _source_vyper_version(self, code: str) -> Version:
         """Given source code, figure out which Vyper version to use"""