@@ -23,7 +23,7 @@ use crate::error::BDKCliError as Error;
23
23
use crate :: utils:: * ;
24
24
use bdk_wallet:: bip39:: { Language , Mnemonic } ;
25
25
use bdk_wallet:: bitcoin:: bip32:: { DerivationPath , KeySource } ;
26
- use bdk_wallet:: bitcoin:: consensus:: encode:: { serialize , serialize_hex} ;
26
+ use bdk_wallet:: bitcoin:: consensus:: encode:: serialize_hex;
27
27
use bdk_wallet:: bitcoin:: script:: PushBytesBuf ;
28
28
use bdk_wallet:: bitcoin:: Network ;
29
29
#[ cfg( any(
@@ -208,15 +208,14 @@ pub fn handle_offline_wallet_subcommand(
208
208
209
209
let psbt = tx_builder. finish ( ) ?;
210
210
211
- let serialized_psbt = psbt. serialize ( ) ;
212
- let psbt_base64 = BASE64_STANDARD . encode ( serialized_psbt) ;
211
+ let psbt_base64 = BASE64_STANDARD . encode ( psbt. serialize ( ) ) ;
213
212
214
213
if wallet_opts. verbose {
215
214
Ok (
216
- json ! ( { "psbt" : psbt_base64, "serialized_psbt" : psbt . serialize ( ) , " details": psbt} ) ,
215
+ json ! ( { "psbt" : psbt_base64, "details" : psbt} ) ,
217
216
)
218
217
} else {
219
- Ok ( json ! ( { "psbt" : psbt_base64, "details" : psbt } ) )
218
+ Ok ( json ! ( { "psbt" : psbt_base64 } ) )
220
219
}
221
220
}
222
221
BumpFee {
@@ -253,10 +252,9 @@ pub fn handle_offline_wallet_subcommand(
253
252
254
253
let psbt = tx_builder. finish ( ) ?;
255
254
256
- let serialized_psbt = psbt. serialize ( ) ;
257
- let psbt_base64 = BASE64_STANDARD . encode ( serialized_psbt) ;
255
+ let psbt_base64 = BASE64_STANDARD . encode ( psbt. serialize ( ) ) ;
258
256
259
- Ok ( json ! ( { "psbt" : psbt_base64, "details" : psbt } ) )
257
+ Ok ( json ! ( { "psbt" : psbt_base64 } ) )
260
258
}
261
259
Policies => {
262
260
let external_policy = wallet. policies ( KeychainKind :: External ) ?;
@@ -284,13 +282,14 @@ pub fn handle_offline_wallet_subcommand(
284
282
..Default :: default ( )
285
283
} ;
286
284
let finalized = wallet. sign ( & mut psbt, signopt) ?;
285
+ let psbt_base64 = BASE64_STANDARD . encode ( psbt. serialize ( ) ) ;
287
286
if wallet_opts. verbose {
288
287
Ok (
289
- json ! ( { "psbt" : BASE64_STANDARD . encode ( serialize ( & psbt_bytes ) ) , "is_finalized" : finalized, "serialized_psbt" : psbt} ) ,
288
+ json ! ( { "psbt" : & psbt_base64 , "is_finalized" : finalized, "serialized_psbt" : & psbt} ) ,
290
289
)
291
290
} else {
292
291
Ok (
293
- json ! ( { "psbt" : BASE64_STANDARD . encode ( serialize ( & psbt_bytes ) ) , "is_finalized" : finalized, } ) ,
292
+ json ! ( { "psbt" : & psbt_base64 , "is_finalized" : finalized, } ) ,
294
293
)
295
294
}
296
295
}
@@ -316,11 +315,11 @@ pub fn handle_offline_wallet_subcommand(
316
315
let finalized = wallet. finalize_psbt ( & mut psbt, signopt) ?;
317
316
if wallet_opts. verbose {
318
317
Ok (
319
- json ! ( { "psbt" : BASE64_STANDARD . encode( serialize( & psbt_bytes ) ) , "is_finalized" : finalized, "serialized_psbt " : psbt} ) ,
318
+ json ! ( { "psbt" : BASE64_STANDARD . encode( psbt . serialize( ) ) , "is_finalized" : finalized, "details " : psbt} ) ,
320
319
)
321
320
} else {
322
321
Ok (
323
- json ! ( { "psbt" : BASE64_STANDARD . encode( serialize( & psbt_bytes ) ) , "is_finalized" : finalized, } ) ,
322
+ json ! ( { "psbt" : BASE64_STANDARD . encode( psbt . serialize( ) ) , "is_finalized" : finalized, } ) ,
324
323
)
325
324
}
326
325
}
0 commit comments