From c86439e0fa85abdf46448784cc406d191a1c02e9 Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Wed, 16 Feb 2022 23:26:15 +0100
Subject: [PATCH] fix: set metadata file extension properly

---
 ethers-solc/src/artifact_output/configurable.rs | 10 +++++-----
 ethers-solc/src/artifacts/output_selection.rs   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ethers-solc/src/artifact_output/configurable.rs b/ethers-solc/src/artifact_output/configurable.rs
index a1bb16ae1..ae6b4162a 100644
--- a/ethers-solc/src/artifact_output/configurable.rs
+++ b/ethers-solc/src/artifact_output/configurable.rs
@@ -145,10 +145,10 @@ impl ConfigurableArtifacts {
         if self.additional_values.ir {
             selection.push(ContractOutputSelection::Ir);
         }
-        if self.additional_values.ir_optimized {
+        if self.additional_values.ir_optimized || self.additional_files.ir_optimized {
             selection.push(ContractOutputSelection::IrOptimized);
         }
-        if self.additional_values.metadata {
+        if self.additional_values.metadata || self.additional_files.metadata {
             selection.push(ContractOutputSelection::Metadata);
         }
         if self.additional_values.storage_layout {
@@ -163,10 +163,10 @@ impl ConfigurableArtifacts {
         if self.additional_values.gas_estimates {
             selection.push(EvmOutputSelection::GasEstimates.into());
         }
-        if self.additional_values.assembly {
+        if self.additional_values.assembly || self.additional_files.assembly {
             selection.push(EvmOutputSelection::Assembly.into());
         }
-        if self.additional_values.ewasm {
+        if self.additional_values.ewasm || self.additional_files.ewasm {
             selection.push(EwasmOutputSelection::All.into());
         }
         selection
@@ -444,7 +444,7 @@ impl ExtraOutputFiles {
     pub fn write_extras(&self, contract: &Contract, file: &Path) -> Result<(), SolcError> {
         if self.metadata {
             if let Some(ref metadata) = contract.metadata {
-                let file = file.join(".metadata.json");
+                let file = file.with_extension("metadata.json");
                 fs::write(&file, serde_json::to_string_pretty(metadata)?)
                     .map_err(|err| SolcError::io(err, file))?
             }
diff --git a/ethers-solc/src/artifacts/output_selection.rs b/ethers-solc/src/artifacts/output_selection.rs
index c04d1c412..375e485f9 100644
--- a/ethers-solc/src/artifacts/output_selection.rs
+++ b/ethers-solc/src/artifacts/output_selection.rs
@@ -168,7 +168,7 @@ impl FromStr for EvmOutputSelection {
             "evm" => Ok(EvmOutputSelection::All),
             "asm" | "evm.assembly" => Ok(EvmOutputSelection::Assembly),
             "evm.legacyAssembly" => Ok(EvmOutputSelection::LegacyAssembly),
-            "hashes" | "methodidentifiers" | "evm.methodIdentifiers" | "evm.methodidentifiers" => {
+            "methodidentifiers" | "evm.methodIdentifiers" | "evm.methodidentifiers" => {
                 Ok(EvmOutputSelection::MethodIdentifiers)
             }
             "gas" | "evm.gasEstimates" | "evm.gasestimates" => Ok(EvmOutputSelection::GasEstimates),