Merge pull request #123 from TheBlueMatt/main

[ldk-sample] / src / bitcoind_client.rs

diff --git a/src/bitcoind_client.rs b/src/bitcoind_client.rs
index 9f28015cf5ed0326190ac88b79b67f736c8de4a0..17ea74c1e4e8b644487a7ecd12c84a141d81f609 100644 (file)
--- a/src/bitcoind_client.rs
+++ b/src/bitcoind_client.rs
@@ -15,7 +15,6 @@ 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;
 use lightning_block_sync::http::HttpEndpoint;
 use lightning_block_sync::rpc::RpcClient;
@@ -76,10 +75,23 @@ impl BitcoindClient {
                                "Failed to make initial call to bitcoind - please check your RPC user/password and access settings")
                        })?;
                let mut fees: HashMap<ConfirmationTarget, AtomicU32> = 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));
+               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,
@@ -163,18 +175,28 @@ impl BitcoindClient {
                                        }
                                };
 
-                               fees.get(&ConfirmationTarget::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(&ConfirmationTarget::Background)
+                               fees.get(&ConfirmationTarget::MinAllowedNonAnchorChannelRemoteFee)
+                                       .unwrap()
+                                       .store(background_estimate - 250, Ordering::Release);
+                               fees.get(&ConfirmationTarget::AnchorChannelFee)
                                        .unwrap()
                                        .store(background_estimate, Ordering::Release);
-                               fees.get(&ConfirmationTarget::Normal)
+                               fees.get(&ConfirmationTarget::NonAnchorChannelFee)
                                        .unwrap()
                                        .store(normal_estimate, Ordering::Release);
-                               fees.get(&ConfirmationTarget::HighPriority)
+                               fees.get(&ConfirmationTarget::ChannelCloseMinimum)
                                        .unwrap()
-                                       .store(high_prio_estimate, Ordering::Release);
+                                       .store(background_estimate, Ordering::Release);
+
                                tokio::time::sleep(Duration::from_secs(60)).await;
                        }
                });
@@ -204,7 +226,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
@@ -296,13 +319,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<Vec<Utxo>, ()> {
                let utxos = tokio::task::block_in_place(move || {