16807123789

Committed 07 Aug 2025 02:18PM UTC coverage: 54.85% (-12.1%) from 66.947%

Build # 16807123789

Build Type

Pull #10140

github

Committed by

web-flow

Commit Message

Merge d256dafec into 2269859d9

Pull Request Pull Request #10140: [2/3] lnwire: fix encoding customized TLV records

Run Details

192 of 207 new or added lines in 9 files covered. (92.75%)

23859 existing lines in 288 files now uncovered.

108730 of 198233 relevant lines covered (54.85%)

22096.12 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

75.81

/lnwire/closing_signed.go

package lnwire

import (
        "bytes"
        "io"

        "github.com/btcsuite/btcd/btcutil"
        "github.com/lightningnetwork/lnd/tlv"
)

// ClosingSigned is sent by both parties to a channel once the channel is clear
// of HTLCs, and is primarily concerned with negotiating fees for the close
// transaction. Each party provides a signature for a transaction with a fee
// that they believe is fair. The process terminates when both sides agree on
// the same fee, or when one side force closes the channel.
//
// NOTE: The responder is able to send a signature without any additional
// messages as all transactions are assembled observing BIP 69 which defines a
// canonical ordering for input/outputs. Therefore, both sides are able to
// arrive at an identical closure transaction as they know the order of the
// inputs/outputs.
type ClosingSigned struct {
        // ChannelID serves to identify which channel is to be closed.
        ChannelID ChannelID

        // FeeSatoshis is the total fee in satoshis that the party to the
        // channel would like to propose for the close transaction.
        FeeSatoshis btcutil.Amount

        // Signature is for the proposed channel close transaction.
        Signature Sig

        // PartialSig is used to transmit a musig2 extended partial signature
        // that signs the latest fee offer. The nonce isn't sent along side, as
        // that has already been sent in the initial shutdown message.
        //
        // NOTE: This field is only populated if a musig2 taproot channel is
        // being signed for. In this case, the above Sig type MUST be blank.
        PartialSig OptPartialSigTLV

        // ExtraData is the set of data that was appended to this message to
        // fill out the full maximum transport message size. These fields can
        // be used to specify optional data such as custom TLV fields.
        ExtraData ExtraOpaqueData
}

// NewClosingSigned creates a new empty ClosingSigned message.
func NewClosingSigned(cid ChannelID, fs btcutil.Amount,
        sig Sig) *ClosingSigned {

        return &ClosingSigned{
                ChannelID:   cid,
                FeeSatoshis: fs,
                Signature:   sig,
        }
}

// A compile time check to ensure ClosingSigned implements the lnwire.Message
// interface.
var _ Message = (*ClosingSigned)(nil)

// A compile time check to ensure ClosingSigned implements the
// lnwire.SizeableMessage interface.
var _ SizeableMessage = (*ClosingSigned)(nil)

// Decode deserializes a serialized ClosingSigned message stored in the passed
// io.Reader observing the specified protocol version.
//
// This is part of the lnwire.Message interface.
func (c *ClosingSigned) Decode(r io.Reader, pver uint32) error {
        err := ReadElements(
                r, &c.ChannelID, &c.FeeSatoshis, &c.Signature,
        )
        if err != nil {
                return err
        }

        var tlvRecords ExtraOpaqueData
        if err := ReadElements(r, &tlvRecords); err != nil {
                return err
        }

        partialSig := c.PartialSig.Zero()
        knownRecords, extraData, err := ParseAndExtractExtraData(
                tlvRecords, &partialSig,
        )
        if err != nil {
                return err
        }

        // Set the corresponding TLV types if they were included in the stream.
        if _, ok := knownRecords[c.PartialSig.TlvType()]; ok {
                c.PartialSig = tlv.SomeRecordT(partialSig)
        }

        c.ExtraData = extraData

        return nil
}

// Encode serializes the target ClosingSigned into the passed io.Writer
// observing the protocol version specified.
//
// This is part of the lnwire.Message interface.
func (c *ClosingSigned) Encode(w *bytes.Buffer, pver uint32) error {
        // Get producers from extra data.
        producers, err := c.ExtraData.RecordProducers()
        if err != nil {
                return err
        }

        c.PartialSig.WhenSome(func(sig PartialSigTLV) {
                producers = append(producers, &sig)
        })

        // Pack all records into a new TLV stream.
        var tlvData ExtraOpaqueData
        err = tlvData.PackRecords(producers...)
        if err != nil {
                return err
        }

        if err := WriteChannelID(w, c.ChannelID); err != nil {
                return err
        }

        if err := WriteSatoshi(w, c.FeeSatoshis); err != nil {
                return err
        }

        if err := WriteSig(w, c.Signature); err != nil {
                return err
        }

        return WriteBytes(w, tlvData)
}

// MsgType returns the integer uniquely identifying this message type on the
// wire.
//
// This is part of the lnwire.Message interface.
func (c *ClosingSigned) MsgType() MessageType {
        return MsgClosingSigned
}

// SerializedSize returns the serialized size of the message in bytes.
//
// This is part of the lnwire.SizeableMessage interface.
func (c *ClosingSigned) SerializedSize() (uint32, error) {
        return MessageSerializedSize(c)
}

