lnwire: replace instances of *btcec.PublicKey with [33]byte in ann messages

In this commit, we replace all instances of *btcec.PublicKey within the
announcement messages with a simple [33]byte. We do this as usually we
don’t need to immediately validate an announcement, therefore we can
avoid the scalar multiplications during decoding.

lnwire/channel_announcement.go

@@ -41,13 +41,13 @@ type ChannelAnnouncement struct {
 	// The public keys of the two nodes who are operating the channel, such
 	// that is NodeID1 the numerically-lesser than NodeID2 (ascending
 	// numerical order).
-	NodeID1 *btcec.PublicKey
+	NodeID1 [33]byte
-	NodeID2 *btcec.PublicKey
+	NodeID2 [33]byte
 
 	// Public keys which corresponds to the keys which was declared in
 	// multisig funding transaction output.
-	BitcoinKey1 *btcec.PublicKey
+	BitcoinKey1 [33]byte
-	BitcoinKey2 *btcec.PublicKey
+	BitcoinKey2 [33]byte
 }
 
 // A compile time check to ensure ChannelAnnouncement implements the

lnwire/lnwire.go

@@ -201,6 +201,10 @@ func writeElement(w io.Writer, element interface{}) error {
 			return err
 		}
 
+		if _, err := w.Write(e[:]); err != nil {
+			return err
+		}
+	case [33]byte:
 		if _, err := w.Write(e[:]); err != nil {
 			return err
 		}
