Merge pull request #263 from attestantio/ensure-secondary-registrations

Ensure secondary registrations take place..

CHANGELOG.md

@@ -1,3 +1,6 @@
+1.9.1:
+  - ensure that secondary validator registrations take place for all accounts
+
 1.9.0:
   - allow Vouch to start with some consensus nodes unavailable
   - allow Vouch to act as an MEV-boost client for non-Vouch validators

main.go

@@ -110,7 +110,7 @@ import (
 )
 
 // ReleaseVersion is the release version for the code.
-var ReleaseVersion = "1.9.0"
+var ReleaseVersion = "1.9.1"
 
 func main() {
 	exitCode := main2()

services/blockrelay/standard/submitvalidatorregistrations.go

@@ -120,9 +120,15 @@ func (s *Service) submitValidatorRegistrationsForAccounts(ctx context.Context,
 	consensusRegistrations := make([]*consensusapi.VersionedSignedValidatorRegistration, 0, len(accounts))
 	relayRegistrations := make(map[string][]*builderapi.VersionedSignedValidatorRegistration)
 	for _, account := range accounts {
-		if err := s.generateValidatorRegistrationsForAccount(ctx, account, controlledValidators, consensusRegistrations, relayRegistrations); err != nil {
+		accountConsensusRegistrations, err := s.generateValidatorRegistrationsForAccount(ctx,
+			account,
+			controlledValidators,
+			relayRegistrations,
+		)
+		if err != nil {
 			return err
 		}
+		consensusRegistrations = append(consensusRegistrations, accountConsensusRegistrations...)
 	}
 	span.AddEvent("Generated registrations")
 
@@ -155,21 +161,25 @@ func (s *Service) submitValidatorRegistrationsForAccounts(ctx context.Context,
 func (s *Service) generateValidatorRegistrationsForAccount(ctx context.Context,
 	account e2wtypes.Account,
 	controlledValidators map[phase0.BLSPubKey]struct{},
-	consensusRegistrations []*consensusapi.VersionedSignedValidatorRegistration,
 	relayRegistrations map[string][]*builderapi.VersionedSignedValidatorRegistration,
-) error {
+) (
+	[]*consensusapi.VersionedSignedValidatorRegistration,
+	error,
+) {
 	pubkey := util.ValidatorPubkey(account)
 	controlledValidators[pubkey] = struct{}{}
 
 	proposerConfig, err := s.executionConfig.ProposerConfig(ctx, account, pubkey, s.fallbackFeeRecipient, s.fallbackGasLimit)
 	if err != nil {
-		return errors.Wrap(err, "No proposer configuration; cannot submit validator registrations")
+		return nil, errors.Wrap(err, "No proposer configuration; cannot submit validator registrations")
 	}
 	if proposerConfig.FeeRecipient.IsZero() {
 		s.log.Error().Stringer("validator", pubkey).Msg("Received 0 execution address for validator registration; using fallback")
 		proposerConfig.FeeRecipient = s.fallbackFeeRecipient
 	}
 
+	consensusRegistrations := make([]*consensusapi.VersionedSignedValidatorRegistration, 0, len(proposerConfig.Relays))
+
 	for index, relay := range proposerConfig.Relays {
 		relayRegistration, consensusRegistration, err := s.generateValidatorRegistrationForRelay(ctx, account, pubkey, relay)
 		if err != nil {
@@ -195,7 +205,7 @@ func (s *Service) generateValidatorRegistrationsForAccount(ctx context.Context,
 		}
 	}
 
-	return nil
+	return consensusRegistrations, nil
 }
 
 func (s *Service) submitRelayRegistrations(ctx context.Context,