-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[2/7] channeldb: add new types and interfaces for gossip 1.75 #8164
base: master
Are you sure you want to change the base?
Conversation
3b4acec
to
b068fc0
Compare
b068fc0
to
0fbc058
Compare
0fbc058
to
be56e6f
Compare
91f4488
to
2da93b7
Compare
be56e6f
to
2d9ef0c
Compare
Important Review skippedAuto reviews are limited to specific labels. Labels to auto review (1)
Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
2da93b7
to
093462b
Compare
2d9ef0c
to
12d2106
Compare
093462b
to
a826e6e
Compare
12d2106
to
a205f32
Compare
The target branch can be updated to point to master. |
|
||
// ChannelAuthProof is an interface that describes the proof of ownership of | ||
// a channel. | ||
type ChannelAuthProof interface { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice, this is basically a sealed interface. There're some linters we can use to implement checks for exhaustive switch statements, so then they become a bit more like sum types.
// announcement. It contains a single Schnorr signature. | ||
type ChannelAuthProof2 struct { | ||
// SchnorrSigBytes are the raw bytes of the encoded schnorr signature. | ||
SchnorrSigBytes []byte |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[schnorr.SignatureSize]byte
?
// ChannelEdgeInfo2 describes the information about a channel announced with | ||
// lnwire.ChannelAnnouncement2 that we will persist. | ||
type ChannelEdgeInfo2 struct { | ||
lnwire.ChannelAnnouncement2 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't see where this was added in this commit.
|
||
// If both bitcoin keys are not present in the announcement, then we | ||
// should previously have stored the funding script found on-chain. | ||
if pubKey1 == nil || pubKey2 == nil { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
@@ -198,3 +198,57 @@ func (c *ChannelEdgePolicy1) Sig() (input.Signature, error) { | |||
// A compile-time check to ensure that ChannelEdgePolicy1 implements the | |||
// ChannelEdgePolicy interface. | |||
var _ ChannelEdgePolicy = (*ChannelEdgePolicy1)(nil) | |||
|
|||
type ChannelEdgePolicy2 struct { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing a godoc
comment.
@@ -198,3 +198,57 @@ func (c *ChannelEdgePolicy1) Sig() (input.Signature, error) { | |||
// A compile-time check to ensure that ChannelEdgePolicy1 implements the | |||
// ChannelEdgePolicy interface. | |||
var _ ChannelEdgePolicy = (*ChannelEdgePolicy1)(nil) | |||
|
|||
type ChannelEdgePolicy2 struct { | |||
lnwire.ChannelUpdate2 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Any particular reason why we're using composition here, instead of creating new attributes for the fields we care about (potentially with more concrete types)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah I guess we can just re-use the existing serialization as well? Potentially yet another reason to TLV everywhere for the wire messages.
type ChannelEdgePolicy2 struct { | ||
lnwire.ChannelUpdate2 | ||
|
||
ToNode [33]byte |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing godoc
comment.
Also based on the comment above, I think we should also make these TLVs on disk in the db. Then we can just combine with the records above to serialize, maintaining extensibility for the future, and also re-using a ton of code to boot.
// edgeInfo2EncodingType will be used as a prefix for edge's advertised | ||
// using the ChannelAnnouncement2 message. The type indicates how the | ||
// bytes following should be deserialized. | ||
edgeInfo2EncodingType edgeInfoEncodingType = 0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why's the encoding type used, if we're using TLV at this level?
// EdgeInfo2Sig is the tlv type used within the serialisation of | ||
// ChannelEdgeInfo2 for storing the signature of the | ||
// lnwire.ChannelAnnouncement2 message. | ||
EdgeInfo2Sig = tlv.Type(1) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can use tlv.RecordT
now alongside the new structs. Most of these types already have records created for them as well.
To prepare for the addition of ChannelAuthProof2 along with a ChannelAuthProof interface, rename ChannelAuthProof to ChannelAuthProof1.
In preparation for the addition of ChannelEdgePolicy2 and a ChannelEdgePolicy interface, rename ChannelEdgePolicy to ChannelEdgePolicy1.
In preparaion for adding ChannelEdgeInfo2 and a ChannelEdgeInfo interface, rename ChannelEdgeInfo to ChannelEdgeInfo1.
Add new ChannelEdgeInfo and ChannelAuthProof interfaces and ensure that they are implemented by ChannelEdgeInfo1 and ChannelAuthProof respectively.
And ensure that ChannelEdgePolicy1 implements it.
And ensure that it implements the ChannelEdgeInfo interface.
And ensure that it implements the ChannelEdgePoicy interface.
This commit moves the serialisation, deserialisation and update functions for ChannelEdgePolicy1 and ChannelEdgeInfo1 into their own files.
In this commit, we update the `putChanEdgeInfo` function to take in the models.ChannelEdgeInfo interface. If the passed value is the legacy models.ChannelEdgeInfo1, then the encoding and decoding remains the same but if it is the new models.ChannelEdgeInfo2 then: - the encoding will be prefixed with a 0xff byte. This should not clash with the encoding of the legacy struct since that encoding will always start with a pub key (of node 1) which means it will always start with 0x02 or 0x03. - The 0xff is then followed by a type-byte which will be used to identify the encoding that follows (this is to make it future proof). For now, there is only one possible type-byte here. - This is then followed by the TLV encoding of ChannelEdgeInfo2.
Similarly to the previous commit, here we add the encoding for the new ChannelEdgePolicy2. This is done in the same was as for ChannelEdgeInfo2: - a 0xff prefix - followed by a type-byte - followed by the TLV encoding of the ChannelEdgePolicy2.
a205f32
to
8dd1fa6
Compare
@ellemouton, remember to re-request review from reviewers when ready |
Depends on #8044
This PR is part of the Gossip 1.75 epic
It does the following:
ChannelEdgeInfo
,ChannelEdgePolicy
andChannelAuthProof
types toChannelEdgeInfo1
,ChannelEdgePolicy1
andChannelAuthProof1
respectively.ChannelEdgeInfo
,ChannelEdgePolicy
andChannelAuthProof
interfaces and ensure that the existing types implement the appropriate interfaces.ChannelEdgeInfo2
,ChannelEdgePolicy2
andChannelAuthProof2
types and ensure that they implement the above interfaces.ChannelEdgeInfo2
andChannelEdgePolicy2
.There are no functional changes in this PR & the new types are not yet used here.