Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Removing detect_missing_libraries arg #822

Merged
merged 1 commit into from
Jan 9, 2025
Merged

feat: Removing detect_missing_libraries arg #822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions crates/cli/src/opts/build/zksync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,6 @@ pub struct ZkSyncArgs {
)]
pub fallback_oz: Option<bool>,

/// Detect missing libraries, instead of erroring
///
/// Currently unused
#[clap(long = "zk-detect-missing-libraries")]
pub detect_missing_libraries: bool,

/// Set the LLVM optimization parameter `-O[0 | 1 | 2 | 3 | s | z]`.
/// Use `3` for best performance and `z` for minimal size.
#[clap(
Expand Down Expand Up @@ -164,10 +158,6 @@ impl ZkSyncArgs {
set_if_some!(self.llvm_options.clone(), zksync.llvm_options);
set_if_some!(self.force_evmla, zksync.force_evmla);
set_if_some!(self.fallback_oz, zksync.fallback_oz);
set_if_some!(
self.detect_missing_libraries.then_some(true),
zksync.detect_missing_libraries
);

set_if_some!(self.optimizer.then_some(true), zksync.optimizer);
set_if_some!(
Expand Down
6 changes: 0 additions & 6 deletions crates/config/src/zksync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@ pub struct ZkSyncConfig {
pub force_evmla: bool,

pub llvm_options: Vec<String>,
/// Detect missing libraries, instead of erroring
///
/// Currently unused
pub detect_missing_libraries: bool,

/// Enable optimizer for zkSync
pub optimizer: bool,
Expand Down Expand Up @@ -91,7 +87,6 @@ impl Default for ZkSyncConfig {
fallback_oz: Default::default(),
enable_eravm_extensions: Default::default(),
force_evmla: Default::default(),
detect_missing_libraries: Default::default(),
llvm_options: Default::default(),
optimizer: true,
optimizer_mode: '3',
Expand Down Expand Up @@ -137,7 +132,6 @@ impl ZkSyncConfig {
via_ir: Some(via_ir),
// Set in project paths.
remappings: Vec::new(),
detect_missing_libraries: self.detect_missing_libraries,
enable_eravm_extensions: self.enable_eravm_extensions,
force_evmla: self.force_evmla,
llvm_options: self.llvm_options.clone(),
Expand Down
7 changes: 0 additions & 7 deletions crates/zksync/compilers/src/compilers/zksolc/settings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,6 @@ pub struct ZkSettings {
#[serde(default)]
/// Libraries
pub libraries: Libraries,
/// Switch to missing deployable libraries detection mode.
/// Contracts are not compiled in this mode, and all compilation artifacts are not included.
#[serde(default, rename = "detectMissingLibraries")]
pub detect_missing_libraries: bool,
// zksolc arguments
/// A flag indicating whether to enable the system contract compilation mode.
/// Whether to enable EraVM extensions.
Expand Down Expand Up @@ -204,7 +200,6 @@ impl Default for ZkSettings {
via_ir: None,
libraries: Default::default(),
remappings: Default::default(),
detect_missing_libraries: false,
enable_eravm_extensions: false,
llvm_options: Default::default(),
force_evmla: false,
Expand Down Expand Up @@ -244,7 +239,6 @@ impl CompilerSettings for ZkSolcSettings {
optimizer,
metadata,
libraries,
detect_missing_libraries,
enable_eravm_extensions,
llvm_options,
force_evmla,
Expand All @@ -262,7 +256,6 @@ impl CompilerSettings for ZkSolcSettings {
*optimizer == other.settings.optimizer &&
*metadata == other.settings.metadata &&
*libraries == other.settings.libraries &&
*detect_missing_libraries == other.settings.detect_missing_libraries &&
*enable_eravm_extensions == other.settings.enable_eravm_extensions &&
*llvm_options == other.settings.llvm_options &&
*force_evmla == other.settings.force_evmla &&
Expand Down
Loading