fix: code clean up

Author: Tarens2

src/common/sweep/index.ts

@@ -1,3 +1,2 @@
 export * from './sweep.module';
 export * from './sweep.service';
-export * from './sweep.constants';

src/common/sweep/sweep.constants.ts

@@ -1,16 +1,11 @@
 import { Inject, Injectable, LoggerService } from '@nestjs/common';
 import { LOGGER_PROVIDER } from '@lido-nestjs/logger';
-import { GenesisTimeService, SLOTS_PER_EPOCH } from '../genesis-time';
+import { SLOTS_PER_EPOCH } from '../genesis-time';
 import {
   isFullyWithdrawableValidator,
   isPartiallyWithdrawableValidator,
 } from '../../jobs/validators/utils/validator-state-utils';
 import { FAR_FUTURE_EPOCH } from '../../jobs/validators';
-import {
-  MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP,
-  MAX_WITHDRAWALS_PER_PAYLOAD,
-  MIN_ACTIVATION_BALANCE,
-} from './sweep.constants';
 import { ConsensusClientService } from '../consensus-provider/consensus-client.service';
 import { parseGwei } from '../utils/parse-gwei';
 import { bigNumberMin } from '../utils/big-number-min';
@@ -21,6 +16,11 @@ import { OracleV2__factory } from '../contracts/generated';
 import { VALIDATORS_EXIT_BUS_ORACLE_CONTRACT_ADDRESSES } from '../contracts/modules/validators-exit-bus-oracle/validators-exit-bus-oracle.constants';
 import { ConfigService } from '../config';
 import { SimpleFallbackJsonRpcBatchProvider } from '@lido-nestjs/execution';
+import {
+  MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP,
+  MAX_WITHDRAWALS_PER_PAYLOAD,
+  MIN_ACTIVATION_BALANCE,
+} from '../../waiting-time/waiting-time.constants';
 
 @Injectable()
 export class SweepService {

src/common/sweep/sweep.service.ts

@@ -3,7 +3,10 @@ import { BigNumber } from '@ethersproject/bignumber';
 import { SLOTS_PER_EPOCH } from 'common/genesis-time';
 import { MAX_WITHDRAWALS_PER_PAYLOAD } from 'waiting-time/waiting-time.constants';
 
-// time to scan all validators and try to withdraw it
+/**
+ * @deprecated
+ * time to scan all validators and try to withdraw it
+ */
 export const calculateSweepingMean = (totalValidators: number) => {
   return BigNumber.from(totalValidators).div(BigNumber.from(MAX_WITHDRAWALS_PER_PAYLOAD).mul(SLOTS_PER_EPOCH)).div(2);
 };

src/waiting-time/utils/calculate-sweeping-mean.ts

@@ -3,13 +3,16 @@ import { parseEther } from '@ethersproject/units';
 export const MIN_PER_EPOCH_CHURN_LIMIT = 4;
 export const CHURN_LIMIT_QUOTIENT = 65536; // 2**16
 
-// todo: rename to MIN_ACTIVATION_BALANCE
-export const MAX_EFFECTIVE_BALANCE = parseEther('32'); // ETH
+// note: currently all lido validators continues holding 32 eth,
+// but after electra upgrade maximum in network increased to 2048 eth
+export const MIN_ACTIVATION_BALANCE = parseEther('32'); // ETH
 
 export const MAX_EFFECTIVE_BALANCE_ELECTRA = parseEther('2048');
 
 export const MAX_WITHDRAWALS_PER_PAYLOAD = 2 ** 4;
 
+export const MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP = 2 ** 3;
+
 export const GAP_AFTER_REPORT = 30 * 60 * 1000; // 30 mins
 
 export const WITHDRAWAL_BUNKER_DELAY_FRAMES = 14;

src/waiting-time/waiting-time.constants.ts

@@ -16,15 +16,14 @@ import { RewardsService } from 'events/rewards';
 import {
   CHURN_LIMIT_QUOTIENT,
   GAP_AFTER_REPORT,
-  MAX_EFFECTIVE_BALANCE,
+  MIN_ACTIVATION_BALANCE,
   MIN_PER_EPOCH_CHURN_LIMIT,
   WITHDRAWAL_BUNKER_DELAY_FRAMES,
 } from './waiting-time.constants';
 import {
   validateTimeResponseWithFallback,
   calculateUnfinalizedEthToRequestId,
   calculateFrameByValidatorBalances,
-  calculateSweepingMean,
 } from './utils';
 import { transformToRequestDto } from './dto';
 import {
@@ -277,7 +276,7 @@ export class WaitingTimeService {
 
     // number epochs needed for closing unfinalizedETH dividing on validator balances and rewards
     const lidoQueueInEpochBeforeVEBOExitLimit = unfinalizedETH.div(
-      MAX_EFFECTIVE_BALANCE.mul(Math.floor(churnLimit)).add(rewardsPerEpoch),
+      MIN_ACTIVATION_BALANCE.mul(Math.floor(churnLimit)).add(rewardsPerEpoch),
     );
 
     // number of validators to exit
@@ -473,7 +472,7 @@ export class WaitingTimeService {
 
     const churnLimit = Math.max(MIN_PER_EPOCH_CHURN_LIMIT, totalValidators / CHURN_LIMIT_QUOTIENT);
 
-    const lidoQueueInEpoch = unfinalizedETH.div(MAX_EFFECTIVE_BALANCE.mul(Math.floor(churnLimit)));
+    const lidoQueueInEpoch = unfinalizedETH.div(MIN_ACTIVATION_BALANCE.mul(Math.floor(churnLimit)));
     const sweepingMean = this.validators.getSweepMeanEpochs();
     const potentialExitEpoch = BigNumber.from(latestEpoch).add(lidoQueueInEpoch).add(sweepingMean);