X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fbitcoind_client.rs;h=c00f52fb752cdd033e69c9cc60085a213db6fec2;hb=b61dae03855accbafcbbc68c69692cbe1797b195;hp=a093e6d2eb7c6d1d85868b64c069181bada19759;hpb=5dc3629d0cef7b20685abbb2ae9942fe28fd6ddc;p=ldk-sample diff --git a/src/bitcoind_client.rs b/src/bitcoind_client.rs index a093e6d..c00f52f 100644 --- a/src/bitcoind_client.rs +++ b/src/bitcoind_client.rs @@ -5,17 +5,19 @@ use crate::convert::{ use crate::disk::FilesystemLogger; use crate::hex_utils; use base64; +use bitcoin::address::{Address, Payload, WitnessVersion}; use bitcoin::blockdata::constants::WITNESS_SCALE_FACTOR; +use bitcoin::blockdata::script::ScriptBuf; use bitcoin::blockdata::transaction::Transaction; use bitcoin::consensus::{encode, Decodable, Encodable}; use bitcoin::hash_types::{BlockHash, Txid}; use bitcoin::hashes::Hash; -use bitcoin::util::address::{Address, Payload, WitnessVersion}; -use bitcoin::{OutPoint, Script, TxOut, WPubkeyHash, XOnlyPublicKey}; +use bitcoin::key::XOnlyPublicKey; +use bitcoin::psbt::PartiallySignedTransaction; +use bitcoin::{Network, OutPoint, TxOut, WPubkeyHash}; 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; use lightning_block_sync::http::HttpEndpoint; use lightning_block_sync::rpc::RpcClient; @@ -28,24 +30,17 @@ use std::sync::Arc; use std::time::Duration; pub struct BitcoindClient { - bitcoind_rpc_client: Arc, + pub(crate) bitcoind_rpc_client: Arc, + network: Network, 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, @@ -69,7 +64,7 @@ const MIN_FEERATE: u32 = 253; impl BitcoindClient { pub(crate) async fn new( - host: String, port: u16, rpc_user: String, rpc_password: String, + host: String, port: u16, rpc_user: String, rpc_password: String, network: Network, handle: tokio::runtime::Handle, logger: Arc, ) -> std::io::Result { let http_endpoint = HttpEndpoint::for_host(host.clone()).with_port(port); @@ -83,17 +78,27 @@ 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::OnChainSweep, AtomicU32::new(5000)); + fees.insert( + ConfirmationTarget::MinAllowedAnchorChannelRemoteFee, + AtomicU32::new(MIN_FEERATE), + ); + fees.insert( + ConfirmationTarget::MinAllowedNonAnchorChannelRemoteFee, + AtomicU32::new(MIN_FEERATE), + ); + fees.insert(ConfirmationTarget::AnchorChannelFee, AtomicU32::new(MIN_FEERATE)); + fees.insert(ConfirmationTarget::NonAnchorChannelFee, AtomicU32::new(2000)); + fees.insert(ConfirmationTarget::ChannelCloseMinimum, AtomicU32::new(MIN_FEERATE)); + let client = Self { bitcoind_rpc_client: Arc::new(bitcoind_rpc_client), host, port, rpc_user, rpc_password, + network, fees: Arc::new(fees), handle: handle.clone(), logger, @@ -107,7 +112,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 { @@ -171,16 +176,25 @@ impl BitcoindClient { } }; - fees.get(&Target::MempoolMinimum) + fees.get(&ConfirmationTarget::OnChainSweep) + .unwrap() + .store(high_prio_estimate, Ordering::Release); + fees.get(&ConfirmationTarget::MinAllowedAnchorChannelRemoteFee) .unwrap() .store(mempoolmin_estimate, Ordering::Release); - fees.get(&Target::Background) + fees.get(&ConfirmationTarget::MinAllowedNonAnchorChannelRemoteFee) + .unwrap() + .store(background_estimate - 250, Ordering::Release); + fees.get(&ConfirmationTarget::AnchorChannelFee) .unwrap() .store(background_estimate, Ordering::Release); - fees.get(&Target::Normal).unwrap().store(normal_estimate, Ordering::Release); - fees.get(&Target::HighPriority) + fees.get(&ConfirmationTarget::NonAnchorChannelFee) .unwrap() - .store(high_prio_estimate, Ordering::Release); + .store(normal_estimate, Ordering::Release); + fees.get(&ConfirmationTarget::ChannelCloseMinimum) + .unwrap() + .store(background_estimate, Ordering::Release); + tokio::time::sleep(Duration::from_secs(60)).await; } }); @@ -210,7 +224,8 @@ impl BitcoindClient { // LDK gives us feerates in satoshis per KW but Bitcoin Core here expects fees // denominated in satoshis per vB. First we need to multiply by 4 to convert weight // units to virtual bytes, then divide by 1000 to convert KvB to vB. - "fee_rate": self.get_est_sat_per_1000_weight(ConfirmationTarget::Normal) as f64 / 250.0, + "fee_rate": self + .get_est_sat_per_1000_weight(ConfirmationTarget::NonAnchorChannelFee) as f64 / 250.0, // While users could "cancel" a channel open by RBF-bumping and paying back to // themselves, we don't allow it here as its easy to have users accidentally RBF bump // and pay to the channel funding address, which results in loss of funds. Real @@ -247,7 +262,7 @@ impl BitcoindClient { .call_method::("getnewaddress", &addr_args) .await .unwrap(); - Address::from_str(addr.0.as_str()).unwrap() + Address::from_str(addr.0.as_str()).unwrap().require_network(self.network).unwrap() } pub async fn get_blockchain_info(&self) -> BlockchainInfo { @@ -267,20 +282,7 @@ impl BitcoindClient { 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) } } @@ -315,13 +317,6 @@ impl BroadcasterInterface for BitcoindClient { } } -impl UtxoLookup for BitcoindClient { - fn get_utxo(&self, _genesis_hash: &BlockHash, _short_channel_id: u64) -> UtxoResult { - // P2PGossipSync takes None for a UtxoLookup, so this will never be called. - todo!(); - } -} - impl WalletSource for BitcoindClient { fn list_confirmed_utxos(&self) -> Result, ()> { let utxos = tokio::task::block_in_place(move || { @@ -331,18 +326,18 @@ impl WalletSource for BitcoindClient { .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) + match utxo.address.payload.clone() { + Payload::WitnessProgram(wp) => match wp.version() { + WitnessVersion::V0 => WPubkeyHash::from_slice(wp.program().as_bytes()) .map(|wpkh| Utxo::new_v0_p2wpkh(outpoint, utxo.amount, &wpkh)) .ok(), // TODO: Add `Utxo::new_v1_p2tr` upstream. - WitnessVersion::V1 => XOnlyPublicKey::from_slice(program) + WitnessVersion::V1 => XOnlyPublicKey::from_slice(wp.program().as_bytes()) .map(|_| Utxo { outpoint, output: TxOut { value: utxo.amount, - script_pubkey: Script::new_witness_program(version, program), + script_pubkey: ScriptBuf::new_witness_program(&wp), }, satisfaction_weight: 1 /* empty script_sig */ * WITNESS_SCALE_FACTOR as u64 + 1 /* witness items */ + 1 /* schnorr sig len */ + 64, /* schnorr sig */ @@ -356,15 +351,15 @@ impl WalletSource for BitcoindClient { .collect()) } - fn get_change_script(&self) -> Result { + 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 { + fn sign_psbt(&self, tx: PartiallySignedTransaction) -> Result { let mut tx_bytes = Vec::new(); - let _ = tx.consensus_encode(&mut tx_bytes).map_err(|_| ()); + let _ = tx.unsigned_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 })