fix concurrent map write panics in generate_consolidations & `gener…

…ate_withdrawal_requests` tasks
ethpandaops · Oct 24, 2024 · 66f1f6f · 66f1f6f
1 parent 56a49cd
commit 66f1f6f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/pkg/coordinator/tasks/generate_consolidations/task.go b/pkg/coordinator/tasks/generate_consolidations/task.go
@@ -131,6 +131,7 @@ func (t *Task) Execute(ctx context.Context) error {
 
 	consolidationTransactions := []string{}
 	consolidationReceipts := map[string]*ethtypes.Receipt{}
+	receiptsMapMutex := sync.Mutex{}
 
 	for {
 		accountIdx := t.nextIndex
@@ -141,7 +142,9 @@ func (t *Task) Execute(ctx context.Context) error {
 				<-pendingChan
 			}
 
+			receiptsMapMutex.Lock()
 			consolidationReceipts[tx.Hash().Hex()] = receipt
+			receiptsMapMutex.Unlock()
 
 			pendingWg.Done()
 
@@ -199,6 +202,9 @@ func (t *Task) Execute(ctx context.Context) error {
 
 	receiptList := []interface{}{}
 
+	receiptsMapMutex.Lock()
+	defer receiptsMapMutex.Unlock()
+
 	for _, txhash := range consolidationTransactions {
 		var receiptMap map[string]interface{}
 

diff --git a/pkg/coordinator/tasks/generate_withdrawal_requests/task.go b/pkg/coordinator/tasks/generate_withdrawal_requests/task.go
@@ -126,6 +126,7 @@ func (t *Task) Execute(ctx context.Context) error {
 	totalCount := 0
 
 	withdrawalTransactions := []string{}
+	receiptsMapMutex := sync.Mutex{}
 	withdrawalReceipts := map[string]*ethtypes.Receipt{}
 
 	for {
@@ -137,7 +138,9 @@ func (t *Task) Execute(ctx context.Context) error {
 				<-pendingChan
 			}
 
+			receiptsMapMutex.Lock()
 			withdrawalReceipts[tx.Hash().Hex()] = receipt
+			receiptsMapMutex.Unlock()
 
 			pendingWg.Done()
 
@@ -191,6 +194,9 @@ func (t *Task) Execute(ctx context.Context) error {
 
 	receiptList := []interface{}{}
 
+	receiptsMapMutex.Lock()
+	defer receiptsMapMutex.Unlock()
+
 	for _, txhash := range withdrawalTransactions {
 		var receiptMap map[string]interface{}