* Added the following fields to block entity:

 * `stakedValidators`
 * `stakedValidatorsTokens`
 * `unstakingValidators`
 * `unstakingValidatorsTokens`

Author: Alann27

schema.graphql

@@ -254,6 +254,10 @@ type Block @entity {
   stakedGatewaysTokens: BigInt
   unstakedGateways: Int
   unstakedGatewaysTokens: BigInt
+  stakedValidators: Int
+  stakedValidatorsTokens: BigInt
+  unstakingValidators: Int
+  unstakingValidatorsTokens: BigInt
 }
 
 # This handle all the information that is coming with the block but is not often used

src/mappings/poktroll/pagination.ts

@@ -7,7 +7,7 @@ import {
   StakeStatus,
   Supplier,
   SupplierServiceConfig,
-  Transaction,
+  Transaction, Validator,
 } from "../../types";
 import { fetchPaginatedRecords } from "../utils/db";
 
@@ -105,6 +105,19 @@ export async function fetchAllSupplierByUnstakingEndBlockId(blockId: bigint): Pr
   });
 }
 
+// validator
+
+export async function fetchAllValidatorByStatus(status: StakeStatus): Promise<Validator[]> {
+  return fetchPaginatedRecords({
+    fetchFn: (options) => Validator.getByStakeStatus(status, options),
+    initialOptions: {
+      // add order and direction to speedup if there is a way
+      // orderBy: 'id', // Order results by ID
+      // orderDirection: 'ASC', // Ascending order
+    },
+  });
+}
+
 // gateway
 
 export async function fetchAllGatewayByStatus(status: StakeStatus): Promise<Gateway[]> {

src/mappings/poktroll/reports.ts

@@ -20,7 +20,7 @@ import {
   fetchAllSupplierByStatus,
   fetchAllSupplierByUnstakingEndBlockId,
   fetchAllSupplierServiceConfigBySupplier,
-  fetchAllTransactions,
+  fetchAllTransactions, fetchAllValidatorByStatus,
 } from "./pagination";
 
 export async function handleAddBlockReports(block: CosmosBlock): Promise<void> {
@@ -44,6 +44,8 @@ export async function handleAddBlockReports(block: CosmosBlock): Promise<void> {
     { unstakedApps, unstakedTokensByApp },
     { stakedGateways, stakedTokensByGateway },
     { unstakedGateways, unstakedTokensByGateway },
+    { stakedTokensByValidators, stakedValidators },
+    { unstakingTokensByValidators, unstakingValidators }
   ] = await Promise.all([
     getRelaysData(blockHeight),
     getTransactionsData(blockHeight),
@@ -56,6 +58,8 @@ export async function handleAddBlockReports(block: CosmosBlock): Promise<void> {
     getUnstakedAppsData(blockHeight),
     getStakedGatewaysData(),
     getUnstakedGatewaysData(blockHeight),
+    getStakedValidatorsData(),
+    getUnstakingValidatorsData(),
   ]);
 
   blockEntity.totalComputedUnits = computedUnits;
@@ -80,6 +84,10 @@ export async function handleAddBlockReports(block: CosmosBlock): Promise<void> {
   blockEntity.stakedGatewaysTokens = stakedTokensByGateway;
   blockEntity.unstakedGateways = unstakedGateways;
   blockEntity.unstakedGatewaysTokens = unstakedTokensByGateway;
+  blockEntity.stakedValidators = stakedValidators;
+  blockEntity.stakedValidatorsTokens = stakedTokensByValidators;
+  blockEntity.unstakingValidators = unstakingValidators;
+  blockEntity.unstakingValidatorsTokens = unstakingTokensByValidators;
 
   await Promise.all([
     blockEntity.save(),
@@ -230,6 +238,26 @@ async function getUnstakingSuppliersData() {
   };
 }
 
+async function getStakedValidatorsData() {
+  const stakedValidators = await fetchAllValidatorByStatus(StakeStatus.Staked);
+  const stakedTokensByValidators = stakedValidators.reduce((acc, validator) => acc + BigInt(validator.stakeAmount), BigInt(0));
+
+  return {
+    stakedValidators: stakedValidators.length,
+    stakedTokensByValidators: stakedTokensByValidators,
+  };
+}
+
+async function getUnstakingValidatorsData() {
+  const unstakingValidators = await fetchAllValidatorByStatus(StakeStatus.Unstaking);
+  const unstakingTokensByValidators = unstakingValidators.reduce((acc, validator) => acc + BigInt(validator.stakeAmount), BigInt(0));
+
+  return {
+    unstakingValidators: unstakingValidators.length,
+    unstakingTokensByValidators,
+  };
+}
+
 async function getTook(block: CosmosBlock) {
   if (block.header.height === 1) {
     return 0;