From d0fe8b737b0f34627d9eca23e415f42bd22cadc2 Mon Sep 17 00:00:00 2001
From: Wilmer Paulino <wilmer.paulino@gmail.com>
Date: Mon, 1 Jun 2020 17:06:08 -0700
Subject: [PATCH] netann: decode features when creating chan ann from stored
 chan info

This was the only field not properly set when creating a
lnwire.ChannelAnnouncement from a channeldb.ChannelEdgeInfo.
---
 netann/channel_announcement.go      |  7 ++-
 netann/channel_announcement_test.go | 67 +++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 netann/channel_announcement_test.go

diff --git a/netann/channel_announcement.go b/netann/channel_announcement.go
index 99f909e2..480b8cf3 100644
--- a/netann/channel_announcement.go
+++ b/netann/channel_announcement.go
@@ -1,6 +1,8 @@
 package netann
 
 import (
+	"bytes"
+
 	"github.com/lightningnetwork/lnd/channeldb"
 	"github.com/lightningnetwork/lnd/lnwire"
 )
@@ -30,7 +32,10 @@ func CreateChanAnnouncement(chanProof *channeldb.ChannelAuthProof,
 		ExtraOpaqueData: chanInfo.ExtraOpaqueData,
 	}
 
-	var err error
+	err := chanAnn.Features.Decode(bytes.NewReader(chanInfo.Features))
+	if err != nil {
+		return nil, nil, nil, err
+	}
 	chanAnn.BitcoinSig1, err = lnwire.NewSigFromRawSignature(
 		chanProof.BitcoinSig1Bytes,
 	)
diff --git a/netann/channel_announcement_test.go b/netann/channel_announcement_test.go
new file mode 100644
index 00000000..49e0789b
--- /dev/null
+++ b/netann/channel_announcement_test.go
@@ -0,0 +1,67 @@
+package netann
+
+import (
+	"bytes"
+	"testing"
+
+	"github.com/btcsuite/btcd/chaincfg/chainhash"
+	"github.com/btcsuite/btcd/wire"
+	"github.com/btcsuite/btcutil"
+	"github.com/lightningnetwork/lnd/channeldb"
+	"github.com/lightningnetwork/lnd/lnwire"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCreateChanAnnouncement(t *testing.T) {
+	t.Parallel()
+
+	key := [33]byte{0x1}
+	sig := lnwire.Sig{0x1}
+	features := lnwire.NewRawFeatureVector(lnwire.AnchorsRequired)
+	var featuresBuf bytes.Buffer
+	if err := features.Encode(&featuresBuf); err != nil {
+		t.Fatalf("unable to encode features: %v", err)
+	}
+
+	expChanAnn := &lnwire.ChannelAnnouncement{
+		ChainHash:       chainhash.Hash{0x1},
+		ShortChannelID:  lnwire.ShortChannelID{BlockHeight: 1},
+		NodeID1:         key,
+		NodeID2:         key,
+		NodeSig1:        sig,
+		NodeSig2:        sig,
+		BitcoinKey1:     key,
+		BitcoinKey2:     key,
+		BitcoinSig1:     sig,
+		BitcoinSig2:     sig,
+		Features:        features,
+		ExtraOpaqueData: []byte{0x1},
+	}
+
+	chanProof := &channeldb.ChannelAuthProof{
+		NodeSig1Bytes:    expChanAnn.NodeSig1.ToSignatureBytes(),
+		NodeSig2Bytes:    expChanAnn.NodeSig2.ToSignatureBytes(),
+		BitcoinSig1Bytes: expChanAnn.BitcoinSig1.ToSignatureBytes(),
+		BitcoinSig2Bytes: expChanAnn.BitcoinSig2.ToSignatureBytes(),
+	}
+	chanInfo := &channeldb.ChannelEdgeInfo{
+		ChainHash:        expChanAnn.ChainHash,
+		ChannelID:        expChanAnn.ShortChannelID.ToUint64(),
+		ChannelPoint:     wire.OutPoint{Index: 1},
+		Capacity:         btcutil.SatoshiPerBitcoin,
+		NodeKey1Bytes:    key,
+		NodeKey2Bytes:    key,
+		BitcoinKey1Bytes: key,
+		BitcoinKey2Bytes: key,
+		Features:         featuresBuf.Bytes(),
+		ExtraOpaqueData:  expChanAnn.ExtraOpaqueData,
+	}
+	chanAnn, _, _, err := CreateChanAnnouncement(
+		chanProof, chanInfo, nil, nil,
+	)
+	if err != nil {
+		t.Fatalf("unable to create channel announcement: %v", err)
+	}
+
+	assert.Equal(t, chanAnn, expChanAnn)
+}