Skip to content

fix: stop tor password overwrite by default #641

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
mojoX911 merged 1 commit into from
Nov 29, 2025
Merged

fix: stop tor password overwrite by default #641

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
8 changes: 4 additions & 4 deletions src/bin/makerd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ struct Cli {
default_value = "user:password",
)]
pub auth: (String, String),
#[clap(long, short = 't', default_value = "")]
pub tor_auth: String,
#[clap(long, short = 't')]
pub tor_auth: Option<String>,
/// Optional wallet name. If the wallet exists, load the wallet, else create a new wallet with the given name. Default: maker-wallet
#[clap(name = "WALLET", long, short = 'w')]
pub(crate) wallet_name: Option<String>,
Expand Down Expand Up @@ -86,7 +86,7 @@ fn main() -> Result<(), MakerError> {
None,
None,
None,
Some(args.tor_auth),
args.tor_auth.clone(),
None,
args.zmq,
args.password,
Expand All @@ -103,7 +103,7 @@ fn main() -> Result<(), MakerError> {
None,
None,
None,
Some(args.tor_auth),
args.tor_auth,
None,
MakerBehavior::Normal,
args.zmq,
Expand Down
10 changes: 5 additions & 5 deletions src/bin/taker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ struct Cli {
/// Bitcoin Core RPC authentication string. Ex: username:password
#[clap(name="USER:PASSWORD",short='a',long, value_parser = parse_proxy_auth, default_value = "user:password")]
pub auth: (String, String),
#[clap(long, short = 't', default_value = "")]
pub tor_auth: String,
#[clap(long, short = 't')]
pub tor_auth: Option<String>,

/// Sets the taker wallet's name. If the wallet file already exists, it will load that wallet. Default: taker-wallet
#[clap(name = "WALLET", long, short = 'w')]
Expand Down Expand Up @@ -197,7 +197,7 @@ fn main() -> Result<(), TakerError> {
args.wallet_name.clone(),
Some(rpc_config.clone()),
None,
Some(args.tor_auth),
args.tor_auth,
args.zmq,
None,
)?;
Expand All @@ -211,7 +211,7 @@ fn main() -> Result<(), TakerError> {
args.wallet_name.clone(),
Some(rpc_config.clone()),
None,
Some(args.tor_auth),
args.tor_auth,
args.zmq,
None,
)?;
Expand All @@ -236,7 +236,7 @@ fn main() -> Result<(), TakerError> {
#[cfg(feature = "integration-test")]
TakerBehavior::Normal,
None,
Some(args.tor_auth),
args.tor_auth,
args.zmq,
args.password,
)?;
Expand Down