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

lnworker: dissociate htlc forwarding and fulfillment

Browse source
This commit is contained in:
ThomasV 2020-03-02 11:05:09 +01:00
parent 09675bd911
commit cfc20845a2
3 changed files with 27 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
electrum/lnchannel.py
View file

@ -430,7 +430,7 @@ class Channel(Logger):
local_ctn = self.get_latest_ctn(LOCAL) local_ctn = self.get_latest_ctn(LOCAL)
remote_ctn = self.get_latest_ctn(REMOTE) remote_ctn = self.get_latest_ctn(REMOTE)
if onion_packet: if onion_packet:
self.hm.log['unfulfilled_htlcs'][htlc.htlc_id] = local_ctn, remote_ctn, onion_packet.hex() self.hm.log['unfulfilled_htlcs'][htlc.htlc_id] = local_ctn, remote_ctn, onion_packet.hex(), False
self.logger.info("receive_htlc") self.logger.info("receive_htlc")
return htlc return htlc

4
electrum/lnpeer.py
View file

@ -1158,7 +1158,6 @@ class Peer(Logger):
dph = processed_onion.hop_data.per_hop dph = processed_onion.hop_data.per_hop
next_chan = self.lnworker.get_channel_by_short_id(dph.short_channel_id) next_chan = self.lnworker.get_channel_by_short_id(dph.short_channel_id)
next_chan_scid = dph.short_channel_id next_chan_scid = dph.short_channel_id
next_peer = self.lnworker.peers[next_chan.node_id]
local_height = self.network.get_local_height() local_height = self.network.get_local_height()
if next_chan is None: if next_chan is None:
self.logger.info(f"cannot forward htlc. cannot find next_chan {next_chan_scid}") self.logger.info(f"cannot forward htlc. cannot find next_chan {next_chan_scid}")
@ -1198,6 +1197,7 @@ class Peer(Logger):
self.logger.info(f'forwarding htlc to {next_chan.node_id}') self.logger.info(f'forwarding htlc to {next_chan.node_id}')
next_htlc = UpdateAddHtlc(amount_msat=next_amount_msat_htlc, payment_hash=htlc.payment_hash, cltv_expiry=next_cltv_expiry, timestamp=int(time.time())) next_htlc = UpdateAddHtlc(amount_msat=next_amount_msat_htlc, payment_hash=htlc.payment_hash, cltv_expiry=next_cltv_expiry, timestamp=int(time.time()))
next_htlc = next_chan.add_htlc(next_htlc) next_htlc = next_chan.add_htlc(next_htlc)
next_peer = self.lnworker.peers[next_chan.node_id]
next_peer.send_message( next_peer.send_message(
"update_add_htlc", "update_add_htlc",
channel_id=next_chan.channel_id, channel_id=next_chan.channel_id,
@ -1207,7 +1207,7 @@ class Peer(Logger):
payment_hash=next_htlc.payment_hash, payment_hash=next_htlc.payment_hash,
onion_routing_packet=processed_onion.next_packet.to_bytes() onion_routing_packet=processed_onion.next_packet.to_bytes()
) )
return next_chan, next_htlc, None return next_chan, next_peer, None
def maybe_fulfill_htlc(self, chan: Channel, htlc: UpdateAddHtlc, *, def maybe_fulfill_htlc(self, chan: Channel, htlc: UpdateAddHtlc, *,
onion_packet: OnionPacket, processed_onion: ProcessedOnionPacket): onion_packet: OnionPacket, processed_onion: ProcessedOnionPacket):

54
electrum/lnworker.py
View file

