Skip to content
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

Jump to bottom

fix(zkstack): Fix wrong missing private key message #3334

Merged
merged 3 commits into from
Nov 29, 2024
Merged

fix(zkstack): Fix wrong missing private key message #3334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c9cd79
Add msg_wallet_private_key_not_set
matias-gonz Nov 26, 2024
d0a1bac
Rename wallet type for wallet owner
matias-gonz Nov 26, 2024
b3aae20
Merge branch 'main' into matias/fix-fill-forge-private-key-message
matias-gonz Nov 28, 2024
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
4 changes: 2 additions & 2 deletions zkstack_cli/crates/zkstack/src/accept_ownership.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use xshell::Shell;

use crate::{
messages::MSG_ACCEPTING_GOVERNANCE_SPINNER,
utils::forge::{check_the_balance, fill_forge_private_key},
utils::forge::{check_the_balance, fill_forge_private_key, WalletOwner},
};

lazy_static! {
Expand Down Expand Up @@ -89,7 +89,7 @@ async fn accept_ownership(
governor: &Wallet,
mut forge: ForgeScript,
) -> anyhow::Result<()> {
forge = fill_forge_private_key(forge, Some(governor))?;
forge = fill_forge_private_key(forge, Some(governor), WalletOwner::Governor)?;
check_the_balance(&forge).await?;
let spinner = Spinner::new(MSG_ACCEPTING_GOVERNANCE_SPINNER);
forge.run(shell)?;
Expand Down
8 changes: 6 additions & 2 deletions zkstack_cli/crates/zkstack/src/commands/chain/deploy_l2_contracts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use crate::{
MSG_CHAIN_NOT_INITIALIZED, MSG_DEPLOYING_L2_CONTRACT_SPINNER,
MSG_L1_SECRETS_MUST_BE_PRESENTED,
},
utils::forge::{check_the_balance, fill_forge_private_key},
utils::forge::{check_the_balance, fill_forge_private_key, WalletOwner},
};

pub enum Deploy2ContractsOption {
Expand Down Expand Up @@ -311,7 +311,11 @@ async fn call_forge(
forge = forge.with_signature(signature);
}

forge = fill_forge_private_key(forge, Some(&ecosystem_config.get_wallets()?.governor))?;
forge = fill_forge_private_key(
forge,
Some(&ecosystem_config.get_wallets()?.governor),
WalletOwner::Governor,
)?;

check_the_balance(&forge).await?;
forge.run(shell)?;
Expand Down
8 changes: 6 additions & 2 deletions zkstack_cli/crates/zkstack/src/commands/chain/deploy_paymaster.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use xshell::Shell;

use crate::{
messages::{MSG_CHAIN_NOT_INITIALIZED, MSG_L1_SECRETS_MUST_BE_PRESENTED},
utils::forge::{check_the_balance, fill_forge_private_key},
utils::forge::{check_the_balance, fill_forge_private_key, WalletOwner},
};

pub async fn run(args: ForgeScriptArgs, shell: &Shell) -> anyhow::Result<()> {
Expand Down Expand Up @@ -56,7 +56,11 @@ pub async fn deploy_paymaster(
if let Some(address) = sender {
forge = forge.with_sender(address);
} else {
forge = fill_forge_private_key(forge, Some(&chain_config.get_wallets_config()?.governor))?;
forge = fill_forge_private_key(
forge,
Some(&chain_config.get_wallets_config()?.governor),
WalletOwner::Governor,
)?;
}

if broadcast {
Expand Down
8 changes: 6 additions & 2 deletions zkstack_cli/crates/zkstack/src/commands/chain/register_chain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use crate::{
MSG_CHAIN_NOT_INITIALIZED, MSG_CHAIN_REGISTERED, MSG_L1_SECRETS_MUST_BE_PRESENTED,
MSG_REGISTERING_CHAIN_SPINNER,
},
utils::forge::{check_the_balance, fill_forge_private_key},
utils::forge::{check_the_balance, fill_forge_private_key, WalletOwner},
};

pub async fn run(args: ForgeScriptArgs, shell: &Shell) -> anyhow::Result<()> {
Expand Down Expand Up @@ -81,7 +81,11 @@ pub async fn register_chain(
if let Some(address) = sender {
forge = forge.with_sender(address);
} else {
forge = fill_forge_private_key(forge, Some(&config.get_wallets()?.governor))?;
forge = fill_forge_private_key(
forge,
Some(&config.get_wallets()?.governor),
WalletOwner::Governor,
)?;
check_the_balance(&forge).await?;
}

Expand Down
4 changes: 2 additions & 2 deletions zkstack_cli/crates/zkstack/src/commands/chain/set_token_multiplier_setter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use crate::{
MSG_TOKEN_MULTIPLIER_SETTER_UPDATED_TO, MSG_UPDATING_TOKEN_MULTIPLIER_SETTER_SPINNER,
MSG_WALLETS_CONFIG_MUST_BE_PRESENT, MSG_WALLET_TOKEN_MULTIPLIER_SETTER_NOT_FOUND,
},
utils::forge::{check_the_balance, fill_forge_private_key},
utils::forge::{check_the_balance, fill_forge_private_key, WalletOwner},
};

lazy_static! {
Expand Down Expand Up @@ -109,7 +109,7 @@ async fn update_token_multiplier_setter(
governor: &Wallet,
mut forge: ForgeScript,
) -> anyhow::Result<()> {
forge = fill_forge_private_key(forge, Some(governor))?;
forge = fill_forge_private_key(forge, Some(governor), WalletOwner::Governor)?;
check_the_balance(&forge).await?;
forge.run(shell)?;
Ok(())
Expand Down
8 changes: 6 additions & 2 deletions zkstack_cli/crates/zkstack/src/commands/chain/setup_legacy_bridge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use xshell::Shell;

use crate::{
messages::{MSG_DEPLOYING_PAYMASTER, MSG_L1_SECRETS_MUST_BE_PRESENTED},
utils::forge::{check_the_balance, fill_forge_private_key},
utils::forge::{check_the_balance, fill_forge_private_key, WalletOwner},
};

pub async fn setup_legacy_bridge(
Expand Down Expand Up @@ -59,7 +59,11 @@ pub async fn setup_legacy_bridge(
)
.with_broadcast();

forge = fill_forge_private_key(forge, Some(&ecosystem_config.get_wallets()?.governor))?;
forge = fill_forge_private_key(
forge,
Some(&ecosystem_config.get_wallets()?.governor),
WalletOwner::Governor,
)?;

let spinner = Spinner::new(MSG_DEPLOYING_PAYMASTER);
check_the_balance(&forge).await?;
Expand Down
8 changes: 6 additions & 2 deletions zkstack_cli/crates/zkstack/src/commands/ecosystem/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use config::{
use types::{L1Network, ProverMode};
use xshell::Shell;

use crate::utils::forge::{check_the_balance, fill_forge_private_key};
use crate::utils::forge::{check_the_balance, fill_forge_private_key, WalletOwner};

pub async fn deploy_l1(
shell: &Shell,
Expand Down Expand Up @@ -54,7 +54,11 @@ pub async fn deploy_l1(
if let Some(address) = sender {
forge = forge.with_sender(address);
} else {
forge = fill_forge_private_key(forge, wallets_config.deployer.as_ref())?;
forge = fill_forge_private_key(
forge,
wallets_config.deployer.as_ref(),
WalletOwner::Deployer,
)?;
}

if broadcast {
Expand Down
8 changes: 6 additions & 2 deletions zkstack_cli/crates/zkstack/src/commands/ecosystem/init.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ use crate::{
MSG_ECOSYSTEM_CONTRACTS_PATH_PROMPT, MSG_INITIALIZING_ECOSYSTEM,
MSG_INTALLING_DEPS_SPINNER,
},
utils::forge::{check_the_balance, fill_forge_private_key},
utils::forge::{check_the_balance, fill_forge_private_key, WalletOwner},
};

pub async fn run(args: EcosystemInitArgs, shell: &Shell) -> anyhow::Result<()> {
Expand Down Expand Up @@ -150,7 +150,11 @@ async fn deploy_erc20(
.with_rpc_url(l1_rpc_url)
.with_broadcast();

forge = fill_forge_private_key(forge, ecosystem_config.get_wallets()?.deployer.as_ref())?;
forge = fill_forge_private_key(
forge,
ecosystem_config.get_wallets()?.deployer.as_ref(),
WalletOwner::Deployer,
)?;

let spinner = Spinner::new(MSG_DEPLOYING_ERC20_SPINNER);
check_the_balance(&forge).await?;
Expand Down
12 changes: 11 additions & 1 deletion zkstack_cli/crates/zkstack/src/messages.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ use ethers::{
use url::Url;
use zksync_consensus_roles::attester;

use crate::utils::forge::WalletOwner;

pub(super) const MSG_SETUP_KEYS_DOWNLOAD_SELECTION_PROMPT: &str =
"Do you want to download the setup keys or generate them?";
pub(super) const MSG_SETUP_KEYS_REGION_PROMPT: &str =
Expand Down Expand Up @@ -334,7 +336,15 @@ pub(super) fn msg_explorer_chain_not_initialized(chain: &str) -> String {
}

/// Forge utils related messages
pub(super) const MSG_DEPLOYER_PK_NOT_SET_ERR: &str = "Deployer private key is not set";
pub(super) fn msg_wallet_private_key_not_set(wallet_owner: WalletOwner) -> String {
format!(
"{} private key is not set",
match wallet_owner {
WalletOwner::Governor => "Governor",
WalletOwner::Deployer => "Deployer",
}
)
}

pub(super) fn msg_address_doesnt_have_enough_money_prompt(
address: &H160,
Expand Down
10 changes: 8 additions & 2 deletions zkstack_cli/crates/zkstack/src/utils/forge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,24 @@ use ethers::types::U256;

use crate::{
consts::MINIMUM_BALANCE_FOR_WALLET,
messages::{msg_address_doesnt_have_enough_money_prompt, MSG_DEPLOYER_PK_NOT_SET_ERR},
messages::{msg_address_doesnt_have_enough_money_prompt, msg_wallet_private_key_not_set},
};

pub enum WalletOwner {
Governor,
Deployer,
}

pub fn fill_forge_private_key(
mut forge: ForgeScript,
wallet: Option<&Wallet>,
wallet_owner: WalletOwner,
) -> anyhow::Result<ForgeScript> {
if !forge.wallet_args_passed() {
forge = forge.with_private_key(
wallet
.and_then(|w| w.private_key_h256())
.context(MSG_DEPLOYER_PK_NOT_SET_ERR)?,
.context(msg_wallet_private_key_not_set(wallet_owner))?,
);
}
Ok(forge)
Expand Down
Loading