Merge pull request #136 from benthecarman/ldk-116

Update ldk to v0.0.116

bitcoin-rpc-provider/Cargo.toml

@@ -9,7 +9,7 @@ bitcoin = {version = "0.29.2"}
 bitcoincore-rpc = {version = "0.16.0"}
 bitcoincore-rpc-json = {version = "0.16.0"}
 dlc-manager = {path = "../dlc-manager"}
-lightning = {version = "0.0.113"}
+lightning = {version = "0.0.116"}
 log = "0.4.14"
 rust-bitcoin-coin-selection = {version = "0.1.0", git = "https://github.com/p2pderivatives/rust-bitcoin-coin-selection", features = ["rand"]}
 simple-wallet = {path = "../simple-wallet"}

bitcoin-rpc-provider/src/lib.rs

@@ -25,18 +25,11 @@ use rust_bitcoin_coin_selection::select_coins;
 /// The minimum feerate we are allowed to send, as specify by LDK.
 const MIN_FEERATE: u32 = 253;
 
-#[derive(Clone, Eq, Hash, PartialEq)]
-pub enum Target {
-    Background,
-    Normal,
-    HighPriority,
-}
-
 pub struct BitcoinCoreProvider {
     client: Arc<Mutex<Client>>,
     // Used to implement the FeeEstimator interface, heavily inspired by
     // https://github.com/lightningdevkit/ldk-sample/blob/main/src/bitcoind_client.rs#L26
-    fees: Arc<HashMap<Target, AtomicU32>>,
+    fees: Arc<HashMap<ConfirmationTarget, AtomicU32>>,
 }
 
 #[derive(Debug)]
