Skip to content

fix(zkstack): use vm_option in args properly #4533

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

Merged
Deniallugo merged 1 commit into from
Oct 9, 2025
Merged

fix(zkstack): use vm_option in args properly #4533

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
11 changes: 10 additions & 1 deletion zkstack_cli/crates/zkstack/src/commands/chain/args/create.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ use slugify_rs::slugify;
use strum::{Display, EnumIter, IntoEnumIterator};
use zkstack_cli_common::{Prompt, PromptConfirm, PromptSelect};
use zkstack_cli_config::forge_interface::deploy_ecosystem::output::Erc20Token;
use zkstack_cli_types::{BaseToken, L1BatchCommitmentMode, L1Network, ProverMode, WalletCreation};
use zkstack_cli_types::{
BaseToken, L1BatchCommitmentMode, L1Network, ProverMode, VMOption, WalletCreation,
};
use zksync_basic_types::H160;

use crate::{
Expand Down Expand Up @@ -88,6 +90,11 @@ impl ChainCreateArgs {
l1_network: &L1Network,
possible_erc20: Vec<Erc20Token>,
) -> anyhow::Result<ChainCreateArgsFinal> {
let vm_option = if self.zksync_os {
VMOption::ZKSyncOsVM
} else {
VMOption::EraVM
};
let mut chain_name = self
.chain_name
.unwrap_or_else(|| Prompt::new(MSG_CHAIN_NAME_PROMPT).ask());
Expand Down Expand Up @@ -247,6 +254,7 @@ impl ChainCreateArgs {
legacy_bridge: self.legacy_bridge,
evm_emulator,
tight_ports: self.tight_ports,
vm_option,
})
}
}
Expand All @@ -264,6 +272,7 @@ pub struct ChainCreateArgsFinal {
pub legacy_bridge: bool,
pub evm_emulator: bool,
pub tight_ports: bool,
pub vm_option: VMOption,
}

#[derive(Debug, Clone, EnumIter, Display, PartialEq, Eq)]
Expand Down
11 changes: 2 additions & 9 deletions zkstack_cli/crates/zkstack/src/commands/chain/create.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ use zkstack_cli_config::{
create_local_configs_dir, create_wallets, traits::SaveConfigWithBasePath, ChainConfig,
EcosystemConfig, GenesisConfig, ZkStackConfig, GENESIS_FILE,
};
use zkstack_cli_types::VMOption;
use zksync_basic_types::L2ChainId;

use crate::{
Expand All @@ -30,12 +29,6 @@ pub async fn create(
ecosystem_config: &mut EcosystemConfig,
shell: &Shell,
) -> anyhow::Result<()> {
let vm_option = if args.zksync_os {
VMOption::ZKSyncOsVM
} else {
VMOption::EraVM
};

let tokens = ecosystem_config.get_erc20_tokens();
let args = args
.fill_values_with_prompt(
Expand All @@ -51,7 +44,7 @@ pub async fn create(
let spinner = Spinner::new(MSG_CREATING_CHAIN_CONFIGURATIONS_SPINNER);
let name = args.chain_name.clone();
let set_as_default = args.set_as_default;
create_chain_inner(args, ecosystem_config, shell, vm_option).await?;
create_chain_inner(args, ecosystem_config, shell).await?;
if set_as_default {
ecosystem_config.set_default_chain(name);
ecosystem_config.save_with_base_path(shell, ".")?;
Expand All @@ -67,8 +60,8 @@ pub(crate) async fn create_chain_inner(
args: ChainCreateArgsFinal,
ecosystem_config: &EcosystemConfig,
shell: &Shell,
vm_option: VMOption,
) -> anyhow::Result<()> {
let vm_option = args.vm_option;
if args.legacy_bridge {
logger::warn("WARNING!!! You are creating a chain with legacy bridge, use it only for testing compatibility")
}
Expand Down
4 changes: 1 addition & 3 deletions zkstack_cli/crates/zkstack/src/commands/ecosystem/create.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use zkstack_cli_config::{
create_local_configs_dir, create_wallets, get_default_era_chain_id,
traits::SaveConfigWithBasePath, EcosystemConfig, EcosystemConfigFromFileError, ZkStackConfig,
};
use zkstack_cli_types::VMOption;

use crate::{
commands::{
Expand Down Expand Up @@ -93,8 +92,7 @@ async fn create(args: EcosystemCreateArgs, shell: &Shell) -> anyhow::Result<()>
spinner.finish();

let spinner = Spinner::new(MSG_CREATING_DEFAULT_CHAIN_SPINNER);
// By default, do not use zksync os for the ecosystem chain
create_chain_inner(chain_config, &ecosystem_config, shell, VMOption::EraVM).await?;
create_chain_inner(chain_config, &ecosystem_config, shell).await?;
spinner.finish();

if args.start_containers {
Expand Down
Loading