diff --git a/Justfile b/Justfile index d8ccf52..163efca 100644 --- a/Justfile +++ b/Justfile @@ -1,5 +1,4 @@ set quiet := true -msrv := "1.75.0" default_wallet := 'regtest_default_wallet' default_datadir := "$HOME/.bdk-bitcoin" rpc_user := 'user' @@ -42,10 +41,6 @@ clean: stable: clean rustup override set stable; cargo update -# set the rust version to the msrv and pin dependencies -msrv: clean - rustup override set {{msrv}}; cargo update; ./ci/pin-msrv.sh - # start regtest bitcoind in default data directory [group('rpc')] start: diff --git a/clippy.toml b/clippy.toml deleted file mode 100644 index 0accddf..0000000 --- a/clippy.toml +++ /dev/null @@ -1 +0,0 @@ -msrv="1.75.0" diff --git a/src/handlers.rs b/src/handlers.rs index 2138e4c..f6d4285 100644 --- a/src/handlers.rs +++ b/src/handlers.rs @@ -364,10 +364,10 @@ pub fn handle_offline_wallet_subcommand( tx_builder.include_output_redeem_witness_script(); } - if let Some(fee_rate) = fee_rate { - if let Some(fee_rate) = FeeRate::from_sat_per_vb(fee_rate as u64) { - tx_builder.fee_rate(fee_rate); - } + if let Some(fee_rate) = fee_rate + && let Some(fee_rate) = FeeRate::from_sat_per_vb(fee_rate as u64) + { + tx_builder.fee_rate(fee_rate); } if let Some(utxos) = utxos { @@ -770,14 +770,14 @@ pub fn handle_config_subcommand( ); } - if let Some(ref internal_desc) = int_descriptor { - if internal_desc.contains("xprv") || internal_desc.contains("tprv") { - eprintln!( - "WARNING: Your internal descriptor contains PRIVATE KEYS. + if let Some(ref internal_desc) = int_descriptor + && (internal_desc.contains("xprv") || internal_desc.contains("tprv")) + { + eprintln!( + "WARNING: Your internal descriptor contains PRIVATE KEYS. Private keys will be saved in PLAINTEXT in the config file. This is a security risk. Consider using public descriptors instead.\n" - ); - } + ); } let mut config = WalletConfig::load(datadir)?.unwrap_or(WalletConfig {