@ -1336,51 +1336,45 @@ class LNWallet(LNWorker):
continue continue
peer = self.peers[chan.node_id] peer = self.peers[chan.node_id]
done = set() done = set()
unfulfilled = chan.hm.log['unfulfilled_htlcs'] unfulfilled = chan.hm.log.get('unfulfilled_htlcs', {})
for htlc_id, (local_ctn, remote_ctn, onion_packet_hex) in unfulfilled.items(): for htlc_id, (local_ctn, remote_ctn, onion_packet_hex, forwarded) in unfulfilled.items():
# todo: decouple this from processing. # todo: decouple this from processing.
await peer.await_local(chan, local_ctn) await peer.await_local(chan, local_ctn)
await peer.await_remote(chan, remote_ctn) await peer.await_remote(chan, remote_ctn)
#
chan.logger.info(f'found unfulfilled htlc: {htlc_id}') chan.logger.info(f'found unfulfilled htlc: {htlc_id}')
onion_packet = OnionPacket.from_bytes(bytes.fromhex(onion_packet_hex)) onion_packet = OnionPacket.from_bytes(bytes.fromhex(onion_packet_hex))
htlc = chan.hm.log[REMOTE]['adds'][htlc_id] htlc = chan.hm.log[REMOTE]['adds'][htlc_id]
payment_hash = htlc.payment_hash payment_hash = htlc.payment_hash
processed_onion = process_onion_packet(onion_packet, associated_data=payment_hash, our_onion_private_key=peer.privkey) processed_onion = process_onion_packet(onion_packet, associated_data=payment_hash, our_onion_private_key=peer.privkey)
if processed_onion.are_we_final: if processed_onion.are_we_final:
preimage, reason = peer.maybe_fulfill_htlc( preimage, error = peer.maybe_fulfill_htlc(
chan=chan, chan=chan,
htlc=htlc, htlc=htlc,
onion_packet=onion_packet, onion_packet=onion_packet,
processed_onion=processed_onion) processed_onion=processed_onion)
if preimage:
await self.enable_htlc_settle.wait()
await peer._fulfill_htlc(chan, htlc.htlc_id, preimage)
else:
await peer.fail_htlc(chan, htlc.htlc_id, onion_packet, reason)
else: else:
# todo: if we are forwarding we need to test next peer's state preimage, error = None, None
# we should dissociate forwarding and fulfillment if not forwarded:
next_chan, next_htlc, reason = peer.maybe_forward_htlc( next_chan, next_peer, error = peer.maybe_forward_htlc(
chan=chan, chan=chan,
htlc=htlc, htlc=htlc,
onion_packet=onion_packet, onion_packet=onion_packet,
processed_onion=processed_onion) processed_onion=processed_onion)
if not next_chan: if not error:
await self.fail_htlc(chan, htlc.htlc_id, onion_packet, reason) unfulfilled[htlc_id] = local_ctn, remote_ctn, onion_packet_hex, True
next_remote_ctn = next_chan.get_latest_ctn(REMOTE)
await next_peer.await_remote(next_chan, next_remote_ctn)
else: else:
next_peer = self.peers[next_chan.node_id] f = self.pending_payments[payment_hash]
next_remote_ctn = next_chan.get_latest_ctn(REMOTE) if f.done():
await next_peer.await_remote(next_chan, next_remote_ctn) success, preimage, error = f.result()
success, preimage, reason = await self.await_payment(next_htlc.payment_hash) if preimage:
if success: await self.enable_htlc_settle.wait()
await peer._fulfill_htlc(chan, htlc.htlc_id, preimage) await peer._fulfill_htlc(chan, htlc.htlc_id, preimage)
self.logger.info("htlc forwarded successfully") done.add(htlc_id)
else: if error:
# TODO: test this await peer.fail_htlc(chan, htlc.htlc_id, onion_packet, error)
self.logger.info(f"forwarded htlc has failed, {reason}") done.add(htlc_id)
await peer.fail_htlc(chan, htlc.htlc_id, onion_packet, reason)
done.add(htlc_id)
# cleanup # cleanup
for htlc_id in done: for htlc_id in done:
unfulfilled.pop(htlc_id) unfulfilled.pop(htlc_id)