AaronFiore/electrum
1
0
Fork 0
Code Activity

lnworker: clear paysessions dict

Browse Source
This commit is contained in:
SomberNight
2023-08-11 21:57:33 +00:00
parent 98bda60c01
commit 13864f7abe
1 changed files with 76 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
electrum/lnworker.py
View File

@@ -693,6 +693,7 @@ class PaySession(Logger):
self._amount_inflight = 0 # what we sent in htlcs (that receiver gets, without fees) self._amount_inflight = 0 # what we sent in htlcs (that receiver gets, without fees)
self._nhtlcs_inflight = 0 self._nhtlcs_inflight = 0
self.is_active = True
def diagnostic_name(self): def diagnostic_name(self):
pkey = sha256(self.payment_key) pkey = sha256(self.payment_key)
@@ -779,6 +780,14 @@ class PaySession(Logger):
def get_outstanding_amount_to_send(self) -> int: def get_outstanding_amount_to_send(self) -> int:
return self.amount_to_pay - self._amount_inflight return self.amount_to_pay - self._amount_inflight
def can_be_deleted(self) -> bool:
if self.is_active:
return False
# note: no one is consuming from sent_htlcs_q anymore
nhtlcs_resolved = self.sent_htlcs_q.qsize()
assert nhtlcs_resolved <= self._nhtlcs_inflight
return nhtlcs_resolved == self._nhtlcs_inflight
class LNWallet(LNWorker): class LNWallet(LNWorker):
@@ -1412,7 +1421,7 @@ class LNWallet(LNWorker):
raise OnionRoutingFailure(code=OnionFailureCode.TRAMPOLINE_EXPIRY_TOO_SOON, data=b'') raise OnionRoutingFailure(code=OnionFailureCode.TRAMPOLINE_EXPIRY_TOO_SOON, data=b'')
payment_key = payment_hash + payment_secret payment_key = payment_hash + payment_secret
#assert payment_key not in self._paysessions # FIXME assert payment_key not in self._paysessions
self._paysessions[payment_key] = paysession = PaySession( self._paysessions[payment_key] = paysession = PaySession(
payment_hash=payment_hash, payment_hash=payment_hash,
payment_secret=payment_secret, payment_secret=payment_secret,
@@ -1429,65 +1438,70 @@ class LNWallet(LNWorker):
# when encountering trampoline forwarding difficulties in the legacy case, we # when encountering trampoline forwarding difficulties in the legacy case, we
# sometimes need to fall back to a single trampoline forwarder, at the expense # sometimes need to fall back to a single trampoline forwarder, at the expense
# of privacy # of privacy
while True: try:
if (amount_to_send := paysession.get_outstanding_amount_to_send()) > 0: while True:
# 1. create a set of routes for remaining amount. if (amount_to_send := paysession.get_outstanding_amount_to_send()) > 0:
# note: path-finding runs in a separate thread so that we don't block the asyncio loop # 1. create a set of routes for remaining amount.
# graph updates might occur during the computation # note: path-finding runs in a separate thread so that we don't block the asyncio loop
routes = self.create_routes_for_payment( # graph updates might occur during the computation
paysession=paysession, routes = self.create_routes_for_payment(
amount_msat=amount_to_send,
full_path=full_path,
fwd_trampoline_onion=fwd_trampoline_onion,
channels=channels,
)
# 2. send htlcs
async for sent_htlc_info, cltv_delta, trampoline_onion in routes:
await self.pay_to_route(
paysession=paysession, paysession=paysession,
sent_htlc_info=sent_htlc_info, amount_msat=amount_to_send,
min_cltv_expiry=cltv_delta, full_path=full_path,
trampoline_onion=trampoline_onion, fwd_trampoline_onion=fwd_trampoline_onion,
channels=channels,
) )
# invoice_status is triggered in self.set_invoice_status when it actually changes. # 2. send htlcs
# It is also triggered here to update progress for a lightning payment in the GUI async for sent_htlc_info, cltv_delta, trampoline_onion in routes:
# (e.g. attempt counter) await self.pay_to_route(
util.trigger_callback('invoice_status', self.wallet, payment_hash.hex(), PR_INFLIGHT) paysession=paysession,
# 3. await a queue sent_htlc_info=sent_htlc_info,
htlc_log = await paysession.wait_for_one_htlc_to_resolve() # TODO maybe wait a bit, more failures might come min_cltv_expiry=cltv_delta,
log.append(htlc_log) trampoline_onion=trampoline_onion,
if htlc_log.success: )
if self.network.path_finder: # invoice_status is triggered in self.set_invoice_status when it actually changes.
# TODO: report every route to liquidity hints for mpp # It is also triggered here to update progress for a lightning payment in the GUI
# in the case of success, we report channels of the # (e.g. attempt counter)
# route as being able to send the same amount in the future, util.trigger_callback('invoice_status', self.wallet, payment_hash.hex(), PR_INFLIGHT)
# as we assume to not know the capacity # 3. await a queue
self.network.path_finder.update_liquidity_hints(htlc_log.route, htlc_log.amount_msat) htlc_log = await paysession.wait_for_one_htlc_to_resolve() # TODO maybe wait a bit, more failures might come
# remove inflight htlcs from liquidity hints log.append(htlc_log)
self.network.path_finder.update_inflight_htlcs(htlc_log.route, add_htlcs=False) if htlc_log.success:
return if self.network.path_finder:
# htlc failed # TODO: report every route to liquidity hints for mpp
if (attempts is not None and len(log) >= attempts) or (attempts is None and time.time() - paysession.start_time > self.PAYMENT_TIMEOUT): # in the case of success, we report channels of the
raise PaymentFailure('Giving up after %d attempts'%len(log)) # route as being able to send the same amount in the future,
# if we get a tmp channel failure, it might work to split the amount and try more routes # as we assume to not know the capacity
# if we get a channel update, we might retry the same route and amount self.network.path_finder.update_liquidity_hints(htlc_log.route, htlc_log.amount_msat)
route = htlc_log.route # remove inflight htlcs from liquidity hints
sender_idx = htlc_log.sender_idx self.network.path_finder.update_inflight_htlcs(htlc_log.route, add_htlcs=False)
erring_node_id = route[sender_idx].node_id return
failure_msg = htlc_log.failure_msg # htlc failed
code, data = failure_msg.code, failure_msg.data if (attempts is not None and len(log) >= attempts) or (attempts is None and time.time() - paysession.start_time > self.PAYMENT_TIMEOUT):
self.logger.info(f"UPDATE_FAIL_HTLC. code={repr(code)}. " raise PaymentFailure('Giving up after %d attempts'%len(log))
f"decoded_data={failure_msg.decode_data()}. data={data.hex()!r}") # if we get a tmp channel failure, it might work to split the amount and try more routes
self.logger.info(f"error reported by {erring_node_id.hex()}") # if we get a channel update, we might retry the same route and amount
if code == OnionFailureCode.MPP_TIMEOUT: route = htlc_log.route
raise PaymentFailure(failure_msg.code_name()) sender_idx = htlc_log.sender_idx
# trampoline erring_node_id = route[sender_idx].node_id
if self.uses_trampoline(): failure_msg = htlc_log.failure_msg
paysession.handle_failed_trampoline_htlc( code, data = failure_msg.code, failure_msg.data
htlc_log=htlc_log, failure_msg=failure_msg) self.logger.info(f"UPDATE_FAIL_HTLC. code={repr(code)}. "
else: f"decoded_data={failure_msg.decode_data()}. data={data.hex()!r}")
self.handle_error_code_from_failed_htlc( self.logger.info(f"error reported by {erring_node_id.hex()}")
route=route, sender_idx=sender_idx, failure_msg=failure_msg, amount=htlc_log.amount_msat) if code == OnionFailureCode.MPP_TIMEOUT:
raise PaymentFailure(failure_msg.code_name())
# trampoline
if self.uses_trampoline():
paysession.handle_failed_trampoline_htlc(
htlc_log=htlc_log, failure_msg=failure_msg)
else:
self.handle_error_code_from_failed_htlc(
route=route, sender_idx=sender_idx, failure_msg=failure_msg, amount=htlc_log.amount_msat)
finally:
paysession.is_active = False
if paysession.can_be_deleted():
self._paysessions.pop(payment_key)
async def pay_to_route( async def pay_to_route(
self, *, self, *,
@@ -2225,6 +2239,8 @@ class LNWallet(LNWorker):
amount_msat=shi.amount_receiver_msat, amount_msat=shi.amount_receiver_msat,
trampoline_fee_level=shi.trampoline_fee_level) trampoline_fee_level=shi.trampoline_fee_level)
q.put_nowait(htlc_log) q.put_nowait(htlc_log)
if paysession.can_be_deleted():
self._paysessions.pop(payment_key)
else: else:
key = payment_hash.hex() key = payment_hash.hex()
self.set_invoice_status(key, PR_PAID) self.set_invoice_status(key, PR_PAID)
@@ -2278,6 +2294,8 @@ class LNWallet(LNWorker):
sender_idx=sender_idx, sender_idx=sender_idx,
trampoline_fee_level=shi.trampoline_fee_level) trampoline_fee_level=shi.trampoline_fee_level)
q.put_nowait(htlc_log) q.put_nowait(htlc_log)
if paysession.can_be_deleted():
self._paysessions.pop(payment_okey)
else: else:
self.logger.info(f"received unknown htlc_failed, probably from previous session") self.logger.info(f"received unknown htlc_failed, probably from previous session")
key = payment_hash.hex() key = payment_hash.hex()