From a4800e70038fe1eec12104f4c81c6cbb6d8daa9a Mon Sep 17 00:00:00 2001
From: Jim McDonald <Jim@mcdee.net>
Date: Sat, 16 Mar 2024 22:17:33 +0000
Subject: [PATCH] Backport fixes for 1.8.1

---
 CHANGELOG.md                           | 4 ++++
 main.go                                | 4 ++--
 services/controller/standard/events.go | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfd129d9..e934c3e7 100644
--- 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
index 8bc435a1..b07b6c70 100644
--- 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
index 65f5368e..bbd6a0f1 100644
--- 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