Merge pull request #572 from iotaledger/fix/notarization-race

Fix race in notarization vs attestations
iotaledger · Nov 28, 2023 · 8c0c4c7 · 8c0c4c7
2 parents a88889e + adffefc
commit 8c0c4c7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pkg/protocol/engine/notarization/slotnotarization/manager.go b/pkg/protocol/engine/notarization/slotnotarization/manager.go
@@ -42,7 +42,7 @@ type Manager struct {
 	acceptedTimeFunc func() time.Time
 	apiProvider      iotago.APIProvider
 
-	commitmentMutex syncutils.Mutex
+	commitmentMutex syncutils.RWMutex
 
 	module.Module
 }
@@ -156,6 +156,9 @@ func (m *Manager) IsBootstrapped() bool {
 }
 
 func (m *Manager) notarizeAcceptedBlock(block *blocks.Block) (err error) {
+	m.commitmentMutex.RLock()
+	defer m.commitmentMutex.RUnlock()
+
 	if err = m.slotMutations.AddAcceptedBlock(block); err != nil {
 		return ierrors.Wrap(err, "failed to add accepted block to slot mutations")
 	}