Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions crates/cast/src/cmd/wallet/list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ impl ListArgs {
.gcp(self.gcp || (self.all && gcp_env_vars_set()))
.turnkey(self.turnkey || self.all)
.interactives(0)
.interactive(false)
.build()
.expect("build multi wallet");

Expand Down
15 changes: 8 additions & 7 deletions crates/wallets/src/wallet_multi/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,13 @@ pub struct MultiWalletOpts {
/// Open an interactive prompt to enter your private key.
///
/// Takes a value for the number of keys to enter.
#[arg(
long,
short,
help_heading = "Wallet options - raw",
default_value = "0",
value_name = "NUM"
)]
#[arg(long, help_heading = "Wallet options - raw", default_value = "0", value_name = "NUM")]
Copy link
Member Author

@zerosnacks zerosnacks Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note the removal of short, breaking change in favor of interactive carrying the short flag

I think this is worth it for UX consistency, https://github.com/search?q=%22forge+script%22+-i+&type=code shows a few very minor examples in unmaintained repos

pub interactives: u32,

/// Open an interactive prompt to enter your private key.
#[arg(long, short, help_heading = "Wallet options - raw", conflicts_with = "interactives")]
pub interactive: bool,

/// Use the provided private keys.
#[arg(long, help_heading = "Wallet options - raw", value_name = "RAW_PRIVATE_KEYS")]
#[builder(default = "None")]
Expand Down Expand Up @@ -264,6 +262,9 @@ impl MultiWalletOpts {
if let Some(mnemonics) = self.mnemonics()? {
signers.extend(mnemonics);
}
if self.interactive {
pending.push(PendingSigner::Interactive);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We simply push this in the same pending queue that interactives uses and re-use the existing flow

}
if self.interactives > 0 {
pending.extend(std::iter::repeat_n(
PendingSigner::Interactive,
Expand Down
Loading