Merge pull request #2852 from w3f/fix-ip-location-dedup

fix ip location dedup

Author: ironoa

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

@@ -123,5 +123,14 @@ spec:
                     "Contabo GmbH"
                   ],
                   "host": "wss://telemetry-backend.w3f.community/feed"
+                },
+                "logger": {
+                  "level": "info",
+                  "excludedLabels": [
+                    "Telemetry",
+                    "Location",
+                    "Block",
+                    "Gateway",
+                  ]
                 }
               }

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

@@ -122,5 +122,14 @@ spec:
                     "Contabo GmbH"
                   ],
                   "host": "wss://telemetry-backend.w3f.community/feed"
+                },
+                "logger": {
+                  "level": "info",
+                  "excludedLabels": [
+                    "Telemetry",
+                    "Location",
+                    "Block",
+                    "Gateway",
+                  ]
                 }
               }

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.12
+    targetRevision: v3.1.13
     plugin:
       env:
         - name: HELM_VALUES
@@ -121,5 +121,14 @@ spec:
                   ],
                   "host": "wss://telemetry-backend.w3f.community/feed",
                   "ipinfoToken": "token=<path:vaults/k8s-community-secrets/items/otv-kusama#ipinfo-token>"
+                },
+                "logger": {
+                  "level": "info",
+                  "excludedLabels": [
+                    "Telemetry",
+                    "Location",
+                    "Block",
+                    "Gateway",
+                  ]
                 }
               }

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.12
+    targetRevision: v3.1.13
     plugin:
       env:
         - name: HELM_VALUES
@@ -120,5 +120,14 @@ spec:
                   ],
                   "host": "wss://telemetry-backend.w3f.community/feed",
                   "ipinfoToken": "token=<path:vaults/k8s-community-secrets/items/otv-polkadot#ipinfo-token>"
+                },
+                "logger": {
+                  "level": "info",
+                  "excludedLabels": [
+                    "Telemetry",
+                    "Location",
+                    "Block",
+                    "Gateway",
+                  ]
                 }
               }

charts/otv-backend/Chart.yaml

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

packages/common/package.json

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

packages/common/src/db/queries/Candidate.ts

@@ -505,7 +505,7 @@ export const reportOnline = async (
       await mergeTelemetryNodeToCandidate(candidate);
 
       // Try and update or make a new Location record
-      await fetchAndSetCandidateLocation(telemetryNodeDetails);
+      await fetchAndSetCandidateLocation(candidate, telemetryNodeDetails);
 
       // Update the candidate online validity
       await setCandidateOnlineValid(candidate);

packages/common/src/db/queries/CandidateUtils.ts

@@ -9,18 +9,11 @@ export const filterCandidateInvalidityFields = (
   candidate: Candidate,
   filter: InvalidityReasonType,
 ): InvalidityReason[] => {
-  if (!candidate || !candidate?.invalidity)
-    throw new Error(
-      `NO CANDIDATE DATA FOUND FOR CANDIDATE with slotId ${candidate.slotId}`,
-    );
-
-  const invalidityReasons = candidate?.invalidity?.filter(
-    (invalidityReason) => {
-      return invalidityReason.type !== filter;
-    },
+  return (
+    candidate?.invalidity?.filter(
+      (invalidityReason) => invalidityReason.type !== filter,
+    ) || []
   );
-
-  return invalidityReasons;
 };
 
 export const setCandidateInvalidity = async (

packages/common/src/utils/Location.ts

@@ -1,7 +1,8 @@
 import {
+  Candidate,
   getCandidateByName,
+  getCandidateLocation,
   getIIT,
-  getLocation,
   removeIIT,
   setIIT,
   setLocation,
@@ -101,13 +102,11 @@ export const nodeDetailsFromTelemetryMessage = (
 };
 
 export const fetchAndSetCandidateLocation = async (
+  candidate: Candidate,
   telemetryNodeDetails: TelemetryNodeDetails,
 ) => {
   // See if there's an existing location for the given telemetry data
-  const existingLocation = await getLocation(
-    telemetryNodeDetails.name,
-    telemetryNodeDetails.ipAddress,
-  );
+  const existingLocation = await getCandidateLocation(candidate.slotId);
 
   // Fetch and set a new location if:
   // - There's no existing location

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1kv/core",
-  "version": "3.1.12",
+  "version": "3.1.13",
   "description": "Services for running the Thousand Validator Program.",
   "main": "index.js",
   "scripts": {