Update lightning requirement from 0.0.110 to 0.0.111

Author: danielgranhao

Cargo.toml

@@ -12,12 +12,12 @@ nigiri = []
 
 [dependencies]
 bdk = { version = "0.23.0", features = ["keys-bip39"] }
-bitcoin = "0.28.1"
+bitcoin = "0.29.1"
 futures = "0.3.24"
-lightning = { version = "0.0.110", features = ["max_level_trace"] }
-lightning-background-processor = "0.0.110"
-lightning-net-tokio = "0.0.110"
-lightning-rapid-gossip-sync = "0.0.110"
+lightning = { version = "0.0.111", features = ["max_level_trace"] }
+lightning-background-processor = "0.0.111"
+lightning-net-tokio = "0.0.111"
+lightning-rapid-gossip-sync = "0.0.111"
 log = "0.4.17"
 rand = "0.8.5"
 thiserror = "1.0.34"

src/chain_access.rs

@@ -1,5 +1,5 @@
 use crate::errors::RuntimeError;
-use bitcoin::{Script, Transaction, Txid};
+use bitcoin::{Script, Txid};
 use esplora_client::blocking::BlockingClient;
 use lightning::chain::{Confirm, Filter, WatchedOutput};
 use std::sync::{Arc, Mutex};
@@ -48,13 +48,8 @@ impl Filter for LipaChainAccess {
             .push((*txid, script_pubkey.clone()));
     }
 
-    fn register_output(&self, output: WatchedOutput) -> Option<(usize, Transaction)> {
+    fn register_output(&self, output: WatchedOutput) {
         self.queued_outputs.lock().unwrap().push(output);
-        // The Filter::register_output return value has been removed, as it was very difficult to
-        // correctly implement (i.e., without blocking). Users previously using it should instead
-        // pass dependent transactions in via additional chain::Confirm::transactions_confirmed
-        // calls (#1663).
-        None
     }
 }
 

src/lib.rs

@@ -43,13 +43,15 @@ use lightning::chain::channelmonitor::ChannelMonitor;
 use lightning::chain::keysinterface::{InMemorySigner, KeysInterface, KeysManager, Recipient};
 use lightning::chain::{BestBlock, Watch};
 use lightning::ln::channelmanager::ChainParameters;
+use lightning::ln::peer_handler::IgnoringMessageHandler;
 use lightning::routing::gossip::NetworkGraph;
 use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringParameters};
 use lightning::util::config::UserConfig;
 use lightning_background_processor::{BackgroundProcessor, GossipSync};
 use lightning_rapid_gossip_sync::RapidGossipSync;
 use log::{warn, Level as LogLevel};
 use std::sync::{Arc, Mutex};
+use std::time::{SystemTime, UNIX_EPOCH};
 
 static ESPLORA_TIMEOUT_SECS: u64 = 30;
 
@@ -294,7 +296,12 @@ fn init_peer_manager(
         })?;
     Ok(PeerManager::new_channel_only(
         channel_manager,
+        IgnoringMessageHandler {},
         our_node_secret,
+        SystemTime::now()
+            .duration_since(UNIX_EPOCH)
+            .unwrap()
+            .as_secs(),
         &ephemeral_bytes,
         logger,
     ))

src/types.rs

@@ -27,6 +27,7 @@ pub(crate) type PeerManager = lightning::ln::peer_handler::PeerManager<
     SocketDescriptor,
     Arc<ChannelManager>,
     IgnoringMessageHandler,
+    IgnoringMessageHandler,
     Arc<LightningLogger>,
     IgnoringMessageHandler,
 >;