Turn on track signers (#47)

* return validators downtime blocks

* get validator validated blocks

* make validatorGroup in validator schema not mandate

Author: kwunyeung

CHANGLOG.md

@@ -3,6 +3,8 @@
 ## [Unreleased]
 
 * [#45] Fixed accounts list resolver
+* Return validator downtime blocks in resolver
+* Return validator validated blocks in resolver
 
 ## First Release v0.1.0
 

imports/api/blocks/server/methods.ts

@@ -68,29 +68,31 @@ Meteor.methods({
         chainState.latestHeight = block.number
 
         // get block singer records
-        // try{
-        //   const epochNumber = await kit.getEpochNumberOfBlock(block.number)
-        //   const election = await kit.contracts.getElection()
-        //   const validatorSet = await election.getElectedValidators(epochNumber)
-        //   const validators = await kit.contracts.getValidators()
-        //   const epochSize = await validators.getEpochSize()
-        //   // console.log(validatorSet)
-
-        //   const electionRC = new ElectionResultsCache(election, epochSize.toNumber())
-        //   for (let v in validatorSet){
-        //     let record:any = {
-        //       blockNumber: block.number,
-        //       signer: validatorSet[v].signer,
-        //       exist: await electionRC.signedParent(validatorSet[v].signer, block)
-        //     }
-        //     ValidatorRecords.insert(record);
-        //   }
-        // // const blockExtraData = parseBlockExtraData(block.extraData);
-        // // console.log(blockExtraData);
-        // }
-        // catch(e){
-        //   console.log(e)
-        // }
+        try{
+          const epochNumber = await kit.getEpochNumberOfBlock(block.number)
+          const election = await kit.contracts.getElection()
+          const validatorSet = await election.getElectedValidators(epochNumber)
+          const validators = await kit.contracts.getValidators()
+          const epochSize = await validators.getEpochSize()
+          // console.log(validatorSet)
+
+          const electionRC = new ElectionResultsCache(election, epochSize.toNumber())
+          for (let v in validatorSet){
+            let record:any = {
+              blockNumber: block.number,
+              signer: validatorSet[v].signer,
+              exist: await electionRC.signedParent(validatorSet[v].signer, block)
+            }
+            ValidatorRecords.insert(record);
+          }
+          block.hasSingers = true
+        // const blockExtraData = parseBlockExtraData(block.extraData);
+        // console.log(blockExtraData);
+        }
+        catch(e){
+          console.log(e)
+        }
+
         // get transactions hash
         if (block.transactions.length > 0) {
           for (let j = 0; j < block.transactions.length; j++) {

imports/api/graphql/resolvers.ts

@@ -142,7 +142,67 @@ export default {
       });
 
       return validatorSet
-    }
+    },
+    async downtime(_, { address, pageSize = 20, page = 1 }, context, info){
+      const totalCounts = ValidatorRecords.find({signer:address}).count();
+      const pipeline = [
+        {
+          '$match': {
+            'signer': address, 
+            'exist': false
+          }
+        }, {
+          '$lookup': {
+            'from': 'blocks', 
+            'localField': 'blockNumber', 
+            'foreignField': 'number', 
+            'as': 'block'
+          }
+        }, {
+          '$sort': {
+            'blockNumber': -1
+          }
+        }, {
+          '$skip': (page - 1) * pageSize
+        }, {
+          '$limit': pageSize
+        }, {
+          '$unwind': {
+            'path': '$block'
+          }
+        }
+      ]
+      const records = await ValidatorRecords.rawCollection().aggregate(pipeline).toArray()
+
+      let blocks = new Array()
+      records.forEach(record => {
+        blocks.push(record.block)
+      });
+
+      return {
+        pageSize: pageSize,
+        page: page,
+        blocks,
+        totalCounts: totalCounts,
+        cursor: blocks.length ? blocks[blocks.length - 1].number : null,
+        hasMore: blocks.length ? blocks[blocks.length - 1].number != 1 : false,
+      };
+    },
+    validatedBlocks(_, { address, pageSize = 20, page = 1 }, context, info){
+      const totalCounts = Blocks.find({miner:address}).count()
+      const blocks = Blocks.find(
+        {miner:address},
+        { sort: { number: -1 }, limit: pageSize, skip: (page - 1) * pageSize }
+      ).fetch()
+      return {
+        pageSize: pageSize,
+        page: page,
+        blocks,
+        totalCounts: totalCounts,
+        cursor: blocks.length ? blocks[blocks.length - 1].number : null,
+        hasMore: blocks.length ? blocks[blocks.length - 1].number != 1 : false,
+      };
+    },
   },
   Block: {
     transactions(parent) {
@@ -162,7 +222,7 @@ export default {
         }
       return miner
     },
-    signers(parent) {
+    async signers(parent) {
       const pipeline = [
         {
           '$match': {
@@ -181,8 +241,8 @@ export default {
           }
         }
       ]
-      const signerRecords = ValidatorRecords.rawCollection().aggregate(pipeline).toArray()
-      console.log(signerRecords);
+      const signerRecords = await ValidatorRecords.rawCollection().aggregate(pipeline).toArray()
+      // console.log(signerRecords);
       return signerRecords
     }
   },

imports/api/graphql/schema.ts

@@ -164,7 +164,7 @@ const typeDefs = gql`
         score: Float!
         signerAccount: Account
         signer: String!
-        validatorGroup: ValidatorGroup!
+        validatorGroup: ValidatorGroup
     }
 
     type Query {
@@ -190,6 +190,16 @@ const typeDefs = gql`
             pageSize: Int,
             page: Int
         ): TransactionList
+        validatedBlocks(
+            address: String
+            pageSize: Int
+            page: Int
+        ): BlockList!
+        downtime(
+            address: String
+            pageSize: Int
+            page: Int
+        ): BlockList!
         account(address: String!): Account
         validatorGroup(address:String!): ValidatorGroup
         validator(address:String!): Validator

imports/startup/server/create-indexes.ts

@@ -7,12 +7,17 @@ import { Validators, ValidatorRecords } from "../../api/validators/validators";
 import { Contracts } from "../../api/contracts/contracts";
 
 Blocks.rawCollection().createIndex({ number: -1 }, { unique: true });
+Blocks.rawCollection().createIndex({ miner: 1 });
+Blocks.rawCollection().createIndex({ number: -1, miner: 1 });
 Accounts.rawCollection().createIndex({ address: 1 }, { unique: true });
 Transactions.rawCollection().createIndex({ hash: 1 }, { unique: true });
 Transactions.rawCollection().createIndex({ blockNumber: -1 });
 Transactions.rawCollection().createIndex({ to: 1 });
 Transactions.rawCollection().createIndex({ from: 1 });
 ValidatorGroups.rawCollection().createIndex({ address: 1 }, { unique: true });
 Validators.rawCollection().createIndex({ address: 1 }, { unique: true });
-ValidatorRecords.rawCollection().createIndex({blockNumber:1, signer: 1}, {unique: true});
+ValidatorRecords.rawCollection().createIndex({blockNumber:-1, signer: 1}, {unique: true});
+ValidatorRecords.rawCollection().createIndex({blockNumber:-1});
+ValidatorRecords.rawCollection().createIndex({signer: 1});
+ValidatorRecords.rawCollection().createIndex({exist:1});
 Contracts.rawCollection().createIndex({ address: 1 }, { unique: true });