Add BdkActor

Cargo.toml

@@ -16,3 +16,4 @@ lightning-transaction-sync = { git = "https://github.com/get10101/rust-lightning
 lightning-net-tokio = { git = "https://github.com/get10101/rust-lightning/", rev = "5aa1449c" }
 lightning-persister = { git = "https://github.com/get10101/rust-lightning/", rev = "5aa1449c" }
 rust-bitcoin-coin-selection = { git = "https://github.com/p2pderivatives/rust-bitcoin-coin-selection" }
+xtra = { git = "https://github.com/Restioson/xtra", rev = "d98393a" }

coordinator/src/admin.rs

@@ -31,20 +31,21 @@ pub struct Balance {
 
 #[autometrics]
 pub async fn get_balance(State(state): State<Arc<AppState>>) -> Result<Json<Balance>, AppError> {
-    spawn_blocking(move || {
-        let offchain = state.node.inner.get_ldk_balance();
-        let onchain =
-            state.node.inner.get_on_chain_balance().map_err(|e| {
-                AppError::InternalServerError(format!("Failed to get balance: {e:#}"))
-            })?;
-
-        Ok(Json(Balance {
-            offchain: offchain.available,
-            onchain: onchain.confirmed,
-        }))
-    })
-    .await
-    .map_err(|e| AppError::InternalServerError(format!("Failed to get balance: {e:#}")))?
+    let onchain = state
+        .node
+        .inner
+        .get_on_chain_balance()
+        .await
+        .map_err(|e| AppError::InternalServerError(format!("Failed to get balance: {e:#}")))?;
+
+    let offchain = spawn_blocking(move || state.node.inner.get_ldk_balance())
+        .await
+        .map_err(|e| AppError::InternalServerError(format!("Failed to get balance: {e:#}")))?;
+
+    Ok(Json(Balance {
+        offchain: offchain.available,
+        onchain: onchain.confirmed,
+    }))
 }
 
 #[autometrics]

coordinator/src/routes.rs

@@ -182,7 +182,7 @@ pub async fn get_new_address(
     State(app_state): State<Arc<AppState>>,
 ) -> Result<Json<String>, AppError> {
     let address =
-        app_state.node.inner.get_new_address().map_err(|e| {
+        app_state.node.inner.get_new_address().await.map_err(|e| {
             AppError::InternalServerError(format!("Failed to get new address: {e:#}"))
         })?;
     Ok(Json(address.to_string()))
@@ -359,7 +359,8 @@ async fn update_settings(
         .node
         .inner
         .update_settings(updated_settings.ln_dlc)
-        .await;
+        .await
+        .map_err(|e| AppError::InternalServerError(format!("Could not write settings: {e:#}")))?;
 
     Ok(())
 }

crates/ln-dlc-node/Cargo.toml

@@ -8,6 +8,7 @@ description = "A common interface for using Lightning and DLC channels side-by-s
 
 [dependencies]
 anyhow = { version = "1", features = ["backtrace"] }
+async-trait = "0.1.68"
 autometrics = "0.5"
 bdk = { version = "0.27.0", default-features = false, features = ["key-value-db", "use-esplora-blocking"] }
 bip39 = { version = "2", features = ["rand_core"] }
@@ -42,6 +43,7 @@ tokio = { version = "1", default-features = false, features = ["io-util", "macro
 tracing = "0.1.37"
 tracing-log = "0.1.3"
 ureq = "2.5.0"
+xtra = { version = "0.6", features = ["instrumentation", "sink"] }
 
 [dev-dependencies]
 clap = { version = "4", features = ["derive"] }