GlcoinCore/alby-hub
1
0
Fork 0
mirror of https://github.com/getAlby/hub.git synced 2026-08-13 12:33:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

chore: split InitiateSwapRequest struct

Browse source
This commit is contained in:
Adithya Vardhan 2026-06-25 14:58:57 +05:30
parent 1f888e0876
commit 2d8f09e5dd
8 changed files with 30 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
api/api.go
View file

@ -997,7 +997,7 @@ func (api *api) GetSwapOutInfo() (*SwapInfoResponse, error) {
}, nil
}
func (api *api) InitiateSwapOut(ctx context.Context, initiateSwapOutRequest *InitiateSwapRequest) (*swaps.SwapResponse, error) {
func (api *api) InitiateSwapOut(ctx context.Context, initiateSwapOutRequest *InitiateSwapOutRequest) (*swaps.SwapResponse, error) {
lnClient := api.svc.GetLNClient()
if lnClient == nil {
return nil, ErrLNClientNotStarted
@ -1030,7 +1030,7 @@ func (api *api) InitiateSwapOut(ctx context.Context, initiateSwapOutRequest *Ini
return swapOutResponse, nil
}
func (api *api) InitiateSwapIn(ctx context.Context, initiateSwapInRequest *InitiateSwapRequest) (*swaps.SwapResponse, error) {
func (api *api) InitiateSwapIn(ctx context.Context, initiateSwapInRequest *InitiateSwapInRequest) (*swaps.SwapResponse, error) {
lnClient := api.svc.GetLNClient()
if lnClient == nil {
return nil, ErrLNClientNotStarted

13
api/models.go
View file

@ -69,8 +69,8 @@ type API interface {
ListSwaps() (*ListSwapsResponse, error)
GetSwapInInfo() (*SwapInfoResponse, error)
GetSwapOutInfo() (*SwapInfoResponse, error)
InitiateSwapIn(ctx context.Context, initiateSwapInRequest *InitiateSwapRequest) (*swaps.SwapResponse, error)
InitiateSwapOut(ctx context.Context, initiateSwapOutRequest *InitiateSwapRequest) (*swaps.SwapResponse, error)
InitiateSwapIn(ctx context.Context, initiateSwapInRequest *InitiateSwapInRequest) (*swaps.SwapResponse, error)
InitiateSwapOut(ctx context.Context, initiateSwapOutRequest *InitiateSwapOutRequest) (*swaps.SwapResponse, error)
RefundSwap(refundSwapRequest *RefundSwapRequest) error
GetSwapMnemonic() string
GetAutoSwapConfig() (*GetAutoSwapConfigResponse, error)
@ -168,14 +168,19 @@ type CreateLightningAddressRequest struct {
AppId uint `json:"appId"`
}
type InitiateSwapRequest struct {
type InitiateSwapInRequest struct {
SwapAmount *uint64 `json:"swapAmount"` // deprecated
SwapAmountSat *uint64 `json:"swapAmountSat"`
Destination string `json:"destination"`
InternalPayment bool `json:"internalPayment"`
FeeRate *uint64 `json:"feeRate"`
}
type InitiateSwapOutRequest struct {
SwapAmount *uint64 `json:"swapAmount"` // deprecated
SwapAmountSat *uint64 `json:"swapAmountSat"`
Destination string `json:"destination"`
}
type RefundSwapRequest struct {
SwapId string `json:"swapId"`
Address string `json:"address"`

4
frontend/src/screens/wallet/receive/ReceiveOnchain.tsx
View file

@ -16,7 +16,7 @@ import { useMempoolApi } from "src/hooks/useMempoolApi";
import { useSwapInfo } from "src/hooks/useSwaps";
import {
CreateInvoiceRequest,
InitiateSwapRequest,
InitiateSwapInRequest,
SwapResponse,
Transaction,
} from "src/types";
@ -75,7 +75,7 @@ export default function ReceiveOnchain() {
return;
}
const payload: InitiateSwapRequest = {
const payload: InitiateSwapInRequest = {
swapAmountSat: parseInt(swapAmountSat),
};
const swapInResponse = await request<SwapResponse>("/api/swaps/in", {

4
frontend/src/screens/wallet/send/Onchain.tsx
View file

@ -19,7 +19,7 @@ import { useBalances } from "src/hooks/useBalances";
import { useMempoolApi } from "src/hooks/useMempoolApi";
import { useSwapInfo } from "src/hooks/useSwaps";
import {
InitiateSwapRequest,
InitiateSwapOutRequest,
RedeemOnchainFundsRequest,
RedeemOnchainFundsResponse,
SwapResponse,
@ -233,7 +233,7 @@ function SwapForm({
event.preventDefault();
try {
setLoading(true);
const payload: InitiateSwapRequest = {
const payload: InitiateSwapOutRequest = {
swapAmountSat: +amountSat,
destination: address,
};

7
frontend/src/screens/wallet/swap/index.tsx
View file

@ -33,7 +33,8 @@ import { useInfo } from "src/hooks/useInfo";
import { useSwapInfo } from "src/hooks/useSwaps";
import {
CreateInvoiceRequest,
InitiateSwapRequest,
InitiateSwapInRequest,
InitiateSwapOutRequest,
SwapResponse,
Transaction,
} from "src/types";
@ -130,7 +131,7 @@ function SwapInForm() {
return;
}
const payload: InitiateSwapRequest = {
const payload: InitiateSwapInRequest = {
swapAmountSat: parseInt(swapAmountSat),
...(swapFrom === "internal"
? {
@ -338,7 +339,7 @@ function SwapOutForm() {
try {
setLoading(true);
const payload: InitiateSwapRequest = {
const payload: InitiateSwapOutRequest = {
swapAmountSat: parseInt(swapAmountSat),
destination,
};

10
frontend/src/types.ts
View file

@ -594,13 +594,17 @@ 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 = {
invoice?: string;
feeSat: number;

4
http/http_service.go
View file

@ -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()),

4
wails/wails_handlers.go
View file

@ -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{