feat: added logs and cache

Author: Tarens2

package.json

@@ -23,7 +23,8 @@
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
     "test:e2e": "jest --config ./test/jest-e2e.json",
-    "typechain": "typechain --target=ethers-v6 --out-dir ./src/common/contracts/generated ./src/common/contracts/abi/*.json"
+    "typechain": "typechain --target=ethers-v6 --out-dir ./src/common/contracts/generated ./src/common/contracts/abi/*.json",
+    "postinstall": "yarn typechain"
   },
   "dependencies": {
     "@ethersproject/bignumber": "^5.7.0",

src/common/sweep/sweep.service.ts

@@ -24,11 +24,12 @@ import { SimpleFallbackJsonRpcBatchProvider } from '@lido-nestjs/execution';
 
 @Injectable()
 export class SweepService {
+  static SERVICE_LOG_NAME = 'sweep';
+
   constructor(
     @Inject(LOGGER_PROVIDER) protected readonly logger: LoggerService,
     protected readonly consensusClientService: ConsensusClientService,
     protected readonly provider: SimpleFallbackJsonRpcBatchProvider,
-    protected readonly genesisService: GenesisTimeService,
     protected readonly configService: ConfigService,
   ) {}
 
@@ -46,6 +47,12 @@ export class SweepService {
     const isElectraActivate = await this.consensusClientService.isElectraActivated(currentEpoch);
     const consensusVersion = await this.getConsensusVersion();
 
+    this.logger.log('check electra info', {
+      isElectraActivate,
+      consensusVersion,
+      service: SweepService.SERVICE_LOG_NAME,
+    });
+
     if (consensusVersion < 3 || !isElectraActivate) {
       return this.getSweepDelayInEpochsPreElectra(indexedValidators, currentEpoch);
     }
@@ -58,7 +65,10 @@ export class SweepService {
     const totalWithdrawableValidators = this.getWithdrawableValidatorsNumber(indexedValidators, epoch);
 
     const fullSweepInEpochs = totalWithdrawableValidators / MAX_WITHDRAWALS_PER_PAYLOAD / SLOTS_PER_EPOCH;
-    return Math.floor(fullSweepInEpochs * 0.5);
+    const result = Math.floor(fullSweepInEpochs * 0.5);
+
+    this.logger.log('calculated sweep delay in epochs pre electra', { result, service: SweepService.SERVICE_LOG_NAME });
+    return result;
   }
 
   // pre pectra
@@ -80,7 +90,13 @@ export class SweepService {
     const fullSweepCycleInEpochs = Math.ceil(
       withdrawalsNumberInSweepCycle / MAX_WITHDRAWALS_PER_PAYLOAD / SLOTS_PER_EPOCH,
     );
-    return Math.floor(fullSweepCycleInEpochs / 2);
+
+    const result = Math.floor(fullSweepCycleInEpochs * 0.5);
+    this.logger.log('calculated sweep delay in epochs post electra', {
+      result,
+      service: SweepService.SERVICE_LOG_NAME,
+    });
+    return result;
   }
 
   private predictWithdrawalsNumberInSweepCycle(state: BeaconState, indexedValidators: IndexedValidator[]): number {

src/storage/validators/validators-cache.service.ts

@@ -30,7 +30,7 @@ export class ValidatorsCacheService {
       await file.close();
       const data: string[] = fileReadResult.split(ValidatorsCacheService.CACHE_DATA_DIVIDER);
 
-      if (data.length !== 4) {
+      if (data.length !== 5) {
         this.logger.log(`invalid cache data length`, {
           service: ValidatorsCacheService.SERVICE_LOG_NAME,
           data,
@@ -52,8 +52,9 @@ export class ValidatorsCacheService {
 
       this.validatorsStorage.setActiveValidatorsCount(Number(data[0]));
       this.validatorsStorage.setMaxExitEpoch(data[1]);
-      this.validatorsStorage.setFrameBalances(this.parseFrameBalances(data[3]));
       this.validatorsStorage.setLastUpdate(Number(data[2]));
+      this.validatorsStorage.setFrameBalances(this.parseFrameBalances(data[3]));
+      this.validatorsStorage.setSweepMeanEpochs(Number(data[4]));
 
       this.logger.log(`success initialize from cache file ${cacheFileName}`, {
         service: ValidatorsCacheService.SERVICE_LOG_NAME,
@@ -77,6 +78,7 @@ export class ValidatorsCacheService {
       this.validatorsStorage.getMaxExitEpoch(),
       this.validatorsStorage.getLastUpdate(),
       stringifyFrameBalances(this.validatorsStorage.getFrameBalances()),
+      this.validatorsStorage.getSweepMeanEpochs(),
     ].join(ValidatorsCacheService.CACHE_DATA_DIVIDER);
     await writeFile(cacheFileName, data);
     this.logger.log(`success save to file ${cacheFileName}`, { service: ValidatorsCacheService.SERVICE_LOG_NAME });