Merge pull request #2673 from w3f/will-nominated

adjust last nominated
w3f · Mar 2, 2024 · 5762a38 · 5762a38
2 parents fa4185a + 18df513
commit 5762a38
Show file tree

Hide file tree

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

diff --git a/packages/common/src/scorekeeper/Nominating.ts b/packages/common/src/scorekeeper/Nominating.ts
@@ -36,8 +36,26 @@ export const doNominations = async (
     });
     let counter = 0;
 
+    const currentEra = await chaindata.getCurrentEra();
+    if (!currentEra) {
+      logger.error(
+        `Error getting current era. Skipping nominations`,
+        scorekeeperLabel,
+      );
+      return null;
+    }
+
     // ensure the group is sorted by least avg stake
     for (const nominator of nominatorGroups) {
+      const nomStash = await nominator.stash();
+      const nominatorLastNominated =
+        await chaindata.getNominatorLastNominationEra(nomStash);
+      if (nominatorLastNominated + 4 > currentEra) {
+        logger.info(
+          `Nominator ${nomStash} has already nominated this era: ${nominatorLastNominated}`,
+        );
+        continue;
+      }
       const nominatorStatus: NominatorStatus = {
         status: `Nominating...`,
         updated: Date.now(),

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@1kv/core",
-  "version": "3.0.23",
+  "version": "3.0.24`",
   "description": "Services for running the Thousand Validator Program.",
   "main": "index.js",
   "scripts": {

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.0.23",
+  "version": "3.0.24",
   "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.0.23",
+  "version": "3.0.24",
   "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.0.23",
+  "version": "3.0.24g",
   "description": "Services for running the Thousand Validator Program.",
   "main": "build/index.js",
   "types": "build/index.d.ts",