meta: use vanilla ldk without our fork

Finally we are able to remove the fork that we have of ldk. Signed-off-by: Vincenzo Palazzo <[email protected]>
vincenzopalazzo · Jun 19, 2024 · e62b04a · e62b04a
1 parent cfcca63
commit e62b04a
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 33 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lampo-common/Cargo.toml b/lampo-common/Cargo.toml
@@ -6,13 +6,13 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-lightning = { git = "https://github.com/vincenzopalazzo/rust-lightning.git", branch = "macros/allow-to-inject-channels-keys", features = ["max_level_trace"] }
-lightning-block-sync = { git = "https://github.com/vincenzopalazzo/rust-lightning.git", branch = "macros/allow-to-inject-channels-keys" }
-lightning-persister = { git = "https://github.com/vincenzopalazzo/rust-lightning.git", branch = "macros/allow-to-inject-channels-keys" }
-lightning-background-processor = { git = "https://github.com/vincenzopalazzo/rust-lightning.git", branch = "macros/allow-to-inject-channels-keys" }
-lightning-net-tokio = { git = "https://github.com/vincenzopalazzo/rust-lightning.git", branch = "macros/allow-to-inject-channels-keys" }
-lightning-rapid-gossip-sync = { git = "https://github.com/vincenzopalazzo/rust-lightning.git", branch = "macros/allow-to-inject-channels-keys" }
-lightning-invoice = { git = "https://github.com/vincenzopalazzo/rust-lightning.git", branch = "macros/allow-to-inject-channels-keys" }
+lightning = { version = "0.0.123", features = ["max_level_trace"] }
+lightning-block-sync = { version = "0.0.123" }
+lightning-persister = { version = "0.0.123" }
+lightning-background-processor = { version = "0.0.123" }
+lightning-net-tokio = { version = "0.0.123" }
+lightning-rapid-gossip-sync = { version = "0.0.123" }
+lightning-invoice = { version = "0.31" }
 bitcoin = { version = "0.30.2", features = ["serde"] }
 clightningrpc-conf = { git = "https://github.com/laanwj/cln4rust.git", branch = "master" }
 crossbeam-channel = "0.5.8"

diff --git a/lampod/src/ln/offchain_manager.rs b/lampod/src/ln/offchain_manager.rs
@@ -94,7 +94,7 @@ impl OffchainManager {
         let offer = Offer::from_str(offer_str).map_err(|err| error::anyhow!("{:?}", err))?;
 
         let amount = match offer.amount() {
-            Some(Amount::Bitcoin { amount_msats }) => amount_msats,
+            Some(Amount::Bitcoin { amount_msats }) => amount_msats.clone(),
             Some(_) => error::bail!(
                 "Cannot process non-Bitcoin-denominated offer value {:?}",
                 offer.amount()

diff --git a/lampod/src/ln/peer_manager.rs b/lampod/src/ln/peer_manager.rs
@@ -32,7 +32,7 @@ pub type LampoArcOnionMessenger<L> = OnionMessenger<
     Arc<LampoKeysManager>,
     Arc<LampoKeysManager>,
     Arc<L>,
-    EmptyNodeIdLookUp,
+    Arc<EmptyNodeIdLookUp>,
     Arc<DefaultMessageRouter<Arc<LampoGraph>, Arc<L>, Arc<LampoKeysManager>>>,
     IgnoringMessageHandler,
     IgnoringMessageHandler,
@@ -90,7 +90,7 @@ impl LampoPeerManager {
             keys.clone(),
             keys.clone(),
             self.logger.clone(),
-            EmptyNodeIdLookUp {},
+            Arc::new(EmptyNodeIdLookUp {}),
             Arc::new(DefaultMessageRouter::new(graph.clone(), keys.clone())),
             IgnoringMessageHandler {},
             IgnoringMessageHandler {},