@@ -107,10 +100,10 @@ impl BitcoinCoreProvider {
 
     pub fn new_from_rpc_client(rpc_client: Client) -> Self {
         let client = Arc::new(Mutex::new(rpc_client));
-        let mut fees: HashMap<Target, AtomicU32> = HashMap::new();
-        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::Background, AtomicU32::new(MIN_FEERATE));
+        fees.insert(ConfirmationTarget::Normal, AtomicU32::new(2000));
+        fees.insert(ConfirmationTarget::HighPriority, AtomicU32::new(5000));
         let fees = Arc::new(fees);
         poll_for_fee_estimates(client.clone(), fees.clone());
         BitcoinCoreProvider { client, fees }
@@ -372,35 +365,22 @@ impl Blockchain for BitcoinCoreProvider {
 }
 
 impl FeeEstimator for BitcoinCoreProvider {
-    fn get_est_sat_per_1000_weight(
-        &self,
-        confirmation_target: lightning::chain::chaininterface::ConfirmationTarget,
-    ) -> u32 {
-        match confirmation_target {
-            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),
-        }
+    fn get_est_sat_per_1000_weight(&self, confirmation_target: ConfirmationTarget) -> u32 {
+        self.fees
+            .get(&confirmation_target)
+            .unwrap()
+            .load(Ordering::Acquire)
     }
 }
 
-fn poll_for_fee_estimates(client: Arc<Mutex<Client>>, fees: Arc<HashMap<Target, AtomicU32>>) {
+fn poll_for_fee_estimates(
+    client: Arc<Mutex<Client>>,
+    fees: Arc<HashMap<ConfirmationTarget, AtomicU32>>,
+) {
     std::thread::spawn(move || loop {
         match query_fee_estimate(&client, 144, EstimateMode::Economical) {
             Ok(fee_rate) => {
-                fees.get(&Target::Background)
+                fees.get(&ConfirmationTarget::Background)
                     .unwrap()
                     .store(fee_rate, Ordering::Release);
             }
@@ -410,7 +390,7 @@ fn poll_for_fee_estimates(client: Arc<Mutex<Client>>, fees: Arc<HashMap<Target,
         };
         match query_fee_estimate(&client, 18, EstimateMode::Conservative) {
             Ok(fee_rate) => {
-                fees.get(&Target::Normal)
+                fees.get(&ConfirmationTarget::Normal)
                     .unwrap()
                     .store(fee_rate, Ordering::Release);
             }
@@ -420,7 +400,7 @@ fn poll_for_fee_estimates(client: Arc<Mutex<Client>>, fees: Arc<HashMap<Target,
         };
         match query_fee_estimate(&client, 6, EstimateMode::Conservative) {
             Ok(fee_rate) => {
-                fees.get(&Target::HighPriority)
+                fees.get(&ConfirmationTarget::HighPriority)
                     .unwrap()
                     .store(fee_rate, Ordering::Release);
             }

dlc-manager/Cargo.toml

@@ -19,7 +19,7 @@ bitcoin = {version = "0.29.2"}
 dlc = {version = "0.4.0", path = "../dlc"}
 dlc-messages = {version = "0.4.0", path = "../dlc-messages"}
 dlc-trie = {version = "0.4.0", path = "../dlc-trie"}
-lightning = {version = "0.0.113"}
+lightning = {version = "0.0.116" }
 log = "0.4.14"
 rand_chacha = {version = "0.3.1", optional = true}
 secp256k1-zkp = {version = "0.7.0", features = ["bitcoin_hashes", "rand", "rand-std"]}

dlc-messages/Cargo.toml

@@ -13,7 +13,7 @@ use-serde = ["serde", "secp256k1-zkp/use-serde"]
 [dependencies]
 bitcoin = {version = "0.29.2"}
 dlc = {version = "0.4.0", path = "../dlc"}
-lightning = {version = "0.0.113" }
+lightning = {version = "0.0.116" }
 secp256k1-zkp = {version = "0.7.0", features = ["bitcoin_hashes", "rand", "rand-std"]}
 serde = {version = "1.0", features = ["derive"], optional = true}
 

dlc-messages/src/message_handler.rs

@@ -7,6 +7,7 @@ use std::{
     sync::Mutex,
 };
 
+use lightning::ln::features::{InitFeatures, NodeFeatures};
 use lightning::{
     ln::{
         msgs::{DecodeError, LightningError},
@@ -208,6 +209,14 @@ impl CustomMessageHandler for MessageHandler {
     fn get_and_clear_pending_msg(&self) -> Vec<(PublicKey, Self::CustomMessage)> {
         self.msg_events.lock().unwrap().drain(..).collect()
     }
+
+    fn provided_node_features(&self) -> NodeFeatures {
+        NodeFeatures::empty()
+    }
+
+    fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
+        InitFeatures::empty()
+    }
 }
 
 #[inline]

dlc-sled-storage-provider/Cargo.toml

@@ -14,7 +14,7 @@ wallet = ["bitcoin", "secp256k1-zkp", "simple-wallet", "lightning"]
 [dependencies]
 bitcoin = {version = "0.29", optional = true}
 dlc-manager = {path = "../dlc-manager"}
-lightning = {version = "0.0.113", optional = true}
+lightning = {version = "0.0.116", optional = true}
 secp256k1-zkp = {version = "0.7", optional = true}
 simple-wallet = {path = "../simple-wallet", optional = true}
 sled = "0.34"

electrs-blockchain-provider/Cargo.toml

@@ -9,8 +9,8 @@ version = "0.1.0"
 bitcoin = {version = "0.29"}
 bitcoin-test-utils = {path = "../bitcoin-test-utils"}
 dlc-manager = {path = "../dlc-manager"}
-lightning = {version = "0.0.113"}
-lightning-block-sync = {version = "0.0.113"}
+lightning = {version = "0.0.116"}
+lightning-block-sync = {version = "0.0.116"}
 reqwest = {version = "0.11", features = ["blocking", "json"]}
 rust-bitcoin-coin-selection = {version = "0.1.0", git = "https://github.com/p2pderivatives/rust-bitcoin-coin-selection", features = ["rand"]}
 serde = {version = "*", features = ["derive"]}

electrs-blockchain-provider/src/lib.rs

@@ -20,6 +20,7 @@ const MIN_FEERATE: u32 = 253;
 
 #[derive(Clone, Eq, Hash, PartialEq)]
 pub enum Target {
+    Minimum = 1008,
     Background = 144,
     Normal = 18,
     HighPriority = 6,
@@ -202,6 +203,11 @@ impl simple_wallet::WalletBlockchainProvider for ElectrsBlockchainProvider {
 impl FeeEstimator for ElectrsBlockchainProvider {
     fn get_est_sat_per_1000_weight(&self, confirmation_target: ConfirmationTarget) -> u32 {
         let est = match confirmation_target {
+            ConfirmationTarget::MempoolMinimum => self
+                .fees
+                .get(&Target::Minimum)
+                .unwrap()
+                .load(Ordering::Acquire),
             ConfirmationTarget::Background => self
                 .fees
                 .get(&Target::Background)
@@ -304,20 +310,25 @@ impl BlockSource for ElectrsBlockchainProvider {
 }
 
 impl BroadcasterInterface for ElectrsBlockchainProvider {
-    fn broadcast_transaction(&self, tx: &Transaction) {
+    fn broadcast_transactions(&self, txs: &[&Transaction]) {
         let client = self.client.clone();
         let host = self.host.clone();
-        let body = bitcoin_test_utils::tx_to_string(tx);
+        let bodies = txs
+            .iter()
+            .map(|tx| bitcoin_test_utils::tx_to_string(tx))
+            .collect::<Vec<_>>();
         std::thread::spawn(move || {
-            match client.post(format!("{host}tx")).body(body).send() {
-                Err(_) => {}
-                Ok(res) => {
-                    if res.error_for_status_ref().is_err() {
-                        // let body = res.text().unwrap_or_default();
-                        // TODO(tibo): log
+            for body in bodies {
+                match client.post(format!("{host}tx")).body(body).send() {
+                    Err(_) => {}
+                    Ok(res) => {
+                        if res.error_for_status_ref().is_err() {
+                            // let body = res.text().unwrap_or_default();
+                            // TODO(tibo): log
+                        }
                     }
-                }
-            };
+                };
+            }
         });
     }
 }

fuzz/Cargo.toml

@@ -10,7 +10,7 @@ cargo-fuzz = true
 [dependencies]
 dlc-messages = {path = "../dlc-messages"}
 honggfuzz = "0.5"
-lightning = {version = "0.0.113" }
+lightning = {version = "0.0.116" }
 
 [workspace]
 members = ["."]

mocks/Cargo.toml

@@ -9,6 +9,6 @@ bitcoin = "0.29"
 dlc = {path = "../dlc"}
 dlc-manager = {path = "../dlc-manager"}
 dlc-messages = {path = "../dlc-messages"}
-lightning = {version = "0.0.113"}
+lightning = {version = "0.0.116"}
 secp256k1-zkp = {version = "0.7.0", features = ["bitcoin_hashes", "global-context", "rand", "rand-std"]}
 simple-wallet = {path = "../simple-wallet"}

sample/Cargo.toml

@@ -12,8 +12,8 @@ dlc-manager = {path = "../dlc-manager", features = ["use-serde", "parallel"]}
 dlc-messages = {path = "../dlc-messages"}
 dlc-sled-storage-provider = {path = "../dlc-sled-storage-provider"}
 futures = "0.3"
-lightning = {version = "0.0.113"}
-lightning-net-tokio = {version = "0.0.113" }
+lightning = {version = "0.0.116"}
+lightning-net-tokio = {version = "0.0.116" }
 p2pd-oracle-client = {path = "../p2pd-oracle-client"}
 serde = "1.0"
 serde_json = "1.0"

sample/src/cli.rs

@@ -535,7 +535,7 @@ fn help() {
 
 fn list_peers(peer_manager: Arc<PeerManager>) {
     println!("\t{{");
-    for pubkey in peer_manager.get_peer_node_ids() {
+    for (pubkey, _) in peer_manager.get_peer_node_ids() {
         println!("\t\t pubkey: {}", pubkey);
     }
     println!("\t}},");
@@ -546,7 +546,7 @@ pub(crate) async fn connect_peer_if_necessary(
     peer_addr: SocketAddr,
     peer_manager: Arc<PeerManager>,
 ) -> Result<(), ()> {
-    for node_pubkey in peer_manager.get_peer_node_ids() {
+    for (node_pubkey, _) in peer_manager.get_peer_node_ids() {
         if node_pubkey == pubkey {
             return Ok(());
         }
@@ -567,7 +567,7 @@ pub(crate) async fn connect_peer_if_necessary(
                 match peer_manager
                     .get_peer_node_ids()
                     .iter()
-                    .find(|id| **id == pubkey)
+                    .find(|id| id.0 == pubkey)
                 {
                     Some(_) => break,
                     None => tokio::time::sleep(Duration::from_millis(10)).await,

sample/src/main.rs

@@ -12,6 +12,7 @@ use dlc_messages::message_handler::MessageHandler as DlcMessageHandler;
 use lightning::ln::peer_handler::{
     ErroringMessageHandler, IgnoringMessageHandler, MessageHandler, PeerManager as LdkPeerManager,
 };
+use lightning::sign::KeysManager;
 use lightning_net_tokio::SocketDescriptor;
 use p2pd_oracle_client::P2PDOracleClient;
 use std::collections::hash_map::HashMap;
@@ -27,6 +28,7 @@ pub(crate) type PeerManager = LdkPeerManager<
     Arc<IgnoringMessageHandler>,
     Arc<FilesystemLogger>,
     Arc<DlcMessageHandler>,
+    Arc<KeysManager>,
 >;
 
 pub(crate) type DlcManager = dlc_manager::manager::Manager<
@@ -122,18 +124,24 @@ async fn main() {
         .duration_since(SystemTime::UNIX_EPOCH)
         .unwrap();
 
+    let km = Arc::new(KeysManager::new(
+        &sk.secret_bytes(),
+        time.as_secs(),
+        time.as_nanos() as u32,
+    ));
+
     // The peer manager helps us establish connections and communicate with our peers.
     let peer_manager: Arc<PeerManager> = Arc::new(PeerManager::new(
         MessageHandler {
             chan_handler: Arc::new(ErroringMessageHandler::new()),
             route_handler: Arc::new(IgnoringMessageHandler {}),
             onion_message_handler: Arc::new(IgnoringMessageHandler {}),
+            custom_message_handler: dlc_message_handler.clone(),
         },
-        sk,
         time.as_secs() as u32,
         &ephemeral_bytes,
         logger.clone(),
-        dlc_message_handler.clone(),
+        km,
     ));
 
     let peer_manager_connection_handler = peer_manager.clone();

simple-wallet/Cargo.toml

@@ -9,7 +9,7 @@ version = "0.1.0"
 bitcoin = "0.29"
 dlc = {path = "../dlc"}
 dlc-manager = {path = "../dlc-manager"}
-lightning = {version = "0.0.113"}
+lightning = {version = "0.0.116"}
 rust-bitcoin-coin-selection = {version = "0.1.0", git = "https://github.com/p2pderivatives/rust-bitcoin-coin-selection", features = ["rand"]}
 secp256k1-zkp = {version = "0.7.0"}