feat: added custom contracts addresses, added using lidoLocator instead of constants

Author: Tarens2

src/common/config/config.service.ts

@@ -1,5 +1,13 @@
 import { ConfigService as ConfigServiceSource } from '@nestjs/config';
 import { EnvironmentVariables } from './env.validation';
+import {
+  AccountingOracleHashConsensusModule,
+  LidoContractModule,
+  LidoLocatorContractModule,
+  OracleReportSanityCheckerModule,
+  ValidatorsExitBusOracleHashConsensusModule,
+  WithdrawalQueueContractModule,
+} from '@lido-nestjs/contracts';
 
 export class ConfigService extends ConfigServiceSource<EnvironmentVariables> {
   /**
@@ -18,4 +26,18 @@ export class ConfigService extends ConfigServiceSource<EnvironmentVariables> {
   public get<T extends keyof EnvironmentVariables>(key: T): EnvironmentVariables[T] {
     return super.get(key, { infer: true }) as EnvironmentVariables[T];
   }
+
+  public getCustomConfigContractsAddressMap() {
+    return new Map<symbol, string>([
+      [WithdrawalQueueContractModule.contractToken, this.get('WITHDRAWAL_QUEUE_CONTRACT_DEVNET_ADDRESS')],
+      [LidoContractModule.contractToken, this.get('LIDO_CONTRACT_DEVNET_ADDRESS')],
+      [OracleReportSanityCheckerModule.contractToken, this.get('ORACLE_REPORT_SANITY_CHECKER_DEVNET_ADDRESS')],
+      [AccountingOracleHashConsensusModule.contractToken, this.get('ACCOUNTING_ORACLE_HASH_CONSENSUS_DEVNET_ADDRESS')],
+      [
+        ValidatorsExitBusOracleHashConsensusModule.contractToken,
+        this.get('VALIDATORS_EXIT_BUS_ORACLE_HASH_CONSENSUS_DEVNET_ADDRESS'),
+      ],
+      [LidoLocatorContractModule.contractToken, this.get('LIDO_LOCATOR_CONTRACT_DEVNET_ADDRESS')],
+    ]);
+  }
 }

src/common/config/env.validation.ts

@@ -1,7 +1,7 @@
 import { CronExpression } from '@nestjs/schedule';
 import { plainToClass, Transform } from 'class-transformer';
-import { IsEnum, IsNumber, IsString, IsOptional, validateSync, Min, IsArray, ArrayMinSize } from 'class-validator';
-import { Environment, LogLevel, LogFormat } from './interfaces';
+import { ArrayMinSize, IsArray, IsEnum, IsNumber, IsOptional, IsString, Min, validateSync } from 'class-validator';
+import { Environment, LogFormat, LogLevel } from './interfaces';
 
 const toNumber =
   ({ defaultValue }) =>
@@ -81,6 +81,30 @@ export class EnvironmentVariables {
   @IsNumber()
   @Transform(({ value }) => Number(value))
   CHAIN_ID: number = null;
+
+  @IsOptional()
+  @IsString()
+  WITHDRAWAL_QUEUE_CONTRACT_DEVNET_ADDRESS = '';
+
+  @IsOptional()
+  @IsString()
+  LIDO_CONTRACT_DEVNET_ADDRESS = '';
+
+  @IsOptional()
+  @IsString()
+  ORACLE_REPORT_SANITY_CHECKER_DEVNET_ADDRESS = '';
+
+  @IsOptional()
+  @IsString()
+  ACCOUNTING_ORACLE_HASH_CONSENSUS_DEVNET_ADDRESS = '';
+
+  @IsOptional()
+  @IsString()
+  VALIDATORS_EXIT_BUS_ORACLE_HASH_CONSENSUS_DEVNET_ADDRESS = '';
+
+  @IsOptional()
+  @IsString()
+  LIDO_LOCATOR_CONTRACT_DEVNET_ADDRESS = '';
 }
 export const ENV_KEYS = Object.keys(new EnvironmentVariables());
 

src/common/contracts/contracts.module.ts

@@ -8,6 +8,7 @@ import {
 } from '@lido-nestjs/contracts';
 import { Global, Module } from '@nestjs/common';
 import { ExecutionProvider } from 'common/execution-provider';
+import { ConfigService } from 'common/config';
 
 @Global()
 @Module({
@@ -20,10 +21,11 @@ import { ExecutionProvider } from 'common/execution-provider';
     LidoLocatorContractModule,
   ].map((module) =>
     module.forRootAsync({
-      async useFactory(provider: ExecutionProvider) {
-        return { provider };
+      async useFactory(provider: ExecutionProvider, config: ConfigService) {
+        const addressMap = config.getCustomConfigContractsAddressMap();
+        return { provider, address: addressMap.get(module.contractToken) };
       },
-      inject: [ExecutionProvider],
+      inject: [ExecutionProvider, ConfigService],
     }),
   ),
 })

src/common/sweep/sweep.service.ts

@@ -1,7 +1,6 @@
 import { ethers } from 'ethers';
 import { Inject, Injectable, LoggerService } from '@nestjs/common';
 import { LOGGER_PROVIDER } from '@lido-nestjs/logger';
-import { SimpleFallbackJsonRpcBatchProvider } from '@lido-nestjs/execution';
 import { ConfigService } from 'common/config';
 import {
   isFullyWithdrawableValidator,
@@ -14,32 +13,32 @@ import { bigNumberMin } from 'common/utils/big-number-min';
 import { OracleV2__factory } from 'common/contracts/generated';
 import { FAR_FUTURE_EPOCH } from 'jobs/validators';
 import { SLOTS_PER_EPOCH } from 'common/genesis-time';
-import { VALIDATORS_EXIT_BUS_ORACLE_CONTRACT_ADDRESSES } from 'common/contracts/modules/validators-exit-bus-oracle/validators-exit-bus-oracle.constants';
 import {
   MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP,
   MAX_WITHDRAWALS_PER_PAYLOAD,
   MIN_ACTIVATION_BALANCE,
 } from 'waiting-time/waiting-time.constants';
 import { Withdrawal } from './sweep.types';
+import { LIDO_LOCATOR_CONTRACT_TOKEN, LidoLocator } from '@lido-nestjs/contracts';
 
 @Injectable()
 export class SweepService {
   static SERVICE_LOG_NAME = 'sweep';
 
   constructor(
     @Inject(LOGGER_PROVIDER) protected readonly logger: LoggerService,
+    @Inject(LIDO_LOCATOR_CONTRACT_TOKEN) protected readonly lidoLocator: LidoLocator,
     protected readonly consensusClientService: ConsensusClientService,
-    protected readonly provider: SimpleFallbackJsonRpcBatchProvider,
     protected readonly configService: ConfigService,
   ) {}
 
   async getConsensusVersion() {
-    const chainId = this.configService.get('CHAIN_ID');
     const provider = new ethers.JsonRpcProvider(this.configService.get('EL_RPC_URLS')[0]);
-    const address: string = VALIDATORS_EXIT_BUS_ORACLE_CONTRACT_ADDRESSES[chainId];
+    const address = await this.lidoLocator.validatorsExitBusOracle();
     const validatorExitBusOracle = OracleV2__factory.connect(address, {
       provider,
     });
+
     return await validatorExitBusOracle.getConsensusVersion();
   }
 

src/events/rewards/rewards.service.ts

@@ -1,13 +1,7 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { SECONDS_PER_SLOT, SLOTS_PER_EPOCH } from '../../common/genesis-time';
 import { SimpleFallbackJsonRpcBatchProvider } from '@lido-nestjs/execution';
-import {
-  Lido,
-  LIDO_CONTRACT_TOKEN,
-  EXECUTION_REWARDS_VAULT_CONTRACT_ADDRESSES,
-  LIDO_LOCATOR_CONTRACT_TOKEN,
-  LidoLocator,
-} from '@lido-nestjs/contracts';
+import { Lido, LIDO_CONTRACT_TOKEN, LIDO_LOCATOR_CONTRACT_TOKEN, LidoLocator } from '@lido-nestjs/contracts';
 import { Interface } from 'ethers';
 import {
   LIDO_EL_REWARDS_RECEIVED_EVENT,
@@ -299,13 +293,10 @@ export class RewardsService {
 
   // it includes WithdrawalVault balance and diff between rewards and cached rewards from previous report
   async getVaultsBalance(blockNumber: number) {
-    const chainId = this.configService.get('CHAIN_ID');
     const withdrawalVaultAddress = await this.lidoLocator.withdrawalVault({ blockTag: blockNumber });
     const withdrawalVaultBalance = await this.provider.getBalance(withdrawalVaultAddress, blockNumber);
-    const rewardsVaultBalance = await this.provider.getBalance(
-      EXECUTION_REWARDS_VAULT_CONTRACT_ADDRESSES[chainId],
-      blockNumber,
-    );
+    const rewardsVaultAddress = await this.lidoLocator.elRewardsVault();
+    const rewardsVaultBalance = await this.provider.getBalance(rewardsVaultAddress, blockNumber);
     const elRewards = this.rewardsStorage.getElRewardsPerFrame();
     const clRewards = this.rewardsStorage.getClRewardsPerFrame();
 

src/jobs/validators/lido-keys/lido-keys.constants.ts

@@ -1,7 +1,10 @@
 import { CHAINS } from '@lido-nestjs/constants';
 
+const DEVNET_7 = '7032118028';
+
 export const KEYS_API_ADDRESS = {
   [CHAINS.Mainnet]: 'https://keys-api.lido.fi/v1/keys?used=true',
   [CHAINS.Goerli]: 'https://keys-api.testnet.fi/v1/keys?used=true',
   [CHAINS.Holesky]: 'https://keys-api-holesky.testnet.fi/v1/keys?used=true',
+  [DEVNET_7]: 'http://hr6vb81d1ndsx-pectra-devnet-7-keys-api.valset-01.testnet.fi/v1/keys?used=true',
 };