Skip to content

Commit

Permalink
fix(compiler:zk): non-opt OutputSelection
Browse files Browse the repository at this point in the history
fix(compiler:zk): `codegen`
  • Loading branch information
Karrq committed Nov 1, 2024
1 parent 9093c3c commit 32c275d
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions crates/config/src/zksync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ use foundry_compilers::{
},
solc::CliSettings,
zksolc::{
settings::{BytecodeHash, Optimizer, OptimizerDetails, SettingsMetadata, ZkSolcSettings},
settings::{
BytecodeHash, Codegen, Optimizer, OptimizerDetails, SettingsMetadata, ZkSolcSettings,

Check failure on line 9 in crates/config/src/zksync.rs

View workflow job for this annotation

GitHub Actions / zk-cargo-test

unresolved import `foundry_compilers::zksolc::settings::Codegen`
},
ZkSettings,
},
};
Expand Down Expand Up @@ -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 {

Check failure on line 127 in crates/config/src/zksync.rs

View workflow job for this annotation

GitHub Actions / zk-cargo-test

mismatched types
per_file: [].into(),

Check failure on line 128 in crates/config/src/zksync.rs

View workflow job for this annotation

GitHub Actions / zk-cargo-test

the trait bound `std::option::Option<HashSet<OutputSelectionFlag>>: From<[_; 0]>` is not satisfied
per_contract: [OutputSelectionFlag::ABI].into(),

Check failure on line 129 in crates/config/src/zksync.rs

View workflow job for this annotation

GitHub Actions / zk-cargo-test

the trait bound `std::option::Option<HashSet<OutputSelectionFlag>>: From<[OutputSelectionFlag; 1]>` is not satisfied
},
},
codegen: if self.force_evmla { Codegen::EVMLA } else { Codegen::Yul },

Check failure on line 132 in crates/config/src/zksync.rs

View workflow job for this annotation

GitHub Actions / zk-cargo-test

struct `ZkSettings` has no field named `codegen`
};

// `cli_settings` get set from `Project` values when building `ZkSolcVersionedInput`
Expand Down

0 comments on commit 32c275d

Please sign in to comment.