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;
use std::time::Duration;
pub struct BitcoindClient {
- bitcoind_rpc_client: Arc<RpcClient>,
+ pub(crate) bitcoind_rpc_client: Arc<RpcClient>,
+ network: Network,
host: String,
port: u16,
rpc_user: String,
rpc_password: String,
- fees: Arc<HashMap<Target, AtomicU32>>,
+ fees: Arc<HashMap<ConfirmationTarget, AtomicU32>>,
handle: tokio::runtime::Handle,
logger: Arc<FilesystemLogger>,
}
-#[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<u32>,
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<FilesystemLogger>,
) -> std::io::Result<Self> {
let http_endpoint = HttpEndpoint::for_host(host.clone()).with_port(port);
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<Target, AtomicU32> = 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<ConfirmationTarget, AtomicU32> = 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,
}
fn poll_for_fee_estimates(
- fees: Arc<HashMap<Target, AtomicU32>>, rpc_client: Arc<RpcClient>,
+ fees: Arc<HashMap<ConfirmationTarget, AtomicU32>>, rpc_client: Arc<RpcClient>,
handle: tokio::runtime::Handle,
) {
handle.spawn(async move {
}
};
- 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;
}
});
// 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
.call_method::<NewAddress>("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 {
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)
}
}
}
}
-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<Vec<Utxo>, ()> {
let utxos = tokio::task::block_in_place(move || {
.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 */
.collect())
}
- fn get_change_script(&self) -> Result<Script, ()> {
+ fn get_change_script(&self) -> Result<ScriptBuf, ()> {
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<Transaction, ()> {
+ fn sign_psbt(&self, tx: PartiallySignedTransaction) -> Result<Transaction, ()> {
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 })
projects / ldk-sample / blobdiff