From f7a8e55a6aa76a2c3eda3173912889fcf5ce8e32 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Fri, 16 Jun 2023 14:03:24 +0000 Subject: [PATCH] lnworker: (trivial) clean-up which bolt-09 feature flags we set --- electrum/lnworker.py | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/electrum/lnworker.py b/electrum/lnworker.py index 89ca65136..8ece6a28e 100644 --- a/electrum/lnworker.py +++ b/electrum/lnworker.py @@ -172,27 +172,33 @@ class ErrorAddingPeer(Exception): pass # set some feature flags as baseline for both LNWallet and LNGossip # note that e.g. DATA_LOSS_PROTECT is needed for LNGossip as many peers require it -BASE_FEATURES = LnFeatures(0)\ - | LnFeatures.OPTION_DATA_LOSS_PROTECT_OPT\ - | LnFeatures.OPTION_STATIC_REMOTEKEY_OPT\ - | LnFeatures.VAR_ONION_OPT\ - | LnFeatures.PAYMENT_SECRET_OPT\ - | LnFeatures.OPTION_UPFRONT_SHUTDOWN_SCRIPT_OPT\ +BASE_FEATURES = ( + LnFeatures(0) + | LnFeatures.OPTION_DATA_LOSS_PROTECT_OPT + | LnFeatures.OPTION_STATIC_REMOTEKEY_OPT + | LnFeatures.VAR_ONION_OPT + | LnFeatures.PAYMENT_SECRET_OPT + | LnFeatures.OPTION_UPFRONT_SHUTDOWN_SCRIPT_OPT +) # we do not want to receive unrequested gossip (see lnpeer.maybe_save_remote_update) -LNWALLET_FEATURES = BASE_FEATURES\ - | LnFeatures.OPTION_DATA_LOSS_PROTECT_REQ\ - | LnFeatures.OPTION_STATIC_REMOTEKEY_REQ\ - | LnFeatures.GOSSIP_QUERIES_REQ\ - | LnFeatures.BASIC_MPP_OPT\ - | LnFeatures.OPTION_TRAMPOLINE_ROUTING_OPT_ELECTRUM\ - | LnFeatures.OPTION_SHUTDOWN_ANYSEGWIT_OPT\ - | LnFeatures.OPTION_CHANNEL_TYPE_OPT\ - | LnFeatures.OPTION_SCID_ALIAS_OPT\ - -LNGOSSIP_FEATURES = BASE_FEATURES\ - | LnFeatures.GOSSIP_QUERIES_OPT\ - | LnFeatures.GOSSIP_QUERIES_REQ\ +LNWALLET_FEATURES = ( + BASE_FEATURES + | LnFeatures.OPTION_DATA_LOSS_PROTECT_REQ + | LnFeatures.OPTION_STATIC_REMOTEKEY_REQ + | LnFeatures.GOSSIP_QUERIES_REQ + | LnFeatures.BASIC_MPP_OPT + | LnFeatures.OPTION_TRAMPOLINE_ROUTING_OPT_ELECTRUM + | LnFeatures.OPTION_SHUTDOWN_ANYSEGWIT_OPT + | LnFeatures.OPTION_CHANNEL_TYPE_OPT + | LnFeatures.OPTION_SCID_ALIAS_OPT +) + +LNGOSSIP_FEATURES = ( + BASE_FEATURES + | LnFeatures.GOSSIP_QUERIES_OPT + | LnFeatures.GOSSIP_QUERIES_REQ +) class LNWorker(Logger, EventListener, NetworkRetryManager[LNPeerAddr]):