feat(zk_toolbox): use configs from the main repo

Cargo.toml

@@ -166,7 +166,7 @@ sha3 = "0.10.8"
 sqlx = "0.7.3"
 static_assertions = "1.1"
 structopt = "0.3.20"
-strum = "0.24"
+strum = "0.26"
 tempfile = "3.0.2"
 test-casing = "0.1.2"
 test-log = "0.2.15"

core/lib/basic_types/src/commitment.rs

@@ -1,12 +1,13 @@
 use serde::{Deserialize, Serialize};
+use strum::{Display, EnumIter};
 
 use crate::{
     ethabi,
     web3::contract::{Detokenize, Error as ContractError},
     U256,
 };
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize, EnumIter, Display)]
 pub enum L1BatchCommitmentMode {
     #[default]
     Rollup,

core/lib/config/src/configs/general.rs

@@ -18,7 +18,7 @@ use crate::{
     SnapshotsCreatorConfig,
 };
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct GeneralConfig {
     pub postgres_config: Option<PostgresConfig>,
     pub api_config: Option<ApiConfig>,

core/lib/config/src/configs/secrets.rs

@@ -30,9 +30,11 @@ impl DatabaseSecrets {
 
     /// Returns a copy of the replica database URL as a `Result` to simplify error propagation.
     pub fn replica_url(&self) -> anyhow::Result<SensitiveUrl> {
-        self.server_replica_url
-            .clone()
-            .context("Replica DB URL is absent")
+        if let Some(replica_url) = &self.server_replica_url {
+            Ok(replica_url.clone())
+        } else {
+            self.master_url()
+        }
     }
 
     /// Returns a copy of the prover database URL as a `Result` to simplify error propagation.

core/lib/protobuf_config/src/lib.rs

@@ -40,7 +40,10 @@ mod wallets;
 use std::{path::PathBuf, str::FromStr};
 
 use anyhow::Context;
-use zksync_protobuf::{serde::serialize_proto, ProtoRepr};
+use zksync_protobuf::{
+    build::{prost_reflect, prost_reflect::ReflectMessage, serde},
+    ProtoRepr,
+};
 use zksync_types::{H160, H256};
 
 fn parse_h256(bytes: &str) -> anyhow::Result<H256> {
@@ -71,3 +74,13 @@ pub fn encode_yaml_repr<T: ProtoRepr>(value: &T::Type) -> anyhow::Result<Vec<u8>
     serialize_proto(&T::build(value), &mut s)?;
     Ok(buffer)
 }
+
+fn serialize_proto<T: ReflectMessage, S: serde::Serializer>(
+    x: &T,
+    s: S,
+) -> Result<S::Ok, S::Error> {
+    let opts = prost_reflect::SerializeOptions::new()
+        .use_proto_field_name(true)
+        .stringify_64_bit_integers(false);
+    x.transcode_to_dynamic().serialize_with_options(s, &opts)
+}

core/lib/protobuf_config/src/secrets.rs

@@ -41,15 +41,12 @@ impl ProtoRepr for proto::DatabaseSecrets {
             .map(str::parse::<SensitiveUrl>)
             .transpose()
             .context("master_url")?;
-        let mut server_replica_url = self
+        let server_replica_url = self
             .server_replica_url
             .as_deref()
             .map(str::parse::<SensitiveUrl>)
             .transpose()
             .context("replica_url")?;
-        if server_replica_url.is_none() {
-            server_replica_url.clone_from(&server_url)
-        }
         let prover_url = self
             .prover_url
             .as_deref()

prover/Cargo.toml

@@ -47,7 +47,7 @@ serde_json = "1.0"
 sha3 = "0.10.8"
 sqlx = { version = "0.7.3", default-features = false }
 structopt = "0.3.26"
-strum = { version = "0.24" }
+strum = { version = "0.26" }
 tempfile = "3"
 tokio = "1"
 toml_edit = "0.14.4"