highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-06-04 20:19:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

rpcserver: passing active net to zpay32.Decode

Browse Source
This commit is contained in:
Daniel McNally 2018-02-19 10:20:54 -05:00
parent 6e5477e378
commit 56c01ebcfe
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpcserver.go
View File

@ -1693,7 +1693,8 @@ func (r *rpcServer) SendPayment(paymentStream lnrpc.Lightning_SendPaymentServer)
// attempt to decode it, populating the // attempt to decode it, populating the
// payment accordingly. // payment accordingly.
if nextPayment.PaymentRequest != "" { if nextPayment.PaymentRequest != "" {
payReq, err := zpay32.Decode(nextPayment.PaymentRequest) payReq, err := zpay32.Decode(nextPayment.PaymentRequest,
activeNetParams.Params)
if err != nil { if err != nil {
select { select {
case errChan <- err: case errChan <- err:
@ -1882,7 +1883,8 @@ func (r *rpcServer) SendPaymentSync(ctx context.Context,
// If the proto request has an encoded payment request, then we we'll // If the proto request has an encoded payment request, then we we'll
// use that solely to dispatch the payment. // use that solely to dispatch the payment.
if nextPayment.PaymentRequest != "" { if nextPayment.PaymentRequest != "" {
payReq, err := zpay32.Decode(nextPayment.PaymentRequest) payReq, err := zpay32.Decode(nextPayment.PaymentRequest,
activeNetParams.Params)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -2150,7 +2152,7 @@ func (r *rpcServer) AddInvoice(ctx context.Context,
// createRPCInvoice creates an *lnrpc.Invoice from the *channeldb.Invoice. // createRPCInvoice creates an *lnrpc.Invoice from the *channeldb.Invoice.
func createRPCInvoice(invoice *channeldb.Invoice) (*lnrpc.Invoice, error) { func createRPCInvoice(invoice *channeldb.Invoice) (*lnrpc.Invoice, error) {
paymentRequest := string(invoice.PaymentRequest) paymentRequest := string(invoice.PaymentRequest)
decoded, err := zpay32.Decode(paymentRequest) decoded, err := zpay32.Decode(paymentRequest, activeNetParams.Params)
if err != nil { if err != nil {
return nil, fmt.Errorf("unable to decode payment request: %v", return nil, fmt.Errorf("unable to decode payment request: %v",
err) err)
@ -2978,7 +2980,7 @@ func (r *rpcServer) DecodePayReq(ctx context.Context,
// Fist we'll attempt to decode the payment request string, if the // Fist we'll attempt to decode the payment request string, if the
// request is invalid or the checksum doesn't match, then we'll exit // request is invalid or the checksum doesn't match, then we'll exit
// here with an error. // here with an error.
payReq, err := zpay32.Decode(req.PayReq) payReq, err := zpay32.Decode(req.PayReq, activeNetParams.Params)
if err != nil { if err != nil {
return nil, err return nil, err
} }