add timer for updating known validators

Author: avalonche

builder/beacon_client.go

@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"strconv"
 	"sync"
+	"time"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
@@ -29,21 +30,28 @@ func (b *testBeaconClient) onForkchoiceUpdate() (uint64, error) {
 	return b.slot, nil
 }
 
+func (b *testBeaconClient) updateValidatorsMap() error {
+	return nil
+}
+
 type BeaconClient struct {
 	endpoint string
 	slotsInEpoch uint64
+	secondsInSlot uint64
 
 	mu               sync.Mutex
 	currentEpoch     uint64
 	currentSlot      uint64
 	nextSlotProposer PubkeyHex
 	slotProposerMap  map[uint64]PubkeyHex
+	slotRequestedCh  chan uint64
 }
 
-func NewBeaconClient(endpoint string, slotsInEpoch uint64) *BeaconClient {
+func NewBeaconClient(endpoint string, slotsInEpoch uint64, secondsInSlot uint64) *BeaconClient {
 	return &BeaconClient{
 		endpoint:        endpoint,
 		slotsInEpoch:    slotsInEpoch,
+		secondsInSlot:   secondsInSlot,
 		slotProposerMap: make(map[uint64]PubkeyHex),
 	}
 }
@@ -56,8 +64,6 @@ func (b *BeaconClient) getProposerForNextSlot(requestedSlot uint64) (PubkeyHex,
 	b.mu.Lock()
 	defer b.mu.Unlock()
 
-	go b.updateValidatorsMap(requestedSlot)
-
 	nextSlotProposer, found := b.slotProposerMap[requestedSlot]
 	if !found {
 		log.Error("inconsistent proposer mapping", "currentSlot", b.currentSlot, "slotProposerMap", b.slotProposerMap)
@@ -66,20 +72,42 @@ func (b *BeaconClient) getProposerForNextSlot(requestedSlot uint64) (PubkeyHex,
 	return nextSlotProposer, nil
 }
 
-func (b *BeaconClient) updateValidatorsMap(nextSlot uint64) error {
-	b.currentSlot = nextSlot
-	nextSlotEpoch := nextSlot / b.slotsInEpoch
-	// if slot at half epoch, fetch next epoch's proposers
-	if nextSlotEpoch != b.currentEpoch || nextSlot%b.slotsInEpoch == b.slotsInEpoch/2 {
-		slotProposerMap, err := fetchEpochProposersMap(b.endpoint, nextSlotEpoch)
-		if err != nil {
-			return err
+func (b *BeaconClient) updateValidatorsMap() error {
+	// Start regular slot updates
+	slotsPerEpoch := b.slotsInEpoch
+	durationPerSlot := time.Duration(b.secondsInSlot) * time.Second
+	durationPerEpoch := durationPerSlot * time.Duration(slotsPerEpoch)
+	b.slotRequestedCh = make(chan uint64)
+	// Every half epoch request validators map
+	timer := time.NewTicker(durationPerEpoch/2)
+	for {
+		select {
+		case slot := <-b.slotRequestedCh:
+			b.currentSlot = slot
+			nextSlotEpoch := slot / b.slotsInEpoch
+			// if slot at half epoch, fetch next epoch's proposers
+			if nextSlotEpoch > b.currentEpoch {
+				slotProposerMap, err := fetchEpochProposersMap(b.endpoint, nextSlotEpoch)
+				if err != nil {
+					log.Error("could not fetch validators map", "err", err)
+					continue
+				}
+				
+				b.slotProposerMap = slotProposerMap
+				b.currentEpoch = nextSlotEpoch
+				b.slotProposerMap = slotProposerMap
+				timer.Reset(durationPerEpoch/2)
+			}
+		case <-timer.C:
+			slotProposerMap, err := fetchEpochProposersMap(b.endpoint, b.currentEpoch+1)
+			if err != nil {
+				log.Error("could not fetch validators map", "err", err)
+				continue
+			}
+			b.slotProposerMap = slotProposerMap
+			timer.Reset(durationPerEpoch/2)
 		}
-
-		b.currentEpoch = nextSlotEpoch
-		b.slotProposerMap = slotProposerMap
 	}
-
 	return nil
 }
 

builder/beacon_client_test.go

@@ -203,7 +203,7 @@ func TestOnForkchoiceUpdate(t *testing.T) {
   ]
 }`)
 
-	bc := NewBeaconClient(mbn.srv.URL)
+	bc := NewBeaconClient(mbn.srv.URL, 32, 12)
 	slot, err := bc.onForkchoiceUpdate()
 	require.NoError(t, err)
 	require.Equal(t, slot, uint64(32))
@@ -221,7 +221,7 @@ func TestOnForkchoiceUpdate(t *testing.T) {
 	mbn.headersCode = 404
 	mbn.headersResp = []byte(`{ "code": 404, "message": "State not found" }`)
 
-	slot, err = NewBeaconClient(mbn.srv.URL).onForkchoiceUpdate()
+	slot, err = NewBeaconClient(mbn.srv.URL, 32, 12).onForkchoiceUpdate()
 	require.EqualError(t, err, "State not found")
 	require.Equal(t, slot, uint64(0))
 

builder/builder.go

@@ -33,11 +33,13 @@ type IBeaconClient interface {
 	isValidator(pubkey PubkeyHex) bool
 	getProposerForNextSlot(requestedSlot uint64) (PubkeyHex, error)
 	onForkchoiceUpdate() (uint64, error)
+	updateValidatorsMap() error
 }
 
 type IRelay interface {
 	SubmitBlock(msg *boostTypes.BuilderSubmitBlockRequest, vd ValidatorData) error
 	GetValidatorForSlot(nextSlot uint64) (ValidatorData, error)
+	Start() error
 }
 
 type IBuilder interface {
@@ -89,7 +91,7 @@ func NewBuilder(sk *bls.SecretKey, ds flashbotsextra.IDatabaseService, relay IRe
 }
 
 func (b *Builder) Start() error {
-	return nil
+	return b.relay.Start()	
 }
 
 func (b *Builder) Stop() error {

builder/config.go

@@ -5,6 +5,7 @@ type Config struct {
 	EnableValidatorChecks         bool     `toml:",omitempty"`
 	EnableLocalRelay              bool     `toml:",omitempty"`
 	SlotsInEpoch		  		  uint64 `toml:",omitempty"`
+	SecondsInSlot		  		  uint64 `toml:",omitempty"`
 	DisableBundleFetcher          bool     `toml:",omitempty"`
 	DryRun                        bool     `toml:",omitempty"`
 	BuilderSecretKey              string   `toml:",omitempty"`
@@ -25,6 +26,7 @@ var DefaultConfig = Config{
 	EnableValidatorChecks:         false,
 	EnableLocalRelay:              false,
 	SlotsInEpoch:          		   32,
+	SecondsInSlot:         		   12,
 	DisableBundleFetcher:          false,
 	DryRun:                        false,
 	BuilderSecretKey:              "0x2fc12ae741f29701f8e30f5de6350766c020cb80768a0ff01e6838ffd2431e11",

builder/local_relay.go

@@ -84,6 +84,11 @@ func NewLocalRelay(sk *bls.SecretKey, beaconClient IBeaconClient, builderSigning
 	}
 }
 
+func (r *LocalRelay) Start() error {
+	go r.beaconClient.updateValidatorsMap()
+	return nil
+}
+
 func (r *LocalRelay) SubmitBlock(msg *boostTypes.BuilderSubmitBlockRequest, _ ValidatorData) error {
 	log.Info("submitting block to local relay", "block", msg.ExecutionPayload.BlockHash.String())
 	return r.submitBlock(msg)

builder/relay.go

@@ -125,6 +125,10 @@ func (r *RemoteRelay) GetValidatorForSlot(nextSlot uint64) (ValidatorData, error
 	return ValidatorData{}, ErrValidatorNotFound
 }
 
+func (r *RemoteRelay) Start() error {
+	return nil
+}
+
 func (r *RemoteRelay) SubmitBlock(msg *boostTypes.BuilderSubmitBlockRequest, _ ValidatorData) error {
 	log.Info("submitting block to remote relay", "endpoint", r.endpoint)
 	code, err := server.SendHTTPRequest(context.TODO(), *http.DefaultClient, http.MethodPost, r.endpoint+"/relay/v1/builder/blocks", msg, nil)

builder/relay_aggregator.go

@@ -24,6 +24,16 @@ func NewRemoteRelayAggregator(primary IRelay, secondary []IRelay) *RemoteRelayAg
 	}
 }
 
+func (r *RemoteRelayAggregator) Start() error {
+	for _, relay := range r.relays {
+		err := relay.Start()
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 func (r *RemoteRelayAggregator) SubmitBlock(msg *boostTypes.BuilderSubmitBlockRequest, registration ValidatorData) error {
 	r.registrationsCacheLock.RLock()
 	defer r.registrationsCacheLock.RUnlock()

builder/relay_aggregator_test.go

@@ -58,6 +58,10 @@ func (r *testRelay) GetValidatorForSlot(nextSlot uint64) (ValidatorData, error)
 	return r.gvsVd, r.gvsErr
 }
 
+func (r *testRelay) Start() error {
+	return nil
+}
+
 func TestRemoteRelayAggregator(t *testing.T) {
 	t.Run("should return error if no relays return validator data", func(t *testing.T) {
 		backend := newTestRelayAggBackend(3)

builder/service.go

@@ -144,7 +144,7 @@ func Register(stack *node.Node, backend *eth.Ethereum, cfg *Config) error {
 	copy(bellatrixForkVersion[:], bellatrixForkVersionBytes[:4])
 	proposerSigningDomain := boostTypes.ComputeDomain(boostTypes.DomainTypeBeaconProposer, bellatrixForkVersion, genesisValidatorsRoot)
 
-	beaconClient := NewBeaconClient(cfg.BeaconEndpoint, cfg.SlotsInEpoch)
+	beaconClient := NewBeaconClient(cfg.BeaconEndpoint, cfg.SlotsInEpoch, cfg.SecondsInSlot)
 
 	var localRelay *LocalRelay
 	if cfg.EnableLocalRelay {

cmd/utils/flags.go

@@ -713,6 +713,11 @@ var (
 		Usage: "Set the number of slots in an epoch in the local relay",
 		Value:   32,
 	}
+	BuilderSecondsInSlot = &cli.Uint64Flag{
+		Name:  "builder.seconds_in_slot",
+		Usage: "Set the number of seconds in a slot in the local relay",
+		Value:   12,
+	}
 	BuilderDisableBundleFetcher = &cli.BoolFlag{
 		Name:     "builder.no_bundle_fetcher",
 		Usage:    "Disable the bundle fetcher",
@@ -1583,6 +1588,7 @@ func SetBuilderConfig(ctx *cli.Context, cfg *builder.Config) {
 	cfg.EnableValidatorChecks = ctx.IsSet(BuilderEnableValidatorChecks.Name)
 	cfg.EnableLocalRelay = ctx.IsSet(BuilderEnableLocalRelay.Name)
 	cfg.SlotsInEpoch = ctx.Uint64(BuilderSlotsInEpoch.Name)
+	cfg.SecondsInSlot = ctx.Uint64(BuilderSecondsInSlot.Name)
 	cfg.DisableBundleFetcher = ctx.IsSet(BuilderDisableBundleFetcher.Name)
 	cfg.DryRun = ctx.IsSet(BuilderDryRun.Name)
 	cfg.BuilderSecretKey = ctx.String(BuilderSecretKey.Name)