@@ -527,6 +531,10 @@ func readElement(r io.Reader, element interface{}) error {
 		if _, err := io.ReadFull(r, *e); err != nil {
 			return err
 		}
+	case *[33]byte:
+		if _, err := io.ReadFull(r, e[:]); err != nil {
+			return err
+		}
 	case []byte:
 		if _, err := io.ReadFull(r, e); err != nil {
 			return err

lnwire/lnwire_test.go

@@ -52,6 +52,19 @@ func randPubKey() (*btcec.PublicKey, error) {
 	return priv.PubKey(), nil
 }
 
+func randRawKey() ([33]byte, error) {
+	var n [33]byte
+
+	priv, err := btcec.NewPrivateKey(btcec.S256())
+	if err != nil {
+		return n, err
+	}
+
+	copy(n[:], priv.PubKey().SerializeCompressed())
+
+	return n, nil
+}
+
 func randRawFeatureVector(r *rand.Rand) *RawFeatureVector {
 	featureVec := NewRawFeatureVector()
 	for i := 0; i < 10000; i++ {
@@ -266,20 +279,30 @@ func TestLightningWireProtocol(t *testing.T) {
 			}
 			req.FundingPoint.Index = uint32(r.Int31()) % math.MaxUint16
 
-			req.CommitSig = testSig
+			var err error
+			req.CommitSig, err = NewSigFromSignature(testSig)
+			if err != nil {
+				t.Fatalf("unable to parse sig: %v", err)
+				return
+			}
 
 			v[0] = reflect.ValueOf(req)
 		},
 		MsgFundingSigned: func(v []reflect.Value, r *rand.Rand) {
 			var c [32]byte
-			if _, err := r.Read(c[:]); err != nil {
+			_, err := r.Read(c[:])
+			if err != nil {
 				t.Fatalf("unable to generate chan id: %v", err)
 				return
 			}
 
 			req := FundingSigned{
-				ChanID:    ChannelID(c),
+				ChanID: ChannelID(c),
-				CommitSig: testSig,
+			}
+			req.CommitSig, err = NewSigFromSignature(testSig)
+			if err != nil {
+				t.Fatalf("unable to parse sig: %v", err)
+				return
 			}
 
 			v[0] = reflect.ValueOf(req)
@@ -305,7 +328,12 @@ func TestLightningWireProtocol(t *testing.T) {
 		MsgClosingSigned: func(v []reflect.Value, r *rand.Rand) {
 			req := ClosingSigned{
 				FeeSatoshis: btcutil.Amount(r.Int63()),
-				Signature:   testSig,
+			}
+			var err error
+			req.Signature, err = NewSigFromSignature(testSig)
+			if err != nil {
+				t.Fatalf("unable to parse sig: %v", err)
+				return
 			}
 
 			if _, err := r.Read(req.ChannelID[:]); err != nil {
@@ -321,17 +349,27 @@ func TestLightningWireProtocol(t *testing.T) {
 				t.Fatalf("unable to generate chan id: %v", err)
 				return
 			}
-			req.CommitSig = testSig
+
+			var err error
+			req.CommitSig, err = NewSigFromSignature(testSig)
+			if err != nil {
+				t.Fatalf("unable to parse sig: %v", err)
+				return
+			}
 
 			// Only create the slice if there will be any signatures
 			// in it to prevent false positive test failures due to
 			// an empty slice versus a nil slice.
 			numSigs := uint16(r.Int31n(1020))
 			if numSigs > 0 {
-				req.HtlcSigs = make([]*btcec.Signature, numSigs)
+				req.HtlcSigs = make([]Sig, numSigs)
 			}
 			for i := 0; i < int(numSigs); i++ {
-				req.HtlcSigs[i] = testSig
+				req.HtlcSigs[i], err = NewSigFromSignature(testSig)
+				if err != nil {
+					t.Fatalf("unable to parse sig: %v", err)
+					return
+				}
 			}
 
 			v[0] = reflect.ValueOf(*req)
@@ -356,32 +394,48 @@ func TestLightningWireProtocol(t *testing.T) {
 			v[0] = reflect.ValueOf(*req)
 		},
 		MsgChannelAnnouncement: func(v []reflect.Value, r *rand.Rand) {
+			var err error
 			req := ChannelAnnouncement{
 				ShortChannelID: NewShortChanIDFromInt(uint64(r.Int63())),
 				Features:       randRawFeatureVector(r),
 			}
-			req.NodeSig1 = testSig
+			req.NodeSig1, err = NewSigFromSignature(testSig)
-			req.NodeSig2 = testSig
+			if err != nil {
-			req.BitcoinSig1 = testSig
+				t.Fatalf("unable to parse sig: %v", err)
-			req.BitcoinSig2 = testSig
+				return
+			}
+			req.NodeSig2, err = NewSigFromSignature(testSig)
+			if err != nil {
+				t.Fatalf("unable to parse sig: %v", err)
+				return
+			}
+			req.BitcoinSig1, err = NewSigFromSignature(testSig)
+			if err != nil {
+				t.Fatalf("unable to parse sig: %v", err)
+				return
+			}
+			req.BitcoinSig2, err = NewSigFromSignature(testSig)
+			if err != nil {
+				t.Fatalf("unable to parse sig: %v", err)
+				return
+			}
 
-			var err error
+			req.NodeID1, err = randRawKey()
-			req.NodeID1, err = randPubKey()
 			if err != nil {
 				t.Fatalf("unable to generate key: %v", err)
 				return
 			}
-			req.NodeID2, err = randPubKey()
+			req.NodeID2, err = randRawKey()
 			if err != nil {
 				t.Fatalf("unable to generate key: %v", err)
 				return
 			}
-			req.BitcoinKey1, err = randPubKey()
+			req.BitcoinKey1, err = randRawKey()
 			if err != nil {
 				t.Fatalf("unable to generate key: %v", err)
 				return
 			}
-			req.BitcoinKey2, err = randPubKey()
+			req.BitcoinKey2, err = randRawKey()
 			if err != nil {
 				t.Fatalf("unable to generate key: %v", err)
 				return
@@ -400,8 +454,8 @@ func TestLightningWireProtocol(t *testing.T) {
 				return
 			}
 
+			var err error
 			req := NodeAnnouncement{
-				Signature: testSig,
 				Features:  randRawFeatureVector(r),
 				Timestamp: uint32(r.Int31()),
 				Alias:     a,
@@ -413,9 +467,13 @@ func TestLightningWireProtocol(t *testing.T) {
 				// TODO(roasbeef): proper gen rand addrs
 				Addresses: testAddrs,
 			}
+			req.Signature, err = NewSigFromSignature(testSig)
+			if err != nil {
+				t.Fatalf("unable to parse sig: %v", err)
+				return
+			}
 
-			var err error
+			req.NodeID, err = randRawKey()
-			req.NodeID, err = randPubKey()
 			if err != nil {
 				t.Fatalf("unable to generate key: %v", err)
 				return
@@ -424,8 +482,8 @@ func TestLightningWireProtocol(t *testing.T) {
 			v[0] = reflect.ValueOf(req)
 		},
 		MsgChannelUpdate: func(v []reflect.Value, r *rand.Rand) {
+			var err error
 			req := ChannelUpdate{
-				Signature:       testSig,
 				ShortChannelID:  NewShortChanIDFromInt(uint64(r.Int63())),
 				Timestamp:       uint32(r.Int31()),
 				Flags:           ChanUpdateFlag(r.Int31()),
@@ -434,6 +492,12 @@ func TestLightningWireProtocol(t *testing.T) {
 				BaseFee:         uint32(r.Int31()),
 				FeeRate:         uint32(r.Int31()),
 			}
+			req.Signature, err = NewSigFromSignature(testSig)
+			if err != nil {
+				t.Fatalf("unable to parse sig: %v", err)
+				return
+			}
+
 			if _, err := r.Read(req.ChainHash[:]); err != nil {
 				t.Fatalf("unable to generate chain hash: %v", err)
 				return
@@ -442,11 +506,23 @@ func TestLightningWireProtocol(t *testing.T) {
 			v[0] = reflect.ValueOf(req)
 		},
 		MsgAnnounceSignatures: func(v []reflect.Value, r *rand.Rand) {
+			var err error
 			req := AnnounceSignatures{
-				ShortChannelID:   NewShortChanIDFromInt(uint64(r.Int63())),
+				ShortChannelID: NewShortChanIDFromInt(uint64(r.Int63())),
-				NodeSignature:    testSig,
-				BitcoinSignature: testSig,
 			}
+
+			req.NodeSignature, err = NewSigFromSignature(testSig)
+			if err != nil {
+				t.Fatalf("unable to parse sig: %v", err)
+				return
+			}
+
+			req.BitcoinSignature, err = NewSigFromSignature(testSig)
+			if err != nil {
+				t.Fatalf("unable to parse sig: %v", err)
+				return
+			}
+
 			if _, err := r.Read(req.ChannelID[:]); err != nil {
 				t.Fatalf("unable to generate chan id: %v", err)
 				return

lnwire/node_announcement.go

@@ -7,8 +7,6 @@ import (
 	"io"
 	"net"
 	"unicode/utf8"
-
-	"github.com/roasbeef/btcd/btcec"
 )
 
 var (
@@ -59,7 +57,7 @@ type NodeAnnouncement struct {
 	Timestamp uint32
 
 	// NodeID is a public key which is used as node identification.
-	NodeID *btcec.PublicKey
+	NodeID [33]byte
 
 	// RGBColor is used to customize their node's appearance in maps and
 	// graphs