feat: new attestations calculation algorithm

README.md

@@ -241,12 +241,6 @@ Independent of `CL_API_MAX_RETRIES`.
 * **Required:** false
 * **Default:** 155000
 ---
-`DENCUN_FORK_EPOCH` - Ethereum consensus layer epoch when the Dencun hard fork has been released. This value must be set
-only for custom networks that support the Dencun hard fork. If the value of this variable is not specified for a custom
-network, it is supposed that this network doesn't support Dencun. For officially supported networks (Mainnet, Goerli and
-Holesky) this value should be omitted.
-* **Required:** false
----
 `VALIDATOR_REGISTRY_SOURCE` - Validators registry source.
 * **Required:** false
 * **Values:** lido (Lido NodeOperatorsRegistry module keys) / keysapi (Lido keys from multiple modules) / file

package.json

@@ -35,7 +35,7 @@
     "@lido-nestjs/execution": "^1.11.1",
     "@lido-nestjs/logger": "^1.3.2",
     "@lido-nestjs/registry": "^7.4.0",
-    "@lodestar/types": "^1.15.1",
+    "@lodestar/types": "^1.24.0",
     "@mikro-orm/core": "^5.3.1",
     "@mikro-orm/knex": "^5.3.1",
     "@mikro-orm/nestjs": "^5.1.0",

src/app/app.service.ts

