Merge pull request #191 from attestantio/v1.8.1-fixes

Backport fixes for 1.8.1
attestantio · Mar 18, 2024 · 7e6c7bd · 7e6c7bd
2 parents 04ad7ac + a4800e7
commit 7e6c7bd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+1.8.1:
+  - ensure proposer-config-check command operates correctly
+  - avoid crash by suitably locking a controller read/write map
+
 1.8.0:
   - support Deneb
   - reject block proposals with 0 fee recipient

diff --git a/main.go b/main.go
@@ -108,7 +108,7 @@ import (
 )
 
 // ReleaseVersion is the release version for the code.
-var ReleaseVersion = "1.8.0"
+var ReleaseVersion = "1.8.1"
 
 func main() {
 	exitCode := main2()
@@ -852,7 +852,7 @@ func startMonitor(ctx context.Context,
 ) {
 	log.Trace().Msg("Starting metrics service")
 	var monitor metrics.Service
-	if viper.Get("metrics.prometheus.listen-address") != nil {
+	if viper.GetString("metrics.prometheus.listen-address") != "" {
 		var err error
 		monitor, err = prometheusmetrics.New(ctx,
 			prometheusmetrics.WithLogLevel(util.LogLevel("metrics.prometheus")),

diff --git a/services/controller/standard/events.go b/services/controller/standard/events.go
@@ -139,7 +139,9 @@ func (s *Service) HandleHeadEvent(event *api.Event) {
 	}
 
 	// Remove old subscriptions if present.
+	s.subscriptionInfosMutex.Lock()
 	delete(s.subscriptionInfos, s.chainTimeService.SlotToEpoch(data.Slot)-2)
+	s.subscriptionInfosMutex.Unlock()
 }
 
 // handlePreviousDependentRootChanged handles the situation where the previous