Various updates

Author: Quenos

auto_policy.py

@@ -13,7 +13,8 @@
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-from PyQt5 import QtCore
+from datetime import datetime
+from scheduler.update_scheduler import UpdateScheduler
 from config.config import SystemConfiguration
 from lightning import lightning_channel
 
@@ -25,15 +26,17 @@ def __init__(self):
         self.policy2 = sc.policy2
         self.policy3 = sc.policy3
 
-        self.update()
-
-        self.timer = QtCore.QTimer()
-        self.timer.timeout.connect(self.update)
-        self.timer.start(1000 * 60 * 60)  # update once every hour
+        # register the auto policy update function, run it evey 2 hours if auto_policy flag is True in config
+        st = sc.auto_policy
+        UpdateScheduler.register('auto_policy',
+                                 self.update,
+                                 interval=2 * 60 * 60 * 1000,
+                                 start=sc.auto_policy,
+                                 immediate=sc.auto_policy)
 
     def update(self):
+        print('auto_policy entry: ' + str(datetime.now()))
         sc = SystemConfiguration()
-        sc.channel_info_update_needed = True
         for c in lightning_channel.Channels.channel_index:
             channel = lightning_channel.Channels.channel_index[c][0]
             if channel.channel_type == "open_channel":
@@ -59,3 +62,5 @@ def update(self):
                         base_fee_msat=int(self.policy3['base_fee']),
                         fee_rate=float(self.policy3['fee_rate']),
                         time_lock_delta=int(sc.default_time_lock_delta))
+        UpdateScheduler.trigger('channel_info_widget')
+        print('auto_policy exit: ' + str(datetime.now()))

balance_info_widget.py

@@ -14,6 +14,7 @@
 #
 
 from lightning import wallet_balance, channel_balance, pending_channels, lightning_channel
+from scheduler.update_scheduler import UpdateScheduler
 from PyQt5 import QtCore, QtWidgets, QtGui
 
 
@@ -162,10 +163,8 @@ def __init__(self):
         self.ratio_label.setText(str(ratio))
         self.formLayout_5.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.ratio_label)
 
-        self.timer = QtCore.QTimer()
-        self.timer.timeout.connect(self.update)
-        self.timer.start(30000)
-
+        # register the balance info widget update function, don't start a timer, but run it once
+        UpdateScheduler.register('balance_info_widget', self.update, start=False, immediate=True)
         self.show()
 
     def update(self):

channel_graph_widget.py

@@ -14,29 +14,26 @@
 #
 
 from PyQt5 import QtCore, QtWidgets, QtGui
-from config.config import SystemConfiguration
 from instruction import CenterNode, CenterNodeInstruction, ChannelGraphPicture, Node, NodeInstruction
 from lightning import lightning_node, lightning_channel
+from scheduler.update_scheduler import UpdateScheduler
 
 
 class ChannelGraphWidget(QtWidgets.QWidget):
     channels = lightning_channel.Channels()
 
-    def __init__(self, channel_info_widget):
+    def __init__(self):
         super().__init__()
         self._stop_repaint = False
         self.pen_width = 2
-        self.channel_info_widget = channel_info_widget
-        self.update()
-        self.timer = QtCore.QTimer()
-        self.timer.timeout.connect(self.update)
-        self.timer.start(1000 * 60 * 60)  # update once every hour
+
+        # register the channel graph widget update function, but don't start an automatic update, but run it once
+        UpdateScheduler.register('channel_graph_widget', self.update, start=False, immediate=True)
 
         self.show()
 
     def update(self):
         ChannelGraphPicture.reset()
-        ChannelGraphWidget.channels.read_channels()
         self._stop_repaint = True
         # draw center node (HomeNode - your node)
         home_node = None
@@ -64,7 +61,7 @@ def update(self):
                 instruction = NodeInstruction(node, pen, channel.chan_id)
                 ChannelGraphPicture.instructions.append(instruction)
         if ChannelGraphPicture.instructions[1]:
-            self.channel_info_widget.update(ChannelGraphPicture.instructions[1].chan_id)
+            UpdateScheduler.trigger('channel_info_widget', ChannelGraphPicture.instructions[1].chan_id)
         self._stop_repaint = False
 
     def paintEvent(self, event):
@@ -73,15 +70,11 @@ def paintEvent(self, event):
             instruction.paint(self, qp)
 
     def mousePressEvent(self, event):
-        sc = SystemConfiguration()
-        temp_update_needed = sc.channel_info_update_needed
-        sc.channel_info_update_needed = False
         for i in ChannelGraphPicture.instructions:
             if isinstance(i, NodeInstruction):
                 try:
                     if i.get_window_position().contains(event.pos()):
-                        self.channel_info_widget.update(i.chan_id)
+                        UpdateScheduler.trigger('channel_info_widget', i.chan_id)
                         break
                 except AttributeError:
