Implement RedeemOnchainFunds() for LDK and Greenlight

frontend/src/components/BreezRedeem.tsx

@@ -1,11 +1,8 @@
-import React from "react";
 import Alert from "src/components/Alert";
 import Loading from "src/components/Loading";
-import { useCSRF } from "src/hooks/useCSRF";
 import { useInfo } from "src/hooks/useInfo";
 import { useOnchainBalance } from "src/hooks/useOnchainBalance";
-import { RedeemOnchainFundsResponse } from "src/types";
-import { request } from "src/utils/request";
+import { useRedeemOnchainFunds } from "src/hooks/useRedeemOnchainFunds";
 
 export default function BreezRedeem() {
   const { data: info } = useInfo();
@@ -16,49 +13,9 @@ export default function BreezRedeem() {
 }
 
 function BreezRedeemInternal() {
-  const { data: onchainBalance, mutate: reloadOnchainBalance } =
-    useOnchainBalance();
+  const { data: onchainBalance } = useOnchainBalance();
 
-  const { data: csrf } = useCSRF();
-  const [isLoading, setLoading] = React.useState(false);
-
-  const redeemFunds = React.useCallback(async () => {
-    if (!csrf) {
-      return;
-    }
-    const toAddress = prompt(
-      "Please enter an onchain bitcoin address (bc1...)"
-    );
-    if (!toAddress) {
-      return;
-    }
-    setLoading(true);
-
-    try {
-      const response = await request<RedeemOnchainFundsResponse>(
-        "/api/wallet/redeem-onchain-funds",
-        {
-          method: "POST",
-          headers: {
-            "X-CSRF-Token": csrf,
-            "Content-Type": "application/json",
-          },
-          body: JSON.stringify({ toAddress }),
-        }
-      );
-      console.log("Redeemed onchain funds", response);
-      if (!response?.txId) {
-        throw new Error("No address in response");
-      }
-      prompt("Funds redeemed. Copy TX to view in mempool", response.txId);
-    } catch (error) {
-      alert("Failed to request a new address: " + error);
-    } finally {
-      setLoading(false);
-    }
-
-    await reloadOnchainBalance();
-  }, [csrf, reloadOnchainBalance]);
+  const redeemOnchainFunds = useRedeemOnchainFunds();
 
   if (!onchainBalance || onchainBalance.spendable <= 0) {
     return null;
@@ -72,10 +29,10 @@ function BreezRedeemInternal() {
           {onchainBalance.spendable} sats to redeem.{" "}
           <button
             className="flex justify-center items-center gap-2 bg-purple-100 p-2 text-purple-500 rounded-md"
-            onClick={redeemFunds}
-            disabled={isLoading}
+            onClick={redeemOnchainFunds.redeemFunds}
+            disabled={redeemOnchainFunds.isLoading}
           >
-            Redeem onchain funds {isLoading && <Loading />}
+            Redeem onchain funds {redeemOnchainFunds.isLoading && <Loading />}
           </button>
         </div>
       </Alert>

frontend/src/hooks/useRedeemOnchainFunds.ts

@@ -0,0 +1,56 @@
+import React from "react";
+import { useCSRF } from "src/hooks/useCSRF";
+import { useOnchainBalance } from "src/hooks/useOnchainBalance";
+import { RedeemOnchainFundsResponse } from "src/types";
+import { request } from "src/utils/request";
+
+export function useRedeemOnchainFunds() {
+  const { data: csrf } = useCSRF();
+  const { mutate: reloadOnchainBalance } = useOnchainBalance();
+  const [isLoading, setLoading] = React.useState(false);
+
+  const redeemFunds = React.useCallback(async () => {
+    if (!csrf) {
+      return;
+    }
+    setLoading(true);
+    await new Promise((resolve) => setTimeout(resolve, 100));
+    const toAddress = prompt(
+      "Please enter an onchain bitcoin address (bc1...)"
+    );
+    if (!toAddress) {
+      setLoading(false);
+      return;
+    }
+
+    try {
+      const response = await request<RedeemOnchainFundsResponse>(
+        "/api/wallet/redeem-onchain-funds",
+        {
+          method: "POST",
+          headers: {
+            "X-CSRF-Token": csrf,
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify({ toAddress }),
+        }
+      );
+      console.log("Redeemed onchain funds", response);
+      if (!response?.txId) {
+        throw new Error("No address in response");
+      }
+      prompt("Funds redeemed. Copy TX to view in mempool", response.txId);
+    } catch (error) {
+      alert("Failed to request a new address: " + error);
+    } finally {
+      setLoading(false);
+    }
+
+    await reloadOnchainBalance();
+  }, [csrf, reloadOnchainBalance]);
+
+  return React.useMemo(
+    () => ({ redeemFunds, isLoading }),
+    [isLoading, redeemFunds]
+  );
+}

frontend/src/screens/channels/Channels.tsx

@@ -6,6 +6,8 @@ import { useOnchainBalance } from "src/hooks/useOnchainBalance";
 import { CloseChannelRequest, CloseChannelResponse, Node } from "src/types";
 import { request } from "src/utils/request";
 import { useCSRF } from "../../hooks/useCSRF.ts";
+import { useRedeemOnchainFunds } from "src/hooks/useRedeemOnchainFunds.ts";
+import Loading from "src/components/Loading.tsx";
 
 export default function Channels() {
   const { data: channels, mutate: reloadChannels } = useChannels();
@@ -14,6 +16,7 @@ export default function Channels() {
   const { data: info, mutate: reloadInfo } = useInfo();
   const { data: csrf } = useCSRF();
   const navigate = useNavigate();
+  const redeemOnchainFunds = useRedeemOnchainFunds();
 
   React.useEffect(() => {
     if (!info || info.running) {
@@ -244,6 +247,16 @@ export default function Channels() {
           Reset Router
         </button>
       )}
+      {(info?.backendType === "LDK" || info?.backendType === "GREENLIGHT") &&
+        (onchainBalance?.spendable || 0) > 0 && (
+          <button
+            onClick={redeemOnchainFunds.redeemFunds}
+            disabled={redeemOnchainFunds.isLoading}
+            className="text-white bg-orange-700 hover:bg-orange-800 focus:ring-4 focus:ring-orange-300 font-medium rounded-lg text-sm px-5 py-2.5 mr-2 dark:bg-orange-600 dark:hover:bg-orange-700 focus:outline-none dark:focus:ring-orange-800 inline-flex gap-2 justify-center items-center"
+          >
+            Redeem Onchain Funds {redeemOnchainFunds.isLoading && <Loading />}
+          </button>
+        )}
 
       <div className="flex flex-col mt-5">
         <div className="overflow-x-auto shadow-md sm:rounded-lg">

go.mod

@@ -7,7 +7,7 @@ toolchain go1.21.1
 require (
 	github.com/breez/breez-sdk-go v0.3.4
 	github.com/davrux/echo-logrus/v4 v4.0.3
-	github.com/getAlby/glalby-go v0.0.0-20240307093106-aab6d05591b4
+	github.com/getAlby/glalby-go v0.0.0-20240319195439-4ec5332e5493
 	github.com/getAlby/ldk-node-go v0.0.0-20240318131343-7ddfe35d7ce9
 	github.com/go-gormigrate/gormigrate/v2 v2.1.1
 	github.com/gorilla/sessions v1.2.1

go.sum

@@ -227,8 +227,10 @@ github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/getAlby/glalby-go v0.0.0-20240307093106-aab6d05591b4 h1:Kzx3NNzSGtMwo9+YdvzG6ISwFq7TmqGBhz3pXnBZ4X0=
-github.com/getAlby/glalby-go v0.0.0-20240307093106-aab6d05591b4/go.mod h1:ViyJvjlvv0GCesTJ7mb3fBo4G+/qsujDAFN90xZ7a9U=
+github.com/getAlby/glalby-go v0.0.0-20240319102223-4c6dcbf77c68 h1:kpR1EP3gwhaieKKMDz1mDxxlHzH3BEgsFS8196BzFKQ=
+github.com/getAlby/glalby-go v0.0.0-20240319102223-4c6dcbf77c68/go.mod h1:ViyJvjlvv0GCesTJ7mb3fBo4G+/qsujDAFN90xZ7a9U=
+github.com/getAlby/glalby-go v0.0.0-20240319195439-4ec5332e5493 h1:izgFrd4y3XhNM24AQXPPjhVBCUjxN0GD2xVt90KdAKU=
+github.com/getAlby/glalby-go v0.0.0-20240319195439-4ec5332e5493/go.mod h1:ViyJvjlvv0GCesTJ7mb3fBo4G+/qsujDAFN90xZ7a9U=
 github.com/getAlby/ldk-node-go v0.0.0-20240318131343-7ddfe35d7ce9 h1:yjGywbDFuaba0V2qporii04/JkP/mgYS4qDeOj3pnH4=
 github.com/getAlby/ldk-node-go v0.0.0-20240318131343-7ddfe35d7ce9/go.mod h1:8BRjtKcz8E0RyYTPEbMS8VIdgredcGSLne8vHDtcRLg=
 github.com/getsentry/raven-go v0.2.0 h1:no+xWJRb5ZI7eE8TWgIq1jLulQiIoLG0IfYxv5JYMGs=

greenlight.go

@@ -483,8 +483,20 @@ func (gs *GreenlightService) GetOnchainBalance(ctx context.Context) (*lnclient.O
 		Total:     (spendableBalance + pendingBalance) / 1000,
 	}, nil
 }
-func (gs *GreenlightService) RedeemOnchainFunds(ctx context.Context, toAddress string) (txId string, err error) {
-	return "", nil
+
+func (gs *GreenlightService) RedeemOnchainFunds(ctx context.Context, toAddress string) (string, error) {
+	amountAll := glalby.AmountOrAll(glalby.AmountOrAllAll{})
+	txId, err := gs.client.Withdraw(glalby.WithdrawRequest{
+		Destination: toAddress,
+		Amount:      &amountAll,
+	})
+	if err != nil {
+		gs.svc.Logger.WithError(err).Error("Withdraw failed")
+		return "", err
+	}
+	gs.svc.Logger.WithField("txId", txId).Info("Redeeming on chain funds")
+
+	return txId.Txid, nil
 }
 
 func (gs *GreenlightService) greenlightInvoiceToTransaction(invoice *glalby.ListInvoicesInvoice) (*Nip47Transaction, error) {

http_service.go

@@ -358,7 +358,7 @@ func (httpSvc *HttpService) redeemOnchainFundsHandler(c echo.Context) error {
 
 	if err != nil {
 		return c.JSON(http.StatusInternalServerError, ErrorResponse{
-			Message: fmt.Sprintf("Failed to request new onchain address: %s", err.Error()),
+			Message: fmt.Sprintf("Failed to redeem onchain funds: %s", err.Error()),
 		})
 	}
 

ldk.go

@@ -150,7 +150,7 @@ func (gs *LDKService) SendPaymentSync(ctx context.Context, payReq string) (preim
 
 	paymentHash, err := gs.node.Bolt11Payment().Send(payReq)
 	if err != nil {
-		gs.svc.Logger.Errorf("SendPayment failed: %v", err)
+		gs.svc.Logger.WithError(err).Error("SendPayment failed")
 		return "", err
 	}
 	fee := uint64(0)
@@ -352,7 +352,7 @@ func (gs *LDKService) MakeInvoice(ctx context.Context, amount int64, description
 		uint32(expiry))
 
 	if err != nil {
-		gs.svc.Logger.Errorf("MakeInvoice failed: %v", err)
+		gs.svc.Logger.WithError(err).Error("MakeInvoice failed")
 		return nil, err
 	}
 
@@ -481,7 +481,7 @@ func (gs *LDKService) GetNodeConnectionInfo(ctx context.Context) (nodeConnection
 	}
 	port, err := strconv.Atoi(parts[1])
 	if err != nil {
-		gs.svc.Logger.Errorf("ConnectPeer failed: %v", err)
+		gs.svc.Logger.WithError(err).Error("ConnectPeer failed")
 		return nil, err
 	}*/
 
@@ -495,7 +495,7 @@ func (gs *LDKService) GetNodeConnectionInfo(ctx context.Context) (nodeConnection
 func (gs *LDKService) ConnectPeer(ctx context.Context, connectPeerRequest *lnclient.ConnectPeerRequest) error {
 	err := gs.node.Connect(connectPeerRequest.Pubkey, connectPeerRequest.Address+":"+strconv.Itoa(int(connectPeerRequest.Port)), true)
 	if err != nil {
-		gs.svc.Logger.Errorf("ConnectPeer failed: %v", err)
+		gs.svc.Logger.WithError(err).Error("ConnectPeer failed")
 		return err
 	}
 
@@ -523,7 +523,7 @@ func (gs *LDKService) OpenChannel(ctx context.Context, openChannelRequest *lncli
 	gs.svc.Logger.Infof("Opening channel with: %v", foundPeer.NodeId)
 	userChannelId, err := gs.node.ConnectOpenChannel(foundPeer.NodeId, foundPeer.Address, uint64(openChannelRequest.Amount), nil, nil, openChannelRequest.Public)
 	if err != nil {
-		gs.svc.Logger.Errorf("OpenChannel failed: %v", err)
+		gs.svc.Logger.WithError(err).Error("OpenChannel failed")
 		return nil, err
 	}
 
@@ -562,7 +562,7 @@ func (gs *LDKService) CloseChannel(ctx context.Context, closeChannelRequest *lnc
 	// TODO: support passing force option
 	err := gs.node.CloseChannel(closeChannelRequest.ChannelId, closeChannelRequest.NodeId, false)
 	if err != nil {
-		gs.svc.Logger.Errorf("CloseChannel failed: %v", err)
+		gs.svc.Logger.WithError(err).Error("CloseChannel failed")
 		return nil, err
 	}
 	return &lnclient.CloseChannelResponse{}, nil
@@ -571,7 +571,7 @@ func (gs *LDKService) CloseChannel(ctx context.Context, closeChannelRequest *lnc
 func (gs *LDKService) GetNewOnchainAddress(ctx context.Context) (string, error) {
 	address, err := gs.node.OnchainPayment().NewAddress()
 	if err != nil {
-		gs.svc.Logger.Errorf("NewOnchainAddress failed: %v", err)
+		gs.svc.Logger.WithError(err).Error("NewOnchainAddress failed")
 		return "", err
 	}
 	return address, nil
@@ -588,8 +588,13 @@ func (gs *LDKService) GetOnchainBalance(ctx context.Context) (*lnclient.OnchainB
 	}, nil
 }
 
-func (gs *LDKService) RedeemOnchainFunds(ctx context.Context, toAddress string) (txId string, err error) {
-	return "", nil
+func (gs *LDKService) RedeemOnchainFunds(ctx context.Context, toAddress string) (string, error) {
+	txId, err := gs.node.OnchainPayment().SendAllToAddress(toAddress)
+	if err != nil {
+		gs.svc.Logger.WithError(err).Error("SendAllToOnchainAddress failed")
+		return "", err
+	}
+	return txId, nil
 }
 
 func (ls *LDKService) ResetRouter(ctx context.Context) error {