feat: updated validators info endpoint

Author: Tarens2

src/http/http.constants.ts

@@ -1,7 +1,7 @@
 export const HTTP_PATHS = {
   1: {
     nft: 'nft',
-    validators: 'validators',
+    'validators-info': 'validators-info',
     'request-time': 'request-time',
     'estimate-gas': 'estimate-gas',
   },

src/http/validators/dto/validators.dto.ts

@@ -24,4 +24,10 @@ export class ValidatorsDto {
     description: 'total number of validators in network',
   })
   totalValidators: number;
+
+  @ApiProperty({
+    example: 100000,
+    description: 'current frame',
+  })
+  currentFrame: number;
 }

src/http/validators/validators.controller.ts

@@ -12,17 +12,17 @@ import { HTTP_PATHS } from 'http/http.constants';
 import { ValidatorsService } from './validators.service';
 import { ValidatorsDto } from './dto';
 
-@Controller(HTTP_PATHS[1].validators)
+@Controller()
 @ApiTags('Validators')
 @UseInterceptors(ClassSerializerInterceptor)
 export class ValidatorsController {
   constructor(protected readonly validatorsService: ValidatorsService) {}
 
   @Version('1')
-  @Get('/')
+  @Get(HTTP_PATHS[1]['validators-info'])
   @CacheTTL(20 * 1000)
   @ApiResponse({ status: HttpStatus.OK, type: ValidatorsDto })
   async validatorsV1(): Promise<ValidatorsDto> {
-    return this.validatorsService.getAllValidatorsInfo();
+    return this.validatorsService.getValidatorsInfo();
   }
 }

src/http/validators/validators.module.ts

@@ -3,9 +3,10 @@ import { ConfigModule } from 'common/config';
 import { ValidatorsController } from './validators.controller';
 import { ValidatorsService } from './validators.service';
 import { ValidatorsStorageModule } from '../../storage';
+import { GenesisTimeModule } from '../../common/genesis-time';
 
 @Module({
-  imports: [ConfigModule, ValidatorsStorageModule],
+  imports: [ConfigModule, ValidatorsStorageModule, GenesisTimeModule],
   controllers: [ValidatorsController],
   providers: [ValidatorsService],
 })

src/http/validators/validators.service.ts

@@ -1,19 +1,22 @@
 import { Injectable } from '@nestjs/common';
 import { ConfigService } from 'common/config';
 import { ValidatorsStorageService } from '../../storage';
+import { GenesisTimeService } from '../../common/genesis-time';
 
 @Injectable()
 export class ValidatorsService {
   constructor(
     protected readonly configService: ConfigService,
     protected readonly validatorsServiceStorage: ValidatorsStorageService,
+    protected readonly genesisTimeService: GenesisTimeService,
   ) {}
 
-  getAllValidatorsInfo() {
+  getValidatorsInfo() {
     const lastUpdatedAt = this.validatorsServiceStorage.getLastUpdate();
     const maxExitEpoch = Number(this.validatorsServiceStorage.getMaxExitEpoch());
     const frameBalancesBigNumber = this.validatorsServiceStorage.getFrameBalances();
     const totalValidators = this.validatorsServiceStorage.getTotal();
+    const currentFrame = this.genesisTimeService.getFrameOfEpoch(this.genesisTimeService.getCurrentEpoch());
 
     const frameBalances = Object.keys(frameBalancesBigNumber).reduce((acc, item) => {
       acc[item] = frameBalancesBigNumber[item].toString();
@@ -25,6 +28,7 @@ export class ValidatorsService {
       maxExitEpoch,
       frameBalances,
       totalValidators,
+      currentFrame,
     };
   }
 }

src/jobs/validators/validators.service.ts

@@ -89,11 +89,13 @@ export class ValidatorsService {
         this.validatorsStorageService.setFrameBalances(frameBalances);
         await this.validatorsCacheService.saveDataToCache();
 
+        const currentFrame = this.genesisTimeService.getFrameOfEpoch(this.genesisTimeService.getCurrentEpoch());
         this.logger.log('End update validators', {
           service: ValidatorsService.SERVICE_LOG_NAME,
           totalValidators,
           latestEpoch,
           frameBalances: stringifyFrameBalances(frameBalances),
+          currentFrame,
         });
 
         Object.keys(frameBalances).forEach((frame) => {

src/waiting-time/utils/calculate-frame-by-validator-balances.ts

@@ -43,9 +43,8 @@ export const calculateFrameByValidatorBalances = (args: calculateFrameByValidato
   const sweepingMean = calculateSweepingMean(totalValidators).toNumber();
   const framesOfSweepingMean = Math.ceil(sweepingMean / epochPerFrame);
 
-  // todo: return back previous version of calculation after rework sweeping mean
-  // If resulted withdrawable_epoch is less than current frame, should return next frame
-  result = result.lt(currentFrame) ? BigNumber.from(currentFrame) : result;
-  const resultWithSweep = result.add(framesOfSweepingMean).toNumber();
-  return resultWithSweep;
+  const resultFrame = result.add(framesOfSweepingMean).toNumber();
+
+  // If withdrawable_epoch is less than current frame, should return next frame
+  return resultFrame < currentFrame ? currentFrame + 1 : resultFrame;
 };