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

fix channel closure when it was requested by the remote party

Browse source
This commit is contained in:
ThomasV 2019-02-01 18:28:35 +01:00
parent d383573bc3
commit 472e82e387
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
electrum/lnbase.py
View file

@ -1176,7 +1176,7 @@ class Peer(PrintError):
self.shutdown_received[chan_id] = asyncio.Future() self.shutdown_received[chan_id] = asyncio.Future()
self.send_shutdown(chan) self.send_shutdown(chan)
payload = await self.shutdown_received[chan_id] payload = await self.shutdown_received[chan_id]
txid = await self._shutdown(chan, payload) txid = await self._shutdown(chan, payload, True)
self.print_error('Channel closed', txid) self.print_error('Channel closed', txid)
return txid return txid
@ -1191,7 +1191,7 @@ class Peer(PrintError):
else: else:
chan = self.channels[chan_id] chan = self.channels[chan_id]
self.send_shutdown(chan) self.send_shutdown(chan)
txid = await self._shutdown(chan, payload) txid = await self._shutdown(chan, payload, False)
self.print_error('Channel closed by remote peer', txid) self.print_error('Channel closed by remote peer', txid)
def send_shutdown(self, chan: Channel): def send_shutdown(self, chan: Channel):
@ -1199,7 +1199,7 @@ class Peer(PrintError):
self.send_message('shutdown', channel_id=chan.channel_id, len=len(scriptpubkey), scriptpubkey=scriptpubkey) self.send_message('shutdown', channel_id=chan.channel_id, len=len(scriptpubkey), scriptpubkey=scriptpubkey)
@log_exceptions @log_exceptions
async def _shutdown(self, chan: Channel, payload): async def _shutdown(self, chan: Channel, payload, is_local):
# set state so that we stop accepting HTLCs # set state so that we stop accepting HTLCs
chan.set_state('CLOSING') chan.set_state('CLOSING')
while len(chan.hm.htlcs_by_direction(LOCAL, RECEIVED)) > 0: while len(chan.hm.htlcs_by_direction(LOCAL, RECEIVED)) > 0:
@ -1218,10 +1218,12 @@ class Peer(PrintError):
break break
# TODO: negociate better # TODO: negociate better
our_fee = their_fee our_fee = their_fee
# add their signature # index of our_sig
i = chan.get_local_index() i = bool(chan.get_local_index())
closing_tx.add_signature_to_txin(0, i, bh2u(der_sig_from_sig_string(our_sig) + b'\x01')) if not is_local: i = not i
closing_tx.add_signature_to_txin(0, 1-i, bh2u(der_sig_from_sig_string(their_sig) + b'\x01')) # add signatures
closing_tx.add_signature_to_txin(0, int(i), bh2u(der_sig_from_sig_string(our_sig) + b'\x01'))
closing_tx.add_signature_to_txin(0, int(not i), bh2u(der_sig_from_sig_string(their_sig) + b'\x01'))
# broadcast # broadcast
await self.network.broadcast_transaction(closing_tx) await self.network.broadcast_transaction(closing_tx)
return closing_tx.txid() return closing_tx.txid()