feat: add option to edit fee while withdrawing

api/api.go

@@ -637,11 +637,11 @@ func (api *api) SignMessage(ctx context.Context, message string) (*SignMessageRe
 	}, nil
 }
 
-func (api *api) RedeemOnchainFunds(ctx context.Context, toAddress string, amount uint64, sendAll bool) (*RedeemOnchainFundsResponse, error) {
+func (api *api) RedeemOnchainFunds(ctx context.Context, toAddress string, amount uint64, feeRate float64, sendAll bool) (*RedeemOnchainFundsResponse, error) {
 	if api.svc.GetLNClient() == nil {
 		return nil, errors.New("LNClient not started")
 	}
-	txId, err := api.svc.GetLNClient().RedeemOnchainFunds(ctx, toAddress, amount, sendAll)
+	txId, err := api.svc.GetLNClient().RedeemOnchainFunds(ctx, toAddress, amount, feeRate, sendAll)
 	if err != nil {
 		return nil, err
 	}

api/models.go

@@ -34,7 +34,7 @@ type API interface {
 	GetNewOnchainAddress(ctx context.Context) (string, error)
 	GetUnusedOnchainAddress(ctx context.Context) (string, error)
 	SignMessage(ctx context.Context, message string) (*SignMessageResponse, error)
-	RedeemOnchainFunds(ctx context.Context, toAddress string, amount uint64, sendAll bool) (*RedeemOnchainFundsResponse, error)
+	RedeemOnchainFunds(ctx context.Context, toAddress string, amount uint64, feeRate float64, sendAll bool) (*RedeemOnchainFundsResponse, error)
 	GetBalances(ctx context.Context) (*BalancesResponse, error)
 	ListTransactions(ctx context.Context, appId *uint, limit uint64, offset uint64) (*ListTransactionsResponse, error)
 	SendPayment(ctx context.Context, invoice string, amountMsat *uint64) (*SendPaymentResponse, error)
@@ -204,9 +204,10 @@ type CloseChannelResponse = lnclient.CloseChannelResponse
 type UpdateChannelRequest = lnclient.UpdateChannelRequest
 
 type RedeemOnchainFundsRequest struct {
-	ToAddress string `json:"toAddress"`
-	Amount    uint64 `json:"amount"`
-	SendAll   bool   `json:"sendAll"`
+	ToAddress string  `json:"toAddress"`
+	Amount    uint64  `json:"amount"`
+	FeeRate   float64 `json:"feeRate"`
+	SendAll   bool    `json:"sendAll"`
 }
 
 type RedeemOnchainFundsResponse struct {

frontend/src/screens/wallet/WithdrawOnchainFunds.tsx

@@ -1,4 +1,9 @@
-import { AlertTriangleIcon, CopyIcon, ExternalLinkIcon } from "lucide-react";
+import {
+  AlertTriangleIcon,
+  ChevronDown,
+  CopyIcon,
+  ExternalLinkIcon,
+} from "lucide-react";
 import React from "react";
 import AppHeader from "src/components/AppHeader";
 import ExternalLink from "src/components/ExternalLink";
@@ -21,6 +26,8 @@ import { LoadingButton } from "src/components/ui/loading-button";
 import { useToast } from "src/components/ui/use-toast";
 import { ONCHAIN_DUST_SATS } from "src/constants";
 import { useBalances } from "src/hooks/useBalances";
+import { useInfo } from "src/hooks/useInfo";
+import { useMempoolApi } from "src/hooks/useMempoolApi";
 
 import { copyToClipboard } from "src/lib/clipboard";
 import { RedeemOnchainFundsResponse } from "src/types";
@@ -29,13 +36,28 @@ import { request } from "src/utils/request";
 export default function WithdrawOnchainFunds() {
   const [isLoading, setLoading] = React.useState(false);
   const { toast } = useToast();
+  const { data: info } = useInfo();
   const { data: balances } = useBalances();
+  const { data: recommendedFees } = useMempoolApi<{
+    fastestFee: number;
+    halfHourFee: number;
+    economyFee: number;
+    minimumFee: number;
+  }>("/v1/fees/recommended");
   const [onchainAddress, setOnchainAddress] = React.useState("");
   const [amount, setAmount] = React.useState("");
+  const [feeRate, setFeeRate] = React.useState("");
   const [sendAll, setSendAll] = React.useState(false);
+  const [showAdvanced, setShowAdvanced] = React.useState(false);
   const [transactionId, setTransactionId] = React.useState("");
   const [confirmDialogOpen, setConfirmDialogOpen] = React.useState(false);
 
+  React.useEffect(() => {
+    if (recommendedFees) {
+      setFeeRate(recommendedFees.fastestFee.toString());
+    }
+  }, [recommendedFees]);
+
   const copy = (text: string) => {
     copyToClipboard(text, toast);
   };
@@ -69,6 +91,7 @@ export default function WithdrawOnchainFunds() {
           body: JSON.stringify({
             toAddress: onchainAddress,
             amount: +amount,
+            feeRate: +feeRate,
             sendAll,
           }),
         }
@@ -87,7 +110,7 @@ export default function WithdrawOnchainFunds() {
       });
     }
     setLoading(false);
-  }, [amount, onchainAddress, sendAll, toast]);
+  }, [amount, feeRate, onchainAddress, sendAll, toast]);
 
   if (transactionId) {
     return (
@@ -120,7 +143,7 @@ export default function WithdrawOnchainFunds() {
     );
   }
 
-  if (!balances) {
+  if (!info || !balances || !recommendedFees) {
     return <Loading />;
   }
 
@@ -239,6 +262,36 @@ export default function WithdrawOnchainFunds() {
               }}
             />
           </div>
+          {info?.backendType === "LND" && (
+            <>
+              {showAdvanced && (
+                <div className="">
+                  <Label htmlFor="fee-rate">Fee Rate (Sat/Vbyte)</Label>
+                  <Input
+                    id="fee-rate"
+                    type="number"
+                    value={feeRate}
+                    required
+                    min={recommendedFees.minimumFee}
+                    onChange={(e) => {
+                      setFeeRate(e.target.value);
+                    }}
+                  />
+                </div>
+              )}
+              {!showAdvanced && (
+                <Button
+                  type="button"
+                  variant="link"
+                  className="text-muted-foreground text-xs"
+                  onClick={() => setShowAdvanced((current) => !current)}
+                >
+                  <ChevronDown className="w-4 h-4 mr-2" />
+                  Advanced Options
+                </Button>
+              )}
+            </>
+          )}
 
           <p className="text-sm text-muted-foreground">
             Please double-check the destination address. This transaction cannot

http/http_service.go

@@ -768,7 +768,7 @@ func (httpSvc *HttpService) redeemOnchainFundsHandler(c echo.Context) error {
 		})
 	}
 
