diff --git a/lncfg/protocol.go b/lncfg/protocol.go index 5e1be5e6..880ae62c 100644 --- a/lncfg/protocol.go +++ b/lncfg/protocol.go @@ -17,6 +17,10 @@ type ProtocolOptions struct { // (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"` + + // NoAnchors should be set if we don't want to support opening or accepting + // channels having the anchor commitment type. + NoAnchors bool `long:"no-anchors" description:"disable support for anchor commitments"` } // Wumbo returns true if lnd should permit the creation and acceptance of wumbo @@ -24,3 +28,9 @@ type ProtocolOptions struct { 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.NoAnchors +} diff --git a/lncfg/protocol_experimental_off.go b/lncfg/protocol_experimental_off.go index 20d1ce48..a4f32c03 100644 --- a/lncfg/protocol_experimental_off.go +++ b/lncfg/protocol_experimental_off.go @@ -6,9 +6,3 @@ package lncfg // features that also require a build-tag to activate. type ExperimentalProtocol struct { } - -// AnchorCommitments returns true if support for the anchor commitment type -// should be signaled. -func (l *ExperimentalProtocol) AnchorCommitments() bool { - return false -} diff --git a/lncfg/protocol_experimental_on.go b/lncfg/protocol_experimental_on.go index dac8cfea..d12fb982 100644 --- a/lncfg/protocol_experimental_on.go +++ b/lncfg/protocol_experimental_on.go @@ -5,13 +5,4 @@ package lncfg // ExperimentalProtocol is a sub-config that houses any experimental protocol // features that also require a build-tag to activate. type ExperimentalProtocol struct { - // Anchors should be set if we want to support opening or accepting - // channels having the anchor commitment type. - Anchors bool `long:"anchors" description:"EXPERIMENTAL: enable experimental support for anchor commitments, won't work with watchtowers"` -} - -// AnchorCommitments returns true if support for the anchor commitment type -// should be signaled. -func (l *ExperimentalProtocol) AnchorCommitments() bool { - return l.Anchors } diff --git a/server.go b/server.go index 7b440ec0..5291b566 100644 --- a/server.go +++ b/server.go @@ -404,7 +404,7 @@ func newServer(cfg *Config, listenAddrs []net.Addr, featureMgr, err := feature.NewManager(feature.Config{ NoTLVOnion: cfg.ProtocolOptions.LegacyOnion(), NoStaticRemoteKey: cfg.ProtocolOptions.NoStaticRemoteKey(), - NoAnchors: !cfg.ProtocolOptions.AnchorCommitments(), + NoAnchors: cfg.ProtocolOptions.NoAnchorCommitments(), NoWumbo: !cfg.ProtocolOptions.Wumbo(), }) if err != nil {