f Update to LDK 0.0.114 and BDK 0.27.1

Author: tnull

Cargo.toml

@@ -9,12 +9,13 @@ description = "A ready-to-go node implementation based on LDK."
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-#lightning = { version = "0.0.112", features = ["max_level_trace", "std"] }
-#lightning-invoice = { version = "0.20" }
-#lightning-net-tokio = { version = "0.0.112" }
-#lightning-persister = { version = "0.0.112" }
-#lightning-background-processor = { version = "0.0.112" }
-#lightning-rapid-gossip-sync = { version = "0.0.112" }
+lightning = { version = "0.0.114", features = ["max_level_trace", "std"] }
+lightning-invoice = { version = "0.22" }
+lightning-net-tokio = { version = "0.0.114" }
+lightning-persister = { version = "0.0.114" }
+lightning-background-processor = { version = "0.0.114" }
+lightning-rapid-gossip-sync = { version = "0.0.114" }
+lightning-transaction-sync = { version = "0.0.114", features = ["esplora-async"] }
 
 #lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main", features = ["max_level_trace", "std"] }
 #lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main" }
@@ -24,13 +25,13 @@ description = "A ready-to-go node implementation based on LDK."
 #lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main" }
 #lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main", features = ["esplora-async"] }
 
-lightning = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate-pre-rebase", features = ["max_level_trace", "std"] }
-lightning-invoice = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate-pre-rebase" }
-lightning-net-tokio = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate-pre-rebase" }
-lightning-persister = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate-pre-rebase" }
-lightning-background-processor = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate-pre-rebase" }
-lightning-rapid-gossip-sync = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate-pre-rebase" }
-lightning-transaction-sync = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate-pre-rebase", features = ["esplora-async"] }
+#lightning = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate-pre-rebase", features = ["max_level_trace", "std"] }
+#lightning-invoice = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate-pre-rebase" }
+#lightning-net-tokio = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate-pre-rebase" }
+#lightning-persister = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate-pre-rebase" }
+#lightning-background-processor = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate-pre-rebase" }
+#lightning-rapid-gossip-sync = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate-pre-rebase" }
+#lightning-transaction-sync = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate-pre-rebase", features = ["esplora-async"] }
 
 #lightning = { path = "../rust-lightning/lightning", features = ["max_level_trace", "std"] }
 #lightning-invoice = { path = "../rust-lightning/lightning-invoice" }
@@ -40,7 +41,7 @@ lightning-transaction-sync = { git = "https://github.com/tnull/rust-lightning",
 #lightning-rapid-gossip-sync = { path = "../rust-lightning/lightning-rapid-gossip-sync" }
 #lightning-transaction-sync = { path = "../rust-lightning/lightning-transaction-sync", features = ["esplora-async"] }
 
-bdk = { version = "0.26.0", default-features = false, features = ["async-interface", "use-esplora-async", "key-value-db"]}
+bdk = { version = "0.27.1", default-features = false, features = ["async-interface", "use-esplora-async", "key-value-db"]}
 bitcoin = "0.29.2"
 
 rand = "0.8.5"

src/error.rs

@@ -17,8 +17,8 @@ pub enum Error {
 	InvoiceInvalid,
 	/// Invoice creation failed.
 	InvoiceCreationFailed,
-	/// No route for the given target could be found.
-	RoutingFailed,
+	/// A attempted payment has failed.
+	PaymentFailed,
 	/// A given peer info could not be parsed.
 	PeerInfoParseFailed,
 	/// A channel could not be opened.
@@ -47,7 +47,7 @@ impl fmt::Display for Error {
 			Self::NonUniquePaymentHash => write!(f, "An invoice must not get payed twice."),
 			Self::InvoiceInvalid => write!(f, "The given invoice is invalid."),
 			Self::InvoiceCreationFailed => write!(f, "Failed to create invoice."),
-			Self::RoutingFailed => write!(f, "Failed to find route."),
+			Self::PaymentFailed => write!(f, "Failed to send the given payment."),
 			Self::PeerInfoParseFailed => write!(f, "Failed to parse the given peer information."),
 			Self::ChannelCreationFailed => write!(f, "Failed to create channel."),
 			Self::ChannelClosingFailed => write!(f, "Failed to close channel."),

src/event.rs

@@ -3,7 +3,7 @@ use crate::{
 	PaymentInfoStorage, PaymentStatus, Wallet,
 };
 
-use crate::logger::{log_error, log_given_level, log_info, log_internal, Logger};
+use crate::logger::{log_error, log_info, Logger};
 
 use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
 use lightning::ln::PaymentHash;

src/io_utils.rs

@@ -41,9 +41,7 @@ pub(crate) fn read_network_graph(
 		}
 	}
 
-	let genesis_hash =
-		bitcoin::blockdata::constants::genesis_block(config.network).header.block_hash();
-	Ok(NetworkGraph::new(genesis_hash, logger))
+	Ok(NetworkGraph::new(config.network, logger))
 }
 
 pub(crate) fn read_scorer(