Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion crates/linking/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ workspace = true

[dependencies]
foundry-compilers = { workspace = true, features = ["full"] }
semver.workspace = true

alloy-primitives = { workspace = true, features = ["rlp"] }

rayon.workspace = true
semver.workspace = true
thiserror.workspace = true
17 changes: 11 additions & 6 deletions crates/linking/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use foundry_compilers::{
artifacts::{CompactContractBytecodeCow, Libraries},
contracts::ArtifactContracts,
};
use rayon::prelude::*;
use semver::Version;
use std::{
collections::{BTreeMap, BTreeSet},
Expand Down Expand Up @@ -174,7 +175,7 @@ impl<'a> Linker<'a> {

// Link and collect bytecodes for `libs_to_deploy`.
let libs_to_deploy = libs_to_deploy
.into_iter()
.into_par_iter()
.map(|(id, _)| {
Ok(self.link(id, &libraries)?.get_bytecode_bytes().unwrap().into_owned())
})
Expand All @@ -198,7 +199,7 @@ impl<'a> Linker<'a> {
self.collect_dependencies(target, &mut needed_libraries)?;

let mut needed_libraries = needed_libraries
.into_iter()
.into_par_iter()
.filter(|id| {
// Filter out already provided libraries.
let (file, name) = self.convert_artifact_id_to_lib_path(id);
Expand Down Expand Up @@ -233,9 +234,9 @@ impl<'a> Linker<'a> {

let (file, name) = self.convert_artifact_id_to_lib_path(id);

for (_, bytecode) in &mut needed_libraries {
needed_libraries.par_iter_mut().for_each(|(_, bytecode)| {
bytecode.to_mut().link(&file.to_string_lossy(), &name, address);
}
});

libraries.libs.entry(file).or_default().insert(name, address.to_checksum(None));
}
Expand Down Expand Up @@ -295,14 +296,18 @@ impl<'a> Linker<'a> {
&self,
libraries: &Libraries,
) -> Result<ArtifactContracts, LinkerError> {
self.contracts.keys().map(|id| Ok((id.clone(), self.link(id, libraries)?))).collect()
self.get_linked_artifacts_cow(libraries).map(ArtifactContracts::from_iter)
}

pub fn get_linked_artifacts_cow(
&self,
libraries: &Libraries,
) -> Result<ArtifactContracts<CompactContractBytecodeCow<'a>>, LinkerError> {
self.contracts.keys().map(|id| Ok((id.clone(), self.link(id, libraries)?))).collect()
self.contracts
.par_iter()
.map(|(id, _)| Ok((id.clone(), self.link(id, libraries)?)))
.collect::<Result<_, _>>()
.map(ArtifactContracts)
}
}

Expand Down
Loading