Merge branch 'main' into cl/remove-evmla

paritytech · Jan 31, 2025 · 8786d01 · 8786d01
2 parents cb1dd20 + ab90af4
commit 8786d01
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ This is a development pre-release.
 - Removed support for legacy EVM assembly (EVMLA) translation.
 
 ### Fixed
+- Solidity: Add the solc `--libraries` files to sources.
 
 ## v0.1.0-dev.9
 

diff --git a/crates/solidity/src/solc/standard_json/input/mod.rs b/crates/solidity/src/solc/standard_json/input/mod.rs
@@ -62,11 +62,17 @@ impl Input {
         metadata: Option<SolcStandardJsonInputSettingsMetadata>,
         suppressed_warnings: Option<Vec<Warning>>,
     ) -> anyhow::Result<Self> {
+        let mut paths: BTreeSet<PathBuf> = paths.iter().cloned().collect();
+        let libraries = Settings::parse_libraries(library_map)?;
+        for library_file in libraries.keys() {
+            paths.insert(PathBuf::from(library_file));
+        }
+
         #[cfg(feature = "parallel")]
         let iter = paths.into_par_iter(); // Parallel iterator
-
         #[cfg(not(feature = "parallel"))]
         let iter = paths.iter(); // Sequential iterator
+
         let sources = iter
             .map(|path| {
                 let source = Source::try_from(path.as_path()).unwrap_or_else(|error| {
@@ -76,8 +82,6 @@ impl Input {
             })
             .collect();
 
-        let libraries = Settings::parse_libraries(library_map)?;
-
         Ok(Self {
             language,
             sources,