Merge branch 'staging' into candidate-code-duplication

ironoa · ironoa · commit 247feeab6f0a · 2024-04-13T19:47:43.000+02:00
diff --git a/apps/1kv-backend-staging/templates/kusama-otv-backend.yaml b/apps/1kv-backend-staging/templates/kusama-otv-backend.yaml
@@ -130,7 +130,7 @@ spec:
                     "Telemetry",
                     "Location",
                     "Block",
-                    "Gateway",
+                    "Gateway"
                   ]
                 }
               }
diff --git a/apps/1kv-backend-staging/templates/polkadot-otv-backend.yaml b/apps/1kv-backend-staging/templates/polkadot-otv-backend.yaml
@@ -129,7 +129,7 @@ spec:
                     "Telemetry",
                     "Location",
                     "Block",
-                    "Gateway",
+                    "Gateway"
                   ]
                 }
               }
diff --git a/apps/1kv-backend/templates/kusama-otv-backend.yaml b/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.13
+    targetRevision: v3.1.14
     plugin:
       env:
         - name: HELM_VALUES
@@ -128,7 +128,7 @@ spec:
                     "Telemetry",
                     "Location",
                     "Block",
-                    "Gateway",
+                    "Gateway"
                   ]
                 }
               }
diff --git a/apps/1kv-backend/templates/polkadot-otv-backend.yaml b/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.13
+    targetRevision: v3.1.14
     plugin:
       env:
         - name: HELM_VALUES
@@ -127,7 +127,7 @@ spec:
                     "Telemetry",
                     "Location",
                     "Block",
-                    "Gateway",
+                    "Gateway"
                   ]
                 }
               }
diff --git a/charts/otv-backend/Chart.yaml b/charts/otv-backend/Chart.yaml
@@ -1,5 +1,5 @@
 description: 1K Validators Backend
 name: otv-backend
-version: v3.1.13
-appVersion: v3.1.13
+version: v3.1.14
+appVersion: v3.1.14
 apiVersion: v2
diff --git a/charts/otv-backend/values.yaml b/charts/otv-backend/values.yaml
@@ -93,7 +93,7 @@ config: |
         "Telemetry",
         "Location",
         "Block",
-        "Gateway",
+        "Gateway"
       ]
     }
   }
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@1kv/common",
-  "version": "3.1.13",
+  "version": "3.1.14",
   "description": "Services for running the Thousand Validator Program.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
