LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

lnchan.receive_revocation: tolerate not having htlc fail reason

Browse source 
If we get a revack after reestablish, but the fail_htlc was already
committed in a previous app-session, the fail_htlc will not be re-sent and
we will not have the reason (as it's not persisted).

fixes #6675
This commit is contained in:
SomberNight 2020-10-23 02:35:20 +02:00
parent 7110fde25d
commit ee24c74f19
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
electrum/lnchannel.py
View file

@ -997,14 +997,22 @@ class Channel(AbstractChannel):
self.lnworker.payment_sent(self, htlc.payment_hash) self.lnworker.payment_sent(self, htlc.payment_hash)
failed = self.hm.failed_in_ctn(new_ctn) failed = self.hm.failed_in_ctn(new_ctn)
for htlc in failed: for htlc in failed:
try:
error_bytes, failure_message = self._receive_fail_reasons.pop(htlc.htlc_id) error_bytes, failure_message = self._receive_fail_reasons.pop(htlc.htlc_id)
except KeyError:
error_bytes, failure_message = None, None
# if we are forwarding, save error message to disk # if we are forwarding, save error message to disk
if self.lnworker.get_payment_info(htlc.payment_hash) is None: if self.lnworker.get_payment_info(htlc.payment_hash) is None:
self.save_fail_htlc_reason(htlc.htlc_id, error_bytes, failure_message) self.save_fail_htlc_reason(htlc.htlc_id, error_bytes, failure_message)
else: else:
self.lnworker.payment_failed(self, htlc.payment_hash, error_bytes, failure_message) self.lnworker.payment_failed(self, htlc.payment_hash, error_bytes, failure_message)
def save_fail_htlc_reason(self, htlc_id, error_bytes, failure_message): def save_fail_htlc_reason(
self,
htlc_id: int,
error_bytes: Optional[bytes],
failure_message: Optional['OnionRoutingFailureMessage'],
):
error_hex = error_bytes.hex() if error_bytes else None error_hex = error_bytes.hex() if error_bytes else None
failure_hex = failure_message.to_bytes().hex() if failure_message else None failure_hex = failure_message.to_bytes().hex() if failure_message else None
self.hm.log['fail_htlc_reasons'][htlc_id] = (error_hex, failure_hex) self.hm.log['fail_htlc_reasons'][htlc_id] = (error_hex, failure_hex)

10
electrum/lnworker.py
View file

@ -59,7 +59,7 @@ from .lnutil import (Outpoint, LNPeerAddr,
BarePaymentAttemptLog, derive_payment_secret_from_payment_preimage) BarePaymentAttemptLog, derive_payment_secret_from_payment_preimage)
from .lnutil import ln_dummy_address, ln_compare_features, IncompatibleLightningFeatures from .lnutil import ln_dummy_address, ln_compare_features, IncompatibleLightningFeatures
from .transaction import PartialTxOutput, PartialTransaction, PartialTxInput from .transaction import PartialTxOutput, PartialTransaction, PartialTxInput
from .lnonion import OnionFailureCode, process_onion_packet, OnionPacket from .lnonion import OnionFailureCode, process_onion_packet, OnionPacket, OnionRoutingFailureMessage
from .lnmsg import decode_msg from .lnmsg import decode_msg
from .i18n import _ from .i18n import _
from .lnrouter import (RouteEdge, LNPaymentRoute, LNPaymentPath, is_route_sane_to_use, from .lnrouter import (RouteEdge, LNPaymentRoute, LNPaymentPath, is_route_sane_to_use,
@ -1241,7 +1241,13 @@ class LNWallet(LNWorker):
info = info._replace(status=status) info = info._replace(status=status)
self.save_payment_info(info) self.save_payment_info(info)
def payment_failed(self, chan, payment_hash: bytes, error_bytes: bytes, failure_message): def payment_failed(
self,
chan: Channel,
payment_hash: bytes,
error_bytes: Optional[bytes],
failure_message: Optional['OnionRoutingFailureMessage'],
):
self.set_payment_status(payment_hash, PR_UNPAID) self.set_payment_status(payment_hash, PR_UNPAID)
f = self.pending_payments.get(payment_hash) f = self.pending_payments.get(payment_hash)
if f and not f.cancelled(): if f and not f.cancelled():