fix: create in upstream merge (#462)

Co-authored-by: Francesco Dainese <[email protected]>
Co-authored-by: Federico Rodríguez <[email protected]>

Cargo.toml

@@ -313,3 +313,11 @@ revm-primitives = { git = "https://github.com/bluealloy/revm.git", rev = "41e2f7
 # [patch."https://github.com/matter-labs/era-boojum"]
 # cs_derive = { git = "https://github.com/nbaztec/era-boojum", branch = "foundry-fix" }
 # boojum = { git = "https://github.com/nbaztec/era-boojum", branch = "foundry-fix" }
+
+# [patch."https://github.com/moonsong-labs/compilers"]
+# foundry-compilers = { path = "../msl-compilers/crates/compilers" }
+# foundry-compilers-core = { path = "../msl-compilers/crates/core" }
+# foundry-compilers-artifacts-vyper = { path = "../msl-compilers/crates/artifacts/vyper" }
+# foundry-compilers-artifacts-solc = { path = "../msl-compilers/crates/artifacts/solc" }
+# foundry-compilers-artifacts-zksolc = { path = "../msl-compilers/crates/artifacts/zksolc" }
+# foundry-compilers-artifacts = { path = "../msl-compilers/crates/artifacts/artifacts" }

crates/cli/src/utils/cmd.rs

@@ -6,6 +6,7 @@ use foundry_compilers::{
     artifacts::{CompactBytecode, CompactDeployedBytecode, Settings},
     cache::{CacheEntry, CompilerCache},
     utils::read_json_file,
+    zksync::artifact_output::zk::ZkContractArtifact,
     Artifact, ProjectCompileOutput,
 };
 use foundry_config::{error::ExtractConfigError, figment::Figment, Chain, Config, NamedChain};
@@ -70,6 +71,35 @@ pub fn remove_contract(
     Ok((abi, bin, runtime))
 }
 
+/// Given a `Project`'s output, removes the matching ABI, Bytecode and
+/// Runtime Bytecode of the given contract.
+#[track_caller]
+pub fn remove_zk_contract(
+    output: &mut foundry_compilers::zksync::compile::output::ProjectCompileOutput,
+    path: &Path,
+    name: &str,
+) -> Result<ZkContractArtifact> {
+    let contract = if let Some(contract) = output.remove(path.to_string_lossy(), name) {
+        contract
+    } else {
+        let mut err = format!("could not find artifact: `{name}`");
+        if let Some(suggestion) =
+            super::did_you_mean(name, output.artifacts().map(|(name, _)| name)).pop()
+        {
+            if suggestion != name {
+                err = format!(
+                    r#"{err}
+
+        Did you mean `{suggestion}`?"#
+                );
+            }
+        }
+        eyre::bail!(err)
+    };
+
+    Ok(contract)
+}
+
 /// Helper function for finding a contract by ContractName
 // TODO: Is there a better / more ergonomic way to get the artifacts given a project and a
 // contract name?