Skip to content

Commit

Permalink
Create public key array once not on each use.
Browse files Browse the repository at this point in the history
  • Loading branch information
mcdee committed Dec 30, 2023
1 parent ecd05a1 commit 8845604
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 16 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ dev:
- support Deneb beta.3
- compose multiclients from clients, reducing connections to beacon nodes
- start validator registrations randomly in middle 80% of each epoch, to avoid overloading relays
- reduce CPU and memory requirements for refreshing validator information

1.7.6:
- add User-Agent header to HTTP requests
Expand Down
27 changes: 11 additions & 16 deletions services/accountmanager/dirk/service.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright © 2020 - 2022 Attestant Limited.
// Copyright © 2020 - 2023 Attestant Limited.
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
Expand Down Expand Up @@ -54,6 +54,7 @@ type Service struct {
accountPaths []string
credentials credentials.TransportCredentials
accounts map[phase0.BLSPubKey]e2wtypes.Account
pubKeys []phase0.BLSPubKey
validatorsManager validatorsmanager.Service
domainProvider eth2client.DomainProvider
farFutureEpoch phase0.Epoch
Expand Down Expand Up @@ -188,6 +189,7 @@ func (s *Service) refreshAccounts(ctx context.Context) {
var accountsMu sync.Mutex
sem := semaphore.NewWeighted(s.processConcurrency)
var wg sync.WaitGroup
pubKeys := make([]phase0.BLSPubKey, 0)
for i := range wallets {
wg.Add(1)
go func(ctx context.Context, sem *semaphore.Weighted, wg *sync.WaitGroup, i int, mu *sync.Mutex) {
Expand All @@ -204,6 +206,7 @@ func (s *Service) refreshAccounts(ctx context.Context) {
mu.Lock()
for k, v := range walletAccounts {
accounts[k] = v
pubKeys = append(pubKeys, k)
}
mu.Unlock()
log.Trace().Dur("elapsed", time.Since(started)).Int("accounts", len(walletAccounts)).Msg("Imported accounts")
Expand All @@ -219,6 +222,7 @@ func (s *Service) refreshAccounts(ctx context.Context) {
return
}
s.accounts = accounts
s.pubKeys = pubKeys
s.mutex.Unlock()
}

Expand Down Expand Up @@ -253,14 +257,11 @@ func (s *Service) refreshValidators(ctx context.Context) error {
defer span.End()

s.mutex.RLock()
accountPubKeys := make([]phase0.BLSPubKey, 0, len(s.accounts))
for pubKey := range s.accounts {
accountPubKeys = append(accountPubKeys, pubKey)
}
pubKeys := s.pubKeys
s.mutex.RUnlock()
log.Trace().Int("accounts", len(accountPubKeys)).Msg("Refreshing validators of accounts")
log.Trace().Int("accounts", len(pubKeys)).Msg("Refreshing validators of accounts")

if err := s.validatorsManager.RefreshValidatorsFromBeaconNode(ctx, accountPubKeys); err != nil {
if err := s.validatorsManager.RefreshValidatorsFromBeaconNode(ctx, pubKeys); err != nil {
return errors.Wrap(err, "failed to refresh validators")
}
return nil
Expand Down Expand Up @@ -313,14 +314,11 @@ func (s *Service) ValidatingAccountsForEpoch(ctx context.Context, epoch phase0.E
}

s.mutex.RLock()
pubKeys := make([]phase0.BLSPubKey, 0, len(s.accounts))
for pubKey := range s.accounts {
pubKeys = append(pubKeys, pubKey)
}
pubKeys := s.pubKeys
s.mutex.RUnlock()

validators := s.validatorsManager.ValidatorsByPubKey(ctx, pubKeys)
validatingAccounts := make(map[phase0.ValidatorIndex]e2wtypes.Account)
validatingAccounts := make(map[phase0.ValidatorIndex]e2wtypes.Account, len(validators))
s.mutex.RLock()
for index, validator := range validators {
state := api.ValidatorToState(validator, nil, epoch, s.farFutureEpoch)
Expand Down Expand Up @@ -357,10 +355,7 @@ func (s *Service) ValidatingAccountsForEpochByIndex(ctx context.Context, epoch p
defer span.End()

s.mutex.RLock()
pubKeys := make([]phase0.BLSPubKey, 0, len(s.accounts))
for pubKey := range s.accounts {
pubKeys = append(pubKeys, pubKey)
}
pubKeys := s.pubKeys
s.mutex.RUnlock()

indexPresenceMap := make(map[phase0.ValidatorIndex]bool)
Expand Down

0 comments on commit 8845604

Please sign in to comment.