fix: sanitize yul artifact contract names

crates/zksync/compilers/src/compilers/zksolc/mod.rs

@@ -358,13 +358,34 @@ impl ZkSolc {
 
     /// Compiles with `--standard-json` and deserializes the output as [`CompilerOutput`].
     pub fn compile(&self, input: &ZkSolcInput) -> Result<ZkCompilerOutput> {
-        // If solc is zksync solc, override the returned version to put the complete zksolc one
         let output = self.compile_output(input)?;
         // Only run UTF-8 validation once.
         let output = std::str::from_utf8(&output).map_err(|_| SolcError::InvalidUtf8)?;
 
         let mut compiler_output: ZkCompilerOutput = serde_json::from_str(output)?;
 
+        // Sanitize contract names that are source file paths, using the file name without
+        // path or .yul extension. This happens in older zksolc versions and creates issues.
+        // See: https://github.com/matter-labs/era-compiler-solidity/issues/243
+        if input.is_yul() {
+            for contracts in compiler_output.contracts.values_mut() {
+                let contract_names = contracts.keys().cloned().collect::<Vec<String>>();
+                for name in contract_names {
+                    if name.ends_with(".yul") {
+                        let sanitized_name = name
+                            .split('/')
+                            .last()
+                            .unwrap()
+                            .strip_suffix(".yul")
+                            .expect("Error sanitizing path into name");
+                        // Removing and inserting should be fine because there cannot be
+                        // two contracts named the same in a source file
+                        let contract = contracts.remove(&name).expect("Error replacing yul key");
+                        contracts.insert(sanitized_name.into(), contract);
+                    }
+                }
+            }
+        }
         // Add zksync version so that there's some way to identify if zksync solc was used
         // by looking at build info
         compiler_output.zksync_solc_version = self.solc_version_info.zksync_version.clone();

crates/zksync/compilers/tests/zksync_tests.rs

@@ -581,16 +581,16 @@ fn zksync_can_compile_yul_sample() {
         .find_map(|contracts| {
             contracts
                 .iter()
-                .find(|(name, _)| name.ends_with("SimpleStore.yul"))
+                .find(|(name, _)| name.ends_with("SimpleStore"))
                 .and_then(|(_, artifacts)| artifacts.first())
         })
-        .expect("SimpleStore.yul artifact not found")
+        .expect("SimpleStore artifact not found")
         .artifact
         .bytecode
         .clone()
         .unwrap();
 
     let yul_bytecode = simple_store_artifact.object().into_bytes().unwrap();
 
-    assert!(!yul_bytecode.is_empty(), "SimpleStore.yul bytecode is empty");
+    assert!(!yul_bytecode.is_empty(), "SimpleStore bytecode is empty");
 }