From: Vihiga Tyonum Date: Wed, 8 Jul 2026 16:32:39 +0000 (+0100) Subject: drop verbose flag X-Git-Url: http://internal-gitweb-vhost/blockdata/script/encode/-script/display/struct.ScriptHash.html?a=commitdiff_plain;h=8dc0503ab8887c119ac49d4b490aecb0170aab64;p=bdk-cli drop verbose flag --- diff --git a/src/commands.rs b/src/commands.rs index b9d1206..529ef26 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -230,9 +230,6 @@ pub struct WalletOpts { /// Selects the wallet to use. #[arg(skip)] pub wallet: Option, - /// Adds verbosity, returns PSBT in JSON format alongside serialized, displays expanded objects. - #[arg(env = "VERBOSE", short = 'v', long = "verbose")] - pub verbose: bool, /// Sets the descriptor to use for the external addresses. #[arg(env = "EXT_DESCRIPTOR", short = 'e', long, required = true)] pub ext_descriptor: String, diff --git a/src/config.rs b/src/config.rs index ec6adfa..6865ee0 100644 --- a/src/config.rs +++ b/src/config.rs @@ -117,7 +117,6 @@ impl TryFrom<&WalletConfigInner> for WalletOpts { Ok(WalletOpts { wallet: Some(config.wallet.clone()), - verbose: false, ext_descriptor: config.ext_descriptor.clone(), int_descriptor: config.int_descriptor.clone(), diff --git a/src/handlers/offline.rs b/src/handlers/offline.rs index 7490d80..094f657 100644 --- a/src/handlers/offline.rs +++ b/src/handlers/offline.rs @@ -311,9 +311,7 @@ impl AppCommand>> for CreateTxCommand { let psbt = tx_builder.finish()?; - // let psbt_base64 = BASE64_STANDARD.encode(psbt.serialize()); - - Ok(PsbtResult::new(&psbt, false, Some(false))) + Ok(PsbtResult::new(&psbt, Some(false))) } } @@ -604,7 +602,7 @@ impl AppCommand>> for BumpFeeCommand { // let psbt_base64 = BASE64_STANDARD.encode(psbt.serialize()); - Ok(PsbtResult::new(&psbt, false, Some(false))) + Ok(PsbtResult::new(&psbt, Some(false))) } } @@ -672,7 +670,7 @@ impl AppCommand>> for SignCommand { ..Default::default() }; let finalized = wallet.sign(&mut psbt, signopt)?; - Ok(PsbtResult::new(&psbt, false, Some(finalized))) + Ok(PsbtResult::new(&psbt, Some(finalized))) } } @@ -728,7 +726,7 @@ impl AppCommand>> for FinalizePsbtCommand { let finalized = wallet.finalize_psbt(&mut psbt, signopt)?; - Ok(PsbtResult::new(&psbt, false, Some(finalized))) + Ok(PsbtResult::new(&psbt, Some(finalized))) } } @@ -763,7 +761,7 @@ impl AppCommand>> for CombinePsbtCommand { Ok(acc) })?; - Ok(PsbtResult::new(&final_psbt, false, None)) + Ok(PsbtResult::new(&final_psbt, None)) } } diff --git a/src/utils/types.rs b/src/utils/types.rs index 6f8cf09..176fd15 100644 --- a/src/utils/types.rs +++ b/src/utils/types.rs @@ -78,21 +78,13 @@ pub struct PsbtResult { #[serde(skip_serializing_if = "Option::is_none")] pub is_finalized: Option, - - #[serde(skip_serializing_if = "Option::is_none")] - pub details: Option, } impl PsbtResult { - pub fn new(psbt: &Psbt, verbose: bool, finalized: Option) -> Self { + pub fn new(psbt: &Psbt, finalized: Option) -> Self { Self { psbt: bdk_wallet::bitcoin::base64::prelude::BASE64_STANDARD.encode(psbt.serialize()), is_finalized: finalized, - details: if verbose { - Some(serde_json::to_value(psbt).unwrap_or_default()) - } else { - None - }, } } }