From 32c275dfaadef42d3d43cc0ee0653e910c83a6b0 Mon Sep 17 00:00:00 2001
From: Francesco Dainese <franci.dainese@gmail.com>
Date: Fri, 1 Nov 2024 18:09:56 +0100
Subject: [PATCH] fix(compiler:zk): non-opt `OutputSelection`

fix(compiler:zk): `codegen`
---
 crates/config/src/zksync.rs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/crates/config/src/zksync.rs b/crates/config/src/zksync.rs
index 5265b9ca1..8d86eaa41 100644
--- 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`