chore: snapshot release workspace

core/archipelago/src/api/rpc/lnd/wallet.rs

@@ -13,18 +13,33 @@ impl RpcHandler {
 
         let resp = client
             .get(format!("{LND_REST_BASE_URL}/v1/newaddress"))
+            .query(&[("type", "WITNESS_PUBKEY_HASH")])
             .header("Grpc-Metadata-macaroon", &macaroon_hex)
             .send()
             .await
             .context("LND REST connection failed")?;
 
+        let status = resp.status();
         let body: serde_json::Value = resp
             .json()
             .await
             .context("Failed to parse newaddress response")?;
 
-        if let Some(error) = body.get("error").and_then(|v| v.as_str()) {
-            anyhow::bail!("LND could not generate an address: {}", error);
+        if !status.is_success() {
+            let message = lnd_error_message(&body);
+            anyhow::bail!(
+                "LND could not generate a Bitcoin address ({}): {}",
+                status,
+                message
+            );
+        }
+
+        if let Some(error) = body
+            .get("error")
+            .or_else(|| body.get("message"))
+            .and_then(|v| v.as_str())
+        {
+            anyhow::bail!("LND could not generate a Bitcoin address: {}", error);
         }
 
         let address = body
@@ -548,3 +563,35 @@ impl RpcHandler {
         }))
     }
 }
+
+fn lnd_error_message(body: &serde_json::Value) -> String {
+    body.get("message")
+        .or_else(|| body.get("error"))
+        .and_then(|v| v.as_str())
+        .filter(|s| !s.trim().is_empty())
+        .unwrap_or("unknown LND error")
+        .to_string()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::lnd_error_message;
+
+    #[test]
+    fn lnd_error_message_prefers_message_field() {
+        let body = serde_json::json!({
+            "error": "grpc proxy error",
+            "message": "wallet locked",
+        });
+
+        assert_eq!(lnd_error_message(&body), "wallet locked");
+    }
+
+    #[test]
+    fn lnd_error_message_falls_back_to_unknown() {
+        assert_eq!(
+            lnd_error_message(&serde_json::json!({})),
+            "unknown LND error"
+        );
+    }
+}