fix(zkstack): get rid of more dependencies from config (#4554)

## What ❔

Don't ask for unnecessary configs

## Is this a breaking change?
- [ ] Yes
- [ ] No

## Operational changes
<!-- Any config changes? Any new flags? Any changes to any scripts? -->
<!-- Please add anything that non-Matter Labs entities running their own
ZK Chain may need to know -->

## 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 `zkstack dev fmt` and `zkstack dev
lint`.

Signed-off-by: Danil <[email protected]>

Author: Deniallugo

zkstack_cli/crates/config/src/forge_interface/deploy_l2_contracts/input.rs

@@ -44,11 +44,15 @@ impl DeployL2ContractsInput {
 }
 
 async fn get_da_validator_type(config: &ChainConfig) -> anyhow::Result<DAValidatorType> {
-    let general = config.get_general_config().await?;
+    let da_client_type = config
+        .get_general_config()
+        .await
+        .map(|c| c.da_client_type())
+        .unwrap_or_default();
 
     match (
         config.l1_batch_commit_data_generator_mode,
-        general.da_client_type().as_deref(),
+        da_client_type.as_deref(),
     ) {
         (L1BatchCommitmentMode::Rollup, _) => Ok(DAValidatorType::Rollup),
         (L1BatchCommitmentMode::Validium, None | Some("NoDA")) => Ok(DAValidatorType::NoDA),

zkstack_cli/crates/zkstack/src/commands/chain/deploy_l2_contracts.rs

@@ -51,6 +51,7 @@ pub async fn run(
 
     let spinner = Spinner::new(MSG_DEPLOYING_L2_CONTRACT_SPINNER);
 
+    let l1_rpc_url = chain_config.get_secrets_config().await?.l1_rpc_url()?;
     match deploy_option {
         Deploy2ContractsOption::All => {
             deploy_l2_contracts(
@@ -60,6 +61,7 @@ pub async fn run(
                 &mut contracts,
                 args,
                 true,
+                l1_rpc_url,
             )
             .await?;
         }
@@ -70,6 +72,7 @@ pub async fn run(
                 &ecosystem_config,
                 &mut contracts,
                 args,
+                l1_rpc_url,
             )
             .await?;
         }
@@ -80,6 +83,7 @@ pub async fn run(
                 &ecosystem_config,
                 &mut contracts,
                 args,
+                l1_rpc_url,
             )
             .await?;
         }
@@ -90,6 +94,7 @@ pub async fn run(
                 &ecosystem_config,
                 &mut contracts,
                 args,
+                l1_rpc_url,
             )
             .await?;
         }
@@ -100,6 +105,7 @@ pub async fn run(
                 &ecosystem_config,
                 &mut contracts,
                 args,
+                l1_rpc_url,
             )
             .await?;
         }
@@ -110,6 +116,7 @@ pub async fn run(
                 &ecosystem_config,
                 &mut contracts,
                 args,
+                l1_rpc_url,
             )
             .await?
         }
@@ -123,6 +130,7 @@ pub async fn run(
 
 /// Build the L2 contracts, deploy one or all of them with `forge`, then update the config
 /// by reading one or all outputs written by the deploy scripts.
+#[allow(clippy::too_many_arguments)]
 async fn build_and_deploy(
     shell: &Shell,
     chain_config: &ChainConfig,
@@ -131,6 +139,7 @@ async fn build_and_deploy(
     signature: Option<&str>,
     mut update_config: impl FnMut(&Shell, &Path) -> anyhow::Result<()>,
     with_broadcast: bool,
+    l1_rpc_url: String,
 ) -> anyhow::Result<()> {
     build_l2_contracts(shell.clone(), &chain_config.contracts_path())?;
     call_forge(
@@ -140,6 +149,7 @@ async fn build_and_deploy(
         forge_args,
         signature,
         with_broadcast,
+        l1_rpc_url,
     )
     .await?;
     update_config(
@@ -155,6 +165,7 @@ pub async fn deploy_upgrader(
     ecosystem_config: &EcosystemConfig,
     contracts_config: &mut ContractsConfig,
     forge_args: ForgeScriptArgs,
+    l1_rpc_url: String,
 ) -> anyhow::Result<()> {
     build_and_deploy(
         shell,
@@ -166,6 +177,7 @@ pub async fn deploy_upgrader(
             contracts_config.set_default_l2_upgrade(&DefaultL2UpgradeOutput::read(shell, out)?)
         },
         true,
+        l1_rpc_url,
     )
     .await
 }
@@ -176,6 +188,7 @@ pub async fn deploy_consensus_registry(
     ecosystem_config: &EcosystemConfig,
     contracts_config: &mut ContractsConfig,
     forge_args: ForgeScriptArgs,
+    l1_rpc_url: String,
 ) -> anyhow::Result<()> {
     build_and_deploy(
         shell,
@@ -187,6 +200,7 @@ pub async fn deploy_consensus_registry(
             contracts_config.set_consensus_registry(&ConsensusRegistryOutput::read(shell, out)?)
         },
         true,
+        l1_rpc_url,
     )
     .await
 }
@@ -197,6 +211,7 @@ pub async fn deploy_multicall3(
     ecosystem_config: &EcosystemConfig,
     contracts_config: &mut ContractsConfig,
     forge_args: ForgeScriptArgs,
+    l1_rpc_url: String,
 ) -> anyhow::Result<()> {
     build_and_deploy(
         shell,
@@ -206,6 +221,7 @@ pub async fn deploy_multicall3(
         Some("runDeployMulticall3"),
         |shell, out| contracts_config.set_multicall3(&Multicall3Output::read(shell, out)?),
         true,
+        l1_rpc_url,
     )
     .await
 }
@@ -216,6 +232,7 @@ pub async fn deploy_timestamp_asserter(
     ecosystem_config: &EcosystemConfig,
     contracts_config: &mut ContractsConfig,
     forge_args: ForgeScriptArgs,
+    l1_rpc_url: String,
 ) -> anyhow::Result<()> {
     build_and_deploy(
         shell,
@@ -228,6 +245,7 @@ pub async fn deploy_timestamp_asserter(
                 .set_timestamp_asserter_addr(&TimestampAsserterOutput::read(shell, out)?)
         },
         true,
+        l1_rpc_url,
     )
     .await
 }
@@ -238,6 +256,7 @@ pub async fn deploy_l2_da_validator(
     ecosystem_config: &EcosystemConfig,
     contracts_config: &mut ContractsConfig,
     forge_args: ForgeScriptArgs,
+    l1_rpc_url: String,
 ) -> anyhow::Result<()> {
     build_and_deploy(
         shell,
@@ -250,6 +269,7 @@ pub async fn deploy_l2_da_validator(
                 .set_l2_da_validator_address(&L2DAValidatorAddressOutput::read(shell, out)?)
         },
         true,
+        l1_rpc_url,
     )
     .await
 }
@@ -261,6 +281,7 @@ pub async fn deploy_l2_contracts(
     contracts_config: &mut ContractsConfig,
     forge_args: ForgeScriptArgs,
     with_broadcast: bool,
+    l1_rpc_url: String,
 ) -> anyhow::Result<()> {
     build_and_deploy(
         shell,
@@ -278,6 +299,7 @@ pub async fn deploy_l2_contracts(
             Ok(())
         },
         with_broadcast,
+        l1_rpc_url,
     )
     .await
 }
@@ -289,6 +311,7 @@ async fn call_forge(
     forge_args: ForgeScriptArgs,
     signature: Option<&str>,
     with_broadcast: bool,
+    l1_rpc_url: String,
 ) -> anyhow::Result<()> {
     let input = DeployL2ContractsInput::new(
         chain_config,
@@ -298,7 +321,6 @@ async fn call_forge(
     .await?;
 
     let foundry_contracts_path = chain_config.path_to_foundry_scripts();
-    let secrets = chain_config.get_secrets_config().await?;
     input.save(
         shell,
         DEPLOY_L2_CONTRACTS_SCRIPT_PARAMS.input(&chain_config.path_to_foundry_scripts()),
@@ -310,7 +332,7 @@ async fn call_forge(
             forge_args.clone(),
         )
         .with_ffi()
-        .with_rpc_url(secrets.l1_rpc_url()?);
+        .with_rpc_url(l1_rpc_url);
     if with_broadcast {
         forge = forge.with_broadcast();
     }

zkstack_cli/crates/zkstack/src/commands/chain/deploy_paymaster.rs

@@ -14,7 +14,17 @@ use crate::utils::forge::{check_the_balance, fill_forge_private_key, WalletOwner
 pub async fn run(args: ForgeScriptArgs, shell: &Shell) -> anyhow::Result<()> {
     let chain_config = ZkStackConfig::current_chain(shell)?;
     let mut contracts = chain_config.get_contracts_config()?;
-    deploy_paymaster(shell, &chain_config, &mut contracts, args, None, true).await?;
+    let l1_rpc_url = chain_config.get_secrets_config().await?.l1_rpc_url()?;
+    deploy_paymaster(
+        shell,
+        &chain_config,
+        &mut contracts,
+        args,
+        None,
+        true,
+        l1_rpc_url,
+    )
+    .await?;
     contracts.save_with_base_path(shell, chain_config.configs)
 }
 
@@ -25,19 +35,19 @@ pub async fn deploy_paymaster(
     forge_args: ForgeScriptArgs,
     sender: Option<String>,
     broadcast: bool,
+    l1_rpc_url: String,
 ) -> anyhow::Result<()> {
     let input = DeployPaymasterInput::new(chain_config)?;
     let foundry_contracts_path = chain_config.path_to_foundry_scripts();
     input.save(
         shell,
         DEPLOY_PAYMASTER_SCRIPT_PARAMS.input(&foundry_contracts_path),
     )?;
-    let secrets = chain_config.get_secrets_config().await?;
 
     let mut forge = Forge::new(&foundry_contracts_path)
         .script(&DEPLOY_PAYMASTER_SCRIPT_PARAMS.script(), forge_args.clone())
         .with_ffi()
-        .with_rpc_url(secrets.l1_rpc_url()?);
+        .with_rpc_url(l1_rpc_url);
 
     if let Some(address) = sender {
         forge = forge.with_sender(address);

zkstack_cli/crates/zkstack/src/commands/chain/init/mod.rs

@@ -168,6 +168,7 @@ pub async fn init(
         &mut contracts_config,
         init_args.forge_args.clone(),
         true,
+        init_args.l1_rpc_url.clone(),
     )
     .await?;
     contracts_config.save_with_base_path(shell, &chain_config.configs)?;
@@ -233,6 +234,7 @@ pub async fn init(
             init_args.forge_args.clone(),
             None,
             true,
+            init_args.l1_rpc_url.clone(),
         )
         .await?;
         contracts_config.save_with_base_path(shell, &chain_config.configs)?;

zkstack_cli/crates/zkstack/src/commands/ecosystem/common.rs

@@ -169,7 +169,7 @@ pub async fn init_chains(
     let mut deploy_paymaster = args.deploy_paymaster;
     let genesis_args = &mut args.genesis_args;
     if args.dev {
-        deploy_paymaster = Some(true);
+        deploy_paymaster = Some(deploy_paymaster.unwrap_or(true));
         if let Some(genesis) = genesis_args {
             genesis.dev = true;
         }