AaronFiore/electrum
1
0
Fork 0
Code Activity

code refactoring: _maybe_fullfill_htlc, _maybe_forward_htlc

Browse Source
This commit is contained in:
ThomasV
2019-02-11 16:31:50 +01:00
parent 5d26f51ad0
commit 86b33a5637
1 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
electrum/lnpeer.py
View File

@@ -917,45 +917,50 @@ class Peer(PrintError):
htlc = {'amount_msat': amount_msat_htlc, 'payment_hash':payment_hash, 'cltv_expiry':cltv_expiry} htlc = {'amount_msat': amount_msat_htlc, 'payment_hash':payment_hash, 'cltv_expiry':cltv_expiry}
htlc_id = chan.receive_htlc(htlc) htlc_id = chan.receive_htlc(htlc)
local_ctn = chan.get_current_ctn(LOCAL) local_ctn = chan.get_current_ctn(LOCAL)
asyncio.ensure_future(self._on_update_add_htlc(chan, local_ctn, htlc_id, htlc, payment_hash, cltv_expiry, amount_msat_htlc, processed_onion)) if processed_onion.are_we_final:
asyncio.ensure_future(self._maybe_fulfill_htlc(chan, local_ctn, htlc_id, htlc, payment_hash, cltv_expiry, amount_msat_htlc, processed_onion))
else:
asyncio.ensure_future(self._maybe_forward_htlc(chan, local_ctn, htlc_id, htlc, payment_hash, cltv_expiry, amount_msat_htlc, processed_onion))
@log_exceptions @log_exceptions
async def _on_update_add_htlc(self, chan, local_ctn, htlc_id, htlc, payment_hash, cltv_expiry, amount_msat_htlc, processed_onion): async def _maybe_forward_htlc(self, chan, local_ctn, htlc_id, htlc, payment_hash, cltv_expiry, amount_msat_htlc, processed_onion):
await self.await_local(chan, local_ctn) await self.await_local(chan, local_ctn)
# Forward HTLC # Forward HTLC
# FIXME: this is not robust to us going offline before payment is fulfilled # FIXME: this is not robust to us going offline before payment is fulfilled
if not processed_onion.are_we_final: 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_peer = self.lnworker.peers[next_chan.node_id]
next_peer = self.lnworker.peers[next_chan.node_id] if next_chan is None or next_chan.get_state() != 'OPEN':
if next_chan is None or next_chan.get_state() != 'OPEN': self.print_error("cannot forward htlc", next_chan.get_state() if next_chan else None)
self.print_error("cannot forward htlc", next_chan.get_state() if next_chan else None) reason = OnionRoutingFailureMessage(code=OnionFailureCode.PERMANENT_CHANNEL_FAILURE, data=b'')
reason = OnionRoutingFailureMessage(code=OnionFailureCode.PERMANENT_CHANNEL_FAILURE, data=b'') await self.fail_htlc(chan, htlc_id, onion_packet, reason)
await self.fail_htlc(chan, htlc_id, onion_packet, reason)
return
self.print_error('forwarding htlc to', next_chan.node_id)
next_cltv_expiry = int.from_bytes(dph.outgoing_cltv_value, 'big')
next_amount_msat_htlc = int.from_bytes(dph.amt_to_forward, 'big')
next_htlc = {'amount_msat':next_amount_msat_htlc, 'payment_hash':payment_hash, 'cltv_expiry':next_cltv_expiry}
next_htlc_id = next_chan.add_htlc(next_htlc)
next_remote_ctn = next_chan.get_current_ctn(REMOTE)
next_peer.send_message(
"update_add_htlc",
channel_id=next_chan.channel_id,
id=next_htlc_id,
cltv_expiry=dph.outgoing_cltv_value,
amount_msat=dph.amt_to_forward,
payment_hash=payment_hash,
onion_routing_packet=processed_onion.next_packet.to_bytes()
)
next_peer.pending_updates[next_chan] = True
await next_peer.await_remote(next_chan, next_remote_ctn)
# wait until we get paid
preimage = await next_peer.payment_preimages[payment_hash].get()
# fulfill the original htlc
await self.fulfill_htlc(chan, htlc_id, preimage)
self.print_error("htlc forwarded successfully")
return return
self.print_error('forwarding htlc to', next_chan.node_id)
next_cltv_expiry = int.from_bytes(dph.outgoing_cltv_value, 'big')
next_amount_msat_htlc = int.from_bytes(dph.amt_to_forward, 'big')
next_htlc = {'amount_msat':next_amount_msat_htlc, 'payment_hash':payment_hash, 'cltv_expiry':next_cltv_expiry}
next_htlc_id = next_chan.add_htlc(next_htlc)
next_remote_ctn = next_chan.get_current_ctn(REMOTE)
next_peer.send_message(
"update_add_htlc",
channel_id=next_chan.channel_id,
id=next_htlc_id,
cltv_expiry=dph.outgoing_cltv_value,
amount_msat=dph.amt_to_forward,
payment_hash=payment_hash,
onion_routing_packet=processed_onion.next_packet.to_bytes()
)
next_peer.pending_updates[next_chan] = True
await next_peer.await_remote(next_chan, next_remote_ctn)
# wait until we get paid
preimage = await next_peer.payment_preimages[payment_hash].get()
# fulfill the original htlc
await self._fulfill_htlc(chan, htlc_id, preimage)
self.print_error("htlc forwarded successfully")
@log_exceptions
async def _maybe_fulfill_htlc(self, chan, local_ctn, htlc_id, htlc, payment_hash, cltv_expiry, amount_msat_htlc, processed_onion):
await self.await_local(chan, local_ctn)
try: try:
preimage, invoice = self.lnworker.get_invoice(payment_hash) preimage, invoice = self.lnworker.get_invoice(payment_hash)
except UnknownPaymentHash: except UnknownPaymentHash:
@@ -986,12 +991,11 @@ class Peer(PrintError):
await self.fail_htlc(chan, htlc_id, onion_packet, reason) await self.fail_htlc(chan, htlc_id, onion_packet, reason)
return return
self.network.trigger_callback('htlc_added', UpdateAddHtlc(**htlc, htlc_id=htlc_id), invoice, RECEIVED) self.network.trigger_callback('htlc_added', UpdateAddHtlc(**htlc, htlc_id=htlc_id), invoice, RECEIVED)
# settle htlc if self.network.config.debug_lightning_do_not_settle:
if not self.network.config.debug_lightning_do_not_settle: return
# settle htlc await self._fulfill_htlc(chan, htlc_id, preimage)
await self.fulfill_htlc(chan, htlc_id, preimage)
async def fulfill_htlc(self, chan: Channel, htlc_id: int, preimage: bytes): async def _fulfill_htlc(self, chan: Channel, htlc_id: int, preimage: bytes):
chan.settle_htlc(preimage, htlc_id) chan.settle_htlc(preimage, htlc_id)
remote_ctn = chan.get_current_ctn(REMOTE) remote_ctn = chan.get_current_ctn(REMOTE)
self.send_message("update_fulfill_htlc", self.send_message("update_fulfill_htlc",