feat(zk_toolbox): Add external_node consensus support

core/bin/external_node/src/config/mod.rs

@@ -27,7 +27,7 @@ use zksync_node_api_server::{
     tx_sender::TxSenderConfig,
     web3::{state::InternalApiConfig, Namespace},
 };
-use zksync_protobuf_config::proto;
+use zksync_protobuf_config::proto::{self};
 use zksync_snapshots_applier::SnapshotsApplierConfig;
 use zksync_types::{
     api::BridgeAddresses, commitment::L1BatchCommitmentMode, url::SensitiveUrl, Address,
@@ -1217,6 +1217,7 @@ pub(crate) struct ExternalNodeConfig<R = RemoteENConfig> {
     pub observability: ObservabilityENConfig,
     pub experimental: ExperimentalENConfig,
     pub consensus: Option<ConsensusConfig>,
+    pub consensus_secrets: Option<ConsensusSecrets>,
     pub api_component: ApiComponentConfig,
     pub tree_component: TreeComponentConfig,
     pub remote: R,
@@ -1240,6 +1241,8 @@ impl ExternalNodeConfig<()> {
             tree_component: envy::prefixed("EN_TREE_")
                 .from_env::<TreeComponentConfig>()
                 .context("could not load external node config (tree component params)")?,
+            consensus_secrets: read_consensus_secrets()
+                .context("config::read_consensus_secrets()")?,
             remote: (),
         })
     }
@@ -1262,7 +1265,7 @@ impl ExternalNodeConfig<()> {
             .map(read_yaml_repr::<proto::consensus::Config>)
             .transpose()
             .context("failed decoding consensus YAML config")?;
-
+        let consensus_secrets = secrets_config.consensus.clone();
         let required = RequiredENConfig::from_configs(
             &general_config,
             &external_node_config,
@@ -1298,6 +1301,7 @@ impl ExternalNodeConfig<()> {
             consensus,
             api_component,
             tree_component,
+            consensus_secrets,
             remote: (),
         })
     }
@@ -1332,6 +1336,7 @@ impl ExternalNodeConfig<()> {
             consensus: self.consensus,
             tree_component: self.tree_component,
             api_component: self.api_component,
+            consensus_secrets: self.consensus_secrets,
             remote,
         })
     }
@@ -1348,6 +1353,7 @@ impl ExternalNodeConfig {
             observability: ObservabilityENConfig::default(),
             experimental: ExperimentalENConfig::mock(),
             consensus: None,
+            consensus_secrets: None,
             api_component: ApiComponentConfig {
                 tree_api_remote_url: None,
             },

core/bin/external_node/src/node_builder.rs

@@ -56,11 +56,7 @@ use zksync_node_framework::{
 };
 use zksync_state::RocksdbStorageOptions;
 
-use crate::{
-    config::{self, ExternalNodeConfig},
-    metrics::framework::ExternalNodeMetricsLayer,
-    Component,
-};
+use crate::{config::ExternalNodeConfig, metrics::framework::ExternalNodeMetricsLayer, Component};
 
 /// Builder for the external node.
 #[derive(Debug)]
@@ -240,8 +236,7 @@ impl ExternalNodeBuilder {
 
     fn add_consensus_layer(mut self) -> anyhow::Result<Self> {
         let config = self.config.consensus.clone();
-        let secrets =
-            config::read_consensus_secrets().context("config::read_consensus_secrets()")?;
+        let secrets = self.config.consensus_secrets.clone();
         let layer = ExternalNodeConsensusLayer { config, secrets };
         self.node.add_layer(layer);
         Ok(self)

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

@@ -1,6 +1,7 @@
 use std::collections::{BTreeMap, BTreeSet};
 
-use secrecy::{ExposeSecret as _, Secret};
+use secrecy::ExposeSecret as _;
+pub use secrecy::Secret;
 use zksync_basic_types::L2ChainId;
 use zksync_concurrency::{limiter, time};