chore: proper generate legacy asm estra output file

foundry-rs · Sep 30, 2024 · e08ccf1 · e08ccf1
1 parent ed3826d
commit e08ccf1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/crates/artifacts/solc/src/output_selection.rs b/crates/artifacts/solc/src/output_selection.rs
@@ -379,7 +379,7 @@ impl FromStr for EvmOutputSelection {
         match s {
             "evm" => Ok(Self::All),
             "asm" | "evm.assembly" => Ok(Self::Assembly),
-            "evm.legacyAssembly" => Ok(Self::LegacyAssembly),
+            "legacyAssembly" | "evm.legacyAssembly" => Ok(Self::LegacyAssembly),
             "methodidentifiers" | "evm.methodIdentifiers" | "evm.methodidentifiers" => {
                 Ok(Self::MethodIdentifiers)
             }

diff --git a/crates/compilers/src/artifact_output/configurable.rs b/crates/compilers/src/artifact_output/configurable.rs
@@ -751,8 +751,8 @@ impl ExtraOutputFiles {
     ) -> Result<(), SolcError> {
         if self.legacy_assembly {
             if let Some(legacy_asm) = asm {
-                let file = file.with_extension("legacyAssembly");
-                fs::write(&file, legacy_asm.as_str().unwrap_or_default())
+                let file = file.with_extension("legacyAssembly.json");
+                fs::write(&file, format!("{legacy_asm}"))
                     .map_err(|err| SolcError::io(err, file))?
             }
         }
@@ -824,6 +824,7 @@ impl ExtraOutputFiles {
 
         let evm = contract.evm.as_ref();
         self.process_assembly(evm.and_then(|evm| evm.assembly.as_deref()), file)?;
+        self.process_legacy_assembly(evm.and_then(|evm| evm.legacy_assembly.clone()), file)?;
 
         let bytecode = evm.and_then(|evm| evm.bytecode.as_ref());
         self.process_generated_sources(bytecode.map(|b| &b.generated_sources), file)?;