From 6142c7bb45c1e597bc875ffdd26eb6d0c08121e3 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 25 May 2021 10:31:04 +0930 Subject: [PATCH] lightningd: option_shutdown_anysegwit is no longer experimental. https://github.com/lightningnetwork/lightning-rfc/pull/672 was merged. Signed-off-by: Rusty Russell Changelog-Added: Protocol: `option_shutdown_anysegwit` allows future segwit versions on shutdown transactions. --- common/features.c | 2 -- lightningd/lightningd.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/common/features.c b/common/features.c index 2ea1c0403e9a..681fdc334e99 100644 --- a/common/features.c +++ b/common/features.c @@ -86,12 +86,10 @@ static const struct feature_style feature_styles[] = { [NODE_ANNOUNCE_FEATURE] = FEATURE_REPRESENT, [BOLT11_FEATURE] = FEATURE_REPRESENT, [CHANNEL_FEATURE] = FEATURE_DONT_REPRESENT} }, -#if EXPERIMENTAL_FEATURES { OPT_SHUTDOWN_ANYSEGWIT, .copy_style = { [INIT_FEATURE] = FEATURE_REPRESENT, [NODE_ANNOUNCE_FEATURE] = FEATURE_REPRESENT, [CHANNEL_FEATURE] = FEATURE_DONT_REPRESENT } }, -#endif }; struct dependency { diff --git a/lightningd/lightningd.c b/lightningd/lightningd.c index 4ae92196386d..ca9a1ae97e7a 100644 --- a/lightningd/lightningd.c +++ b/lightningd/lightningd.c @@ -802,10 +802,10 @@ static struct feature_set *default_features(const tal_t *ctx) OPTIONAL_FEATURE(OPT_BASIC_MPP), OPTIONAL_FEATURE(OPT_GOSSIP_QUERIES_EX), OPTIONAL_FEATURE(OPT_STATIC_REMOTEKEY), + OPTIONAL_FEATURE(OPT_SHUTDOWN_ANYSEGWIT), #if EXPERIMENTAL_FEATURES OPTIONAL_FEATURE(OPT_ANCHOR_OUTPUTS), OPTIONAL_FEATURE(OPT_ONION_MESSAGES), - OPTIONAL_FEATURE(OPT_SHUTDOWN_ANYSEGWIT), #endif };