X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fbitcoind_client.rs;h=9f28015cf5ed0326190ac88b79b67f736c8de4a0;hb=88bd0ca9ec1c511b3e3eb36095fbacca7ccc78fc;hp=228f27a2318406b1a2380b73ba78669eb2bd55b8;hpb=b7daadc95bb35d9e9b7ad29d90c6531de000de8a;p=ldk-sample diff --git a/src/bitcoind_client.rs b/src/bitcoind_client.rs index 228f27a..9f28015 100644 --- a/src/bitcoind_client.rs +++ b/src/bitcoind_client.rs @@ -1,13 +1,19 @@ use crate::convert::{ - BlockchainInfo, FeeResponse, FundedTx, MempoolMinFeeResponse, NewAddress, RawTx, SignedTx, + BlockchainInfo, FeeResponse, FundedTx, ListUnspentResponse, MempoolMinFeeResponse, NewAddress, + RawTx, SignedTx, }; use crate::disk::FilesystemLogger; +use crate::hex_utils; use base64; +use bitcoin::blockdata::constants::WITNESS_SCALE_FACTOR; use bitcoin::blockdata::transaction::Transaction; -use bitcoin::consensus::encode; +use bitcoin::consensus::{encode, Decodable, Encodable}; use bitcoin::hash_types::{BlockHash, Txid}; -use bitcoin::util::address::Address; +use bitcoin::hashes::Hash; +use bitcoin::util::address::{Address, Payload, WitnessVersion}; +use bitcoin::{OutPoint, Script, TxOut, WPubkeyHash, XOnlyPublicKey}; use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator}; +use lightning::events::bump_transaction::{Utxo, WalletSource}; use lightning::log_error; use lightning::routing::utxo::{UtxoLookup, UtxoResult}; use lightning::util::logger::Logger; @@ -22,24 +28,16 @@ use std::sync::Arc; use std::time::Duration; pub struct BitcoindClient { - bitcoind_rpc_client: Arc, + pub(crate) bitcoind_rpc_client: Arc, host: String, port: u16, rpc_user: String, rpc_password: String, - fees: Arc>, + fees: Arc>, handle: tokio::runtime::Handle, logger: Arc, } -#[derive(Clone, Eq, Hash, PartialEq)] -pub enum Target { - MempoolMinimum, - Background, - Normal, - HighPriority, -} - impl BlockSource for BitcoindClient { fn get_header<'a>( &'a self, header_hash: &'a BlockHash, height_hint: Option, @@ -77,11 +75,11 @@ impl BitcoindClient { std::io::Error::new(std::io::ErrorKind::PermissionDenied, "Failed to make initial call to bitcoind - please check your RPC user/password and access settings") })?; - let mut fees: HashMap = HashMap::new(); - fees.insert(Target::MempoolMinimum, AtomicU32::new(MIN_FEERATE)); - fees.insert(Target::Background, AtomicU32::new(MIN_FEERATE)); - fees.insert(Target::Normal, AtomicU32::new(2000)); - fees.insert(Target::HighPriority, AtomicU32::new(5000)); + let mut fees: HashMap = HashMap::new(); + fees.insert(ConfirmationTarget::MempoolMinimum, AtomicU32::new(MIN_FEERATE)); + fees.insert(ConfirmationTarget::Background, AtomicU32::new(MIN_FEERATE)); + fees.insert(ConfirmationTarget::Normal, AtomicU32::new(2000)); + fees.insert(ConfirmationTarget::HighPriority, AtomicU32::new(5000)); let client = Self { bitcoind_rpc_client: Arc::new(bitcoind_rpc_client), host, @@ -101,7 +99,7 @@ impl BitcoindClient { } fn poll_for_fee_estimates( - fees: Arc>, rpc_client: Arc, + fees: Arc>, rpc_client: Arc, handle: tokio::runtime::Handle, ) { handle.spawn(async move { @@ -165,14 +163,16 @@ impl BitcoindClient { } }; - fees.get(&Target::MempoolMinimum) + fees.get(&ConfirmationTarget::MempoolMinimum) .unwrap() .store(mempoolmin_estimate, Ordering::Release); - fees.get(&Target::Background) + fees.get(&ConfirmationTarget::Background) .unwrap() .store(background_estimate, Ordering::Release); - fees.get(&Target::Normal).unwrap().store(normal_estimate, Ordering::Release); - fees.get(&Target::HighPriority) + fees.get(&ConfirmationTarget::Normal) + .unwrap() + .store(normal_estimate, Ordering::Release); + fees.get(&ConfirmationTarget::HighPriority) .unwrap() .store(high_prio_estimate, Ordering::Release); tokio::time::sleep(Duration::from_secs(60)).await; @@ -250,24 +250,18 @@ impl BitcoindClient { .await .unwrap() } + + pub async fn list_unspent(&self) -> ListUnspentResponse { + self.bitcoind_rpc_client + .call_method::("listunspent", &vec![]) + .await + .unwrap() + } } impl FeeEstimator for BitcoindClient { fn get_est_sat_per_1000_weight(&self, confirmation_target: ConfirmationTarget) -> u32 { - match confirmation_target { - ConfirmationTarget::MempoolMinimum => { - self.fees.get(&Target::MempoolMinimum).unwrap().load(Ordering::Acquire) - } - ConfirmationTarget::Background => { - self.fees.get(&Target::Background).unwrap().load(Ordering::Acquire) - } - ConfirmationTarget::Normal => { - self.fees.get(&Target::Normal).unwrap().load(Ordering::Acquire) - } - ConfirmationTarget::HighPriority => { - self.fees.get(&Target::HighPriority).unwrap().load(Ordering::Acquire) - } - } + self.fees.get(&confirmation_target).unwrap().load(Ordering::Acquire) } } @@ -308,3 +302,55 @@ impl UtxoLookup for BitcoindClient { todo!(); } } + +impl WalletSource for BitcoindClient { + fn list_confirmed_utxos(&self) -> Result, ()> { + let utxos = tokio::task::block_in_place(move || { + self.handle.block_on(async move { self.list_unspent().await }).0 + }); + Ok(utxos + .into_iter() + .filter_map(|utxo| { + let outpoint = OutPoint { txid: utxo.txid, vout: utxo.vout }; + match utxo.address.payload { + Payload::WitnessProgram { version, ref program } => match version { + WitnessVersion::V0 => WPubkeyHash::from_slice(program) + .map(|wpkh| Utxo::new_v0_p2wpkh(outpoint, utxo.amount, &wpkh)) + .ok(), + // TODO: Add `Utxo::new_v1_p2tr` upstream. + WitnessVersion::V1 => XOnlyPublicKey::from_slice(program) + .map(|_| Utxo { + outpoint, + output: TxOut { + value: utxo.amount, + script_pubkey: Script::new_witness_program(version, program), + }, + satisfaction_weight: 1 /* empty script_sig */ * WITNESS_SCALE_FACTOR as u64 + + 1 /* witness items */ + 1 /* schnorr sig len */ + 64, /* schnorr sig */ + }) + .ok(), + _ => None, + }, + _ => None, + } + }) + .collect()) + } + + fn get_change_script(&self) -> Result { + tokio::task::block_in_place(move || { + Ok(self.handle.block_on(async move { self.get_new_address().await.script_pubkey() })) + }) + } + + fn sign_tx(&self, tx: Transaction) -> Result { + let mut tx_bytes = Vec::new(); + let _ = tx.consensus_encode(&mut tx_bytes).map_err(|_| ()); + let tx_hex = hex_utils::hex_str(&tx_bytes); + let signed_tx = tokio::task::block_in_place(move || { + self.handle.block_on(async move { self.sign_raw_transaction_with_wallet(tx_hex).await }) + }); + let signed_tx_bytes = hex_utils::to_vec(&signed_tx.hex).ok_or(())?; + Transaction::consensus_decode(&mut signed_tx_bytes.as_slice()).map_err(|_| ()) + } +}