From cdd7e016c2eab9cb6550be64c1acc32c49d60240 Mon Sep 17 00:00:00 2001 From: Justin Brower Date: Fri, 6 Sep 2024 10:56:06 -0400 Subject: [PATCH] remove a duplicate fetch in status --- cli/core/status.go | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/cli/core/status.go b/cli/core/status.go index d5fc2f8f..fd208894 100644 --- a/cli/core/status.go +++ b/cli/core/status.go @@ -120,22 +120,17 @@ func GetStatus(ctx context.Context, eigenpodAddress string, eth *ethclient.Clien PanicOnError("failed to calculate sum of onchain validator balances", err) sumRestakedBalancesGwei := new(big.Float).SetUint64(uint64(sumRestakedBalancesU64)) - for i := 0; i < len(allValidatorsForEigenpod); i++ { - validator := allValidatorsForEigenpod[i].Validator - validatorIndex := allValidatorsForEigenpod[i].Index - - validatorInfo, err := eigenPod.ValidatorPubkeyToInfo(nil, validator.PublicKey[:]) - PanicOnError("failed to fetch validator info", err) - - validators[fmt.Sprintf("%d", validatorIndex)] = Validator{ - Index: validatorIndex, - Status: int(validatorInfo.Status), - Slashed: validator.Slashed, - PublicKey: validator.PublicKey.String(), - IsAwaitingActivationQueue: validator.ActivationEpoch == FAR_FUTURE_EPOCH, - IsAwaitingWithdrawalCredentialProof: IsAwaitingWithdrawalCredentialProof(validatorInfo, validator), - EffectiveBalance: uint64(validator.EffectiveBalance), - CurrentBalance: uint64(allBeaconBalances[validatorIndex]), + for _, validator := range allValidatorsWithInfoForEigenpod { + + validators[fmt.Sprintf("%d", validator.Index)] = Validator{ + Index: validator.Index, + Status: int(validator.Info.Status), + Slashed: validator.Validator.Slashed, + PublicKey: validator.Validator.PublicKey.String(), + IsAwaitingActivationQueue: validator.Validator.ActivationEpoch == FAR_FUTURE_EPOCH, + IsAwaitingWithdrawalCredentialProof: IsAwaitingWithdrawalCredentialProof(validator.Info, validator.Validator), + EffectiveBalance: uint64(validator.Validator.EffectiveBalance), + CurrentBalance: uint64(allBeaconBalances[validator.Index]), } }