AaronFiore/electrum
1
0
Fork 0
Code Activity

Remove old trampoline compatibility bits from invoices

Browse Source 
bits 50/51 are now used on the network (as option_zeroconf)
This commit is contained in:
ThomasV
2022-09-29 12:05:34 +02:00
parent 95b2f6fd63
commit 4366055ada
2 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
electrum/lnutil.py
View File

@@ -1097,20 +1097,6 @@ class LnFeatures(IntFlag):
_ln_feature_contexts[OPTION_TRAMPOLINE_ROUTING_REQ] = (LNFC.INIT | LNFC.NODE_ANN | LNFC.INVOICE) _ln_feature_contexts[OPTION_TRAMPOLINE_ROUTING_REQ] = (LNFC.INIT | LNFC.NODE_ANN | LNFC.INVOICE)
_ln_feature_contexts[OPTION_TRAMPOLINE_ROUTING_OPT] = (LNFC.INIT | LNFC.NODE_ANN | LNFC.INVOICE) _ln_feature_contexts[OPTION_TRAMPOLINE_ROUTING_OPT] = (LNFC.INIT | LNFC.NODE_ANN | LNFC.INVOICE)
# allow old Electrum wallets to pay us with trampoline
OPTION_TRAMPOLINE_ROUTING_REQ_COMPAT_ELECTRUM = 1 << 24
OPTION_TRAMPOLINE_ROUTING_OPT_COMPAT_ELECTRUM = 1 << 25
_ln_feature_contexts[OPTION_TRAMPOLINE_ROUTING_REQ_COMPAT_ELECTRUM] = (LNFC.INVOICE)
_ln_feature_contexts[OPTION_TRAMPOLINE_ROUTING_OPT_COMPAT_ELECTRUM] = (LNFC.INVOICE)
# allow old Phoenix wallets to pay us with trampoline
OPTION_TRAMPOLINE_ROUTING_REQ_COMPAT_ECLAIR = 1 << 50
OPTION_TRAMPOLINE_ROUTING_OPT_COMPAT_ECLAIR = 1 << 51
_ln_feature_contexts[OPTION_TRAMPOLINE_ROUTING_REQ_COMPAT_ECLAIR] = (LNFC.INVOICE)
_ln_feature_contexts[OPTION_TRAMPOLINE_ROUTING_OPT_COMPAT_ECLAIR] = (LNFC.INVOICE)
OPTION_SHUTDOWN_ANYSEGWIT_REQ = 1 << 26 OPTION_SHUTDOWN_ANYSEGWIT_REQ = 1 << 26
OPTION_SHUTDOWN_ANYSEGWIT_OPT = 1 << 27 OPTION_SHUTDOWN_ANYSEGWIT_OPT = 1 << 27

6
electrum/trampoline.py
View File

@@ -102,11 +102,7 @@ def is_legacy_relay(invoice_features, r_tags) -> Tuple[bool, List[bytes]]:
""" """
invoice_features = LnFeatures(invoice_features) invoice_features = LnFeatures(invoice_features)
# trampoline-supporting wallets: # trampoline-supporting wallets:
# OPTION_TRAMPOLINE_ROUTING_OPT_COMPAT_ECLAIR: old Phoenix/Eclair wallets if invoice_features.supports(LnFeatures.OPTION_TRAMPOLINE_ROUTING_OPT:
# OPTION_TRAMPOLINE_ROUTING_OPT_COMPAT_ELECTRUM: old Electrum wallets
if (invoice_features.supports(LnFeatures.OPTION_TRAMPOLINE_ROUTING_OPT)
or invoice_features.supports(LnFeatures.OPTION_TRAMPOLINE_ROUTING_OPT_COMPAT_ECLAIR)
or invoice_features.supports(LnFeatures.OPTION_TRAMPOLINE_ROUTING_OPT_COMPAT_ELECTRUM)):
# If there are no r_tags (routing hints) included, the wallet doesn't have # If there are no r_tags (routing hints) included, the wallet doesn't have
# private channels and is probably directly connected to a trampoline node. # private channels and is probably directly connected to a trampoline node.
# Any trampoline node should be able to figure out a path to the receiver and # Any trampoline node should be able to figure out a path to the receiver and