akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lncfg: make anchor commitments opt-in

Browse Source 
This commit reverts the anchors-by-default change, and instead make
anchor commitments and opt-in option. The plan is to enable anchors by
default further down the line.
This commit is contained in:
Johan T. Halseth 2021-01-14 09:09:42 +01:00
parent f057f2c485
commit c86761f1b3
No known key found for this signature in database
GPG Key ID: 15BAADA29DA20D26
2 changed files with 3 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lncfg/protocol.go
View File

@ -1,5 +1,3 @@
// +build !rpctest
package lncfg package lncfg
// ProtocolOptions is a struct that we use to be able to test backwards // ProtocolOptions is a struct that we use to be able to test backwards
@ -20,9 +18,8 @@ type ProtocolOptions struct {
// mini. // mini.
WumboChans bool `long:"wumbo-channels" description:"if set, then lnd will create and accept requests for channels larger chan 0.16 BTC"` WumboChans bool `long:"wumbo-channels" description:"if set, then lnd will create and accept requests for channels larger chan 0.16 BTC"`
// NoAnchors should be set if we don't want to support opening or accepting // Anchors enables anchor commitments.
// channels having the anchor commitment type. Anchors bool `long:"anchors" description:"enable support for anchor commitments"`
NoAnchors bool `long:"no-anchors" description:"disable support for anchor commitments"`
} }
// Wumbo returns true if lnd should permit the creation and acceptance of wumbo // Wumbo returns true if lnd should permit the creation and acceptance of wumbo
@ -34,5 +31,5 @@ func (l *ProtocolOptions) Wumbo() bool {
// NoAnchorCommitments returns true if we have disabled support for the anchor // NoAnchorCommitments returns true if we have disabled support for the anchor
// commitment type. // commitment type.
func (l *ProtocolOptions) NoAnchorCommitments() bool { func (l *ProtocolOptions) NoAnchorCommitments() bool {
return l.NoAnchors return !l.Anchors
} }

38
lncfg/protocol_rpctest.go
View File

@ -1,38 +0,0 @@
// +build rpctest
package lncfg
// ProtocolOptions is a struct that we use to be able to test backwards
// compatibility of protocol additions, while defaulting to the latest within
// lnd, or to enable experimental protocol changes.
type ProtocolOptions struct {
// LegacyProtocol is a sub-config that houses all the legacy protocol
// options. These are mostly used for integration tests as most modern
// nodes shuld always run with them on by default.
LegacyProtocol `group:"legacy" namespace:"legacy"`
// ExperimentalProtocol is a sub-config that houses any experimental
// protocol features that also require a build-tag to activate.
ExperimentalProtocol
// WumboChans should be set if we want to enable support for wumbo
// (channels larger than 0.16 BTC) channels, which is the opposite of
// mini.
WumboChans bool `long:"wumbo-channels" description:"if set, then lnd will create and accept requests for channels larger chan 0.16 BTC"`
// Anchors enables anchor commitments.
// TODO(halseth): transition itests to anchors instead!
Anchors bool `long:"anchors" description:"enable support for anchor commitments"`
}
// Wumbo returns true if lnd should permit the creation and acceptance of wumbo
// channels.
func (l *ProtocolOptions) Wumbo() bool {
return l.WumboChans
}
// NoAnchorCommitments returns true if we have disabled support for the anchor
// commitment type.
func (l *ProtocolOptions) NoAnchorCommitments() bool {
return !l.Anchors
}