Merge pull request #2059 from get10101/replace-tcp-with-ws

Replace TCP with WebSockets (when feature gate enabled)
get10101 · Feb 27, 2024 · d1f4a89 · d1f4a89
2 parents 8d9411f + 1528483
commit d1f4a89
Show file tree

Hide file tree

Showing 22 changed files with 1,232 additions and 74 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -31,7 +31,6 @@ dlc-trie = { git = "https://github.com/get10101/rust-dlc", rev = "0191dc4" }
 lightning = { git = "https://github.com/bonomat/rust-lightning-p2p-derivatives", rev = "e49030e" }
 lightning-background-processor = { git = "https://github.com/bonomat/rust-lightning-p2p-derivatives", rev = "e49030e" }
 lightning-transaction-sync = { git = "https://github.com/bonomat/rust-lightning-p2p-derivatives", rev = "e49030e" }
-lightning-net-tokio = { git = "https://github.com/bonomat/rust-lightning-p2p-derivatives", rev = "e49030e" }
 lightning-persister = { git = "https://github.com/bonomat/rust-lightning-p2p-derivatives", rev = "e49030e" }
 lightning-rapid-gossip-sync = { git = "https://github.com/bonomat/rust-lightning-p2p-derivatives", rev = "e49030e" }
 

diff --git a/coordinator/Cargo.toml b/coordinator/Cargo.toml
@@ -77,6 +77,7 @@ version = "0.25"
 
 [dependencies.ln-dlc-node]
 path = "../crates/ln-dlc-node"
+features = ["ln_net_axum_ws"]
 
 [dependencies.openssl]
 version = "0.10.60"

diff --git a/coordinator/src/admin.rs b/coordinator/src/admin.rs
@@ -508,6 +508,7 @@ pub async fn open_channel(
         let peer = NodeInfo {
             pubkey,
             address: target_address,
+            is_ws: false,
         };
         state.node.inner.connect(peer).await.map_err(|e| {
             AppError::InternalServerError(format!("Could not connect to target node {e:#}"))

diff --git a/coordinator/src/bin/coordinator.rs b/coordinator/src/bin/coordinator.rs
@@ -331,7 +331,7 @@ async fn main() -> Result<()> {
     tracing::debug!("Listening on http://{}", http_address);
 
     match axum::Server::bind(&http_address)
-        .serve(app.into_make_service())
+        .serve(app.into_make_service_with_connect_info::<SocketAddr>())
         .await
     {
         Ok(_) => {

diff --git a/coordinator/src/node/connection.rs b/coordinator/src/node/connection.rs
@@ -76,6 +76,7 @@ fn reconnect_to_disconnected_public_channel_peers(
                     let node_info = NodeInfo {
                         pubkey: peer,
                         address,
+                        is_ws: false,
                     };
 
                     match node.connect(node_info).await {