diff --git a/packages/common/src/constraints/ScoreCandidates.ts b/packages/common/src/constraints/ScoreCandidates.ts
@@ -96,8 +96,6 @@ export const scoreCandidate = async (
 
     const latestCandidateLocation = await queries.getCandidateLocation(
       candidate.slotId,
-      candidate.name,
-      candidate.stash,
     );
 
     const provider = latestCandidateLocation?.provider || "No Provider";
diff --git a/packages/common/src/constraints/ValidityChecks.ts b/packages/common/src/constraints/ValidityChecks.ts
@@ -361,11 +361,7 @@ export const checkProvider = async (
   candidate: Candidate,
 ): Promise<boolean> => {
   try {
-    const location = await queries.getCandidateLocation(
-      candidate.slotId,
-      candidate.name,
-      candidate.stash,
-    );
+    const location = await queries.getCandidateLocation(candidate.slotId);
     if (location && location.provider) {
       const bannedProviders = config.telemetry?.blacklistedProviders;
       if (bannedProviders?.includes(location.provider)) {
diff --git a/packages/common/src/constraints/Values.ts b/packages/common/src/constraints/Values.ts
@@ -117,11 +117,7 @@ export const getLocationValues = async (
   const locationMap = new Map<string, number>();
   const locationArr: { name: string; numberOfNodes: number }[] = [];
   for (const candidate of validCandidates) {
-    const candidateLocation = await getCandidateLocation(
-      candidate.slotId,
-      candidate.name,
-      candidate.stash,
-    );
+    const candidateLocation = await getCandidateLocation(candidate.slotId);
     const location = candidateLocation?.city || NoLocation.NoLocation;
 
     const locationCount = locationMap.get(location);
@@ -155,11 +151,7 @@ export const getRegionValues = async (
   const regionMap = new Map<string, number>();
   const regionArr: { name: string; numberOfNodes: number }[] = [];
   for (const candidate of validCandidates) {
-    const candidateLocation = await getCandidateLocation(
-      candidate.slotId,
-      candidate.name,
-      candidate.stash,
-    );
+    const candidateLocation = await getCandidateLocation(candidate.slotId);
     const region =
       candidateLocation && candidateLocation.region
         ? candidateLocation.region
@@ -196,11 +188,7 @@ export const getCountryValues = async (
   const countryMap = new Map<string, number>();
   const countryArr: { name: string; numberOfNodes: number }[] = [];
   for (const candidate of validCandidates) {
-    const candidateLocation = await getCandidateLocation(
-      candidate.slotId,
-      candidate.name,
-      candidate.stash,
-    );
+    const candidateLocation = await getCandidateLocation(candidate.slotId);
     const country =
       candidateLocation && candidateLocation.country
         ? candidateLocation.country
@@ -235,11 +223,7 @@ export const getProviderValues = async (
   const providerMap = new Map<string, number>();
   const providerArr: { name: string; numberOfNodes: number }[] = [];
   for (const candidate of validCandidates) {
-    const candidateLocation = await getCandidateLocation(
-      candidate.slotId,
-      candidate.name,
-      candidate.stash,
-    );
+    const candidateLocation = await getCandidateLocation(candidate.slotId);
     const provider =
       candidateLocation && candidateLocation.provider
         ? candidateLocation.provider
diff --git a/packages/common/src/db/queries/Location.ts b/packages/common/src/db/queries/Location.ts
@@ -36,10 +36,8 @@ export const getLocation = async (
 
 export const getCandidateLocation = async (
   slotId: number,
-  stash?: string,
-  name?: string,
 ): Promise<Location | null> => {
-  const query = [{ slotId: slotId }, { stash: stash }, { name: name }];
+  const query = [{ slotId: slotId }];
 
   return LocationModel.findOne({ $or: query })
     .sort({ updated: -1 })
@@ -69,7 +67,7 @@ export const setLocation = async (
     }
     // Try and find an existing record
     const query = {
-      $or: [{ addr }, { name }, { slotId }],
+      $or: [{ slotId }],
     };
     const data = await LocationModel.findOne(query).lean<Location>();
 
@@ -79,6 +77,7 @@ export const setLocation = async (
     }
 
     // Create a new Location record if there is no existing record, or there is a different ip address
+    // TODO: check if we need multiple addresses to be stored
     if (!data || data?.addr != addr) {
       const location = new LocationModel({
         slotId: slotId,
@@ -103,7 +102,7 @@ export const setLocation = async (
       await location.save();
     } else {
       await LocationModel.findOneAndUpdate(
-        { addr, name },
+        { slotId },
         {
           slotId: slotId,
           address: stash,
diff --git a/packages/common/src/scorekeeper/jobs/specificJobs/LocationStatsJob.ts b/packages/common/src/scorekeeper/jobs/specificJobs/LocationStatsJob.ts
@@ -44,10 +44,7 @@ export const locationStatsJob = async (metadata: JobRunnerMetadata) => {
 
     // Add all candidate entries to the list of nodes
     for (const [index, candidate] of candidates.entries()) {
-      const location = await queries.getCandidateLocation(
-        candidate.slotId,
-        candidate.name,
-      );
+      const location = await queries.getCandidateLocation(candidate.slotId);
       if (
         location?.city != "None" &&
         location?.region != "None" &&
diff --git a/packages/common/src/utils/Location.ts b/packages/common/src/utils/Location.ts
@@ -127,7 +127,6 @@ export const fetchAndSetCandidateLocation = async (
       iit && iit.iit ? iit.iit : null,
     );
     await updateIITRequestCount();
-    const candidate = await getCandidateByName(telemetryNodeDetails.name);
     const slotId = candidate?.slotId;
     const stash = candidate?.stash;
     if (slotId == undefined || !stash) {
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@1kv/core",
-  "version": "3.1.13",
+  "version": "3.1.14",
   "description": "Services for running the Thousand Validator Program.",
   "main": "index.js",
   "scripts": {
diff --git a/packages/gateway/package.json b/packages/gateway/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@1kv/gateway",
-  "version": "3.1.13",
+  "version": "3.1.14",
   "description": "Services for running the Thousand Validator Program.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
diff --git a/packages/gateway/src/services/Candidate.ts b/packages/gateway/src/services/Candidate.ts
@@ -7,11 +7,7 @@ export const getCandidateData = async (candidate: any): Promise<any> => {
     queries.getChainMetadata(),
     queries.getLatestValidatorScore(candidate.stash),
     queries.getLatestNominatorStake(candidate.stash),
-    queries.getCandidateLocation(
-      candidate.slotId,
-      candidate.name,
-      candidate.stash,
-    ),
+    queries.getCandidateLocation(candidate.slotId),
   ]);
 
   const denom = Math.pow(10, metadata.decimals);
diff --git a/packages/gateway/src/services/Stats.ts b/packages/gateway/src/services/Stats.ts
@@ -37,11 +37,7 @@ export const getValidLocationStats = async () => {
   const totalNodes = [];
 
   for (const candidate of candidates) {
-    const location = await queries.getCandidateLocation(
-      candidate.slotId,
-      candidate.name,
-      candidate.stash,
-    );
+    const location = await queries.getCandidateLocation(candidate.slotId);
     if (
       location?.city != "None" &&
       location?.region != "None" &&
diff --git a/packages/scorekeeper-status-ui/package.json b/packages/scorekeeper-status-ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@1kv/scorekeeper-status-ui",
   "private": true,
-  "version": "3.1.13",
+  "version": "3.1.14",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@1kv/telemetry",
-  "version": "3.1.13",
+  "version": "3.1.14",
   "description": "Services for running the Thousand Validator Program.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@1kv/worker",
-  "version": "3.1.13",
+  "version": "3.1.14",
   "description": "Services for running the Thousand Validator Program.",
   "main": "build/index.js",
   "types": "build/index.d.ts",

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ spec:`
`130`	`130`	`"Telemetry",`
`131`	`131`	`"Location",`
`132`	`132`	`"Block",`
`133`		`- "Gateway",`
	`133`	`+ "Gateway"`
`134`	`134`	`]`
`135`	`135`	`}`
`136`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ spec:`
`129`	`129`	`"Telemetry",`
`130`	`130`	`"Location",`
`131`	`131`	`"Block",`
`132`		`- "Gateway",`
	`132`	`+ "Gateway"`
`133`	`133`	`]`
`134`	`134`	`}`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ spec:`
`17`	`17`	`source:`
`18`	`18`	`repoURL: https://w3f.github.io/helm-charts/`
`19`	`19`	`chart: otv-backend`
`20`		`- targetRevision: v3.1.13`
	`20`	`+ targetRevision: v3.1.14`
`21`	`21`	`plugin:`
`22`	`22`	`env:`
`23`	`23`	`- name: HELM_VALUES`
`@@ -128,7 +128,7 @@ spec:`
`128`	`128`	`"Telemetry",`
`129`	`129`	`"Location",`
`130`	`130`	`"Block",`
`131`		`- "Gateway",`
	`131`	`+ "Gateway"`
`132`	`132`	`]`
`133`	`133`	`}`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ config: \|`
`93`	`93`	`"Telemetry",`
`94`	`94`	`"Location",`
`95`	`95`	`"Block",`
`96`		`- "Gateway",`
	`96`	`+ "Gateway"`
`97`	`97`	`]`
`98`	`98`	`}`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@1kv/common",`
`3`		`- "version": "3.1.13",`
	`3`	`+ "version": "3.1.14",`
`4`	`4`	`"description": "Services for running the Thousand Validator Program.",`
`5`	`5`	`"main": "build/index.js",`
`6`	`6`	`"types": "build/index.d.ts",`