Merge pull request #448 from Skyge/feature-fix-import-key-file

Fix importing key file error. fixes #440

brownie/_cli/accounts.py

@@ -80,12 +80,18 @@ def _generate(id_):
 
 
 def _import(id_, path):
-    source_path = Path(path).absolute()
-    if not source_path.suffix:
-        source_path = source_path.with_suffix(".json")
     dest_path = _get_data_folder().joinpath(f"accounts/{id_}.json")
     if dest_path.exists():
         raise FileExistsError(f"A keystore file already exists with the id '{id_}'")
+
+    source_path = Path(path).absolute()
+    if not source_path.exists():
+        temp_source = source_path.with_suffix(".json")
+        if temp_source.exists():
+            source_path = temp_source
+        else:
+            raise FileNotFoundError(f"Cannot find {source_path}")
+
     accounts.load(source_path)
     shutil.copy(source_path, dest_path)
     notify(

brownie/network/account.py

@@ -108,17 +108,25 @@ def load(self, filename: str = None) -> Union[List, "LocalAccount"]:
 
         Returns:
             Account instance."""
-        project_path = _get_data_folder().joinpath("accounts")
+        base_accounts_path = _get_data_folder().joinpath("accounts")
         if not filename:
-            return [i.stem for i in project_path.glob("*.json")]
+            return [i.stem for i in base_accounts_path.glob("*.json")]
+
         filename = str(filename)
-        if not filename.endswith(".json"):
-            filename += ".json"
         json_file = Path(filename).expanduser()
+
         if not json_file.exists():
-            json_file = project_path.joinpath(filename)
-            if not json_file.exists():
-                raise FileNotFoundError(f"Cannot find {json_file}")
+            temp_json_file = json_file.with_suffix(".json")
+            if temp_json_file.exists():
+                json_file = temp_json_file
+            else:
+                json_file_name = json_file.name
+                json_file = base_accounts_path.joinpath(json_file_name)
+                if json_file.suffix != ".json":
+                    json_file = json_file.with_suffix(".json")
+                if not json_file.exists():
+                    raise FileNotFoundError(f"Cannot find {json_file}")
+
         with json_file.open() as fp:
             priv_key = web3.eth.account.decrypt(
                 json.load(fp), getpass("Enter the password to unlock this account: ")