chore: Update LDK v0.0.108 -> v0.0.110

- All patches upstreamed, back to using crates.io version
- Remove `NodeAlias`
- Fix various API-breaking changes mostly in accordance with ldk-sample

v0.0.109:

- https://github.com/lightningdevkit/rust-lightning/releases/tag/v0.0.109
- lightningdevkit/ldk-sample#62

v0.0.110:
- https://github.com/lightningdevkit/rust-lightning/releases/tag/v0.0.110
- lightningdevkit/ldk-sample#66

Author: MaxFangX

Cargo.lock

@@ -18,19 +18,17 @@ bitcoin-bech32 = "0.12"
 
 # --- LIGHTNING --- #
 
-# lightning = { version = "0.0.108", features = ["max_level_trace"] }
-# lightning-block-sync = { version = "0.0.108", features = [ "rpc-client" ] }
-# lightning-invoice = { version = "0.16" }
-# lightning-net-tokio = { version = "0.0.108" }
+# lightning = { version = "0.0.110", features = ["max_level_trace"] }
+# lightning-block-sync = { version = "0.0.110", features = [ "rpc-client" ] }
+lightning-invoice = { version = "0.18" }
+# lightning-net-tokio = { version = "0.0.110" }
 
-# TODO Switch to back to crates.io version after LDK with lightning-net-tokio
-# patch is released
-# lightning = { git = "https://github.com/lexe-tech/rust-lightning", features = ["max_level_trace"], branch = "net-tokio-connect-v0.0.108" }
-# lightning-block-sync = { git = "https://github.com/lexe-tech/rust-lightning", features = [ "rpc-client" ], branch = "net-tokio-connect-v0.0.108" }
-lightning-invoice = { git = "https://github.com/lexe-tech/rust-lightning", branch = "net-tokio-connect-v0.0.108" }
-# lightning-net-tokio = { git = "https://github.com/lexe-tech/rust-lightning", branch = "net-tokio-connect-v0.0.108" }
+# lightning = { git = "https://github.com/lexe-tech/rust-lightning", features = ["max_level_trace"], branch = "main" }
+# lightning-block-sync = { git = "https://github.com/lexe-tech/rust-lightning", features = [ "rpc-client" ], branch = "main" }
+# lightning-invoice = { git = "https://github.com/lexe-tech/rust-lightning", branch = "main" }
+# lightning-net-tokio = { git = "https://github.com/lexe-tech/rust-lightning", branch = "main" }
 
-# NOTE For debugging and testing patches during local development
+# For debugging and testing patches during local development
 # lightning = { path = "../../ldk/lightning", features = ["max_level_trace"]}
 # lightning-block-sync = { path = "../../ldk/lightning-block-sync", features = [ "rpc-client" ] }
 # lightning-invoice = { path = "../../ldk/lightning-invoice" }

common/Cargo.toml

@@ -101,10 +101,6 @@ pub struct StartArgs {
     #[argh(option, default = "Network::default()")]
     pub network: Network,
 
-    /// this node's Lightning Network alias
-    #[argh(option, default = "NodeAlias::default()")]
-    pub announced_node_name: NodeAlias,
-
     /// whether the node should shut down after completing sync and other
     /// maintenance tasks. This only applies if no activity was detected prior
     /// to the completion of sync (which is usually what happens). Useful when
@@ -146,7 +142,6 @@ impl Default for StartArgs {
             warp_port: None,
             peer_port: None,
             network: Network::default(),
-            announced_node_name: NodeAlias::default(),
             shutdown_after_sync_if_no_activity: false,
             inactivity_timer_sec: 3600,
             repl: false,
@@ -171,8 +166,6 @@ impl StartArgs {
             .arg(&self.inactivity_timer_sec.to_string())
             .arg("--network")
             .arg(&self.network.to_string())
-            .arg("--announced-node-name")
-            .arg(&self.announced_node_name.to_string())
             .arg("--backend-url")
             .arg(&self.backend_url)
             .arg("--runner-url")
@@ -333,56 +326,6 @@ impl Display for BitcoindRpcInfo {
     }
 }
 
-// NOTE: NodeAlias isn't meaningfully used anywhere - it's only purpose is to
-// provide a Display impl for println! statements. Consider removing
-#[derive(Clone, Copy, Default, PartialEq, Eq)]
-pub struct NodeAlias([u8; 32]);
-
-impl NodeAlias {
-    pub fn new(inner: [u8; 32]) -> Self {
-        Self(inner)
-    }
-}
-
-impl FromStr for NodeAlias {
-    type Err = anyhow::Error;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let bytes = s.as_bytes();
-        ensure!(
-            bytes.len() <= 32,
-            "node alias can't be longer than 32 bytes"
-        );
-
-        let mut alias = [0_u8; 32];
-        alias[..bytes.len()].copy_from_slice(bytes);
-
-        Ok(Self(alias))
-    }
-}
-
-impl Display for NodeAlias {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        for b in self.0.iter() {
-            let c = *b as char;
-            if c == '\0' {
-                break;
-            }
-            if c.is_ascii_graphic() || c == ' ' {
-                continue;
-            }
-            write!(f, "{c}")?;
-        }
-        Ok(())
-    }
-}
-
-impl fmt::Debug for NodeAlias {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        Display::fmt(self, f)
-    }
-}
-
 /// There are slight variations is how the network is represented as strings
 /// across bitcoind rpc calls, lightning, etc. For consistency, we use the
 /// mapping defined in bitcoin::Network's FromStr impl, which is:
