chore: move contract verifier logic to lib (#2240)

## What ❔

Move the contract verifier struct to the separate lib crate.

## Why ❔

This logic can be used as a library. At lest, for example, now it's
needed for some compiler analysis tool.

## Checklist

<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->

- [ ] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [ ] Tests for the changes have been added / updated.
- [ ] Documentation comments have been added / updated.
- [ ] Code has been formatted via `zk fmt` and `zk lint`.
- [ ] Spellcheck has been run via `zk spellcheck`.

Cargo.toml

@@ -38,6 +38,7 @@ members = [
     "core/lib/basic_types",
     "core/lib/config",
     "core/lib/constants",
+    "core/lib/contract_verifier",
     "core/lib/contracts",
     "core/lib/crypto",
     "core/lib/circuit_breaker",
@@ -212,6 +213,7 @@ zksync = { path = "sdk/zksync-rs" }
 zksync_basic_types = { path = "core/lib/basic_types" }
 zksync_circuit_breaker = { path = "core/lib/circuit_breaker" }
 zksync_config = { path = "core/lib/config" }
+zksync_contract_verifier_lib = { path = "core/lib/contract_verifier" }
 zksync_contracts = { path = "core/lib/contracts" }
 zksync_core_leftovers = { path = "core/lib/zksync_core_leftovers" }
 zksync_crypto = { path = "core/lib/crypto" }

core/bin/contract-verifier/Cargo.toml

@@ -11,11 +11,10 @@ categories.workspace = true
 publish = false
 
 [dependencies]
-zksync_types.workspace = true
 zksync_dal.workspace = true
 zksync_env_config.workspace = true
 zksync_config.workspace = true
-zksync_contracts.workspace = true
+zksync_contract_verifier_lib.workspace = true
 zksync_queued_job_processor.workspace = true
 zksync_utils.workspace = true
 prometheus_exporter.workspace = true
@@ -25,15 +24,5 @@ anyhow.workspace = true
 tokio = { workspace = true, features = ["full"] }
 futures.workspace = true
 ctrlc.workspace = true
-thiserror.workspace = true
-chrono.workspace = true
-serde_json.workspace = true
-ethabi.workspace = true
-vise.workspace = true
-hex.workspace = true
-serde = { workspace = true, features = ["derive"] }
 structopt.workspace = true
-lazy_static.workspace = true
-tempfile.workspace = true
-regex.workspace = true
 tracing.workspace = true

core/bin/contract-verifier/src/main.rs

@@ -9,19 +9,12 @@ use zksync_config::{
     configs::{ObservabilityConfig, PrometheusConfig},
     ApiConfig, ContractVerifierConfig,
 };
+use zksync_contract_verifier_lib::ContractVerifier;
 use zksync_dal::{ConnectionPool, Core, CoreDal};
 use zksync_env_config::FromEnv;
 use zksync_queued_job_processor::JobProcessor;
 use zksync_utils::{wait_for_tasks::ManagedTasks, workspace_dir_or_current_dir};
 
-use crate::verifier::ContractVerifier;
-
-pub mod error;
-mod metrics;
-pub mod verifier;
-pub mod zksolc_utils;
-pub mod zkvyper_utils;
-
 async fn update_compiler_versions(connection_pool: &ConnectionPool<Core>) {
     let mut storage = connection_pool.connection().await.unwrap();
     let mut transaction = storage.start_transaction().await.unwrap();

core/lib/contract_verifier/Cargo.toml

@@ -0,0 +1,33 @@
+[package]
+name = "zksync_contract_verifier_lib"
+version = "0.1.0"
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+[dependencies]
+zksync_types.workspace = true
+zksync_dal.workspace = true
+zksync_env_config.workspace = true
+zksync_config.workspace = true
+zksync_contracts.workspace = true
+zksync_queued_job_processor.workspace = true
+zksync_utils.workspace = true
+
+anyhow.workspace = true
+tokio = { workspace = true, features = ["full"] }
+thiserror.workspace = true
+chrono.workspace = true
+serde_json.workspace = true
+ethabi.workspace = true
+vise.workspace = true
+hex.workspace = true
+serde = { workspace = true, features = ["derive"] }
+lazy_static.workspace = true
+tempfile.workspace = true
+regex.workspace = true
+tracing.workspace = true

core/bin/contract-verifier/src/verifier.rs → core/lib/contract_verifier/src/lib.rs

@@ -30,6 +30,11 @@ use crate::{
     zkvyper_utils::{ZkVyper, ZkVyperInput},
 };
 
+pub mod error;
+mod metrics;
+mod zksolc_utils;
+mod zkvyper_utils;
+
 lazy_static! {
     static ref DEPLOYER_CONTRACT: Contract = zksync_contracts::deployer_contract();
 }
@@ -274,7 +279,7 @@ impl ContractVerifier {
         Err(ContractVerifierError::MissingContract(contract_name))
     }
 
-    async fn compile(
+    pub async fn compile(
         request: VerificationRequest,
         config: ContractVerifierConfig,
     ) -> Result<CompilationArtifacts, ContractVerifierError> {

core/bin/contract-verifier/src/zksolc_utils.rs → core/lib/contract_verifier/src/zksolc_utils.rs

@@ -74,18 +74,6 @@ impl Default for Optimizer {
     }
 }
 
-impl Optimizer {
-    ///
-    /// A shortcut constructor.
-    ///
-    pub fn new(enabled: bool) -> Self {
-        Self {
-            enabled,
-            mode: None,
-        }
-    }
-}
-
 pub struct ZkSolc {
     zksolc_path: PathBuf,
     solc_path: PathBuf,