fix: Revert a rust-lightning patch

This _may_ be a fix for #1697. This is the reverting patch: lightningdevkit/rust-lightning@121bc324.
get10101 · Dec 8, 2023 · dbf1530 · dbf1530
1 parent 8abc4c7
commit dbf1530
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,12 +29,12 @@ p2pd-oracle-client = { git = "https://github.com/p2pderivatives/rust-dlc", rev =
 dlc-trie = { git = "https://github.com/p2pderivatives/rust-dlc", rev = "145cf6e" }
 
 # We should usually track the `p2pderivatives/split-tx-experiment[-10101]` branch.
-lightning = { git = "https://github.com/p2pderivatives/rust-lightning/", rev = "08c0c5fd" }
-lightning-background-processor = { git = "https://github.com/p2pderivatives/rust-lightning/", rev = "08c0c5fd" }
-lightning-transaction-sync = { git = "https://github.com/p2pderivatives/rust-lightning/", rev = "08c0c5fd" }
-lightning-net-tokio = { git = "https://github.com/p2pderivatives/rust-lightning/", rev = "08c0c5fd" }
-lightning-persister = { git = "https://github.com/p2pderivatives/rust-lightning/", rev = "08c0c5fd" }
-lightning-rapid-gossip-sync = { git = "https://github.com/p2pderivatives/rust-lightning/", rev = "08c0c5fd" }
+lightning = { git = "https://github.com/p2pderivatives/rust-lightning/", rev = "121bc324" }
+lightning-background-processor = { git = "https://github.com/p2pderivatives/rust-lightning/", rev = "121bc324" }
+lightning-transaction-sync = { git = "https://github.com/p2pderivatives/rust-lightning/", rev = "121bc324" }
+lightning-net-tokio = { git = "https://github.com/p2pderivatives/rust-lightning/", rev = "121bc324" }
+lightning-persister = { git = "https://github.com/p2pderivatives/rust-lightning/", rev = "121bc324" }
+lightning-rapid-gossip-sync = { git = "https://github.com/p2pderivatives/rust-lightning/", rev = "121bc324" }
 
 rust-bitcoin-coin-selection = { git = "https://github.com/p2pderivatives/rust-bitcoin-coin-selection" }
 

diff --git a/crates/ln-dlc-node/src/node/dlc_channel.rs b/crates/ln-dlc-node/src/node/dlc_channel.rs
@@ -127,6 +127,8 @@ impl<S: TenTenOneStorage + 'static, N: LnDlcStorage + Sync + Send + 'static> Nod
             Message::SubChannel(SubChannelMessage::Accept(accept_sub_channel)),
         );
 
+        tracing::info!(channel_id = %channel_id_hex, "Sent DLC channel accept message");
+
         Ok(())
     }
 

diff --git a/mobile/native/src/logger.rs b/mobile/native/src/logger.rs
@@ -28,7 +28,7 @@ pub fn log_base_directives(env: EnvFilter, level: LevelFilter) -> Result<EnvFilt
         .add_directive("sled=warn".parse()?)
         .add_directive("bdk=warn".parse()?) // bdk is quite spamy on debug
         .add_directive("lightning_transaction_sync=warn".parse()?)
-        .add_directive("lightning::ln::peer_handler=debug".parse()?)
+        .add_directive("lightning::ln::peer_handler=trace".parse()?)
         .add_directive("lightning=trace".parse()?)
         .add_directive("ureq=info".parse()?);
     Ok(filter)
-Original file line number
+Diff line change
@@ Expand Up @@
                 Message::SubChannel(SubChannelMessage::Accept(accept_sub_channel)),
             );
+            tracing::info!(channel_id = %channel_id_hex, "Sent DLC channel accept message");
             Ok(())
         }
@@ Expand Down @@