Merge pull request #93 from lightningdevkit/bump-node

Author: benthecarman

Cargo.lock

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-ldk-node = { version = "0.7.0" }
+ldk-node = { git = "https://github.com/lightningdevkit/ldk-node", rev = "d1bbf978c8b7abe87ae2e40793556c1fe4e7ea49" }
 serde = { version = "1.0.203", default-features = false, features = ["derive"] }
 hyper = { version = "1", default-features = false, features = ["server", "http1"] }
 http-body-util = { version = "0.1", default-features = false }

ldk-server/Cargo.toml

@@ -93,7 +93,6 @@ impl From<NodeError> for LdkServerError {
 			| NodeError::AsyncPaymentServicesDisabled => {
 				(error.to_string(), LdkServerErrorCode::InvalidRequestError)
 			},
-
 			NodeError::ConnectionFailed
 			| NodeError::InvoiceCreationFailed
 			| NodeError::InvoiceRequestCreationFailed
@@ -109,8 +108,8 @@ impl From<NodeError> for LdkServerError {
 			| NodeError::DuplicatePayment
 			| NodeError::InsufficientFunds
 			| NodeError::UnsupportedCurrency
+			| NodeError::HrnParsingFailed
 			| NodeError::LiquidityFeeTooHigh => (error.to_string(), LdkServerErrorCode::LightningError),
-
 			NodeError::AlreadyRunning
 			| NodeError::NotRunning
 			| NodeError::PersistenceFailed
@@ -125,6 +124,7 @@ impl From<NodeError> for LdkServerError {
 			| NodeError::OnchainTxCreationFailed
 			| NodeError::OnchainTxSigningFailed
 			| NodeError::TxSyncFailed
+			| NodeError::InvalidScriptPubKey
 			| NodeError::TxSyncTimeout => (error.to_string(), LdkServerErrorCode::InternalServerError),
 		};
 		LdkServerError::new(error_code, message)

ldk-server/src/api/error.rs

@@ -14,6 +14,7 @@ mod util;
 
 use crate::service::NodeService;
 
+use ldk_node::entropy::NodeEntropy;
 use ldk_node::{Builder, Event, Node};
 
 use tokio::net::TcpListener;
@@ -147,7 +148,16 @@ fn main() {
 
 	builder.set_runtime(runtime.handle().clone());
 
-	let node = match builder.build() {
+	let seed_path = format!("{}/keys_seed", config_file.storage_dir_path);
+	let node_entropy = match NodeEntropy::from_seed_path(seed_path) {
+		Ok(entropy) => entropy,
+		Err(e) => {
+			error!("Failed to load or generate seed: {e}");
+			std::process::exit(-1);
+		},
+	};
+
+	let node = match builder.build(node_entropy) {
 		Ok(node) => Arc::new(node),
 		Err(e) => {
 			error!("Failed to build LDK Node: {e}");