AaronFiore/electrum
1
0
Fork 0
Code Activity

Reorganize code so that we can send Multi Part Payments:

Browse Source 
- LNWorker is notified about htlc events and creates payment events.
 - LNWorker._pay is a while loop that calls create_routes_from_invoice.
 - create_route_from_invoices should decide whether to split the payment,
   using graph knowledge and feedback from previous attempts (not in this commit)
 - data structures for payment logs are simplified into a single type, HtlcLog
This commit is contained in:
ThomasV
2021-01-30 16:10:51 +01:00
parent 1102ea50e8
commit f28a2aae73
6 changed files with 204 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
electrum/gui/qt/channel_details.py
View File

@@ -82,8 +82,8 @@ class ChannelDetailsDialog(QtWidgets.QDialog):
dest_mapping = self.keyname_rows[to]
dest_mapping[payment_hash] = len(dest_mapping)
ln_payment_completed = QtCore.pyqtSignal(str, bytes, bytes)
ln_payment_failed = QtCore.pyqtSignal(str, bytes, bytes)
htlc_fulfilled = QtCore.pyqtSignal(str, bytes, bytes)
htlc_failed = QtCore.pyqtSignal(str, bytes, bytes)
htlc_added = QtCore.pyqtSignal(str, Channel, UpdateAddHtlc, Direction)
state_changed = QtCore.pyqtSignal(str, Abstract_Wallet, AbstractChannel)
@@ -95,7 +95,7 @@ class ChannelDetailsDialog(QtWidgets.QDialog):
self.update()
@QtCore.pyqtSlot(str, Channel, UpdateAddHtlc, Direction)
def do_htlc_added(self, evtname, chan, htlc, direction):
def on_htlc_added(self, evtname, chan, htlc, direction):
if chan != self.chan:
return
mapping = self.keyname_rows['inflight']
@@ -103,14 +103,14 @@ class ChannelDetailsDialog(QtWidgets.QDialog):
self.folders['inflight'].appendRow(self.make_htlc_item(htlc, direction))
@QtCore.pyqtSlot(str, bytes, bytes)
def do_ln_payment_completed(self, evtname, payment_hash, chan_id):
def on_htlc_fulfilled(self, evtname, payment_hash, chan_id):
if chan_id != self.chan.channel_id:
return
self.move('inflight', 'settled', payment_hash)
self.update()
@QtCore.pyqtSlot(str, bytes, bytes)
def do_ln_payment_failed(self, evtname, payment_hash, chan_id):
def on_htlc_failed(self, evtname, payment_hash, chan_id):
if chan_id != self.chan.channel_id:
return
self.move('inflight', 'failed', payment_hash)
@@ -137,14 +137,14 @@ class ChannelDetailsDialog(QtWidgets.QDialog):
self.format_msat = lambda msat: window.format_amount_and_units(msat / 1000)
# connect signals with slots
self.ln_payment_completed.connect(self.do_ln_payment_completed)
self.ln_payment_failed.connect(self.do_ln_payment_failed)
self.htlc_fulfilled.connect(self.on_htlc_fulfilled)
self.htlc_failed.connect(self.on_htlc_failed_failed)
self.state_changed.connect(self.do_state_changed)
self.htlc_added.connect(self.do_htlc_added)
self.htlc_added.connect(self.on_htlc_added)
# register callbacks for updating
util.register_callback(self.ln_payment_completed.emit, ['ln_payment_completed'])
util.register_callback(self.ln_payment_failed.emit, ['ln_payment_failed'])
util.register_callback(self.htlc_fulfilled.emit, ['htlc_fulfilled'])
util.register_callback(self.htlc_failed.emit, ['htlc_failed'])
util.register_callback(self.htlc_added.emit, ['htlc_added'])
util.register_callback(self.state_changed.emit, ['channel'])