diff --git a/server.go b/server.go index 02161bf73..830a3232c 100644 --- a/server.go +++ b/server.go @@ -542,6 +542,17 @@ func newServer(cfg *Config, listenAddrs []net.Addr, readBufferPool, cfg.Workers.Read, pool.DefaultWorkerTimeout, ) + // 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:lll featureMgr, err := feature.NewManager(feature.Config{ NoTLVOnion: cfg.ProtocolOptions.LegacyOnion(), @@ -556,6 +567,7 @@ func newServer(cfg *Config, listenAddrs []net.Addr, CustomFeatures: cfg.ProtocolOptions.CustomFeatures(), NoTaprootChans: !cfg.ProtocolOptions.TaprootChans, NoRouteBlinding: cfg.ProtocolOptions.NoRouteBlinding(), + NoRbfCoopClose: !cfg.ProtocolOptions.RbfCoopClose, }) if err != nil { return nil, err