Merge pull request #2898 from w3f/erastats-fix

fix bug | otimize call

Author: ironoa

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))

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;
       }

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);
   }

packages/common/test/utils/Validators.unit.test.ts

@@ -120,6 +120,7 @@ describe("setValidatorRanks", () => {
 
     const subNumEras = await getIdentityValidatorActiveEras(
       "HkJjBkX8fPBFJvTtAbUDKWZSsMrNFuMc7TrT8BqVS5YhZXg",
+      validatorSets,
     );
     expect(subNumEras).toBe(5);
 

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;
-};