1	package lnwire
2
3	import (
4	"bytes"
5	"io"
6
7	"github.com/btcsuite/btcd/btcutil"
8	"github.com/lightningnetwork/lnd/tlv"
9	)
10
11	// ClosingSigned is sent by both parties to a channel once the channel is clear
12	// of HTLCs, and is primarily concerned with negotiating fees for the close
13	// transaction. Each party provides a signature for a transaction with a fee
14	// that they believe is fair. The process terminates when both sides agree on
15	// the same fee, or when one side force closes the channel.
16	//
17	// NOTE: The responder is able to send a signature without any additional
18	// messages as all transactions are assembled observing BIP 69 which defines a
19	// canonical ordering for input/outputs. Therefore, both sides are able to
20	// arrive at an identical closure transaction as they know the order of the
21	// inputs/outputs.
22	type ClosingSigned struct {
23	// ChannelID serves to identify which channel is to be closed.
24	ChannelID ChannelID
25
26	// FeeSatoshis is the total fee in satoshis that the party to the
27	// channel would like to propose for the close transaction.
28	FeeSatoshis btcutil.Amount
29
30	// Signature is for the proposed channel close transaction.
31	Signature Sig
32
33	// PartialSig is used to transmit a musig2 extended partial signature
34	// that signs the latest fee offer. The nonce isn't sent along side, as
35	// that has already been sent in the initial shutdown message.
36	//
37	// NOTE: This field is only populated if a musig2 taproot channel is
38	// being signed for. In this case, the above Sig type MUST be blank.
39	PartialSig OptPartialSigTLV
40
41	// ExtraData is the set of data that was appended to this message to
42	// fill out the full maximum transport message size. These fields can
43	// be used to specify optional data such as custom TLV fields.
44	ExtraData ExtraOpaqueData
45	}
46
47	// NewClosingSigned creates a new empty ClosingSigned message.
48	func NewClosingSigned(cid ChannelID, fs btcutil.Amount,
49	sig Sig) *ClosingSigned {	19✔
50		19✔
51	return &ClosingSigned{	19✔
52	ChannelID: cid,	19✔
53	FeeSatoshis: fs,	19✔
54	Signature: sig,	19✔
55	}	19✔
56	}	19✔
57
58	// A compile time check to ensure ClosingSigned implements the lnwire.Message
59	// interface.
60	var _ Message = (*ClosingSigned)(nil)
61
62	// A compile time check to ensure ClosingSigned implements the
63	// lnwire.SizeableMessage interface.
64	var _ SizeableMessage = (*ClosingSigned)(nil)
65
66	// Decode deserializes a serialized ClosingSigned message stored in the passed
67	// io.Reader observing the specified protocol version.
68	//
69	// This is part of the lnwire.Message interface.
70	func (c *ClosingSigned) Decode(r io.Reader, pver uint32) error {	174✔
71	err := ReadElements(	174✔
72	r, &c.ChannelID, &c.FeeSatoshis, &c.Signature,	174✔
73	)	174✔
74	if err != nil {	179✔
75	return err	5✔
76	}	5✔
77
78	var tlvRecords ExtraOpaqueData	169✔
79	if err := ReadElements(r, &tlvRecords); err != nil {	169✔
80	return err	×
81	}	×
82
83	partialSig := c.PartialSig.Zero()	169✔
84	knownRecords, extraData, err := ParseAndExtractExtraData(	169✔
85	tlvRecords, &partialSig,	169✔
86	)	169✔
87	if err != nil {	213✔
88	return err	44✔
89	}	44✔
90
91	// Set the corresponding TLV types if they were included in the stream.
92	if _, ok := knownRecords[c.PartialSig.TlvType()]; ok {	169✔
93	c.PartialSig = tlv.SomeRecordT(partialSig)	44✔
94	}	44✔
95
96	c.ExtraData = extraData	125✔
97		125✔
98	return nil	125✔
99	}
100
101	// Encode serializes the target ClosingSigned into the passed io.Writer
102	// observing the protocol version specified.
103	//
104	// This is part of the lnwire.Message interface.
105	func (c ClosingSigned) Encode(w bytes.Buffer, pver uint32) error {	113✔
106	// Get producers from extra data.	113✔
107	producers, err := c.ExtraData.RecordProducers()	113✔
108	if err != nil {	113✔
NEW 109	return err	×
NEW 110	}	×
111
112	c.PartialSig.WhenSome(func(sig PartialSigTLV) {	155✔
113	producers = append(producers, &sig)	42✔
114	})	42✔
115
116	// Pack all records into a new TLV stream.
117	var tlvData ExtraOpaqueData	113✔
118	err = tlvData.PackRecords(producers...)	113✔
119	if err != nil {	113✔
120	return err	×
121	}	×
122
123	if err := WriteChannelID(w, c.ChannelID); err != nil {	113✔
124	return err	×
125	}	×
126
127	if err := WriteSatoshi(w, c.FeeSatoshis); err != nil {	113✔
128	return err	×
129	}	×
130
131	if err := WriteSig(w, c.Signature); err != nil {	113✔
132	return err	×
133	}	×
134
135	return WriteBytes(w, tlvData)	113✔
136	}
137
138	// MsgType returns the integer uniquely identifying this message type on the
139	// wire.
140	//
141	// This is part of the lnwire.Message interface.
142	func (c *ClosingSigned) MsgType() MessageType {	112✔
143	return MsgClosingSigned	112✔
144	}	112✔
145
146	// SerializedSize returns the serialized size of the message in bytes.
147	//
148	// This is part of the lnwire.SizeableMessage interface.
149	func (c *ClosingSigned) SerializedSize() (uint32, error) {	×
150	return MessageSerializedSize(c)	×
151	}	×

lightningnetwork / lnd / 16807123789

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous