AaronFiore/electrum
1
0
Fork 0
Code Activity

maybe_fulfill_htlc: check trampoline before hold invoice

Browse Source 
order is important: if we receive a trampoline onion for a hold
invoice, we need to peel the onion through the recursive call.
This commit is contained in:
ThomasV
2023-07-26 18:40:38 +02:00
parent 4d84769096
commit e5ac521d38
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
electrum/lnpeer.py
View File

@@ -1807,20 +1807,11 @@ class Peer(Logger):
assert payment_status is True assert payment_status is True
payment_hash = htlc.payment_hash payment_hash = htlc.payment_hash
preimage = self.lnworker.get_preimage(payment_hash)
hold_invoice_callback = self.lnworker.hold_invoice_callbacks.get(payment_hash)
if hold_invoice_callback:
if preimage:
return preimage, None
else:
# for hold invoices, trigger callback
cb, timeout = hold_invoice_callback
if int(time.time()) < timeout:
return None, lambda: cb(payment_hash)
else:
raise exc_incorrect_or_unknown_pd
# detect callback
# if there is a trampoline_onion, maybe_fulfill_htlc will be called again # if there is a trampoline_onion, maybe_fulfill_htlc will be called again
# order is important: if we receive a trampoline onion for a hold invoice, we need to peel the onion first.
if processed_onion.trampoline_onion_packet: if processed_onion.trampoline_onion_packet:
# TODO: we should check that all trampoline_onions are the same # TODO: we should check that all trampoline_onions are the same
trampoline_onion = self.process_onion_packet( trampoline_onion = self.process_onion_packet(
@@ -1836,8 +1827,10 @@ class Peer(Logger):
processed_onion=trampoline_onion, processed_onion=trampoline_onion,
onion_packet_bytes=onion_packet_bytes, onion_packet_bytes=onion_packet_bytes,
is_trampoline=True) is_trampoline=True)
assert cb is None if preimage:
return preimage, None return preimage, None
else:
return cb, None
else: else:
callback = lambda: self.maybe_forward_trampoline( callback = lambda: self.maybe_forward_trampoline(
payment_hash=payment_hash, payment_hash=payment_hash,
@@ -1846,6 +1839,19 @@ class Peer(Logger):
trampoline_onion=trampoline_onion) trampoline_onion=trampoline_onion)
return None, callback return None, callback
preimage = self.lnworker.get_preimage(payment_hash)
hold_invoice_callback = self.lnworker.hold_invoice_callbacks.get(payment_hash)
if hold_invoice_callback:
if preimage:
return preimage, None
else:
# for hold invoices, trigger callback
cb, timeout = hold_invoice_callback
if int(time.time()) < timeout:
return None, lambda: cb(payment_hash)
else:
raise exc_incorrect_or_unknown_pd
# TODO don't accept payments twice for same invoice # TODO don't accept payments twice for same invoice
# TODO check invoice expiry # TODO check invoice expiry
info = self.lnworker.get_payment_info(payment_hash) info = self.lnworker.get_payment_info(payment_hash)