aljaz/lndhub.go
1
1
Fork 0
mirror of https://github.com/getAlby/lndhub.go.git synced 2026-02-20 20:34:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove zpay32 dep

Browse Source
This commit is contained in:
kiwiidb
2022-02-15 17:19:35 +01:00
parent a3b3e17d49
commit fb8fe70d07
4 changed files with 21 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/payinvoice.ctrl.go
View File

@@ -51,7 +51,7 @@ func (controller *PayInvoiceController) PayInvoice(c echo.Context) error {
}
paymentRequest := reqBody.Invoice
decodedPaymentRequest, err := controller.svc.DecodePaymentRequest(paymentRequest)
decodedPaymentRequest, err := controller.svc.DecodePaymentRequest(c.Request().Context(), paymentRequest)
if err != nil {
c.Logger().Errorf("Invalid payment request: %v", err)
sentry.CaptureException(err)

46
lib/service/invoices.go
View File

@@ -6,15 +6,12 @@ import (
"encoding/hex"
"errors"
"math/rand"
"strings"
"time"
"github.com/btcsuite/btcd/chaincfg"
"github.com/getAlby/lndhub.go/common"
"github.com/getAlby/lndhub.go/db/models"
"github.com/labstack/gommon/random"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/zpay32"
"github.com/uptrace/bun"
"github.com/uptrace/bun/schema"
)
@@ -223,32 +220,19 @@ func (svc *LndhubService) PayInvoice(ctx context.Context, invoice *models.Invoic
return &paymentResponse, err
}
func (svc *LndhubService) AddOutgoingInvoice(ctx context.Context, userID int64, paymentRequest string, decodedInvoice *zpay32.Invoice) (*models.Invoice, error) {
func (svc *LndhubService) AddOutgoingInvoice(ctx context.Context, userID int64, paymentRequest string, decodedInvoice *lnrpc.PayReq) (*models.Invoice, error) {
// Initialize new DB invoice
destinationPubkeyHex := hex.EncodeToString(decodedInvoice.Destination.SerializeCompressed())
expiresAt := decodedInvoice.Timestamp.Add(decodedInvoice.Expiry())
invoice := models.Invoice{
Type: common.InvoiceTypeOutgoing,
UserID: userID,
PaymentRequest: paymentRequest,
RHash: decodedInvoice.PaymentHash,
Amount: decodedInvoice.NumSatoshis,
State: common.InvoiceStateInitialized,
DestinationPubkeyHex: destinationPubkeyHex,
ExpiresAt: bun.NullTime{Time: expiresAt},
}
if decodedInvoice.Description != nil {
invoice.Memo = *decodedInvoice.Description
}
if decodedInvoice.DescriptionHash != nil {
dh := *decodedInvoice.DescriptionHash
invoice.DescriptionHash = hex.EncodeToString(dh[:])
}
if decodedInvoice.PaymentHash != nil {
ph := *decodedInvoice.PaymentHash
invoice.RHash = hex.EncodeToString(ph[:])
}
if decodedInvoice.MilliSat != nil {
msat := decodedInvoice.MilliSat
invoice.Amount = int64(msat.ToSatoshis())
DestinationPubkeyHex: decodedInvoice.Destination,
DescriptionHash: decodedInvoice.DescriptionHash,
Memo: decodedInvoice.Description,
ExpiresAt: bun.NullTime{Time: time.Unix(decodedInvoice.Expiry, 0)},
}
// Save invoice
@@ -313,8 +297,8 @@ func (svc *LndhubService) AddIncomingInvoice(ctx context.Context, userID int64,
return &invoice, nil
}
func (svc *LndhubService) DecodePaymentRequest(bolt11 string) (*zpay32.Invoice, error) {
return zpay32.Decode(bolt11, ChainFromCurrency(bolt11[2:]))
func (svc *LndhubService) DecodePaymentRequest(ctx context.Context, bolt11 string) (*lnrpc.PayReq, error) {
return svc.LndClient.DecodeBolt11(ctx, bolt11)
}
const hexBytes = random.Hex
@@ -326,15 +310,3 @@ func makePreimageHex() []byte {
}
return b
}
func ChainFromCurrency(currency string) *chaincfg.Params {
if strings.HasPrefix(currency, "bcrt") {
return &chaincfg.RegressionNetParams
} else if strings.HasPrefix(currency, "tb") {
return &chaincfg.TestNet3Params
} else if strings.HasPrefix(currency, "sb") {
return &chaincfg.SimNetParams
} else {
return &chaincfg.MainNetParams
}
}

1
lnd/interface.go
View File

@@ -13,6 +13,7 @@ type LightningClientWrapper interface {
AddInvoice(ctx context.Context, req *lnrpc.Invoice, options ...grpc.CallOption) (*lnrpc.AddInvoiceResponse, error)
SubscribeInvoices(ctx context.Context, req *lnrpc.InvoiceSubscription, options ...grpc.CallOption) (SubscribeInvoicesWrapper, error)
GetInfo(ctx context.Context, req *lnrpc.GetInfoRequest, options ...grpc.CallOption) (*lnrpc.GetInfoResponse, error)
DecodeBolt11(ctx context.Context, bolt11 string, options ...grpc.CallOption) (*lnrpc.PayReq, error)
}
type SubscribeInvoicesWrapper interface {

10
lnd/lnd.go
View File

@@ -15,6 +15,10 @@ import (
"gopkg.in/macaroon.v2"
)
const (
MSAT_PER_SAT = 1000
)
// LNDoptions are the options for the connection to the lnd node.
type LNDoptions struct {
Address string
@@ -110,3 +114,9 @@ func (wrapper *LNDWrapper) SubscribeInvoices(ctx context.Context, req *lnrpc.Inv
func (wrapper *LNDWrapper) GetInfo(ctx context.Context, req *lnrpc.GetInfoRequest, options ...grpc.CallOption) (*lnrpc.GetInfoResponse, error) {
return wrapper.client.GetInfo(ctx, req, options...)
}
func (wrapper *LNDWrapper) DecodeBolt11(ctx context.Context, bolt11 string, options ...grpc.CallOption) (*lnrpc.PayReq, error) {
return wrapper.client.DecodePayReq(ctx, &lnrpc.PayReqString{
PayReq: bolt11,
})
}