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>,
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>,
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::MaxAllowedNonAnchorChannelRemoteFee,
+ AtomicU32::new(25 * 250),
+ );
+ 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,
}
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::MaxAllowedNonAnchorChannelRemoteFee)
+ .unwrap()
+ .store(std::cmp::max(25 * 250, high_prio_estimate * 10), 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
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 || {
projects / ldk-sample / blobdiff