fix: removes avoid-contracts in favour of --skip

crates/cli/src/opts/build/zksync.rs

@@ -103,10 +103,6 @@ pub struct ZkSyncArgs {
     #[clap(long = "zk-optimizer")]
     pub optimizer: bool,
 
-    /// Contracts to avoid compiling on zkSync
-    #[clap(long = "zk-avoid-contracts", visible_alias = "avoid-contracts", value_delimiter = ',')]
-    pub avoid_contracts: Option<Vec<String>>,
-
     /// Paymaster address
     #[clap(
         long = "zk-paymaster-address",
@@ -171,7 +167,6 @@ impl ZkSyncArgs {
             self.detect_missing_libraries.then_some(true),
             zksync.detect_missing_libraries
         );
-        set_if_some!(self.avoid_contracts.clone(), zksync.avoid_contracts);
 
         set_if_some!(self.optimizer.then_some(true), zksync.optimizer);
         set_if_some!(

crates/common/Cargo.toml

@@ -13,9 +13,7 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-foundry-block-explorers = { workspace = true, features = [
-    "foundry-compilers",
-] }
+foundry-block-explorers = { workspace = true, features = ["foundry-compilers"] }
 foundry-zksync-compiler.workspace = true
 foundry-common-fmt.workspace = true
 foundry-compilers.workspace = true
@@ -69,9 +67,6 @@ anstream.workspace = true
 anstyle.workspace = true
 terminal_size.workspace = true
 
-# zksync
-globset = "0.4"
-
 [dev-dependencies]
 similar-asserts.workspace = true
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }

crates/common/src/compile.rs

@@ -288,7 +288,6 @@ impl ProjectCompiler {
     pub fn zksync_compile(
         self,
         project: &Project<ZkSolcCompiler, ZkArtifactOutput>,
-        maybe_avoid_contracts: Option<Vec<globset::GlobMatcher>>,
     ) -> Result<ZkProjectCompileOutput> {
         // TODO: Avoid process::exit
         if !project.paths.has_input_files() && self.files.is_empty() {
@@ -311,12 +310,7 @@ impl ProjectCompiler {
         self.zksync_compile_with(&project.paths.root, || {
             let files_to_compile =
                 if !files.is_empty() { files } else { project.paths.input_files() };
-            let avoid_contracts = maybe_avoid_contracts.unwrap_or_default();
-            let sources = Source::read_all(
-                files_to_compile
-                    .into_iter()
-                    .filter(|p| !avoid_contracts.iter().any(|c| c.is_match(p))),
-            )?;
+            let sources = Source::read_all(files_to_compile)?;
             foundry_compilers::zksync::compile::project::ProjectCompiler::with_sources(
                 project, sources,
             )?

crates/config/README.md

@@ -240,8 +240,6 @@ fallback_oz = false
 enable_eravm_extensions = false
 # Force compilation via EVMLA instead of Yul codegen pipeline
 force_evmla = false 
-# List of globs that match contracts to avoid compiling with zksolc
-avoid_contracts = []
 # Enable optimizer on zksolc (defaults to true)
 optimizer = true 
 # zksolc optimizer mode (0 | 1 | 2 | 3 | s | z)

crates/config/src/zksync.rs

@@ -51,9 +51,6 @@ pub struct ZkSyncConfig {
     /// Currently unused
     pub detect_missing_libraries: bool,
 
-    /// Source files to avoid compiling on zksolc
-    pub avoid_contracts: Option<Vec<String>>,
-
     /// Enable optimizer for zkSync
     pub optimizer: bool,
 
@@ -83,7 +80,6 @@ impl Default for ZkSyncConfig {
             force_evmla: Default::default(),
             detect_missing_libraries: Default::default(),
             llvm_options: Default::default(),
-            avoid_contracts: Default::default(),
             optimizer: true,
             optimizer_mode: '3',
             optimizer_details: Default::default(),
@@ -146,13 +142,4 @@ impl ZkSyncConfig {
         // `cli_settings` get set from `Project` values when building `ZkSolcVersionedInput`
         ZkSolcSettings { settings: zk_settings, cli_settings: CliSettings::default() }
     }
-
-    pub fn avoid_contracts(&self) -> Option<Vec<globset::GlobMatcher>> {
-        self.avoid_contracts.clone().map(|patterns| {
-            patterns
-                .into_iter()
-                .map(|pat| globset::Glob::new(&pat).expect("invalid pattern").compile_matcher())
-                .collect::<Vec<_>>()
-        })
-    }
 }

crates/forge/bin/cmd/build.rs

@@ -130,8 +130,7 @@ impl BuildArgs {
                 .quiet(format_json)
                 .bail(!format_json);
 
-            let zk_output =
-                zk_compiler.zksync_compile(&zk_project, config.zksync.avoid_contracts())?;
+            let zk_output = zk_compiler.zksync_compile(&zk_project)?;
             if format_json {
                 println!("{}", serde_json::to_string_pretty(&zk_output.output())?);
             }

crates/forge/bin/cmd/create.rs

@@ -151,8 +151,7 @@ impl CreateArgs {
             let zk_project =
                 foundry_zksync_compiler::config_create_project(&config, config.cache, false)?;
             let zk_compiler = ProjectCompiler::new().files([target_path.clone()]);
-            let mut zk_output =
-                zk_compiler.zksync_compile(&zk_project, config.zksync.avoid_contracts())?;
+            let mut zk_output = zk_compiler.zksync_compile(&zk_project)?;
 
             let artifact = remove_zk_contract(&mut zk_output, &target_path, &self.contract.name)?;
 

crates/forge/bin/cmd/test/mod.rs

@@ -316,8 +316,7 @@ impl TestArgs {
             let sources_to_compile = self.get_sources_to_compile(&config, &filter)?;
             let zk_compiler = ProjectCompiler::new().files(sources_to_compile);
 
-            let zk_output =
-                zk_compiler.zksync_compile(&zk_project, config.zksync.avoid_contracts())?;
+            let zk_output = zk_compiler.zksync_compile(&zk_project)?;
             let dual_compiled_contracts =
                 DualCompiledContracts::new(&output, &zk_output, &project.paths, &zk_project.paths);
 

crates/forge/tests/cli/ext_integration.rs

@@ -149,6 +149,6 @@ fn convex_shutdown_simulation() {
 #[test]
 fn test_zk_aave_di() {
     ExtTester::new("Moonsong-Labs", "aave-delivery-infrastructure", "ci")
-        .args(["--zksync", "--avoid-contracts", "\"*/PayloadScripts.t.sol\""])
+        .args(["--zksync", "--skip", "\"*/PayloadScripts.t.sol\""])
         .run()
 }

crates/forge/tests/it/test_helpers.rs

@@ -484,7 +484,7 @@ pub fn get_zk_compiled(zk_project: &ZkProject) -> ZkProjectCompileOutput {
         write = Some(lock.write().unwrap());
     }
 
-    out = zk_compiler.zksync_compile(zk_project, None);
+    out = zk_compiler.zksync_compile(zk_project);
 
     if let Some(ref mut write) = write {
         write.write_all(b"1").unwrap();

crates/script/src/build.rs

@@ -243,10 +243,7 @@ impl PreprocessedState {
 
             let zk_compiler = ProjectCompiler::new().files(sources_to_compile);
 
-            zk_output = Some(
-                zk_compiler
-                    .zksync_compile(&zk_project, script_config.config.zksync.avoid_contracts())?,
-            );
+            zk_output = Some(zk_compiler.zksync_compile(&zk_project)?);
             Some(DualCompiledContracts::new(
                 &output,
                 &zk_output.clone().unwrap(),

crates/verify/src/verify.rs

@@ -368,7 +368,7 @@ impl VerifyArgs {
             let provider = utils::get_provider(&config)?;
             let code = provider.get_code_at(self.address).await?;
 
-            let output = ProjectCompiler::new().zksync_compile(&project, None)?;
+            let output = ProjectCompiler::new().zksync_compile(&project)?;
             let contracts = ContractsByArtifact::new(
                 output.artifact_ids().map(|(id, artifact)| (id, artifact.clone().into())),
             );

crates/verify/src/zk_provider.rs

@@ -81,7 +81,7 @@ impl ZkVerificationContext {
         let output = ProjectCompiler::new()
             .quiet(true)
             .files([self.target_path.clone()])
-            .zksync_compile(&project, None)?;
+            .zksync_compile(&project)?;
 
         let artifact = output
             .find(&self.target_path, &self.target_name)
@@ -100,7 +100,7 @@ impl ZkVerificationContext {
         let output = ProjectCompiler::new()
             .quiet(true)
             .files([self.target_path.clone()])
-            .zksync_compile(&project, None)?;
+            .zksync_compile(&project)?;
 
         let artifact = output
             .find(&self.target_path, &self.target_name)