@@ -30,7 +30,6 @@ export class AppService implements OnModuleInit, OnApplicationBootstrap {
     this.logger.log(`DRY RUN ${this.configService.get('DRY_RUN') ? 'enabled' : 'disabled'}`);
     this.logger.log(`Slot time: ${this.configService.get('CHAIN_SLOT_TIME_SECONDS')} seconds`);
     this.logger.log(`Epoch size: ${this.configService.get('FETCH_INTERVAL_SLOTS')} slots`);
-    this.logger.log(`Dencun fork epoch: ${this.configService.get('DENCUN_FORK_EPOCH')}`);
   }
 
   public async onApplicationBootstrap(): Promise<void> {

src/common/config/env.validation.ts

@@ -1,4 +1,4 @@
-import { Expose, Transform, plainToInstance } from 'class-transformer';
+import { Transform, plainToInstance } from 'class-transformer';
 import {
   ArrayMinSize,
   IsArray,
@@ -9,7 +9,6 @@ import {
   IsNumber,
   IsObject,
   IsPort,
-  IsPositive,
   IsString,
   Max,
   Min,
@@ -18,8 +17,6 @@ import {
   validateSync,
 } from 'class-validator';
 
-import { Epoch } from 'common/consensus-provider/types';
-
 import { Environment, LogFormat, LogLevel } from './interfaces';
 
 export enum Network {
@@ -39,12 +36,6 @@ export enum WorkingMode {
   Head = 'head',
 }
 
-const dencunForkEpoch = {
-  '1': 269568,
-  '5': 231680,
-  '17000': 29696,
-};
-
 const toBoolean = (value: any): boolean => {
   if (typeof value === 'boolean') {
     return value;
@@ -171,15 +162,6 @@ export class EnvironmentVariables {
   @ValidateIf((vars) => vars.ETH_NETWORK === Network.Mainnet)
   public START_EPOCH = 155000;
 
-  @IsInt()
-  @IsPositive()
-  @Expose()
-  @Transform(
-    ({ value, obj }) =>
-      dencunForkEpoch[obj.ETH_NETWORK] || (value != null && value.trim() !== '' ? parseInt(value, 10) : Number.MAX_SAFE_INTEGER),
-  )
-  public DENCUN_FORK_EPOCH: Epoch;
-
   @IsNumber()
   @Min(32)
   @Transform(({ value }) => parseInt(value, 10), { toClassOnly: true })

src/common/consensus-provider/consensus-provider.service.ts

@@ -15,7 +15,15 @@ import { EpochProcessingState } from 'storage/clickhouse';
 
 import { BlockCache, BlockCacheService } from './block-cache';
 import { MaxDeepError, ResponseError, errCommon, errRequest } from './errors';
-import { BlockHeaderResponse, BlockInfoResponse, GenesisResponse, ProposerDutyInfo, SyncCommitteeInfo, VersionResponse } from './intefaces';
+import {
+  BlockHeaderResponse,
+  BlockInfoResponse,
+  GenesisResponse,
+  ProposerDutyInfo,
+  SpecResponse,
+  SyncCommitteeInfo,
+  VersionResponse,
+} from './intefaces';
 import { BlockId, Epoch, Slot, StateId } from './types';
 
 let ssz: typeof import('@lodestar/types').ssz;
@@ -29,6 +37,11 @@ interface RequestRetryOptions {
   useFallbackOnResolved?: (r: any) => boolean;
 }
 
+export interface ForkEpochs {
+  deneb: number;
+  electra: number;
+}
+
 @Injectable()
 export class ConsensusProviderService {
   protected apiUrls: string[];
@@ -37,10 +50,12 @@ export class ConsensusProviderService {
   protected genesisTime = 0;
   protected defaultMaxSlotDeepCount = 32;
   protected latestSlot = { slot: 0, fetchTime: 0 };
+  protected forkEpochs: ForkEpochs;
 
   protected endpoints = {
     version: 'eth/v1/node/version',
     genesis: 'eth/v1/beacon/genesis',
+    spec: 'eth/v1/config/spec',
     blockInfo: (blockId: BlockId): string => `eth/v2/beacon/blocks/${blockId}`,
     beaconHeaders: (blockId: BlockId): string => `eth/v1/beacon/headers/${blockId}`,
     attestationCommittees: (stateId: StateId, epoch: Epoch): string => `eth/v1/beacon/states/${stateId}/committees?epoch=${epoch}`,
@@ -68,6 +83,23 @@ export class ConsensusProviderService {
     return (this.version = version);
   }
 
+  public async getForkEpochs(): Promise<ForkEpochs> {
+    if (this.forkEpochs != null) {
+      return this.forkEpochs;
+    }
+
+    const spec = await this.retryRequest<SpecResponse>(async (apiURL: string) => this.apiGet(apiURL, this.endpoints.spec));
+    this.forkEpochs = {
+      deneb: spec.DENEB_FORK_EPOCH != null ? parseInt(spec.DENEB_FORK_EPOCH, 10) : Number.MAX_SAFE_INTEGER,
+      electra: spec.ELECTRA_FORK_EPOCH != null ? parseInt(spec.ELECTRA_FORK_EPOCH, 10) : Number.MAX_SAFE_INTEGER,
+    };
+
+    this.logger.log(`Deneb fork epoch: ${this.forkEpochs.deneb}`);
+    this.logger.log(`Electra fork epoch: ${this.forkEpochs.electra}`);
+
+    return this.forkEpochs;
+  }
+
   public async getGenesisTime(): Promise<number> {
     if (this.genesisTime > 0) {
       return this.genesisTime;

src/common/consensus-provider/intefaces/response.interface.ts

@@ -12,25 +12,6 @@ export enum ValStatus {
   WithdrawalDone = 'withdrawal_done',
 }
 
-export interface AttesterDutyInfo {
-  pubkey: string;
-  validator_index: string;
-  committee_index: string;
-  committee_length: string;
-  committees_at_slot: string;
-  validator_committee_index: string;
-  slot: string;
-}
-
-export interface CheckedAttesterDutyInfo extends AttesterDutyInfo {
-  attested: boolean;
-  valid_head: boolean;
-  valid_target: boolean;
-  valid_source: boolean;
-  inclusion_delay: number;
-  in_block: string | undefined;
-}
-
 export interface BlockHeaderResponse {
   root: RootHex;
   canonical: boolean;
@@ -99,6 +80,7 @@ export interface ProposerDutyInfo {
 
 export interface BeaconBlockAttestation {
   aggregation_bits: string;
+  committee_bits?: string;
   data: {
     slot: string;
     index: string;
@@ -114,32 +96,6 @@ export interface BeaconBlockAttestation {
   };
 }
 
-export interface StateValidatorResponse {
-  index: string;
-  balance: string;
-  status: (typeof ValStatus)[keyof typeof ValStatus];
-  validator: {
-    pubkey: string;
-    withdrawal_credentials: string;
-    effective_balance: string;
-    slashed: boolean;
-    activation_eligibility_epoch: string;
-    activation_epoch: string;
-    exit_epoch: string;
-    withdrawable_epoch: string;
-  };
-}
-
-export interface SyncCommitteeDutyInfo {
-  pubkey: string;
-  validator_index: ValidatorIndex;
-  validator_sync_committee_indices: string[];
-  results: {
-    block: string;
-    sync: boolean;
-  }[];
-}
-
 export interface SyncCommitteeInfo {
   validators: ValidatorIndex[];
 }
@@ -159,3 +115,8 @@ export interface SyncCommitteeValidator {
 export interface VersionResponse {
   version: string;
 }
+
+export interface SpecResponse {
+  DENEB_FORK_EPOCH?: string;
+  ELECTRA_FORK_EPOCH?: string;
+}

src/duty/attestation/attestation.constants.ts

@@ -12,24 +12,24 @@ const timelyTarget = (attIncDelay: number, attValidSource: boolean, attValidTarg
   return attValidSource && attValidTarget && attIncDelay <= 32;
 };
 
-const timelyTargetDencun = (attValidSource: boolean, attValidTarget: boolean): boolean => {
+const timelyTargetDeneb = (attValidSource: boolean, attValidTarget: boolean): boolean => {
   return attValidSource && attValidTarget;
 };
 
 const timelyHead = (attIncDelay: number, attValidSource: boolean, attValidTarget: boolean, attValidHead: boolean): boolean => {
   return attValidSource && attValidTarget && attValidHead && attIncDelay === 1;
 };
 
-export const getFlags = (
+export const getAttestationFlags = (
   attIncDelay: number,
   attValidSource: boolean,
   attValidTarget: boolean,
   attValidHead: boolean,
-  isDencunFork: boolean,
+  isDenebFork: boolean,
 ) => {
   return {
     source: timelySource(attIncDelay, attValidSource),
-    target: isDencunFork ? timelyTargetDencun(attValidSource, attValidTarget) : timelyTarget(attIncDelay, attValidSource, attValidTarget),
+    target: isDenebFork ? timelyTargetDeneb(attValidSource, attValidTarget) : timelyTarget(attIncDelay, attValidSource, attValidTarget),
     head: timelyHead(attIncDelay, attValidSource, attValidTarget, attValidHead),
   };
 };