Merge pull request #121 from attestantio/ignore-zero-value-bids

Ignore zero-value bids.
attestantio · Feb 16, 2023 · 9b8114d · 9b8114d
2 parents 2b163eb + 7138bb5
commit 9b8114d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/services/blockrelay/standard/auctionblock.go b/services/blockrelay/standard/auctionblock.go
@@ -169,7 +169,7 @@ func (s *Service) bestBuilderBid(ctx context.Context,
 	errored := 0
 	timedOut := 0
 	softTimedOut := 0
-	bestScore := new(big.Int)
+	bestScore := big.NewInt(0)
 
 	// Loop 1: prior to soft timeout.
 	for responded+errored+timedOut+softTimedOut != requests {
@@ -182,12 +182,12 @@ func (s *Service) bestBuilderBid(ctx context.Context,
 				continue
 			}
 			switch {
-			case res.Bid == nil || resp.score.Cmp(bestScore) > 0:
+			case resp.score.Cmp(bestScore) > 0:
 				log.Trace().Str("provider", resp.provider.Address()).Stringer("score", resp.score).Msg("New winning bid")
 				res.Bid = resp.bid
 				bestScore = resp.score
 				res.Providers = []builderclient.BuilderBidProvider{resp.provider}
-			case resp.score.Cmp(bestScore) == 0 && bidsEqual(res.Bid, resp.bid):
+			case res.Bid != nil && resp.score.Cmp(bestScore) == 0 && bidsEqual(res.Bid, resp.bid):
 				log.Trace().Str("provider", resp.provider.Address()).Msg("Matching bid from different relay")
 				res.Providers = append(res.Providers, resp.provider)
 			default:
@@ -222,12 +222,12 @@ func (s *Service) bestBuilderBid(ctx context.Context,
 				continue
 			}
 			switch {
-			case res.Bid == nil || resp.score.Cmp(bestScore) > 0:
+			case resp.score.Cmp(bestScore) > 0:
 				log.Trace().Str("provider", resp.provider.Address()).Stringer("score", resp.score).Msg("New winning bid")
 				res.Bid = resp.bid
 				bestScore = resp.score
 				res.Providers = []builderclient.BuilderBidProvider{resp.provider}
-			case resp.score.Cmp(bestScore) == 0 && bidsEqual(res.Bid, resp.bid):
+			case res.Bid != nil && resp.score.Cmp(bestScore) == 0 && bidsEqual(res.Bid, resp.bid):
 				log.Trace().Str("provider", resp.provider.Address()).Msg("Matching bid from different relay")
 				res.Providers = append(res.Providers, resp.provider)
 			default:

diff --git a/services/blockrelay/standard/executionconfig.go b/services/blockrelay/standard/executionconfig.go
@@ -156,15 +156,15 @@ func (s *Service) obtainExecutionConfig(ctx context.Context,
 		for _, pubkey := range pubkeys {
 			pubkeyStrs = append(pubkeyStrs, fmt.Sprintf("%#x", pubkey))
 		}
-		ctx = context.WithValue(ctx, &httpconfidant.Body{}, []byte(fmt.Sprintf(`["%s"]`, strings.Join(pubkeyStrs, `","`))))
+		ctx = context.WithValue(ctx, &httpconfidant.Body{}, []byte(fmt.Sprintf(`[%q]`, strings.Join(pubkeyStrs, `","`))))
 
 		res, err = s.majordomo.Fetch(ctx, s.configURL)
 	}
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to obtain execution configuration")
 	}
 
-	log.Trace().Str("res", string(res)).Msg("Received response")
+	log.Trace().RawJSON("res", res).Msg("Received response")
 
 	executionConfig, err := blockrelay.UnmarshalJSON(res)
 	if err != nil {