From 429bbf33ef6aad7fdb812ac7aca2f4ff60b63c7f Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Tue, 5 Mar 2024 00:19:19 -0600 Subject: [PATCH] server: thread through new NoRbfCoopClose option For now, we disallow the option to be used with the taproot chans option, as the new flow hasn't yet been updated for nonce usage. --- server.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/server.go b/server.go index 5d21e3e7e..c771ffc5c 100644 --- a/server.go +++ b/server.go @@ -612,6 +612,17 @@ func newServer(cfg *Config, listenAddrs []net.Addr, "aux controllers") } + // For now, the RBF coop close flag and the taproot channel type cannot + // be used together. + // + // TODO(roasbeef): fix + if cfg.ProtocolOptions.RbfCoopClose && + cfg.ProtocolOptions.TaprootChans { + + return nil, fmt.Errorf("RBF coop close and taproot " + + "channels cannot be used together") + } + //nolint:ll featureMgr, err := feature.NewManager(feature.Config{ NoTLVOnion: cfg.ProtocolOptions.LegacyOnion(), @@ -629,6 +640,7 @@ func newServer(cfg *Config, listenAddrs []net.Addr, NoRouteBlinding: cfg.ProtocolOptions.NoRouteBlinding(), NoExperimentalEndorsement: cfg.ProtocolOptions.NoExperimentalEndorsement(), NoQuiescence: cfg.ProtocolOptions.NoQuiescence(), + NoRbfCoopClose: !cfg.ProtocolOptions.RbfCoopClose, }) if err != nil { return nil, err