Use LND's on-chain wallet

src/main.rs

@@ -6,14 +6,13 @@ use axum::{
     routing::{get, post},
     Extension, Json, Router,
 };
-use bitcoincore_rpc::Client;
 use lnurl::withdraw::WithdrawalResponse;
 use lnurl::{AsyncClient, Tag};
 use log::error;
 use nostr::key::Keys;
 use serde::Deserialize;
 use serde_json::{json, Value};
-use std::{net::SocketAddr, sync::Arc};
+use std::net::SocketAddr;
 use tokio::signal::unix::{signal, SignalKind};
 use tokio::sync::oneshot;
 use tonic_openssl_lnd::LndLightningClient;
@@ -39,7 +38,6 @@ pub struct AppState {
     keys: Keys,
     network: bitcoin::Network,
     lightning_client: LndLightningClient,
-    bitcoin_client: Arc<Client>,
     lnurl: AsyncClient,
 }
 
@@ -48,7 +46,6 @@ impl AppState {
         host: String,
         keys: Keys,
         lightning_client: LndLightningClient,
-        bitcoin_client: Client,
         network: bitcoin::Network,
     ) -> Self {
         let lnurl = lnurl::Builder::default().build_async().unwrap();
@@ -57,7 +54,6 @@ impl AppState {
             keys,
             network,
             lightning_client,
-            bitcoin_client: Arc::new(bitcoin_client),
             lnurl,
         }
     }

src/nostr_dms.rs

@@ -1,7 +1,6 @@
 use crate::{AppState, MAX_SEND_AMOUNT};
 use bitcoin::Amount;
 use bitcoin_waila::PaymentParams;
-use bitcoincore_rpc::RpcApi;
 use lightning_invoice::Bolt11Invoice;
 use lnurl::lightning_address::LightningAddress;
 use lnurl::lnurl::LnUrl;
@@ -182,9 +181,18 @@ async fn handle_event(event: Event, state: AppState) -> anyhow::Result<()> {
                 return Err(anyhow::anyhow!("Amount exceeds max send amount"));
             }
 
-            let txid = state
-                .bitcoin_client
-                .send_to_address(&address, amount, None, None, None, None, None, None)?;
+            let resp = {
+                let mut wallet_client = state.lightning_client.clone();
+                let req = tonic_openssl_lnd::lnrpc::SendCoinsRequest {
+                    addr: address.to_string(),
+                    amount: amount.to_sat() as i64,
+                    spend_unconfirmed: true,
+                    ..Default::default()
+                };
+                wallet_client.send_coins(req).await?.into_inner()
+            };
+
+            let txid = resp.txid;
 
             info!("Sent onchain tx: {txid}");
             return Ok(());

src/onchain.rs

@@ -1,9 +1,7 @@
 use bitcoin::{Address, Amount};
 use bitcoin_waila::PaymentParams;
-use bitcoincore_rpc::RpcApi;
 use serde::{Deserialize, Serialize};
 use std::str::FromStr;
-use tokio::task;
 
 use crate::{AppState, MAX_SEND_AMOUNT};
 
@@ -43,8 +41,6 @@ pub async fn pay_onchain(
             )
         };
 
-        let bitcoin_client = state.bitcoin_client.clone();
-
         let amount = params
             .amount()
             .or(payload.sats.map(Amount::from_sat))
@@ -54,12 +50,19 @@ pub async fn pay_onchain(
             anyhow::bail!("max amount is 10,000,000");
         }
 
-        let txid = task::block_in_place(|| {
-            bitcoin_client.send_to_address(&address, amount, None, None, None, None, None, None)
-        })?;
+        let resp = {
+            let mut wallet_client = state.lightning_client.clone();
+            let req = tonic_openssl_lnd::lnrpc::SendCoinsRequest {
+                addr: address.to_string(),
+                amount: amount.to_sat() as i64,
+                spend_unconfirmed: true,
+                ..Default::default()
+            };
+            wallet_client.send_coins(req).await?.into_inner()
+        };
 
         OnchainResponse {
-            txid: txid.to_string(),
+            txid: resp.txid,
             address: address.to_string(),
         }
     };

src/setup.rs

@@ -1,6 +1,6 @@
-use bitcoincore_rpc::{Auth, Client, RpcApi};
-use nostr::key::Keys;
 use std::env;
+
+use nostr::key::Keys;
 use tonic_openssl_lnd::lnrpc;
 
 use crate::AppState;
@@ -58,25 +58,5 @@ pub async fn setup() -> anyhow::Result<AppState> {
         lightning_client
     };
 
-    // Setup bitcoin rpc stuff
-    let bitcoin_client = {
-        let url = env::var("BITCOIN_RPC_HOST_AND_PORT").expect("missing BITCOIN_RPC_HOST_AND_PORT");
-        let user = env::var("BITCOIN_RPC_USER").expect("missing BITCOIN_RPC_USER");
-        let pass = env::var("BITCOIN_RPC_PASSWORD").expect("missing BITCOIN_RPC_PASSWORD");
-        let rpc =
-            Client::new(&url, Auth::UserPass(user, pass)).expect("failed to create RPC client");
-
-        // Make sure we can get info at startup
-        let _blockchain_info = rpc.get_blockchain_info();
-
-        rpc
-    };
-
-    Ok(AppState::new(
-        host,
-        keys,
-        lightning_client,
-        bitcoin_client,
-        network,
-    ))
+    Ok(AppState::new(host, keys, lightning_client, network))
 }