use rust-lightning v0.2

Author: zoedberg

Cargo.lock

@@ -24,13 +24,15 @@ clap = "4.5.20"
 dirs = "5.0.1"
 futures = "0.3"
 hex = { package = "hex-conservative", version = "0.3.0", default-features = false }
-lightning = { version = "0.0.125", features = ["max_level_trace"], path = "./rust-lightning/lightning" }
-lightning-background-processor = { version = "0.0.125", features = ["futures"], path = "./rust-lightning/lightning-background-processor" }
-lightning-block-sync = { version = "0.0.125", features = ["rpc-client", "tokio"] }
-lightning-invoice = { version = "0.32.0", features = ["std"], path = "./rust-lightning/lightning-invoice" }
-lightning-net-tokio = { version = "0.0.125" }
-lightning-persister = { version = "0.0.125", path = "./rust-lightning/lightning-persister" }
-lightning-rapid-gossip-sync = { version = "0.0.125", path = "./rust-lightning/lightning-rapid-gossip-sync" }
+lightning = { version = "0.2.0", path = "./rust-lightning/lightning", features = ["dnssec"] }
+lightning-background-processor = { version = "0.2.0", path = "./rust-lightning/lightning-background-processor" }
+lightning-block-sync = { version = "0.2.0", features = ["rpc-client", "tokio"] }
+lightning-dns-resolver = { version = "0.3.0", path = "./rust-lightning/lightning-dns-resolver" }
+lightning-invoice = { version = "0.34.0", features = ["std"], path = "./rust-lightning/lightning-invoice" }
+lightning-macros = { version = "0.2.0" }
+lightning-net-tokio = { version = "0.2.0" }
+lightning-persister = { version = "0.2.0", path = "./rust-lightning/lightning-persister", features = ["tokio"] }
+lightning-rapid-gossip-sync = { version = "0.2.0", path = "./rust-lightning/lightning-rapid-gossip-sync" }
 magic-crypt = "4.0.1"
 rand = "0.8.5"
 regex = { version = "1.11", default-features = false }

Cargo.toml

@@ -22,8 +22,8 @@ responsibility for loss of funds or any other issue you may encounter.
 
 Also note that [rust-lightning] has been changed in order to support RGB
 channels,
-[here](https://github.com/RGB-Tools/rust-lightning/compare/v0.0.125...rgb)
-a comparison with `v0.0.125`, the version we applied the changes to.
+[here](https://github.com/RGB-Tools/rust-lightning/compare/v0.2...rgb)
+a comparison with `v0.2`, the version we applied the changes to.
 
 ## Install
 

README.md

@@ -127,7 +127,7 @@ impl BitcoindClient {
             rpc_user.clone(),
             rpc_password.clone()
         ));
-        let bitcoind_rpc_client = RpcClient::new(&rpc_credentials, http_endpoint)?;
+        let bitcoind_rpc_client = RpcClient::new(&rpc_credentials, http_endpoint);
         let _dummy = bitcoind_rpc_client
             .call_method::<BlockchainInfo>("getblockchaininfo", &[])
             .await

rust-lightning

@@ -2,6 +2,7 @@ use bitcoin::secp256k1::PublicKey;
 use bitcoin::Network;
 use chrono::Utc;
 use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringDecayParameters};
+use lightning::util::hash_tables::new_hash_map;
 use lightning::util::logger::{Logger, Record};
 use lightning::util::ser::{Readable, ReadableArgs, Writer};
 use std::collections::HashMap;
@@ -162,7 +163,7 @@ pub(crate) fn read_inbound_payment_info(path: &Path) -> InboundPaymentInfoStorag
         }
     }
     InboundPaymentInfoStorage {
-        payments: HashMap::new(),
+        payments: new_hash_map(),
     }
 }
 
@@ -173,7 +174,7 @@ pub(crate) fn read_outbound_payment_info(path: &Path) -> OutboundPaymentInfoStor
         }
     }
     OutboundPaymentInfoStorage {
-        payments: HashMap::new(),
+        payments: new_hash_map(),
     }
 }
 
@@ -183,7 +184,7 @@ pub(crate) fn read_output_spender_txes(path: &Path) -> OutputSpenderTxes {
             return info;
         }
     }
-    HashMap::new()
+    new_hash_map()
 }
 
 pub(crate) fn read_swaps_info(path: &Path) -> SwapMap {
@@ -193,7 +194,7 @@ pub(crate) fn read_swaps_info(path: &Path) -> SwapMap {
         }
     }
     SwapMap {
-        swaps: HashMap::new(),
+        swaps: new_hash_map(),
     }
 }
 
@@ -219,6 +220,6 @@ pub(crate) fn read_channel_ids_info(path: &Path) -> ChannelIdsMap {
         }
     }
     ChannelIdsMap {
-        channel_ids: HashMap::new(),
+        channel_ids: new_hash_map(),
     }
 }