-                    sc.channel_info_update_needed = temp_update_needed
-        sc.channel_info_update_needed = temp_update_needed
+                    pass

channel_info_widget.py

@@ -14,10 +14,12 @@
 #
 
 from datetime import date
+import urllib.error
 from lightning import lightning_channel
 from PyQt5 import QtCore, QtWidgets, QtGui
 from stylesheets.dark_theme import DarkTheme
 from lightning.fwding_event import FwdingEvents
+from scheduler.update_scheduler import UpdateScheduler
 from utils.block_explorer import open_block_explorer
 from config.config import SystemConfiguration
 
@@ -156,7 +158,7 @@ def reject(self):
             self.parent.fee_rate = -1
             self.hide()
 
-    def __init__(self, channel_id=0):
+    def __init__(self):
         super().__init__()
 
         sc = SystemConfiguration()
@@ -170,7 +172,7 @@ def __init__(self, channel_id=0):
         self.fee_rate = sc.default_fee_rate
         self.time_lock_delta = sc.default_time_lock_delta
 
-        self.channel_id = channel_id
+        # self.channel_id = channel_id
         self.channel_name_label = QtWidgets.QLabel(self)
         self.channel_name_label.setGeometry(QtCore.QRect(200, 0, 700, 60))
         font = QtGui.QFont()
@@ -398,6 +400,14 @@ def __init__(self, channel_id=0):
         self.date_label.setTextInteractionFlags(QtCore.Qt.TextSelectableByMouse)
         self.formLayout_3.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.date_label)
 
+        self.label_304 = QtWidgets.QLabel(self.formLayoutWidget_3)
+        self.label_304.setObjectName("label_304")
+        self.formLayout_3.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_304)
+        self.date_created_label = QtWidgets.QLabel(self.formLayoutWidget_3)
+        self.date_created_label.setObjectName("date_created_label")
+        self.date_created_label.setTextInteractionFlags(QtCore.Qt.TextSelectableByMouse)
+        self.formLayout_3.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.date_created_label)
+
         self.formLayoutWidget_4 = QtWidgets.QWidget(self)
         self.formLayoutWidget_4.setGeometry(QtCore.QRect(0, 280, 900, 150))
         self.formLayoutWidget_4.setObjectName("formLayoutWidget_3")
@@ -498,26 +508,26 @@ def __init__(self, channel_id=0):
         self.label_301.setText('Total forwarded amount out:')
         self.label_302.setText('Total fees received:')
         self.label_303.setText('Date last forward (UTC):')
+        self.label_304.setText('Date channel creation:')
 
-        if self.channel_id != 0:
-            self.update(channel_id)
-        # don't show the object yet, because it is forward created
-        # in order for the channel list to access this object
-        # to update info
+        for c in lightning_channel.Channels.channel_index:
+            self.update(channel_id=c)
+            break
 
-        self.timer = QtCore.QTimer()
-        self.timer.timeout.connect(lambda: self.update(self.channel_id))
-        self.timer.start(1000 * 60 * 5)  # update once 5 minutes
+        self.show()
 
-    def update(self, channel_id):
-        sc = SystemConfiguration()
-        self.channel_id = channel_id
-        if sc.channel_info_update_needed:
-            lightning_channel.Channels.read_channels()
-            sc.channel_info_update_needed = False
+        # register the channel info widget update function, but don't start an automatic update
+        UpdateScheduler.register('channel_info_widget', self.update, start=False, immediate=False)
+
+    def update(self, channel_id=None):
+        if channel_id is not None:
+            self.channel_id = channel_id
+
+        if self.channel_id is None:
+            return
 
         self.forwarding_events = FwdingEvents()
-        channel = lightning_channel.Channels.channel_index[channel_id][0]
+        channel = lightning_channel.Channels.channel_index[self.channel_id][0]
         if channel.channel_state == lightning_channel.Channel.ChannelState.ACTIVE:
             self.reconnect_push_button.hide()
         else:
@@ -564,14 +574,20 @@ def update(self, channel_id):
             self.date_label.setText(str(date.fromtimestamp(last_forward)))
         else:
             self.date_label.setText('---')
+        try:
+            self.date_created_label.setText(str(date.fromtimestamp(channel.creation_date)))
+        except urllib.error.URLError:
+            self.date_created_label.setText('Unable to determine')
+
 
     def reconnect_channel(self, event):
         try:
             channel = lightning_channel.Channels.channel_index[self.channel_id][0]
             channel.reconnect()
-            sc = SystemConfiguration()
-            sc.channel_info_update_needed = True
-            self.update(self.channel_id)
+
+            lightning_channel.Channels.read_channels()
+            UpdateScheduler.trigger('channel_info_widget', self.channel_id)
+
             if self.active_label.text() == 'INACTIVE':
                 mb = QtWidgets.QMessageBox()
                 mb.about(self, "Reconnect error", "Unable to reconnect with node. Try again later")
