redo storage layout format in archives

Author: charles-cooper

vyper/cli/compile_archive.py

@@ -45,17 +45,18 @@ def compiler_data_from_zip(file_name, settings, no_bytecode_metadata):
     fcontents = archive.read("MANIFEST/compilation_targets").decode("utf-8")
     compilation_targets = fcontents.splitlines()
 
-    storage_layout_path = "MANIFEST/storage_layout.json"
+    if len(compilation_targets) != 1:
+        raise BadArchive("Multiple compilation targets not supported!")
+
+    mainpath = PurePath(compilation_targets[0])
+
+    storage_layout_path = f"storage_layouts/{mainpath}.json"
     storage_layout = None
     if storage_layout_path in archive.namelist():
         storage_layout = json.loads(archive.read(storage_layout_path).decode("utf-8"))
 
-    if len(compilation_targets) != 1:
-        raise BadArchive("Multiple compilation targets not supported!")
-
     input_bundle = ZipInputBundle(archive)
 
-    mainpath = PurePath(compilation_targets[0])
     file = input_bundle.load_file(mainpath)
     assert isinstance(file, FileInput)  # mypy hint
 

vyper/compiler/input_bundle.py

@@ -259,7 +259,8 @@ def _load_from_path(self, resolved_path: PurePath, original_path: PurePath) -> C
         # zipfile.BadZipFile: File is not a zip file
 
         try:
-            value = self.archive.read(resolved_path.as_posix()).decode("utf-8")
+            p = PurePath("sources") / resolved_path
+            value = self.archive.read(p.as_posix()).decode("utf-8")
         except KeyError:
             # zipfile literally raises KeyError if the file is not there
             raise _NotFound(resolved_path)

vyper/compiler/output_bundle.py

@@ -22,7 +22,7 @@
 # information.
 
 
-def _anonymize(p: str):
+def _anonymize(p: str) -> str:
     segments = []
     # replace ../../../a/b with 0/1/2/a/b
     for i, s in enumerate(PurePath(p).parts):
@@ -252,12 +252,14 @@ def __del__(self):
 
     def write_sources(self, sources: dict[str, CompilerInput]):
         for path, c in sources.items():
-            self.archive.writestr(_anonymize(path), c.contents)
+            path = f"sources/{_anonymize(path)}"
+            self.archive.writestr(path, c.contents)
 
     def write_storage_layout_overrides(
         self, compilation_target_path: str, storage_layout_override: StorageLayout
     ):
-        self.archive.writestr("MANIFEST/storage_layout.json", json.dumps(storage_layout_override))
+        path = f"storage_layouts/{compilation_target_path}.json"
+        self.archive.writestr(path, json.dumps(storage_layout_override))
 
     def write_search_paths(self, search_paths: list[str]):
         self.archive.writestr("MANIFEST/searchpaths", "\n".join(search_paths))