-
Fee
-
- {swapInfo.albyServiceFee + swapInfo.boltzServiceFee}% + on-chain
- fees
-
+
+ {isInternalSwap && (
+
+ )}
+
+
{isInternalSwap ? "Swap Fee" : "Fee"}
+
+ {swapInfo.albyServiceFee + swapInfo.boltzServiceFee}% + on-chain
+ fees
+
+
@@ -323,7 +339,7 @@ function SwapOutForm() {
try {
setLoading(true);
- const payload: InitiateSwapRequest = {
+ const payload: InitiateSwapOutRequest = {
swapAmountSat: parseInt(swapAmountSat),
destination,
};
diff --git a/frontend/src/types.ts b/frontend/src/types.ts
index d05867904..08207e641 100644
--- a/frontend/src/types.ts
+++ b/frontend/src/types.ts
@@ -594,9 +594,15 @@ export type AutoSwapRequest = {
unlockPassword?: string;
};
-export type InitiateSwapRequest = {
- swapAmountSat?: number;
- destination?: string;
+export type InitiateSwapInRequest = {
+ swapAmountSat: number;
+ internalPayment?: boolean;
+ feeRate?: number;
+};
+
+export type InitiateSwapOutRequest = {
+ swapAmountSat: number;
+ destination: string;
};
export type LSPOrderResponse = {
diff --git a/http/http_service.go b/http/http_service.go
index b36091a62..04c4e3437 100644
--- a/http/http_service.go
+++ b/http/http_service.go
@@ -1479,7 +1479,7 @@ func (httpSvc *HttpService) getSwapInInfoHandler(c echo.Context) error {
}
func (httpSvc *HttpService) initiateSwapOutHandler(c echo.Context) error {
- var initiateSwapOutRequest api.InitiateSwapRequest
+ var initiateSwapOutRequest api.InitiateSwapOutRequest
if err := c.Bind(&initiateSwapOutRequest); err != nil {
return c.JSON(http.StatusBadRequest, ErrorResponse{
Message: fmt.Sprintf("Bad request: %s", err.Error()),
@@ -1497,7 +1497,7 @@ func (httpSvc *HttpService) initiateSwapOutHandler(c echo.Context) error {
}
func (httpSvc *HttpService) initiateSwapInHandler(c echo.Context) error {
- var initiateSwapInRequest api.InitiateSwapRequest
+ var initiateSwapInRequest api.InitiateSwapInRequest
if err := c.Bind(&initiateSwapInRequest); err != nil {
return c.JSON(http.StatusBadRequest, ErrorResponse{
Message: fmt.Sprintf("Bad request: %s", err.Error()),
diff --git a/swaps/swaps_service.go b/swaps/swaps_service.go
index 7a8c2f310..e45f3bb9c 100644
--- a/swaps/swaps_service.go
+++ b/swaps/swaps_service.go
@@ -56,7 +56,7 @@ type SwapsService interface {
StopAutoSwapOut()
EnableAutoSwapOut(encryptionKey string) error
SwapOut(amountSat uint64, destination string, autoSwap, usedXpubDerivation bool) (*SwapResponse, error)
- SwapIn(amountSat uint64, autoSwap bool) (*SwapResponse, error)
+ SwapIn(amountSat uint64, autoSwap bool, internalPayment bool, feeRate *uint64) (*SwapResponse, error)
GetSwapOutInfo() (*SwapInfo, error)
GetSwapInInfo() (*SwapInfo, error)
RefundSwap(swapId, address string, enableRetries bool) error
@@ -379,7 +379,7 @@ func (svc *swapsService) SwapOut(amountSat uint64, destination string, autoSwap,
}, nil
}
-func (svc *swapsService) SwapIn(amountSat uint64, autoSwap bool) (*SwapResponse, error) {
+func (svc *swapsService) SwapIn(amountSat uint64, autoSwap bool, internalPayment bool, feeRate *uint64) (*SwapResponse, error) {
amountMsat := amountSat * 1000
invoice, err := svc.transactionsService.MakeInvoice(svc.ctx, amountMsat, "On-chain to lightning swap", "", 0, nil, svc.lnClient, nil, nil, nil)
if err != nil {
@@ -498,6 +498,17 @@ func (svc *swapsService) SwapIn(amountSat uint64, autoSwap bool) (*SwapResponse,
logger.Logger.WithField("swapId", swap.Id).Info("Swap created")
+ if internalPayment {
+ _, err = svc.lnClient.RedeemOnchainFunds(svc.ctx, swap.Address, swap.ExpectedAmount, feeRate, false)
+ if err != nil {
+ logger.Logger.WithError(err).WithFields(logrus.Fields{
+ "swapId": swap.Id,
+ "amountSat": swap.ExpectedAmount,
+ }).Error("Failed to fund internal swap in")
+ return nil, err
+ }
+ }
+
go svc.startSwapInListener(&dbSwap)
return &SwapResponse{
diff --git a/wails/wails_handlers.go b/wails/wails_handlers.go
index 193f3a532..a4f7d2ee5 100644
--- a/wails/wails_handlers.go
+++ b/wails/wails_handlers.go
@@ -1154,7 +1154,7 @@ func (app *WailsApp) WailsRequestRouter(route string, method string, body string
}
return WailsRequestRouterResponse{Body: swapInInfo, Error: ""}
case "/api/swaps/out":
- initiateSwapOutRequest := &api.InitiateSwapRequest{}
+ initiateSwapOutRequest := &api.InitiateSwapOutRequest{}
err := json.Unmarshal([]byte(body), initiateSwapOutRequest)
if err != nil {
logger.Logger.WithFields(logrus.Fields{
@@ -1175,7 +1175,7 @@ func (app *WailsApp) WailsRequestRouter(route string, method string, body string
}
return WailsRequestRouterResponse{Body: swapOutResponse, Error: ""}
case "/api/swaps/in":
- initiateSwapInRequest := &api.InitiateSwapRequest{}
+ initiateSwapInRequest := &api.InitiateSwapInRequest{}
err := json.Unmarshal([]byte(body), initiateSwapInRequest)
if err != nil {
logger.Logger.WithFields(logrus.Fields{