@@ -604,6 +620,6 @@ def set_channel_policy(self):
                                                              base_fee_msat=self.base_fee_msat,
                                                              fee_rate=self.fee_rate,
                                                              time_lock_delta=self.time_lock_delta)
-            sc = SystemConfiguration()
-            sc.channel_info_update_needed = True
-            self.update(self.channel_id)
+
+            lightning_channel.Channels.read_channels()
+            UpdateScheduler.trigger('channel_info_widget', self.channel_id)

conductor.py

@@ -23,7 +23,7 @@
 from node_info_widget import NodeInfoWidget
 from stylesheets.dark_theme import DarkTheme
 from config.config import SystemConfiguration
-from lightning import test_lnd_connection
+from lightning import test_lnd_connection, lightning_channel
 from auto_policy import AutoPolicy
 
 from PyQt5 import QtCore, QtWidgets, QtGui
@@ -57,6 +57,9 @@ def __init__(self):
         self.settings_dialog = None
         self.node_info_dialog = None
 
+        # read the channels for this node, to be used by the other widgets
+        lightning_channel.Channels.read_channels()
+
         self.resize(50, 50)
         centralwidget = QtWidgets.QWidget(self)
         centralwidget.setObjectName("centralwidget")
@@ -87,14 +90,10 @@ def __init__(self):
         action_menu = menubar.addMenu('&Action')
         action_menu.addAction(open_channel_action)
 
-        # Channel List and Channel Graph need access to the ChannelInfoWidget to display info
-        # create the channel info widget to be used by the channel list and graph
-        self.channelInfoWidget = ChannelInfoWidget()
-
         self.dockGraphWidget = QtWidgets.QDockWidget("Lightning Channel Graph", self)
         self.dockGraphWidget.setMinimumSize(QtCore.QSize(1035, 440))
         self.dockGraphWidget.setObjectName("dockGraphWidget")
-        self.dockGraphWidget.setWidget(ChannelGraphWidget(self.channelInfoWidget))
+        self.dockGraphWidget.setWidget(ChannelGraphWidget())
         self.addDockWidget(QtCore.Qt.DockWidgetArea(1), self.dockGraphWidget)
 
         self.dockPendingChannelsWidget = QtWidgets.QDockWidget("Pending Channels", self)
@@ -106,7 +105,7 @@ def __init__(self):
         self.dockInfoWidget = QtWidgets.QDockWidget("Lightning Channel Info", self)
         self.dockInfoWidget.setMinimumSize(QtCore.QSize(800, 440))
         self.dockInfoWidget.setObjectName("dockInfoWidget")
-        self.dockInfoWidget.setWidget(self.channelInfoWidget)
+        self.dockInfoWidget.setWidget(ChannelInfoWidget())
         self.addDockWidget(QtCore.Qt.DockWidgetArea(QtCore.Qt.LeftDockWidgetArea), self.dockInfoWidget)
 
         self.dockNodeInfoWidget = QtWidgets.QDockWidget("Node Info", self)
@@ -123,10 +122,6 @@ def __init__(self):
 
         self.auto_policy = AutoPolicy()
 
-        # because the containing view for ChannelInfoWidget did not exist on time of creation
-        # of the object, the object can not show itself
-        self.channelInfoWidget.show()
-
     def settings(self):
         self.settings_dialog = SettingsDialog()
         self.settings_dialog.setModal(True)
@@ -141,10 +136,6 @@ def settings(self):
     def open_channel(self):
         self.dockNodeInfoWidget.show()
 
-    @staticmethod
-    def open_block_explorer(link_str):
-        QtGui.QDesktopServices.openUrl(QtCore.QUrl(link_str))
-
 
 if __name__ == "__main__":
     app = QtWidgets.QApplication(sys.argv)

config/conductor.conf

@@ -6,12 +6,14 @@ tls_cert = /home/coen/data
 lnd_rpc_address = 192.168.0.110
 lnd_rpc_port = 10009
 
+#section [SETTING] is optional, when present all the option below must be defined
 [SETTINGS]
 default_sat_per_byte = 1
 default_base_fee_msat = 1000
 default_fee_rate = 0.000001
 default_time_lock_delta = 144
 
+# section [POLICY] is optional, if present all the below options must be defined
 [POLICY]
 # if local balance divided by remote balance >= policy1_perc
 # in the case below if the local balance is at least 4 times
@@ -33,3 +35,6 @@ policy2_fee_rate = 0.000001
 policy3_perc = 0
 policy3_base_fee = 5000
 policy3_fee_rate = 0.000001
+
+# the automatic policy update is run from the start and run every 2 hours when option is set to True
+auto_policy = True