Fix ctx cancel

smartcontractkit · Oct 31, 2024 · fe86168 · fe86168
1 parent 6392027
commit fe86168
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/pkg/solana/client/multinode/transaction_sender.go b/pkg/solana/client/multinode/transaction_sender.go
@@ -102,7 +102,13 @@ func (txSender *TransactionSender[TX, RESULT, CHAIN_ID, RPC]) SendTransaction(ct
 	}
 
 	txSenderCtx, cancel := txSender.chStop.NewCtx()
-	defer cancel()
+	reportWg := sync.WaitGroup{}
+	defer func() {
+		go func() {
+			reportWg.Wait()
+			cancel()
+		}()
+	}()
 
 	healthyNodesNum := 0
 	err := txSender.multiNode.DoAll(txSenderCtx, func(ctx context.Context, rpc RPC, isSendOnly bool) {
@@ -152,7 +158,11 @@ func (txSender *TransactionSender[TX, RESULT, CHAIN_ID, RPC]) SendTransaction(ct
 	}
 
 	txSender.wg.Add(1)
-	go txSender.reportSendTxAnomalies(tx, txResultsToReport)
+	reportWg.Add(1)
+	go func() {
+		txSender.reportSendTxAnomalies(tx, txResultsToReport)
+		reportWg.Done()
+	}()
 
 	return txSender.collectTxResults(ctx, tx, healthyNodesNum, txResults, startTime)
 }