Merge branch 'fix(web)/staking-refetch-and-improving-fetching-timing' into fix(web)/dashboard-data-and-wallet-connection

Author: alcercu

bot-pinner/README.md

@@ -15,7 +15,8 @@ $ docker-compose up -d
 
 1. Standard IPFS container which creates a local mount for data
 2. Evidence container that awaits new events and then scrapes the latest hashes and submits it to IPFS.
-
+3. `src/peers.txt` contains a list of peers, by default it will add connects to Estuary & Kleros IPFS nodes. This should make it easier to find content by creating a data network around Kleros Court V2.
+   1. Adding these peers will make it easier to find and replicate content.
 ## DappNode
 
 :warning: For the following steps, you need access to [a DappNode](https://dappnode.io) system with the IPFS service running.

bot-pinner/docker-compose.yml

@@ -20,7 +20,7 @@ services:
         - ./court/:/var/lib/data/
         - ./watchlist/:/var/lib/watchlist/
       environment:
-          RPC: "https://rinkeby.arbitrum.io/rpc"
+          RPC: "https://arb-goerli.g.alchemy.com/v2/<key>"
           IPFS: "http://localhost:5001/api/v0"
           INTERVAL: 300
           RETRY: 2

bot-pinner/src/add_hashes.py

@@ -2,21 +2,23 @@
 import requests
 import os
 import time
-from tooling import motd, create_logger, port_up
+from tooling import motd, create_logger
 import json
 import glob
 
 
-logger = create_logger()
-motd()
+
+
 
 # Init
 RPC = os.environ.get("RPC", "http://localhost:8545")
 IPFS = os.environ.get("IPFS", "http://ipfs-cluster.dappnode:9094")
 INTERVAL = os.environ.get("INTERVAL", 600)  # Events are not constantly listened to, instead it checks per INTERVAL.
-RETRY = int(os.environ.get("RETRY", 0)) # Retry interval value
+RETRY = int(os.environ.get("RETRY", 0))  # Retry interval value
 attempted_retries = dict()
 
+logger = create_logger(IPFS)
+
 # Contract / RPC
 w3 = Web3(Web3.HTTPProvider(RPC))
 
@@ -36,6 +38,7 @@
 except FileNotFoundError:
     pass
 
+
 def main():
     block_number = block
     tasks = ["Evidence"]
@@ -75,12 +78,14 @@ def retry_hashes():
             attempted_retries[_hash] += 1
         if RETRY == 0 or attempted_retries[_hash] < RETRY:
             add_hash(_hash)
-        elif attempted_retries[_hash] > int(RETRY + 10): 
+        elif attempted_retries[_hash] > int(RETRY + 10):
             attempted_retries[_hash] = int(RETRY - 2) # Reset the search
 
+
 def check_hash(_hash):
     return _hash.rsplit('/', 1)[0] # Recursive pin // i.e. strip _hash/something.json
 
+
 def add_hash(_hash):
     _hash = check_hash(_hash)
     try:
@@ -91,6 +96,7 @@ def add_hash(_hash):
         logger.warning(f"Time-out: Couldn't find {_hash} on the IPFS network")
         if _hash not in hashes_wanted: hashes_wanted.append(_hash)
 
+
 def get_contracts():
     contracts = []
     for f in glob.glob('/var/lib/watchlist/**/*.json', recursive=True):
@@ -105,5 +111,6 @@ def get_contracts():
             pass
     return contracts
 
+
 if __name__ == '__main__':
     main()

bot-pinner/src/peers.txt

@@ -0,0 +1,4 @@
+/ip4/139.178.68.217/tcp/6744/p2p/12D3KooWCVXs8P7iq6ao4XhfAmKWrEeuKFWCJgqe9jGDMTqHYBjw
+/ip4/147.75.49.71/tcp/6745/p2p/12D3KooWGBWx9gyUFTVQcKMTenQMSyE2ad9m7c9fpjS4NMjoDien
+/ip4/147.75.86.255/tcp/6745/p2p/12D3KooWFrnuj5o3tx4fGD2ZVJRyDqTdzGnU3XYXmBbWbc8Hs8Nd
+/ip4/3.134.223.177/tcp/6745/p2p/12D3KooWN8vAoGd6eurUSidcpLYguQiGZwt4eVgDvbgaS7kiGTup

bot-pinner/src/tooling.py

@@ -1,20 +1,30 @@
 import time
-import socket
 import logging
 import sys
-import glob
-import json
-from web3 import  Web3
+import requests
 
-def create_logger():
+
+def check_ipfs(IPFS, logger):
+    try:
+        r = requests.post(f"{IPFS}/version")
+    except:
+        logger.error("Couldn't connect to IPFS API, retrying..")
+        time.sleep(15)
+        check_ipfs(IPFS, logger)
+
+
+def create_logger(IPFS):
     # create a logger object
-    logger = logging.getLogger('kleros-v2-evidence-collector')
+    logger = logging.getLogger('kleros-v2-evidence')
     logger.setLevel(logging.INFO)
     logfile = logging.StreamHandler(sys.stdout)
     fmt = '%(asctime)s  %(levelname)s  %(message)s'
     formatter = logging.Formatter(fmt)
     logfile.setFormatter(formatter)
     logger.addHandler(logfile)
+    motd()
+    check_ipfs(IPFS, logger)
+    add_peers(IPFS, logger)
     return logger
 
 
@@ -33,27 +43,22 @@ def motd():
         `-_, :!;;;''
             `-!'
     """
-    print("Booting...")
-    print(kleros)
-    print("Kleros Court V2 Evidence Collector!")
-    time.sleep(10)  # Wait for IPFS to come up
-    print(additional_info())
-
-
-def  additional_info():
-    ipfs_api = port_up(8080)
-    ipfs_gw = port_up(5001)
-    if ipfs_api == 0 and ipfs_gw == 0:
-        return "Gateway and API are up.  IPFS WebUI: http://127.0.0.1:5001/webui"
-    if ipfs_api == 0:
-        return "API is up"
-    return "API or Gateway unavailable. (If running on different ports, disregard this check)"
-
-
-def port_up(port: int, host="127.0.0.1"):
-    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    result = sock.connect_ex((host, port))
-    sock.close()
-    return result
+    motd = f"""
+Booting... \
+        {kleros}  \
+        Kleros Court V2 Evidence Collector!"""
+    print(motd)
+
+
+def add_peers(ipfs, logger):
+    with open('peers.txt') as f:
+        peers = f.read().splitlines()
+    for peer in peers:
+        r = requests.post(f"{ipfs}/swarm/connect?arg={peer}", timeout=25)
+        if r.status_code == 200:
+            logger.info(f"Succesfully added peer: {[peer]}")
+        if r.status_code != 200:
+            logger.warning(f"Couldn't add {peer} to peerlist {r.content}")
+
 
 

bot-pinner/watchlist/DisputeKitClassic.json

@@ -1,5 +1,5 @@
 {
-  "address": "0xA2c538AA05BBCc44c213441f6f3777223D2BF9e5",
+  "address": "0x8F1a2B8F9b04320375856580Fc6B1669Cb12a9EE",
   "abi": [
     {
       "inputs": [

contracts/src/arbitration/dispute-kits/DisputeKitClassic.sol

@@ -14,7 +14,7 @@ import "../interfaces/IEvidence.sol";
 /// @title DisputeKitClassic
 /// Dispute kit implementation of the Kleros v1 features including:
 /// - a drawing system: proportional to staked PNK,
-/// - a vote aggreation system: plurality,
+/// - a vote aggregation system: plurality,
 /// - an incentive system: equal split between coherent votes,
 /// - an appeal system: fund 2 choices only, vote on any choice.
 contract DisputeKitClassic is BaseDisputeKit, IEvidence {

contracts/src/arbitration/dispute-kits/DisputeKitSybilResistant.sol

@@ -21,7 +21,7 @@ interface IProofOfHumanity {
 /// @title DisputeKitSybilResistant
 /// Dispute kit implementation adapted from DisputeKitClassic
 /// - a drawing system: at most 1 vote per juror registered on Proof of Humanity,
-/// - a vote aggreation system: plurality,
+/// - a vote aggregation system: plurality,
 /// - an incentive system: equal split between coherent votes,
 /// - an appeal system: fund 2 choices only, vote on any choice.
 contract DisputeKitSybilResistant is BaseDisputeKit, IEvidence {