port changes from common-finality exporter to avail-finality

exporters/avail/finality_exporter.py

@@ -22,6 +22,7 @@
 import threading
 import logging
 import traceback
+import random
 from functions import SUBSTRATE_INTERFACE, get_chain_info, get_keys, ss58_convert
 from _thread import interrupt_main
 from collections import deque
@@ -87,6 +88,8 @@ def get_votes(url, substrate_interface):
     while True:
         try:
             d = substrate_interface.rpc_request(method='grandpa_roundState')
+            if url in q_outaged:
+                q_outaged.remove(url)
             d = d['result']['best']
             if d['round'] != rd and len(r) != 0:
                 q_votes_raw.append(r)
@@ -97,8 +100,6 @@ def get_votes(url, substrate_interface):
             r[rd]['prevotes'] = d['prevotes']['missing']
             r[rd]['precommits'] = d['precommits']['missing']
 
-            if url in q_outaged:
-                q_outaged.remove(url)
         except Exception:
             if url not in q_outaged:
                 q_outaged.append(url)
@@ -176,6 +177,7 @@ def construct_metrics(active_validators, grandpa_keys, votes_threshold, current_
 
 
 def main():
+    substrate_interface = SUBSTRATE_INTERFACE(random.choice(rpc_endpoints), chain)
     while True:
         try:
             for i in q_outaged:
@@ -212,19 +214,14 @@ def main():
     rpc_count = len(rpc_endpoints)
     thread_count = 3
 
-    substrate_interface = SUBSTRATE_INTERFACE(rpc_endpoints[0])
-
     q_metrics = deque([])
     q_votes_raw = deque([], maxlen=rpc_count * thread_count * 15)
     q_rounds_processed = deque([], maxlen=100)
     q_outaged = deque([], maxlen=30)
 
     for url in rpc_endpoints:
         for i in range(thread_count):
-            if url == rpc_endpoints[0]:
-                th = threading.Thread(target=get_votes, args=(url, substrate_interface))
-            else:
-                th = threading.Thread(target=get_votes, args=(url, SUBSTRATE_INTERFACE(url)))
+            th = threading.Thread(target=get_votes, args=(url, SUBSTRATE_INTERFACE(url)))
             th.daemon = True
             th.start()
             time.sleep(0.2)

exporters/avail/functions.py

@@ -43,7 +43,11 @@ def request(self, module: str, function: str, params: str = None):
             r = None
 
     def rpc_request(self, method: str, params: str = None):
-        return self.substrate.rpc_request(method=method, params=params)
+        try:
+            return self.substrate.rpc_request(method=method, params=params)
+        except Exception as e:
+            self.substrate.connect_websocket()
+            logging.critical('The substrate api request failed with error ' + str(e))
 
 
 def get_era_points(data):

exporters/common/finality_exporter.py

@@ -105,7 +105,7 @@ def get_votes(url, substrate_interface):
                 q_outaged.append(url)
             time.sleep(1)
             substrate_interface.connect_websocket()
-
+            pass
 
 def construct_metrics(active_validators, grandpa_keys, votes_threshold, current_session):
     data = q_votes_raw.copy()

exporters/github_release/projects.yml

@@ -5,3 +5,4 @@ projects:
   Moonbeam: https://api.github.com/repos/PureStake/moonbeam/releases/latest
   Acala: https://api.github.com/repos/AcalaNetwork/Acala/releases/latest
   Astar: https://api.github.com/repos/PlasmNetwork/Astar/releases/latest
+  Avail: https://api.github.com/repos/availproject/avail/releases/latest