Gossip

channeldb/graph.go

@@ -2735,8 +2735,8 @@ func (l *LightningNode) AddPubKey(key *btcec.PublicKey) {
 }
 
 // NodeAnnouncement retrieves the latest node announcement of the node.
-func (l *LightningNode) NodeAnnouncement(signed bool) (*lnwire.NodeAnnouncement,
-	error) {
+func (l *LightningNode) NodeAnnouncement(signed bool) (
+	*lnwire.NodeAnnouncement1, error) {
 
 	if !l.HaveNodeAnnouncement {
 		return nil, fmt.Errorf("node does not have node announcement")
@@ -2747,7 +2747,7 @@ func (l *LightningNode) NodeAnnouncement(signed bool) (*lnwire.NodeAnnouncement,
 		return nil, err
 	}
 
-	nodeAnn := &lnwire.NodeAnnouncement{
+	nodeAnn := &lnwire.NodeAnnouncement1{
 		Features:        l.Features.RawFeatureVector,
 		NodeID:          l.PubKeyBytes,
 		RGBColor:        l.Color,

channeldb/migration/lnwire21/message.go

@@ -100,7 +100,7 @@ func (t MessageType) String() string {
 	case MsgPing:
 		return "Ping"
 	case MsgAnnounceSignatures:
-		return "AnnounceSignatures"
+		return "AnnounceSignatures1"
 	case MsgPong:
 		return "Pong"
 	case MsgUpdateFee:

channeldb/models/channel.go

@@ -96,7 +96,7 @@ func (k CircuitKey) String() string {
 // constraints will be consulted in order to ensure that adequate fees are
 // paid, and our time-lock parameters are respected. In the event that an
 // incoming HTLC violates any of these constraints, it is to be _rejected_ with
-// the error possibly carrying along a ChannelUpdate message that includes the
+// the error possibly carrying along a ChannelUpdate1 message that includes the
 // latest policy.
 type ForwardingPolicy struct {
 	// MinHTLCOut is the smallest HTLC that is to be forwarded.

channeldb/waitingproof.go

@@ -191,15 +191,17 @@ type WaitingProofKey [9]byte
 // needed to make channel proof exchange persistent, so that after client
 // restart we may receive remote/local half proof and process it.
 type WaitingProof struct {
-	*lnwire.AnnounceSignatures
+	*lnwire.AnnounceSignatures1
 	isRemote bool
 }
 
 // NewWaitingProof constructs a new waiting prof instance.
-func NewWaitingProof(isRemote bool, proof *lnwire.AnnounceSignatures) *WaitingProof {
+func NewWaitingProof(isRemote bool,
+	proof *lnwire.AnnounceSignatures1) *WaitingProof {
+
 	return &WaitingProof{
-		AnnounceSignatures: proof,
-		isRemote:           isRemote,
+		AnnounceSignatures1: proof,
+		isRemote:            isRemote,
 	}
 }
 
@@ -238,11 +240,7 @@ func (p *WaitingProof) Encode(w io.Writer) error {
 		return fmt.Errorf("expect io.Writer to be *bytes.Buffer")
 	}
 
-	if err := p.AnnounceSignatures.Encode(buf, 0); err != nil {
-		return err
-	}
-
-	return nil
+	return p.AnnounceSignatures1.Encode(buf, 0)
 }
 
 // Decode reads the data from the byte stream and initializes the
@@ -252,11 +250,12 @@ func (p *WaitingProof) Decode(r io.Reader) error {
 		return err
 	}
 
-	msg := &lnwire.AnnounceSignatures{}
+	msg := &lnwire.AnnounceSignatures1{}
 	if err := msg.Decode(r, 0); err != nil {
 		return err
 	}
 
-	(*p).AnnounceSignatures = msg
+	p.AnnounceSignatures1 = msg
+
 	return nil
 }

channeldb/waitingproof_test.go

@@ -18,7 +18,7 @@ func TestWaitingProofStore(t *testing.T) {
 	db, err := MakeTestDB(t)
 	require.NoError(t, err, "failed to make test database")
 
-	proof1 := NewWaitingProof(true, &lnwire.AnnounceSignatures{
+	proof1 := NewWaitingProof(true, &lnwire.AnnounceSignatures1{
 		NodeSignature:    wireSig,
 		BitcoinSignature: wireSig,
 		ExtraOpaqueData:  make([]byte, 0),

discovery/chan_series.go

@@ -50,7 +50,7 @@ type ChannelGraphTimeSeries interface {
 	// their updates that match the set of specified short channel ID's.
 	// We'll use this to reply to a QueryShortChanIDs message sent by a
 	// remote peer. The response will contain a unique set of
-	// ChannelAnnouncements, the latest ChannelUpdate for each of the
+	// ChannelAnnouncements, the latest ChannelUpdate1 for each of the
 	// announcements, and a unique set of NodeAnnouncements.
 	FetchChanAnns(chain chainhash.Hash,
 		shortChanIDs []lnwire.ShortChannelID) ([]lnwire.Message, error)
@@ -59,7 +59,8 @@ type ChannelGraphTimeSeries interface {
 	// specified short channel ID. If no channel updates are known for the
 	// channel, then an empty slice will be returned.
 	FetchChanUpdates(chain chainhash.Hash,
-		shortChanID lnwire.ShortChannelID) ([]*lnwire.ChannelUpdate, error)
+		shortChanID lnwire.ShortChannelID) ([]*lnwire.ChannelUpdate1,
+		error)
 }
 
 // ChanSeries is an implementation of the ChannelGraphTimeSeries
@@ -235,7 +236,7 @@ func (c *ChanSeries) FilterChannelRange(chain chainhash.Hash,
 // FetchChanAnns returns a full set of channel announcements as well as their
 // updates that match the set of specified short channel ID's.  We'll use this
 // to reply to a QueryShortChanIDs message sent by a remote peer. The response
-// will contain a unique set of ChannelAnnouncements, the latest ChannelUpdate
+// will contain a unique set of ChannelAnnouncements, the latest ChannelUpdate1
 // for each of the announcements, and a unique set of NodeAnnouncements.
 //
 // NOTE: This is part of the ChannelGraphTimeSeries interface.
@@ -324,7 +325,7 @@ func (c *ChanSeries) FetchChanAnns(chain chainhash.Hash,
 //
 // NOTE: This is part of the ChannelGraphTimeSeries interface.
 func (c *ChanSeries) FetchChanUpdates(chain chainhash.Hash,
-	shortChanID lnwire.ShortChannelID) ([]*lnwire.ChannelUpdate, error) {
+	shortChanID lnwire.ShortChannelID) ([]*lnwire.ChannelUpdate1, error) {
 
 	chanInfo, e1, e2, err := c.graph.FetchChannelEdgesByID(
 		shortChanID.ToUint64(),
@@ -333,7 +334,7 @@ func (c *ChanSeries) FetchChanUpdates(chain chainhash.Hash,
 		return nil, err
 	}
 
-	chanUpdates := make([]*lnwire.ChannelUpdate, 0, 2)
+	chanUpdates := make([]*lnwire.ChannelUpdate1, 0, 2)
 	if e1 != nil {
 		chanUpdate, err := netann.ChannelUpdateFromEdge(chanInfo, e1)
 		if err != nil {