update get_voters.ts api

Author: igorls

src/api/routes/v2-state/get_voters/get_voters.ts

@@ -1,13 +1,13 @@
-import { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
-import { timedQuery } from "../../../helpers/functions.js";
-import { getSkipLimit } from "../../v2-history/get_actions/functions.js";
+import {FastifyInstance, FastifyReply, FastifyRequest} from "fastify";
+import {timedQuery} from "../../../helpers/functions.js";
+import {getSkipLimit} from "../../v2-history/get_actions/functions.js";
 
-import { estypes } from "@elastic/elasticsearch";
-import { IVoter } from "../../../../interfaces/table-voter.js";
+import {estypes} from "@elastic/elasticsearch";
+import {IVoter} from "../../../../interfaces/table-voter.js";
 
 async function getVoters(fastify: FastifyInstance, request: FastifyRequest) {
     const query: any = request.query;
-    const { skip, limit } = getSkipLimit(request.query);
+    const {skip, limit} = getSkipLimit(request.query);
     const maxDocs = fastify.manager.config.api.limits.get_voters ?? 100;
 
     const response: any = {
@@ -17,46 +17,58 @@ async function getVoters(fastify: FastifyInstance, request: FastifyRequest) {
 
     let stateResult: IVoter[];
 
-    if (fastify.manager.config.indexer.experimental_mongodb_state && fastify.manager.conn.mongodb  && query.useMongo === 'true') {
+    if (fastify.manager.config.indexer.experimental_mongodb_state && fastify.manager.conn.mongodb && query.useMongo === 'true') {
         const dbName = `${fastify.manager.conn.mongodb.database_prefix}_${fastify.manager.chain}`;
         const collection = fastify.mongo.client.db(dbName).collection<IVoter>('voters');
 
         const mongoQuery: any = {};
         if (query.producer) {
-            mongoQuery.producers = { $all: query.producer.split(",") };
+            mongoQuery.producers = {$all: query.producer.split(",")};
         }
-        if (query.proxy === 'true') {
+
+        if (query.is_proxy === 'true') {
             mongoQuery.is_proxy = true;
         }
 
         response.voter_count = await collection.countDocuments(mongoQuery);
 
         stateResult = await collection
-            .find(mongoQuery, { projection: { _id: 0, voter: 1, last_vote_weight: 1, block_num: 1 } })
+            .find(mongoQuery, {
+                projection: {
+                    _id: 0,
+                    voter: 1,
+                    last_vote_weight: 1,
+                    is_proxy: 1,
+                    block_num: 1,
+                    staked: 1,
+                    producers: query.listProducers === 'true' ? 1 : undefined
+                }
+            })
             .skip(skip || 0)
             .limit(limit || 50)
             .toArray();
 
     } else {
-        let queryStruct: any = { bool: { must: [] } };
+
+        let queryStruct: any = {bool: {must: []}};
         if (query.producer) {
             for (const bp of query.producer.split(",")) {
-                queryStruct.bool.must.push({ term: { producers: bp } });
+                queryStruct.bool.must.push({term: {producers: bp}});
             }
         }
         if (query.proxy === 'true') {
-            queryStruct.bool.must.push({ term: { is_proxy: true } });
+            queryStruct.bool.must.push({term: {is_proxy: true}});
         }
         if (queryStruct.bool.must.length === 0) {
-            queryStruct = { match_all: {} };
+            queryStruct = {match_all: {}};
         }
 
         const esResult = await fastify.elastic.search<any>({
             index: `${fastify.manager.chain}-table-voters-*`,
             from: skip || 0,
             size: (limit > maxDocs ? maxDocs : limit) || 10,
             query: queryStruct,
-            sort: [{ last_vote_weight: "desc" }]
+            sort: [{last_vote_weight: "desc"}]
         });
         stateResult = esResult.hits.hits.map((hit: any) => hit._source);
         response.voter_count = (esResult.hits.total as estypes.SearchTotalHits).value;
@@ -66,7 +78,10 @@ async function getVoters(fastify: FastifyInstance, request: FastifyRequest) {
         response.voters.push({
             account: voter.voter,
             weight: voter.last_vote_weight,
-            last_vote: voter.block_num
+            staked: voter.staked,
+            is_proxy: voter.is_proxy,
+            last_vote_block: voter.block_num,
+            producers: voter.producers || undefined
         });
     }
 

src/api/routes/v2-state/get_voters/index.ts

@@ -24,10 +24,15 @@ export default function (fastify: FastifyInstance, opts: any, next) {
                     type: "object",
                     properties: {
                         account: {type: "string"},
+                        is_proxy: {type: "boolean"},
                         weight: {type: "number"},
-                        last_vote: {type: "number"},
-                        data: {
-                            additionalProperties: true
+                        staked: {type: "number"},
+                        last_vote_block: {type: "number"},
+                        producers: {
+                            type: "array",
+                            items: {
+                                type: "string"
+                            }
                         }
                     }
                 }

src/indexer/modules/master.ts

@@ -49,8 +49,9 @@ import {getTotalValue} from "../../api/helpers/functions.js";
 import {ShipServer, StateHistorySocket} from "../connections/state-history.js";
 import {updateByBlock} from "../definitions/updateByBlock.painless.js";
 import {IAccount} from "../../interfaces/table-account.js";
-import Timeout = NodeJS.Timeout;
 import {IProposal} from "../../interfaces/table-proposal.js";
+import {IVoter} from "../../interfaces/table-voter.js";
+import Timeout = NodeJS.Timeout;
 
 interface RevBlock {
     num: number;
@@ -2442,7 +2443,17 @@ export class HyperionMaster {
                         {key: {"provided_approvals.actor": 1}},
                         {key: {"requested_approvals.actor": 1}}
                     ]);
-
+                    // voters table indices
+                    const voters = db.collection<IVoter>("voters");
+                    await voters.createIndexes([
+                        {key: {voter: 1}},
+                        {key: {block_num: 1}},
+                        {key: {staked: 1}},
+                        {key: {last_vote_weight: 1}},
+                        {key: {proxied_vote_weight: 1}},
+                        {key: {producers: 1}},
+                        {key: {is_proxy: 1}}
+                    ]);
                 }
             }
         } catch (e: any) {