Improved update after channel policy changes

Author: Quenos

auto_policy.py

@@ -33,9 +33,9 @@ def __init__(self):
 
     def update(self):
         sc = SystemConfiguration()
+        sc.channel_info_update_needed = True
         for c in lightning_channel.Channels.channel_index:
             channel = lightning_channel.Channels.channel_index[c][0]
-            x = channel.remote_pubkey
             if channel.channel_type == "open_channel":
                 if channel.remote_balance == 0:
                     balance_ratio = 100000.0

channel_graph_widget.py

@@ -14,6 +14,7 @@
 #
 
 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
 
@@ -50,7 +51,7 @@ def update(self):
         pen = QtGui.QPen(colour, self.pen_width)
 
         instruction = CenterNodeInstruction(center_node, pen)
-        ChannelGraphPicture._instructions.append(instruction)
+        ChannelGraphPicture.instructions.append(instruction)
 
         # draw the nodes and channels connect to the center node
         for c in lightning_channel.Channels.channel_index:
@@ -61,22 +62,26 @@ def update(self):
                 pen = QtGui.QPen(colour, self.pen_width)
                 node = Node(channel.remote_node_alias)
                 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)
+                ChannelGraphPicture.instructions.append(instruction)
+        if ChannelGraphPicture.instructions[1]:
+            self.channel_info_widget.update(ChannelGraphPicture.instructions[1].chan_id)
         self._stop_repaint = False
 
     def paintEvent(self, event):
         qp = QtGui.QPainter(self)
-        for instruction in ChannelGraphPicture._instructions:
+        for instruction in ChannelGraphPicture.instructions:
             instruction.paint(self, qp)
 
     def mousePressEvent(self, event):
-        for i in ChannelGraphPicture._instructions:
+        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)
                         break
                 except AttributeError:
-                    pass
+                    sc.channel_info_update_needed = temp_update_needed
+        sc.channel_info_update_needed = temp_update_needed

channel_info_widget.py

@@ -505,10 +505,16 @@ def __init__(self, channel_id=0):
         # in order for the channel list to access this object
         # to update info
 
-    def update(self, channel_id, cold_update=False):
+        self.timer = QtCore.QTimer()
+        self.timer.timeout.connect(lambda: self.update(self.channel_id))
+        self.timer.start(1000 * 60 * 5)  # update once 5 minutes
+
+    def update(self, channel_id):
+        sc = SystemConfiguration()
         self.channel_id = channel_id
-        if cold_update:
+        if sc.channel_info_update_needed:
             lightning_channel.Channels.read_channels()
+            sc.channel_info_update_needed = False
 
         self.forwarding_events = FwdingEvents()
         channel = lightning_channel.Channels.channel_index[channel_id][0]
@@ -563,7 +569,9 @@ def reconnect_channel(self, event):
         try:
             channel = lightning_channel.Channels.channel_index[self.channel_id][0]
             channel.reconnect()
-            self.update(self.channel_id, cold_update=True)
+            sc = SystemConfiguration()
+            sc.channel_info_update_needed = True
+            self.update(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")
@@ -596,4 +604,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)
-            self.update(self.channel_id, cold_update=True)
+            sc = SystemConfiguration()
+            sc.channel_info_update_needed = True
+            self.update(self.channel_id)

config/conductor.conf

@@ -13,14 +13,23 @@ default_fee_rate = 0.000001
 default_time_lock_delta = 144
 
 [POLICY]
+# if local balance divided by remote balance >= policy1_perc
+# in the case below if the local balance is at least 4 times
+# larger than the remote balance of a channel, policy 1 will be set (no fees)
 policy1_perc = 4
 policy1_base_fee = 0
 policy1_fee_rate = 0.000001
 
+#elsif local balance divided by remote balance >= policy2_perc
+# in the case below if the local balance is between 4 times smaller and 4 times larger
+# policy 2 will be set (2500 msat)
 policy2_perc = 0.25
 policy2_base_fee = 2500
 policy2_fee_rate = 0.000001
 
+#else
+# in all other cases policy three will be used (5000 msat)
+# so if if the local balance is more than 4 times smaller in this case
 policy3_perc = 0
 policy3_base_fee = 5000
 policy3_fee_rate = 0.000001

config/config.py

@@ -43,6 +43,8 @@ def __init__(self):
         self._policy2 = None
         self._policy3 = None
 
+        self._channel_info_update_needed = False
+
     @property
     def admin_macaroon_directory(self):
         return self._admin_macaroon_directory
@@ -131,6 +133,14 @@ def policy3(self):
     def policy3(self, value):
         self._policy3 = value
 
+    @property
+    def channel_info_update_needed(self):
+        return self._channel_info_update_needed
+
+    @channel_info_update_needed.setter
+    def channel_info_update_needed(self, value):
+        self._channel_info_update_needed = value
+
     def read_config(self):
         if not os.path.isfile('./config/conductor.conf'):
             raise FileNotFoundError

instruction.py

@@ -226,14 +226,14 @@ def reset(self):
 
 
 class ChannelGraphPicture(object):
-    _instructions = []
+    instructions = []
 
     @staticmethod
     def reset():
-        for instruction in ChannelGraphPicture._instructions:
+        for instruction in ChannelGraphPicture.instructions:
             instruction.reset()
         Node.reset()
-        ChannelGraphPicture._instructions = []
+        ChannelGraphPicture.instructions = []
 
 
 class Node(object):