feat: support loading types from ethPM Manifest

Author: fubuloubu

vyper/cli/utils.py

@@ -9,10 +9,20 @@
 def get_interface_file_path(base_paths: Sequence, import_path: str) -> Path:
     relative_path = Path(import_path)
     for path in base_paths:
+        # Find ABI JSON files
         file_path = path.joinpath(relative_path)
         suffix = next((i for i in (".vy", ".json") if file_path.with_suffix(i).exists()), None)
         if suffix:
             return file_path.with_suffix(suffix)
+
+        # Find ethPM Manifest files (`from path.to.Manifest import InterfaceName`)
+        # NOTE: Use file parent because this assumes that `file_path`
+        #       coincides with an ABI interface file
+        file_path = file_path.parent
+        suffix = next((i for i in (".vy", ".json") if file_path.with_suffix(i).exists()), None)
+        if suffix:
+            return file_path.with_suffix(suffix)
+
     raise FileNotFoundError(f" Cannot locate interface '{import_path}{{.vy,.json}}'")
 
 

vyper/cli/vyper_compile.py

@@ -217,10 +217,36 @@ def get_interface_codes(root_path: Path, contract_sources: ContractCodes) -> Dic
             with valid_path.open() as fh:
                 code = fh.read()
                 if valid_path.suffix == ".json":
-                    interfaces[file_path][interface_name] = {
-                        "type": "json",
-                        "code": json.loads(code.encode()),
-                    }
+                    contents = json.loads(code.encode())
+
+                    # EthPM Manifest (EIP-2678)
+                    if "contractTypes" in contents:
+                        if (
+                            interface_name not in contents["contractTypes"]
+                            or "abi" not in contents["contractTypes"][interface_name]
+                        ):
+                            raise ValueError(
+                                f"Could not find interface '{interface_name}'"
+                                f" in manifest '{valid_path}'."
+                            )
+
+                        interfaces[file_path][interface_name] = {
+                            "type": "json",
+                            "code": contents["contractTypes"][interface_name]["abi"],
+                        }
+
+                    # ABI JSON file (either `List[ABI]` or `{"abi": List[ABI]}`)
+                    elif isinstance(contents, list) or (
+                        "abi" in contents and isinstance(contents["abi"], list)
+                    ):
+                        interfaces[file_path][interface_name] = {
+                            "type": "json",
+                            "code": contents,
+                        }
+
+                    else:
+                        raise ValueError(f"Corrupted file: '{valid_path}'")
+
                 else:
                     interfaces[file_path][interface_name] = {"type": "vyper", "code": code}