feat(compiler:zk): zksolc 1.5.7 (#688)

* fix(compiler:zk): non-opt `OutputSelection` fix(compiler:zk): `codegen` * chore: bump compilers * chore: re-bump compilers after merge
matter-labs · Nov 4, 2024 · 953a180 · 953a180
1 parent 883034d
commit 953a180
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/config/src/zksync.rs b/crates/config/src/zksync.rs
@@ -5,7 +5,9 @@ use foundry_compilers::{
     },
     solc::CliSettings,
     zksolc::{
-        settings::{BytecodeHash, Optimizer, OptimizerDetails, SettingsMetadata, ZkSolcSettings},
+        settings::{
+            BytecodeHash, Codegen, Optimizer, OptimizerDetails, SettingsMetadata, ZkSolcSettings,
+        },
         ZkSettings,
     },
 };
@@ -122,11 +124,12 @@ impl ZkSyncConfig {
             force_evmla: self.force_evmla,
             llvm_options: self.llvm_options.clone(),
             output_selection: OutputSelection {
-                all: Some(FileOutputSelection {
-                    per_file: None,
-                    per_contract: Some([OutputSelectionFlag::ABI].into()),
-                }),
+                all: FileOutputSelection {
+                    per_file: [].into(),
+                    per_contract: [OutputSelectionFlag::ABI].into(),
+                },
             },
+            codegen: if self.force_evmla { Codegen::EVMLA } else { Codegen::Yul },
         };
 
         // `cli_settings` get set from `Project` values when building `ZkSolcVersionedInput`