@@ -481,14 +424,6 @@ mod test {
         assert_eq!(expected, actual);
     }
 
-    #[test]
-    fn test_parse_node_alias() {
-        let expected = NodeAlias(*b"hello, world - this is lexe\0\0\0\0\0");
-        let actual =
-            NodeAlias::from_str("hello, world - this is lexe").unwrap();
-        assert_eq!(expected, actual);
-    }
-
     #[test]
     fn test_network_roundtrip() {
         // Mainnet is disabled for now

common/src/cli.rs

@@ -25,19 +25,17 @@ base64 = "0.13.0"
 
 # --- LIGHTNING --- #
 
-# lightning = { version = "0.0.108", features = ["max_level_trace"] }
-# lightning-block-sync = { version = "0.0.108", features = [ "rpc-client" ] }
-# lightning-invoice = { version = "0.16" }
-# lightning-net-tokio = { version = "0.0.108" }
-
-# TODO Switch to back to crates.io version after LDK with lightning-net-tokio
-# patch is released
-lightning = { git = "https://github.com/lexe-tech/rust-lightning", features = ["max_level_trace"], branch = "net-tokio-connect-v0.0.108" }
-lightning-block-sync = { git = "https://github.com/lexe-tech/rust-lightning", features = [ "rpc-client" ], branch = "net-tokio-connect-v0.0.108" }
-lightning-invoice = { git = "https://github.com/lexe-tech/rust-lightning", branch = "net-tokio-connect-v0.0.108" }
-lightning-net-tokio = { git = "https://github.com/lexe-tech/rust-lightning", branch = "net-tokio-connect-v0.0.108" }
-
-# NOTE For debugging and testing patches during local development
+lightning = { version = "0.0.110", features = ["max_level_trace"] }
+lightning-block-sync = { version = "0.0.110", features = [ "rpc-client" ] }
+lightning-invoice = { version = "0.18" }
+lightning-net-tokio = { version = "0.0.110" }
+
+# lightning = { git = "https://github.com/lexe-tech/rust-lightning", features = # ["max_level_trace"], branch = "main" }
+# lightning-block-sync = { git = "https://github.com/lexe-tech/rust-lightning", # features = [ "rpc-client" ], branch = "main" }
+# lightning-invoice = { git = "https://github.com/lexe-tech/rust-lightning", # branch = "main" }
+# lightning-net-tokio = { git = "https://github.com/lexe-tech/rust-lightning", # branch = "main" }
+
+# For debugging and testing patches during local development
 # lightning = { path = "../../ldk/lightning", features = ["max_level_trace"]}
 # lightning-block-sync = { path = "../../ldk/lightning-block-sync", features = [ "rpc-client" ] }
 # lightning-invoice = { path = "../../ldk/lightning-invoice" }

node/Cargo.toml

@@ -8,7 +8,7 @@ use bitcoind::bitcoincore_rpc::RpcApi;
 use bitcoind::{self, BitcoinD, Conf};
 use common::api::UserPk;
 use common::cli::{
-    BitcoindRpcInfo, Network, NodeAlias, StartArgs, DEFAULT_BACKEND_URL,
+    BitcoindRpcInfo, Network, StartArgs, DEFAULT_BACKEND_URL,
     DEFAULT_RUNNER_URL,
 };
 use common::rng::SysRng;
@@ -36,7 +36,6 @@ fn default_args_for_user(user_pk: UserPk) -> StartArgs {
         },
         user_pk,
         peer_port: None,
-        announced_node_name: NodeAlias::default(),
         network: Network::from_str("regtest").unwrap(),
         warp_port: None,
         shutdown_after_sync_if_no_activity: false,

node/src/command/test/mod.rs

@@ -10,7 +10,7 @@ use bitcoin::blockdata::transaction::Transaction;
 use bitcoin::consensus::encode;
 use bitcoin::secp256k1::Secp256k1;
 use bitcoin_bech32::WitnessProgram;
-use common::cli::{Network, NodeAlias};
+use common::cli::Network;
 use common::hex;
 use lightning::chain::chaininterface::{
     BroadcasterInterface, ConfirmationTarget, FeeEstimator,
@@ -271,6 +271,8 @@ async fn handle_event_fallible(
         }
         Event::PaymentPathSuccessful { .. } => {}
         Event::PaymentPathFailed { .. } => {}
+        Event::ProbeSuccessful { .. } => {}
+        Event::ProbeFailed { .. } => {}
         Event::PaymentFailed { payment_hash, .. } => {
             print!(
 				"\nEVENT: Failed to send payment to payment hash {:?}: exhausted payment retry attempts",
@@ -311,7 +313,7 @@ async fn handle_event_fallible(
                                     Some(announcement) => {
                                         format!(
                                             " from node {}",
-                                            NodeAlias::new(announcement.alias)
+                                            announcement.alias
                                         )
                                     }
                                 },
@@ -357,6 +359,7 @@ async fn handle_event_fallible(
             print!("> ");
             io::stdout().flush().unwrap();
         }
+        Event::HTLCHandlingFailed { .. } => {}
         Event::PendingHTLCsForwardable { time_forwardable } => {
             let forwarding_channel_manager = channel_manager.clone();
             let millis_to_sleep = time_forwardable.as_millis() as u64;

node/src/event_handler.rs

@@ -49,9 +49,9 @@ const TIME_TO_CONTEST_FRAUDULENT_TXNS: u16 = 6 * 24 * 7;
 const TIME_TO_CONTEST_FRAUDULENT_TXNS: u16 = BREAKDOWN_TIMEOUT;
 
 pub const USER_CONFIG: UserConfig = UserConfig {
-    own_channel_config: OWN_CHANNEL_CONFIG,
-    peer_channel_config_limits: PEER_CHANNEL_CONFIG_LIMITS,
-    channel_options: CHANNEL_OPTIONS,
+    channel_handshake_config: CHANNEL_HANDSHAKE_CONFIG,
+    channel_handshake_limits: CHANNEL_HANDSHAKE_LIMITS,
+    channel_config: CHANNEL_CONFIG,
 
     // Do not accept any HTLC forwarding risks
     accept_forwards_to_priv_channels: false,
@@ -63,24 +63,33 @@ pub const USER_CONFIG: UserConfig = UserConfig {
     manually_accept_inbound_channels: false,
 };
 
-const OWN_CHANNEL_CONFIG: ChannelHandshakeConfig = ChannelHandshakeConfig {
-    // Wait 6 confirmations for channels to be considered locked-in.
-    minimum_depth: 6,
-    // Require the channel counterparty (Lexe's LSPs) to wait <this param> to
-    // claim funds in the case of a unilateral close. Specified in # of blocks.
-    our_to_self_delay: TIME_TO_CONTEST_FRAUDULENT_TXNS,
-    // Allow extremely small HTLCs
-    our_htlc_minimum_msat: 1,
-    // Allow up to 100% of our funds to be encumbered in inbound HTLCS.
-    max_inbound_htlc_value_in_flight_percent_of_channel: 100,
-    // Attempt to use better privacy. The LSP should have this enabled.
-    negotiate_scid_privacy: true,
-};
+const CHANNEL_HANDSHAKE_CONFIG: ChannelHandshakeConfig =
+    ChannelHandshakeConfig {
+        // Wait 6 confirmations for channels to be considered locked-in.
+        minimum_depth: 6,
+        // Require the channel counterparty (Lexe's LSPs) to wait <this param>
+        // to claim funds in the case of a unilateral close. Specified
+        // in # of blocks.
+        our_to_self_delay: TIME_TO_CONTEST_FRAUDULENT_TXNS,
+        // Allow extremely small HTLCs
+        our_htlc_minimum_msat: 1,
+        // Allow up to 100% of our funds to be encumbered in inbound HTLCS.
+        max_inbound_htlc_value_in_flight_percent_of_channel: 100,
+        // Attempt to use better privacy. The LSP should have this enabled.
+        negotiate_scid_privacy: true,
+        // Do not publically announce our channels
+        announced_channel: false,
+        // The additional 'security' provided by setting is pointless.
+        // Additionally, we do not want to commit to a `shutdown_pubkey`
+        // so that it is possible to sweep all funds to an address
+        // specified at the time of channel close.
+        commit_upfront_shutdown_pubkey: false,
+    };
 
-const PEER_CHANNEL_CONFIG_LIMITS: ChannelHandshakeLimits =
+const CHANNEL_HANDSHAKE_LIMITS: ChannelHandshakeLimits =
     ChannelHandshakeLimits {
         // Force an incoming channel (from the LSP) to match the value we set
-        // for `ChannelConfig::announced_channel` (which is false)
+        // for `ChannelHandshakeConfig::announced_channel` (which is false)
         force_announced_channel_preference: true,
         // *We* (the node) wait a maximum of 6 * 24 blocks (1 day) to reclaim
         // our funds in the case of a unilateral close initiated by us.
@@ -97,19 +106,13 @@ const PEER_CHANNEL_CONFIG_LIMITS: ChannelHandshakeLimits =
         max_minimum_depth: 144,
     };
 
-const CHANNEL_OPTIONS: ChannelConfig = ChannelConfig {
+const CHANNEL_CONFIG: ChannelConfig = ChannelConfig {
     // (proportional fee) We do not forward anything so this can be 0
     forwarding_fee_proportional_millionths: 0,
     // (base fee) We do not forward anything so this can be 0
     forwarding_fee_base_msat: 0,
     // We do not forward anything so this can be the minimum
     cltv_expiry_delta: MIN_CLTV_EXPIRY_DELTA,
-    // Do not publically announce our channels
-    announced_channel: false,
-    // The additional 'security' provided by setting is pointless. Additionally,
-    // we do not want to commit to a `shutdown_pubkey` so that it is possible to
-    // sweep all funds to an address specified at the time of channel close.
-    commit_upfront_shutdown_pubkey: false,
     // LDK default
     max_dust_htlc_exposure_msat: 5_000_000,
     // Pay up to 1000 sats (50 cents assuming $50K per BTC) to avoid waiting up

node/src/lexe/channel_manager/mod.rs

@@ -11,7 +11,7 @@ use anyhow::Context;
 use bitcoin::hashes::sha256::Hash as Sha256;
 use bitcoin::hashes::Hash;
 use bitcoin::secp256k1::PublicKey;
-use common::cli::{Network, NodeAlias};
+use common::cli::Network;
 use common::hex;
 use lightning::chain::keysinterface::{KeysInterface, Recipient};
 use lightning::ln::{PaymentHash, PaymentPreimage};
@@ -379,10 +379,7 @@ fn list_channels(
             .get(&NodeId::from_pubkey(&chan_info.counterparty.node_id))
         {
             if let Some(announcement) = &node_info.announcement_info {
-                println!(
-                    "\t\tpeer_alias: {}",
-                    NodeAlias::new(announcement.alias)
-                );
+                println!("\t\tpeer_alias: {}", announcement.alias);
             }
         }
 
@@ -640,7 +637,7 @@ fn force_close_channel(
     channel_manager: LexeChannelManager,
 ) {
     match channel_manager
-        .force_close_channel(&channel_id, &counterparty_node_id)
+        .force_close_broadcasting_latest_txn(&channel_id, &counterparty_node_id)
     {
         Ok(()) => println!("EVENT: initiating channel force-close"),
         Err(e) => println!("ERROR: failed to force-close channel: {:?}", e),