Merge pull request #2845 from w3f/staging

Staging

Author: ironoa

apps/1kv-backend/templates/kusama-otv-backend.yaml

@@ -17,7 +17,7 @@ spec:
   source:
     repoURL: https://w3f.github.io/helm-charts/
     chart: otv-backend
-    targetRevision: v3.1.11
+    targetRevision: v3.1.12
     plugin:
       env:
         - name: HELM_VALUES

apps/1kv-backend/templates/polkadot-otv-backend.yaml

@@ -17,7 +17,7 @@ spec:
   source:
     repoURL: https://w3f.github.io/helm-charts/
     chart: otv-backend
-    targetRevision: v3.1.11
+    targetRevision: v3.1.12
     plugin:
       env:
         - name: HELM_VALUES

charts/otv-backend/Chart.yaml

@@ -1,5 +1,5 @@
 description: 1K Validators Backend
 name: otv-backend
-version: v3.1.11
-appVersion: v3.1.11
+version: v3.1.12
+appVersion: v3.1.12
 apiVersion: v2

charts/otv-backend/values.yaml

@@ -86,5 +86,14 @@ config: |
       ],
       "host": "wss://telemetry-backend.w3f.community/feed",
       "ipinfoToken": "token=xxx"
+    },
+    "logger": {
+      "level": "info",
+      "excludedLabels": [
+        "Telemetry",
+        "Location",
+        "Block",
+        "Gateway",
+      ]
     }
   }

helmfile.d/config/kusama/otv-backend-ci.yaml.gotmpl

@@ -19,7 +19,14 @@ config: |
       "test": false,
       "retroactive": false,
       "historicalNominations": false,
-      "apiEndpoints": [],
+      "apiEndpoints": [
+        "wss://kusama-rpc-tn.dwellir.com",
+        "wss://kusama-rpc.dwellir.com",
+        "wss://kusama.public.curie.radiumblock.xyz/ws",
+        "wss://rpc.ibp.network/kusama",
+        "wss://rpc.dotters.network/kusama",
+        "wss://ksm-rpc.stakeworld.io"
+      ],
       "candidatesUrl": "https://raw.githubusercontent.com/w3f/1k-validators-be/master/candidates/kusama.json"
     },
     "constraints": {

helmfile.d/config/polkadot/otv-backend-ci.yaml.gotmpl

@@ -19,7 +19,13 @@ config: |
       "test": false,
       "retroactive": false,
       "historicalNominations": false,
-      "apiEndpoints": [],
+      "apiEndpoints": [
+        "wss://rpc.dotters.network/polkadot",
+        "wss://dot-rpc.stakeworld.io",
+        "wss://polkadot.public.curie.radiumblock.co/ws",
+        "wss://rpc.ibp.network/polkadot",
+        "wss://polkadot-rpc-tn.dwellir.com"
+      ],
       "candidatesUrl": "https://raw.githubusercontent.com/w3f/1k-validators-be/master/candidates/polkadot.json"
     },
     "constraints": {

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1kv/common",
-  "version": "3.1.11",
+  "version": "3.1.12",
   "description": "Services for running the Thousand Validator Program.",
   "main": "build/index.js",
   "types": "build/index.d.ts",

packages/common/src/config.ts

@@ -162,6 +162,10 @@ export type ConfigSchema = {
     host: string;
     ipinfoToken: string;
   };
+  logger: {
+    level: string;
+    excludedLabels: string[];
+  };
 };
 
 export const loadConfig = (configPath: string): ConfigSchema => {

packages/common/src/constraints/ValidityChecks.ts

@@ -23,16 +23,17 @@ import logger from "../logger";
 import { constraintsLabel } from "./constraints";
 import { getLatestTaggedRelease } from "../scorekeeper/jobs/specificJobs";
 
-export const checkOnline = async (candidate: any): Promise<boolean> => {
+export const checkOnline = async (candidate: Candidate): Promise<boolean> => {
   try {
-    if (candidate && Number(candidate.onlineSince) === 0) {
-      await setOnlineValidity(candidate.stash, false);
+    const now = new Date().getTime();
+    if (now - candidate.onlineSince > Constants.SIXTEEN_HOURS) {
+      //TODO: reduce it after a first test
+      await setOnlineValidity(candidate.slotId, false);
       return false;
     } else {
-      await setOnlineValidity(candidate.stash, true);
+      await setOnlineValidity(candidate.slotId, true);
       return true;
     }
-    return true;
   } catch (e) {
     logger.error(`Error checking online status: ${e}`, constraintsLabel);
     throw new Error("could not make validity check");

packages/common/src/db/models.ts

@@ -332,7 +332,7 @@ export const CandidateSchema = new Schema({
   offlineSince: { type: Number, default: 0 },
   // The cumulative duration of offline time (in ms).
   offlineAccumulated: { type: Number, default: 0 },
-  // The timestamp for the most recent time the node has come online.
+  // The timestamp for the most recent time the node has come online. TOFIX: wrong name, SINCE is misleading -> lastSeenOnline
   onlineSince: { type: Number, default: 0 },
   // Whether it is running the latest client code.
   updated: { type: Boolean, default: false },