Created zpay32.InvoiceSigner, NodeContextSigner refers to that now.

Author: ksedgwic

channeldb/migration_01_to_11/migration_11_invoices_test.go

@@ -2,14 +2,12 @@ package migration_01_to_11
 
 import (
 	"bytes"
-	"fmt"
 	"testing"
 	"time"
 
 	"github.com/btcsuite/btcd/btcec"
 	bitcoinCfg "github.com/btcsuite/btcd/chaincfg"
 	"github.com/lightningnetwork/lnd/channeldb/kvdb"
-	"github.com/lightningnetwork/lnd/lntest/mock"
 	"github.com/lightningnetwork/lnd/zpay32"
 	litecoinCfg "github.com/ltcsuite/ltcd/chaincfg"
 )
@@ -160,5 +158,6 @@ func getPayReq(net *bitcoinCfg.Params) (string, error) {
 	}
 
 	privKey, _ := btcec.PrivKeyFromBytes(btcec.S256(), testPrivKeyBytes)
-	return payReq.Encode(NewSingleNodeContextSigner(privKey))
+	testInvoiceSigner := zpay32.NewMockInvoiceSigner(privKey)
+	return payReq.Encode(testInvoiceSigner)
 }

lnwallet/contextsigner.go

@@ -8,6 +8,7 @@ import (
 	"github.com/lightningnetwork/lnd/keychain"
 	"github.com/lightningnetwork/lnd/lnwallet/chanfunding"
 	"github.com/lightningnetwork/lnd/lnwire"
+	"github.com/lightningnetwork/lnd/zpay32"
 )
 
 type ContextSigner interface {
@@ -33,10 +34,7 @@ type NodeContextSigner interface {
 	SignChannelUpdate(dataToSign []byte) (input.Signature, error)
 
 	// Generate a signature for an invoice.
-	SignInvoice(
-		humanReadablePart string,
-		fieldsData []byte,
-	) ([]byte, []byte, error)
+	zpay32.InvoiceSigner
 
 	// Generate a signature for an ad-hoc message.
 	SignMessage(dataToSign []byte) ([]byte, error)

zpay32/encode.go

@@ -7,13 +7,20 @@ import (
 
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcutil/bech32"
-	"github.com/lightningnetwork/lnd/lnwallet"
 	"github.com/lightningnetwork/lnd/lnwire"
 )
 
+type InvoiceSigner interface {
+	// Generate a signature for an invoice.
+	SignInvoice(
+		humanReadablePart string,
+		fieldsData []byte,
+	) ([]byte, []byte, error)
+}
+
 // Encode takes the given MessageSigner and returns a string encoding this
 // invoice signed by the node key of the signer.
-func (invoice *Invoice) Encode(signer lnwallet.NodeContextSigner) (string, error) {
+func (invoice *Invoice) Encode(signer InvoiceSigner) (string, error) {
 	// First check that this invoice is valid before starting the encoding.
 	if err := validateInvoice(invoice); err != nil {
 		return "", err

zpay32/invoice_test.go

@@ -17,7 +17,6 @@ import (
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/btcsuite/btcutil"
-	"github.com/lightningnetwork/lnd/lntest/mock"
 	"github.com/lightningnetwork/lnd/lnwire"
 
 	litecoinCfg "github.com/ltcsuite/ltcd/chaincfg"
@@ -101,7 +100,7 @@ var (
 		},
 	}
 
-	testMessageSigner = mock.NewSingleNodeContextSigner(testPrivKey)
+	testMessageSigner = NewMockInvoiceSigner(testPrivKey)
 
 	emptyFeatures = lnwire.NewFeatureVector(nil, lnwire.Features)
 
@@ -905,7 +904,7 @@ func TestInvoiceChecksumMalleability(t *testing.T) {
 	ts := time.Unix(0, 0)
 
 	privKey, _ := btcec.PrivKeyFromBytes(btcec.S256(), privKeyBytes)
-	msgSigner := mock.NewSingleNodeContextSigner(privKey)
+	msgSigner := NewMockInvoiceSigner(privKey)
 
 	opts := []func(*Invoice){Description("test")}
 	invoice, err := NewInvoice(chain, payHash, ts, opts...)

zpay32/mock.go

@@ -0,0 +1,47 @@
+package zpay32
+
+import (
+	"fmt"
+
+	"github.com/btcsuite/btcd/btcec"
+	"github.com/btcsuite/btcd/chaincfg/chainhash"
+	"github.com/btcsuite/btcutil/bech32"
+)
+
+type MockInvoiceSigner struct {
+	privKey *btcec.PrivateKey
+}
+
+func NewMockInvoiceSigner(
+	privKey *btcec.PrivateKey) *MockInvoiceSigner {
+	return &MockInvoiceSigner{
+		privKey: privKey,
+	}
+}
+
+// Generate a signature for an invoice.
+func (is *MockInvoiceSigner) SignInvoice(
+	humanReadablePart string,
+	fieldsData []byte,
+) ([]byte, []byte, error) {
+	// The signature is over the single SHA-256 hash of the hrp + the
+	// tagged fields encoded in base256.
+	taggedFieldsBytes, err := bech32.ConvertBits(fieldsData, 5, 8, true)
+	if err != nil {
+		return nil, nil, err
+	}
+	toSign := append([]byte(humanReadablePart), taggedFieldsBytes...)
+	hash := chainhash.HashB(toSign)
+
+	// Should the signature reference a compressed public key or not.
+	isCompressedKey := true
+
+	// btcec.SignCompact returns a pubkey-recoverable signature
+	sign, err := btcec.SignCompact(
+		btcec.S256(), is.privKey, hash, isCompressedKey,
+	)
+	if err != nil {
+		return nil, nil, fmt.Errorf("can't sign the hash: %v", err)
+	}
+	return hash, sign, nil
+}