feat: support suppressed warnings/errors for zksolc

matter-labs · Nov 4, 2024 · 5c2e7e8 · 5c2e7e8
1 parent 953a180
commit 5c2e7e8
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/config/src/zksync.rs b/crates/config/src/zksync.rs
@@ -6,14 +6,15 @@ use foundry_compilers::{
     solc::CliSettings,
     zksolc::{
         settings::{
-            BytecodeHash, Codegen, Optimizer, OptimizerDetails, SettingsMetadata, ZkSolcSettings,
+            BytecodeHash, Codegen, Optimizer, OptimizerDetails, SettingsMetadata, ZkSolcError,
+            ZkSolcSettings, ZkSolcWarning,
         },
         ZkSettings,
     },
 };
 
 use serde::{Deserialize, Serialize};
-use std::path::PathBuf;
+use std::{collections::HashSet, path::PathBuf};
 
 use crate::SolcReq;
 
@@ -59,8 +60,14 @@ pub struct ZkSyncConfig {
     /// The optimization mode string for zkSync
     pub optimizer_mode: char,
 
-    /// zkSolc optimizer details
+    /// zksolc optimizer details
     pub optimizer_details: Option<OptimizerDetails>,
+
+    /// zksolc suppressed errors
+    pub suppressed_warnings: HashSet<ZkSolcWarning>,
+
+    /// zksolc suppressed warnings
+    pub suppressed_errors: HashSet<ZkSolcError>,
 }
 
 impl Default for ZkSyncConfig {
@@ -80,6 +87,8 @@ impl Default for ZkSyncConfig {
             optimizer: true,
             optimizer_mode: '3',
             optimizer_details: Default::default(),
+            suppressed_warnings: Default::default(),
+            suppressed_errors: Default::default(),
         }
     }
 }
@@ -130,6 +139,8 @@ impl ZkSyncConfig {
                 },
             },
             codegen: if self.force_evmla { Codegen::EVMLA } else { Codegen::Yul },
+            suppressed_warnings: self.suppressed_warnings.clone(),
+            suppressed_errors: self.suppressed_errors.clone(),
         };
 
         // `cli_settings` get set from `Project` values when building `ZkSolcVersionedInput`