From 2949bdc7b8ab40c44803fad8fccb2a8f420d1566 Mon Sep 17 00:00:00 2001 From: Daniela Brozzoni Date: Mon, 26 Jun 2023 12:18:43 +0200 Subject: [PATCH] Update example_cli to rust-bitcoin 0.30.0 --- example-crates/example_cli/src/lib.rs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/example-crates/example_cli/src/lib.rs b/example-crates/example_cli/src/lib.rs index 4d5cd284..513f74b8 100644 --- a/example-crates/example_cli/src/lib.rs +++ b/example-crates/example_cli/src/lib.rs @@ -7,7 +7,7 @@ use std::{cmp::Reverse, collections::HashMap, path::PathBuf, sync::Mutex, time:: use bdk_chain::{ bitcoin::{ - psbt::Prevouts, secp256k1::Secp256k1, util::sighash::SighashCache, Address, LockTime, + absolute, address, psbt::Prevouts, secp256k1::Secp256k1, sighash::SighashCache, Address, Network, Sequence, Transaction, TxIn, TxOut, }, indexed_tx_graph::{IndexedAdditions, IndexedTxGraph}, @@ -70,7 +70,7 @@ pub enum Commands { /// Send coins to an address. Send { value: u64, - address: Address, + address: Address, #[clap(short, default_value = "bnb")] coin_select: CoinSelectionAlgo, }, @@ -457,7 +457,7 @@ where additions.append(change_additions); // Clone to drop the immutable reference. - let change_script = change_script.clone(); + let change_script = change_script.into(); let change_plan = bdk_tmp_plan::plan_satisfaction( &graph @@ -465,7 +465,8 @@ where .keychains() .get(&internal_keychain) .expect("must exist") - .at_derivation_index(change_index), + .at_derivation_index(change_index) + .expect("change_index can't be hardened"), &assets, ) .expect("failed to obtain change plan"); @@ -520,9 +521,8 @@ where // tip as the `lock_time` for anti-fee-sniping purposes lock_time: chain .get_chain_tip()? - .and_then(|block_id| LockTime::from_height(block_id.height).ok()) - .unwrap_or(LockTime::ZERO) - .into(), + .and_then(|block_id| absolute::LockTime::from_height(block_id.height).ok()) + .unwrap_or(absolute::LockTime::ZERO), input: selected_txos .iter() .map(|(_, utxo)| TxIn { @@ -625,7 +625,8 @@ pub fn planned_utxos { let chain = &*chain.lock().unwrap(); + let address = address.require_network(network)?; run_send_cmd( graph, db,