Add channel to notify externally of new validators

flashbots · Jul 5, 2024 · d7b62c1 · d7b62c1
1 parent 7dc9c0d
commit d7b62c1
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 1 deletion.
diff --git a/datastore/datastore.go b/datastore/datastore.go
@@ -172,6 +172,14 @@ func (ds *Datastore) NumRegisteredValidators() (uint64, error) {
 	return ds.db.NumRegisteredValidators()
 }
 
+func (ds *Datastore) SetKnownValidator(pubkeyHex common.PubkeyHex, index uint64) {
+	ds.knownValidatorsLock.Lock()
+	defer ds.knownValidatorsLock.Unlock()
+
+	ds.knownValidatorsByPubkey[pubkeyHex] = index
+	ds.knownValidatorsByIndex[index] = pubkeyHex
+}
+
 // SaveValidatorRegistration saves a validator registration into both Redis and the database
 func (ds *Datastore) SaveValidatorRegistration(entry builderApiV1.SignedValidatorRegistration) error {
 	// First save in the database

diff --git a/services/api/service.go b/services/api/service.go
@@ -202,6 +202,9 @@ type RelayAPI struct {
 
 	validatorRegC chan builderApiV1.SignedValidatorRegistration
 
+	// used to notify when a new validator has been registered
+	validatorUpdateCh chan struct{}
+
 	// used to wait on any active getPayload calls on shutdown
 	getPayloadCallsInFlight sync.WaitGroup
 
@@ -293,7 +296,8 @@ func NewRelayAPI(opts RelayAPIOpts) (api *RelayAPI, err error) {
 		proposerDutiesResponse: &[]byte{},
 		blockSimRateLimiter:    NewBlockSimulationRateLimiter(opts.BlockSimURL),
 
-		validatorRegC: make(chan builderApiV1.SignedValidatorRegistration, 450_000),
+		validatorRegC:     make(chan builderApiV1.SignedValidatorRegistration, 450_000),
+		validatorUpdateCh: make(chan struct{}),
 	}
 
 	if os.Getenv("FORCE_GET_HEADER_204") == "1" {
@@ -554,6 +558,10 @@ func (api *RelayAPI) StopServer() (err error) {
 	return api.srv.Shutdown(context.Background())
 }
 
+func (api *RelayAPI) ValidatorUpdateCh() chan struct{} {
+	return api.validatorUpdateCh
+}
+
 func (api *RelayAPI) isCapella(slot uint64) bool {
 	return hasReachedFork(slot, api.capellaEpoch) && !hasReachedFork(slot, api.denebEpoch)
 }
@@ -1114,6 +1122,12 @@ func (api *RelayAPI) handleRegisterValidator(w http.ResponseWriter, req *http.Re
 		default:
 			regLog.Error("validator registration channel full")
 		}
+
+		// notify of a new validator
+		select {
+		case api.validatorUpdateCh <- struct{}{}:
+		default:
+		}
 	})
 
 	log = log.WithFields(logrus.Fields{

diff --git a/services/api/service_test.go b/services/api/service_test.go
@@ -200,6 +200,28 @@ func TestRegisterValidator(t *testing.T) {
 		rr := backend.request(http.MethodPost, path, []builderApiV1.SignedValidatorRegistration{common.ValidPayloadRegisterValidator})
 		require.Equal(t, http.StatusBadRequest, rr.Code)
 	})
+
+	t.Run("known validator", func(t *testing.T) {
+		backend := newTestBackend(t, 1)
+
+		msg := common.ValidPayloadRegisterValidator
+		backend.datastore.SetKnownValidator(common.PubkeyHex(msg.Message.Pubkey.String()), 1)
+
+		rr := backend.request(http.MethodPost, path, []builderApiV1.SignedValidatorRegistration{common.ValidPayloadRegisterValidator})
+		require.Equal(t, http.StatusOK, rr.Code)
+
+		// wait for the both channel notifications
+		select {
+		case val := <-backend.relay.validatorRegC:
+			require.Equal(t, val.Message.Pubkey, msg.Message.Pubkey)
+		default:
+		}
+
+		select {
+		case <-backend.relay.validatorUpdateCh:
+		default:
+		}
+	})
 }
 
 func TestGetHeader(t *testing.T) {