Merge pull request #2903 from w3f/staging

Staging
w3f · Apr 26, 2024 · ec20e19 · ec20e19
2 parents ce9a906 + c200468
commit ec20e19
Show file tree

Hide file tree

Showing 17 changed files with 182 additions and 184 deletions.
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.2.0
+    targetRevision: v3.2.1
     plugin:
       env:
         - name: HELM_VALUES

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.2.0
+    targetRevision: v3.2.1
     plugin:
       env:
         - name: HELM_VALUES

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.2.0
-appVersion: v3.2.0
+version: v3.2.1
+appVersion: v3.2.1
 apiVersion: v2
diff --git a/package.json b/package.json
@@ -104,7 +104,7 @@
     "@bull-board/koa": "^5.15.0",
     "@koa/router": "^12.0.1",
     "@octokit/rest": "^20.0.2",
-    "@polkadot/api": "^10.12.2",
+    "@polkadot/api": "^11.0.2",
     "@polkadot/keyring": "^12.6.2",
     "@types/cron": "^2.4.0",
     "@types/jest": "^29.5.12",

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@1kv/common",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Services for running the Thousand Validator Program.",
   "main": "build/index.js",
   "types": "build/index.d.ts",

diff --git a/packages/common/src/db/queries/Validators.ts b/packages/common/src/db/queries/Validators.ts
@@ -187,10 +187,10 @@ export const getValidatorActiveEras = async (
 // return the number of eras
 export const getIdentityValidatorActiveEras = async (
   address: string,
+  validatorSets: ValidatorSet[],
 ): Promise<number> => {
   const identityAddresses = await getIdentityAddresses(address);
   let count = 0;
-  const validatorSets = await getAllValidatorSets();
   for (const era of validatorSets) {
     if (
       era.validators.some((validator) => identityAddresses.includes(validator))

diff --git a/packages/common/src/scorekeeper/NumNominations.ts b/packages/common/src/scorekeeper/NumNominations.ts
@@ -65,15 +65,17 @@ export const autoNumNominations = async (
     );
 
   // Query the staking info of the validator set
-  const query = await api?.derive.staking.electedInfo();
-  const { info } = query;
+  const { info } = await api?.derive.staking.electedInfo({
+    withExposureMeta: true,
+  });
 
   const totalStakeAmounts = [];
 
   // add formatted totals to list
   for (const validator of info) {
-    const { exposure } = validator;
-    const { total, own, others } = exposure;
+    const { exposureMeta } = validator;
+    if (!exposureMeta?.isSome) continue;
+    const { total } = exposureMeta.value;
 
     const totalValue = total.unwrap();
 

diff --git a/packages/common/src/scorekeeper/jobs/specificJobs/EraStatsJob.ts b/packages/common/src/scorekeeper/jobs/specificJobs/EraStatsJob.ts
@@ -76,7 +76,7 @@ export const eraStatsJob = async (
       updated: Date.now(),
     });
 
-    for (let i = currentEra; i > 20; i--) {
+    for (let i = currentEra; i > currentEra - 20; i--) {
       if (await queries.validatorSetExistsForEra(i)) {
         continue;
       }

diff --git a/packages/common/src/utils/Validators.ts b/packages/common/src/utils/Validators.ts
@@ -1,12 +1,14 @@
-import { allCandidates, setRank } from "../db/queries";
+import { allCandidates, getAllValidatorSets, setRank } from "../db/queries";
 import { queries } from "../index";
 
 // Sets all validators ranks
 export const setValidatorRanks = async () => {
   const candidates = await allCandidates();
+  const validatorSets = await getAllValidatorSets();
   for (const candidate of candidates) {
     const identityRank = await queries.getIdentityValidatorActiveEras(
       candidate.stash,
+      validatorSets,
     );
     await setRank(candidate.stash, identityRank);
   }

diff --git a/packages/common/test/utils/Validators.unit.test.ts b/packages/common/test/utils/Validators.unit.test.ts
@@ -120,6 +120,7 @@ describe("setValidatorRanks", () => {
 
     const subNumEras = await getIdentityValidatorActiveEras(
       "HkJjBkX8fPBFJvTtAbUDKWZSsMrNFuMc7TrT8BqVS5YhZXg",
+      validatorSets,
     );
     expect(subNumEras).toBe(5);
 

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@1kv/core",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "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.2.0",
+  "version": "3.2.1",
   "description": "Services for running the Thousand Validator Program.",
   "main": "build/index.js",
   "types": "build/index.d.ts",

diff --git a/packages/gateway/src/services/Validator.ts b/packages/gateway/src/services/Validator.ts
@@ -31,10 +31,3 @@ export const getValidatorsNumActiveEras = async (
   const eras = await queries.getValidatorActiveEras(stash);
   return eras;
 };
-
-export const getIdentityValidatorNumActiveEras = async (
-  stash: string,
-): Promise<any> => {
-  const eras = await queries.getIdentityValidatorActiveEras(stash);
-  return eras;
-};
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.2.0",
+  "version": "3.2.1",
   "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.2.0",
+  "version": "3.2.1",
   "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.2.0",
+  "version": "3.2.1",
   "description": "Services for running the Thousand Validator Program.",
   "main": "build/index.js",
   "types": "build/index.d.ts",