add matrix handle to candidate

w3f · Oct 22, 2022 · 35102e8 · 35102e8
1 parent 4d86d2b
commit 35102e8
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 7 deletions.
diff --git a/helmfile.d/config/kusama/otv-backend-prod.yaml.gotmpl b/helmfile.d/config/kusama/otv-backend-prod.yaml.gotmpl
@@ -18,7 +18,10 @@ config: |
       "test": false,
       "retroactive": false,
       "historicalNominations": false,
-      "apiEndpoints": []
+      "apiEndpoints": [
+        "wss://kusama-rpc.polkadot.io",
+        "wss://kusama.api.onfinality.io/public-ws"
+      ]
     },
     "constraints": {
       "skipConnectionTime": false,

diff --git a/helmfile.d/config/polkadot/otv-backend-prod.yaml.gotmpl b/helmfile.d/config/polkadot/otv-backend-prod.yaml.gotmpl
@@ -18,7 +18,10 @@ config: |
       "test": false,
       "retroactive": false,
       "historicalNominations": false,
-      "apiEndpoints": []
+      "apiEndpoints": [
+        "wss://rpc.polkadot.io",
+        "wss://polkadot.api.onfinality.io/public-ws"
+        ]
     },
     "constraints": {
       "skipConnectionTime": false,

diff --git a/package.json b/package.json
@@ -11,10 +11,11 @@
   ],
   "scripts": {
     "create-config:all": "yarn workspaces foreach run create-config",
+    "create-kusama-config:all": "yarn workspaces foreach run create-kusama-config",
     "docker:start": "yarn build:clean && docker-compose up -d --build",
     "lint": "yarn workspaces foreach run lint",
     "lint:fix": "yarn workspaces foreach run lint:fix",
-    "clean": "yarn workspaces foreach run clean",
+    "clean": "rm -rf redis/ && yarn workspaces foreach run clean",
     "build": "yarn workspaces foreach -t run build",
     "build:clean": "yarn workspaces foreach run clean:build",
     "start:dev:gateway": "yarn workspace @1kv/gateway run start:dev",

diff --git a/packages/common/src/db/models.ts b/packages/common/src/db/models.ts
@@ -226,6 +226,7 @@ export const CandidateSchema = new Schema({
   // The referenda indexes voted on
   democracyVotes: [Number],
   infrastructureLocation: LocationSchema,
+  matrix: [String],
 });
 
 export const CandidateModel = mongoose.model("Candidate", CandidateSchema);

diff --git a/packages/common/src/db/queries/Candidate.ts b/packages/common/src/db/queries/Candidate.ts
@@ -14,13 +14,16 @@ export const addCandidate = async (
   kusamaStash: string,
   skipSelfStake: boolean,
   bio: string,
+  matrix: any,
   bot?: any
 ): Promise<boolean> => {
   const network = (await getChainMetadata()).name;
   const keyring = new Keyring();
   const ss58Prefix = network == "Kusama" ? 2 : 0;
   stash = keyring.encodeAddress(stash, ss58Prefix);
-  logger.info(`(Db::addCandidate) name: ${name} stash: ${stash}`);
+  logger.info(
+    `(Db::addCandidate) name: ${name} stash: ${stash} matrix: ${matrix}`
+  );
 
   // Check to see if the candidate has already been added as a node.
   const data = await CandidateModel.findOne({ name });
@@ -35,6 +38,7 @@ export const addCandidate = async (
       kusamaStash,
       skipSelfStake,
       bio,
+      matrix,
     });
 
     if (!!bot) {
@@ -55,6 +59,7 @@ export const addCandidate = async (
       kusamaStash,
       skipSelfStake,
       bio,
+      matrix,
     }
   );
 };

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -131,18 +131,18 @@ const start = async (cmd: { config: string }) => {
       if (candidate === null) {
         continue;
       } else {
-        const { name, stash } = candidate;
+        const { name, stash, riotHandle } = candidate;
         const bio = candidate.bio || "";
         // Polkadot only options.
         const kusamaStash = candidate.kusamaStash || "";
         const skipSelfStake = candidate.skipSelfStake || false;
-
         await queries.addCandidate(
           name,
           stash,
           kusamaStash,
           skipSelfStake,
-          bio
+          bio,
+          riotHandle
         );
       }
     }

diff --git a/packages/gateway/src/services/Candidate.ts b/packages/gateway/src/services/Candidate.ts
@@ -6,6 +6,40 @@ export const getCandidate = async (stash: any): Promise<any> => {
 
   try {
     candidate = await queries.getCandidate(stash);
+    if (candidate && candidate.stash) {
+      const score = await queries.getValidatorScore(candidate.stash);
+      return {
+        discoveredAt: candidate.discoveredAt,
+        nominatedAt: candidate.nominatedAt,
+        offlineSince: candidate.offlineSince,
+        offlineAccumulated: candidate.offlineAccumulated,
+        rank: candidate.rank,
+        faults: candidate.faults,
+        invalidityReasons: candidate.invalidityReasons,
+        unclaimedEras: candidate.unclaimedEras,
+        inclusion: candidate.inclusion,
+        name: candidate.name,
+        queuedKeys: candidate.queuedKeys,
+        nextKeys: candidate.nextKeys,
+        stash: candidate.stash,
+        rewardDestination: candidate.rewardDestination,
+        controller: candidate.controller,
+        kusamaStash: candidate.kusamaStash,
+        commission: candidate.commission,
+        identity: candidate.identity,
+        active: candidate.active,
+        valid: candidate.valid,
+        validity: candidate.invalidity,
+        score: score,
+        total: score && score.total ? score.total : 0,
+        location: candidate.location,
+        councilStake: candidate.councilStake,
+        councilVotes: candidate.councilVotes,
+        democracyVoteCount: candidate.democracyVoteCount,
+        democracyVotes: candidate.democracyVotes,
+        matrix: candidate.matrix,
+      };
+    }
   } catch (error) {
     logger.error("findCandidate", { error });
   }
@@ -43,6 +77,7 @@ export const getCandidates = async (): Promise<any> => {
         councilVotes: candidate.councilVotes,
         democracyVoteCount: candidate.democracyVoteCount,
         democracyVotes: candidate.democracyVotes,
+        matrix: candidate.matrix,
       };
     })
   );