-	redeemOnchainFundsResponse, err := httpSvc.api.RedeemOnchainFunds(ctx, redeemOnchainFundsRequest.ToAddress, redeemOnchainFundsRequest.Amount, redeemOnchainFundsRequest.SendAll)
+	redeemOnchainFundsResponse, err := httpSvc.api.RedeemOnchainFunds(ctx, redeemOnchainFundsRequest.ToAddress, redeemOnchainFundsRequest.Amount, redeemOnchainFundsRequest.FeeRate, redeemOnchainFundsRequest.SendAll)
 
 	if err != nil {
 		return c.JSON(http.StatusInternalServerError, ErrorResponse{

lnclient/breez/breez.go

@@ -368,7 +368,7 @@ func (bs *BreezService) GetOnchainBalance(ctx context.Context) (*lnclient.Onchai
 	}, nil
 }
 
-func (bs *BreezService) RedeemOnchainFunds(ctx context.Context, toAddress string, amount uint64, sendAll bool) (txId string, err error) {
+func (bs *BreezService) RedeemOnchainFunds(ctx context.Context, toAddress string, amount uint64, feeRate float64, sendAll bool) (txId string, err error) {
 	if !sendAll {
 		return "", errors.New("only send all is supported")
 	}

lnclient/cashu/cashu.go

@@ -226,7 +226,7 @@ func (cs *CashuService) GetOnchainBalance(ctx context.Context) (*lnclient.Onchai
 	}, nil
 }
 
-func (cs *CashuService) RedeemOnchainFunds(ctx context.Context, toAddress string, amount uint64, sendAll bool) (string, error) {
+func (cs *CashuService) RedeemOnchainFunds(ctx context.Context, toAddress string, amount uint64, feeRate float64, sendAll bool) (string, error) {
 	return "", nil
 }
 

lnclient/greenlight/greenlight.go

@@ -498,7 +498,7 @@ func (gs *GreenlightService) GetOnchainBalance(ctx context.Context) (*lnclient.O
 	}, nil
 }
 
-func (gs *GreenlightService) RedeemOnchainFunds(ctx context.Context, toAddress string, amount uint64, sendAll bool) (string, error) {
+func (gs *GreenlightService) RedeemOnchainFunds(ctx context.Context, toAddress string, amount uint64, feeRate float64, sendAll bool) (string, error) {
 	if !sendAll {
 		return "", errors.New("only send all is supported")
 	}

lnclient/ldk/ldk.go

@@ -1087,7 +1087,7 @@ func (ls *LDKService) GetOnchainBalance(ctx context.Context) (*lnclient.OnchainB
 	}, nil
 }
 
-func (ls *LDKService) RedeemOnchainFunds(ctx context.Context, toAddress string, amount uint64, sendAll bool) (string, error) {
+func (ls *LDKService) RedeemOnchainFunds(ctx context.Context, toAddress string, amount uint64, feeRate float64, sendAll bool) (string, error) {
 	if !sendAll {
 		// NOTE: this may fail if user does not reserve enough for the onchain transaction
 		// and can also drain the anchor reserves if the user provides a too high amount.

lnclient/lnd/lnd.go

@@ -913,11 +913,12 @@ func (svc *LNDService) GetOnchainBalance(ctx context.Context) (*lnclient.Onchain
 	}, nil
 }
 
-func (svc *LNDService) RedeemOnchainFunds(ctx context.Context, toAddress string, amount uint64, sendAll bool) (txId string, err error) {
+func (svc *LNDService) RedeemOnchainFunds(ctx context.Context, toAddress string, amount uint64, feeRate float64, sendAll bool) (txId string, err error) {
 	resp, err := svc.client.SendCoins(ctx, &lnrpc.SendCoinsRequest{
-		Addr:    toAddress,
-		SendAll: sendAll,
-		Amount:  int64(amount),
+		Addr:        toAddress,
+		SendAll:     sendAll,
+		Amount:      int64(amount),
+		SatPerVbyte: uint64(feeRate),
 	})
 	if err != nil {
 		return "", err

lnclient/models.go

@@ -66,7 +66,7 @@ type LNClient interface {
 	ResetRouter(key string) error
 	GetOnchainBalance(ctx context.Context) (*OnchainBalanceResponse, error)
 	GetBalances(ctx context.Context) (*BalancesResponse, error)
-	RedeemOnchainFunds(ctx context.Context, toAddress string, amount uint64, sendAll bool) (txId string, err error)
+	RedeemOnchainFunds(ctx context.Context, toAddress string, amount uint64, feeRate float64, sendAll bool) (txId string, err error)
 	SendPaymentProbes(ctx context.Context, invoice string) error
 	SendSpontaneousPaymentProbes(ctx context.Context, amountMsat uint64, nodeId string) error
 	ListPeers(ctx context.Context) ([]PeerDetails, error)

lnclient/phoenixd/phoenixd.go

@@ -433,7 +433,7 @@ func (svc *PhoenixService) SendKeysend(ctx context.Context, amount uint64, desti
 	return nil, errors.New("not implemented")
 }
 
-func (svc *PhoenixService) RedeemOnchainFunds(ctx context.Context, toAddress string, amount uint64, sendAll bool) (txId string, err error) {
+func (svc *PhoenixService) RedeemOnchainFunds(ctx context.Context, toAddress string, amount uint64, feeRate float64, sendAll bool) (txId string, err error) {
 	return "", errors.New("not implemented")
 }
 

tests/mock_ln_client.go

@@ -143,7 +143,7 @@ func (mln *MockLn) GetBalances(ctx context.Context) (*lnclient.BalancesResponse,
 func (mln *MockLn) GetOnchainBalance(ctx context.Context) (*lnclient.OnchainBalanceResponse, error) {
 	return nil, nil
 }
-func (mln *MockLn) RedeemOnchainFunds(ctx context.Context, toAddress string, amount uint64, sendAll bool) (txId string, err error) {
+func (mln *MockLn) RedeemOnchainFunds(ctx context.Context, toAddress string, amount uint64, feeRate float64, sendAll bool) (txId string, err error) {
 	return "", nil
 }
 func (mln *MockLn) ResetRouter(key string) error {

wails/wails_handlers.go

@@ -514,7 +514,7 @@ func (app *WailsApp) WailsRequestRouter(route string, method string, body string
 			return WailsRequestRouterResponse{Body: nil, Error: err.Error()}
 		}
 
-		redeemOnchainFundsResponse, err := app.api.RedeemOnchainFunds(ctx, redeemOnchainFundsRequest.ToAddress, redeemOnchainFundsRequest.Amount, redeemOnchainFundsRequest.SendAll)
+		redeemOnchainFundsResponse, err := app.api.RedeemOnchainFunds(ctx, redeemOnchainFundsRequest.ToAddress, redeemOnchainFundsRequest.Amount, redeemOnchainFundsRequest.FeeRate, redeemOnchainFundsRequest.SendAll)
 		if err != nil {
 			return WailsRequestRouterResponse{Body: nil, Error: err.Error()}
 		}