Merge pull request #2688 from w3f/will-filtered

bump version to v3.1.2
w3f · Mar 2, 2024 · 33450db · 33450db
2 parents 655fc39 + 3443e5d
commit 33450db
Show file tree

Hide file tree

Showing 13 changed files with 158 additions and 98 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.1.1
+    targetRevision: v3.1.2
     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.1.1
+    targetRevision: v3.1.2
     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.1.1
-appVersion: v3.1.1
+version: v3.1.2
+appVersion: v3.1.2
 apiVersion: v2
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@1kv/common",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "Services for running the Thousand Validator Program.",
   "main": "build/index.js",
   "types": "build/index.d.ts",

diff --git a/packages/common/src/nominator/nominator.ts b/packages/common/src/nominator/nominator.ts
@@ -155,6 +155,7 @@ export default class Nominator extends EventEmitter {
       const stash = await this.stash();
       const isBonded = await this.chaindata.isBonded(stash);
       const [bonded, err] = await this.chaindata.getDenomBondedAmount(stash);
+      const currentBlock = await this.chaindata.getLatestBlock();
 
       const currentEra = (await this.chaindata.getCurrentEra()) || 0;
       const lastNominationEra =
@@ -170,13 +171,15 @@ export default class Nominator extends EventEmitter {
             name = (await this.chaindata.getFormattedIdentity(target))?.name;
           }
 
-          const score = await queries.getLatestValidatorScore(target);
+          const scoreResult = await queries.getLatestValidatorScore(target);
+          const score =
+            scoreResult && scoreResult.total ? scoreResult.total : 0;
 
           return {
             stash: target,
             name: name,
             kyc: kyc,
-            score: score && score[0] && score[0].total ? score[0].total : 0,
+            score: score,
           };
         }),
       );
@@ -193,23 +196,29 @@ export default class Nominator extends EventEmitter {
               let name = await queries.getIdentityName(target);
 
               if (!name) {
-                name = (await this.chaindata.getFormattedIdentity(target))
-                  ?.name;
+                const formattedIdentity =
+                  await this.chaindata.getFormattedIdentity(target);
+                name = formattedIdentity?.name;
               }
 
-              const score = await queries.getLatestValidatorScore(target);
+              const scoreResult = await queries.getLatestValidatorScore(target);
+              const score =
+                scoreResult && scoreResult.total ? scoreResult.total : 0;
 
               return {
                 stash: target,
                 name: name,
                 kyc: kyc,
-                score: score && score.total ? score.total : 0,
+                score: score,
               };
             }),
           );
-
+          const executionMsTime =
+            (this._proxyDelay + currentBlock - announcement.number) * 6 * 1000;
           return {
-            namedTargets,
+            ...announcement,
+            targets: namedTargets,
+            executionTime: executionMsTime,
           };
         }),
       );

diff --git a/packages/common/src/scorekeeper/Round.ts b/packages/common/src/scorekeeper/Round.ts
@@ -99,7 +99,7 @@ export const startRound = async (
     );
     for (const nom of filteredNominators) {
       const nominatorStatus: NominatorStatus = {
-        status: `[${index}/${allCandidates.length}] Checked Candidate ${candidate.name} ${isValid ? "✅ " : "❌"}`,
+        status: `[${index}/${allCandidates.length}] ${candidate.name} ${isValid ? "✅ " : "❌"}`,
         updated: Date.now(),
         stale: false,
       };

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

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.1",
+  "version": "3.1.2",
   "type": "module",
   "scripts": {
     "dev": "vite",