LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-11 21:19:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove our closed channels from channeldb. note some FIXMEs

Browse source 
payment were attempting to use the closed channels.
This commit is contained in:
SomberNight 2018-08-16 15:58:02 +02:00
parent b3c21aa8d8
commit 7baf428cb8
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
electrum/lnbase.py
View file

@ -748,6 +748,7 @@ class Peer(PrintError):
def mark_open(self, chan): def mark_open(self, chan):
if chan.get_state() == "OPEN": if chan.get_state() == "OPEN":
return return
# NOTE: even closed channels will be temporarily marked "OPEN"
assert chan.local_state.funding_locked_received assert chan.local_state.funding_locked_received
chan.set_state("OPEN") chan.set_state("OPEN")
self.network.trigger_callback('channel', chan) self.network.trigger_callback('channel', chan)
@ -833,7 +834,8 @@ class Peer(PrintError):
@aiosafe @aiosafe
async def pay(self, path, chan, amount_msat, payment_hash, pubkey_in_invoice, min_final_cltv_expiry): async def pay(self, path, chan, amount_msat, payment_hash, pubkey_in_invoice, min_final_cltv_expiry):
assert chan.get_state() == "OPEN" # FIXME aiosafe is breaking "raise PaymentFailure"
assert chan.get_state() == "OPEN", chan.get_state()
assert amount_msat > 0, "amount_msat is not greater zero" assert amount_msat > 0, "amount_msat is not greater zero"
height = self.network.get_local_height() height = self.network.get_local_height()
@ -856,10 +858,15 @@ class Peer(PrintError):
msat_remote = chan.remote_state.amount_msat + amount_msat msat_remote = chan.remote_state.amount_msat + amount_msat
htlc = UpdateAddHtlc(amount_msat, payment_hash, final_cltv_expiry_with_deltas) htlc = UpdateAddHtlc(amount_msat, payment_hash, final_cltv_expiry_with_deltas)
# FIXME if we raise here, this channel will not get blacklisted, and the payment can never succeed,
# as we will just keep retrying this same path. using the current blacklisting is not a solution as
# then no other payment can use this channel either.
# we need finer blacklisting -- e.g. a blacklist for just this "payment session"?
# or blacklist entries could store an msat value and also expire
if len(chan.htlcs_in_local) + 1 > chan.remote_config.max_accepted_htlcs: if len(chan.htlcs_in_local) + 1 > chan.remote_config.max_accepted_htlcs:
raise PaymentFailure('too many HTLCs already in channel') raise PaymentFailure('too many HTLCs already in channel')
if chan.htlcsum(chan.htlcs_in_local) + amount_msat > chan.remote_config.max_htlc_value_in_flight_msat: if chan.htlcsum(chan.htlcs_in_local) + amount_msat > chan.remote_config.max_htlc_value_in_flight_msat:
raise PaymentFailure('HTLC value sum would exceed max allowed') raise PaymentFailure('HTLC value sum would exceed max allowed: {} msat'.format(chan.remote_config.max_htlc_value_in_flight_msat))
if msat_local < 0: if msat_local < 0:
# FIXME what about channel_reserve_satoshis? will the remote fail the channel if we go below? test. # FIXME what about channel_reserve_satoshis? will the remote fail the channel if we go below? test.
raise PaymentFailure('not enough local balance') raise PaymentFailure('not enough local balance')

1
electrum/lnworker.py
View file

@ -124,6 +124,7 @@ class LNWorker(PrintError):
if chan.funding_outpoint not in outpoints: if chan.funding_outpoint not in outpoints:
chan.set_funding_txo_spentness(True) chan.set_funding_txo_spentness(True)
chan.set_state("CLOSED") chan.set_state("CLOSED")
self.channel_db.remove_channel(chan.short_channel_id)
# FIXME is this properly GC-ed? (or too soon?) # FIXME is this properly GC-ed? (or too soon?)
LNChanCloseHandler(self.network, self.wallet, chan) LNChanCloseHandler(self.network, self.wallet, chan)
else: else: