fix: Update dependency foundry compilers use of ZksolcSettings (#544)

* Update foundry compilers for latest changes of ZksolcSettings * Update crates/config/src/zksync.rs Co-authored-by: Federico Rodríguez <[email protected]> * cargo fmt --------- Co-authored-by: Jrigada <[email protected]> Co-authored-by: Federico Rodríguez <[email protected]>
matter-labs · Aug 29, 2024 · c8e23ef · c8e23ef
1 parent bf71946
commit c8e23ef
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/config/src/zksync.rs b/crates/config/src/zksync.rs
@@ -4,8 +4,9 @@ use foundry_compilers::{
         EvmVersion, Libraries,
     },
     solc::CliSettings,
-    zksolc::settings::{
-        BytecodeHash, Optimizer, OptimizerDetails, SettingsMetadata, ZkSolcSettings,
+    zksolc::{
+        settings::{BytecodeHash, Optimizer, OptimizerDetails, SettingsMetadata, ZkSolcSettings},
+        ZkSettings,
     },
 };
 
@@ -108,7 +109,7 @@ impl ZkSyncConfig {
             jump_table_density_threshold: None,
         };
 
-        ZkSolcSettings {
+        let zk_settings = ZkSettings {
             libraries,
             optimizer,
             evm_version: Some(evm_version),
@@ -126,8 +127,10 @@ impl ZkSyncConfig {
                     per_contract: Some([OutputSelectionFlag::ABI].into()),
                 }),
             },
-            cli_settings: CliSettings::default(),
-        }
+        };
+
+        // `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>> {

diff --git a/crates/verify/src/etherscan/flatten.rs b/crates/verify/src/etherscan/flatten.rs
@@ -12,7 +12,7 @@ use foundry_compilers::{
         solc::{SolcCompiler, SolcLanguage, SolcVersionedInput},
         Compiler, CompilerInput,
     },
-    solc::Solc,
+    solc::{CliSettings, Solc},
     zksolc::{
         input::{ZkSolcInput, ZkSolcVersionedInput},
         ZkSolc, ZkSolcCompiler,
@@ -70,7 +70,7 @@ impl EtherscanSourceProvider for EtherscanFlattenedSource {
         args: &VerifyArgs,
         context: &ZkVerificationContext,
     ) -> Result<(String, String, CodeFormat)> {
-        let metadata = context.project.settings.metadata.as_ref();
+        let metadata = context.project.settings.settings.metadata.as_ref();
         let bch = metadata.and_then(|m| m.bytecode_hash).unwrap_or_default();
 
         eyre::ensure!(
@@ -190,9 +190,7 @@ Diagnostics: {diags}",
                 ..Default::default()
             },
             solc_version: solc_version.clone(),
-            allow_paths: Default::default(),
-            base_path: Default::default(),
-            include_paths: Default::default(),
+            cli_settings: CliSettings::default(),
         };
 
         let solc_compiler = if compiler_version.is_zksync_solc {