fix the remembered proposer index/pubkey mapping

flashbots · Apr 7, 2023 · bf5f210 · bf5f210
1 parent bccadc5
commit bf5f210
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/beaconclient/multi_beacon_client.go b/beaconclient/multi_beacon_client.go
@@ -245,21 +245,22 @@ func (c *MultiBeaconClient) PublishBlock(block *common.SignedBeaconBlock) (code
 	var lastErrPublishResp publishResp
 	for i := 0; i < len(clients); i++ {
 		res := <-resChans
+		log = log.WithField("beacon", clients[res.index].GetURI())
 		if res.err != nil {
-			log.WithField("beacon", clients[res.index].GetURI()).WithField("statusCode", res.code).WithError(res.err).Error("failed to publish block")
+			log.WithField("statusCode", res.code).WithError(res.err).Warn("failed to publish block")
 			lastErrPublishResp = res
 			continue
 		} else if res.code == 202 {
 			// Should the block fail full validation, a separate success response code (202) is used to indicate that the block was successfully broadcast but failed integration.
 			// https://ethereum.github.io/beacon-APIs/?urls.primaryName=dev#/Beacon/publishBlock
-			log.WithField("beacon", clients[res.index].GetURI()).WithField("statusCode", res.code).WithError(res.err).Error("block failed validation but was still broadcast")
+			log.WithField("statusCode", res.code).WithError(res.err).Error("block failed validation but was still broadcast")
 			lastErrPublishResp = res
 			continue
 		}
 
 		c.bestBeaconIndex.Store(int64(res.index))
 
-		log.WithField("beacon", clients[res.index].GetURI()).WithField("statusCode", res.code).Info("published block")
+		log.WithField("statusCode", res.code).Info("published block")
 		return res.code, nil
 	}
 

diff --git a/services/housekeeper/housekeeper.go b/services/housekeeper/housekeeper.go
@@ -44,7 +44,7 @@ type Housekeeper struct {
 
 	headSlot uberatomic.Uint64
 
-	proposersAlreadySaved map[string]bool // to avoid repeating redis writes
+	proposersAlreadySaved map[uint64]string // to avoid repeating redis writes
 }
 
 var ErrServerAlreadyStarted = errors.New("server was already started")
@@ -56,7 +56,7 @@ func NewHousekeeper(opts *HousekeeperOpts) *Housekeeper {
 		redis:                 opts.Redis,
 		db:                    opts.DB,
 		beaconClient:          opts.BeaconClient,
-		proposersAlreadySaved: make(map[string]bool),
+		proposersAlreadySaved: make(map[uint64]string),
 	}
 
 	return server
@@ -202,16 +202,17 @@ func (hk *Housekeeper) updateKnownValidators() {
 			hk.log.Debugf("writing to redis: %d / %d", i, numValidators)
 		}
 
-		// avoid resaving
-		if hk.proposersAlreadySaved[validator.Validator.Pubkey] {
+		// avoid resaving if index->pubkey mapping is the same
+		prevPubkeyForIndex := hk.proposersAlreadySaved[validator.Index]
+		if prevPubkeyForIndex == validator.Validator.Pubkey {
 			continue
 		}
 
 		err := hk.redis.SetKnownValidator(types.PubkeyHex(validator.Validator.Pubkey), validator.Index)
 		if err != nil {
 			log.WithError(err).WithField("pubkey", validator.Validator.Pubkey).Error("failed to set known validator in Redis")
 		} else {
-			hk.proposersAlreadySaved[validator.Validator.Pubkey] = true
+			hk.proposersAlreadySaved[validator.Index] = validator.Validator.Pubkey
 			newValidators++
 		}
 	}