Merge pull request #1906 from w3f/will-vals159

Add More Validators Round 159
w3f · Aug 8, 2022 · f4ca2bd · f4ca2bd
2 parents 3322f10 + abdafb3
commit f4ca2bd
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 9 deletions.
diff --git a/charts/otv-backend/Chart.yaml b/charts/otv-backend/Chart.yaml
@@ -1,4 +1,4 @@
 description: 1K Validators Backend
 name: otv-backend
-version: v2.6.23
+version: v2.6.24
 apiVersion: v2
diff --git a/charts/otv-backend/values.yaml b/charts/otv-backend/values.yaml
@@ -17,7 +17,7 @@ resources:
 
 image:
   repo: web3f/otv-backend
-  tag: v2.6.23
+  tag: v2.6.24
 
 certificate:
   enabled: true

diff --git a/helmfile.d/10-otv-backend.yaml b/helmfile.d/10-otv-backend.yaml
@@ -11,7 +11,7 @@ releases:
     namespace: kusama
     {{ if eq .Environment.Name "production" }}
     chart: w3f/otv-backend
-    version: v2.6.23
+    version: v2.6.24
     {{ else }}
     chart: ../charts/otv-backend
     {{ end }}
@@ -27,7 +27,7 @@ releases:
     namespace: polkadot
     {{ if eq .Environment.Name "production" }}
     chart: w3f/otv-backend
-    version: v2.6.23
+    version: v2.6.24
     {{ else }}
     chart: ../charts/otv-backend
     {{ end }} 

diff --git a/helmfile.d/config/kusama/otv-backend-prod.yaml.gotmpl b/helmfile.d/config/kusama/otv-backend-prod.yaml.gotmpl
@@ -2949,6 +2949,11 @@ config: |
               "name": "Chris Staking/k2",
               "stash": "EAqxvPZ3nxyfum6d8DFBeGuykQayJHtE6DyCcHMyd6o57WZ",
               "riotHandle": "@clang:matrix.org"
+          },
+          {
+              "name": "Vel_Validator",
+              "stash": "EaQghcv5V7uFSvj1yHgXxnhTy7y7KP7Lfgms1rvQqbwXBZN",
+              "riotHandle": "@vda0390:matrix.org"
           }
       ],
       "forceRound": false,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "1k-validators-be",
-  "version": "2.6.23",
+  "version": "2.6.24",
   "description": "Services for running the Thousand Validator Program.",
   "main": "index.js",
   "scripts": {

diff --git a/src/index.ts b/src/index.ts
@@ -25,7 +25,7 @@ import { startClearAccumulatedOfflineTimeJob, startMonitorJob } from "./cron";
 
 const isCI = process.env.CI;
 
-const version = "v2.6.23";
+const version = "v2.6.24";
 
 const catchAndQuit = async (fn: any) => {
   try {

diff --git a/src/jobs.ts b/src/jobs.ts
@@ -187,8 +187,9 @@ export const unclaimedErasJob = async (
 
   for (const candidate of candidates) {
     // Set unclaimed eras
-    const unclaimedEras = await chaindata.getUnclaimedEras(candidate.stash, db);
-    await db.setUnclaimedEras(candidate.stash, unclaimedEras);
+    // const unclaimedEras = await chaindata.getUnclaimedEras(candidate.stash, db);
+    // await db.setUnclaimedEras(candidate.stash, unclaimedEras);
+    await db.setUnclaimedEras(candidate.stash, []); // reset unclaimed eras
     await checkUnclaimed(db, chaindata, unclaimedEraThreshold, candidate);
   }
 

diff --git a/src/scorekeeper.ts b/src/scorekeeper.ts
@@ -587,7 +587,7 @@ export default class ScoreKeeper {
       await startActiveValidatorJob(this.config, this.db, this.chaindata);
       await startInclusionJob(this.config, this.db, this.chaindata);
       await startSessionKeyJob(this.config, this.db, this.chaindata);
-      // await startUnclaimedEraJob(this.config, this.db, this.chaindata);
+      await startUnclaimedEraJob(this.config, this.db, this.chaindata);
       await startValidatorPrefJob(this.config, this.db, this.chaindata);
       // if (this.claimer) {
       //   await startRewardClaimJob(