From 6c96cc309abdc1c59729270e5996a7f4b7ae63eb Mon Sep 17 00:00:00 2001
From: forcodedancing <just.haha.it@gmail.com>
Date: Thu, 7 Dec 2023 16:00:46 +0800
Subject: [PATCH] fix: add timeout when selecting clients (#104)

---
 executor/client.go |  5 ++++-
 monitor/monitor.go | 21 +++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/executor/client.go b/executor/client.go
index 4d1bb73..22c537f 100644
--- a/executor/client.go
+++ b/executor/client.go
@@ -3,6 +3,7 @@ package executor
 import (
 	"context"
 	"sync"
+	"time"
 
 	gnfdclient "github.com/bnb-chain/greenfield-go-sdk/client"
 	"github.com/bnb-chain/greenfield-go-sdk/types"
@@ -75,7 +76,9 @@ func (gc *GnfdCompositeClients) GetClient() *GnfdCompositeClient {
 
 func getClientBlockHeight(clientChan chan *GnfdCompositeClient, wg *sync.WaitGroup, client *GnfdCompositeClient) {
 	defer wg.Done()
-	status, err := client.TmClient.Status(context.Background())
+	ctxWithTimeout, cancel := context.WithTimeout(context.Background(), time.Second)
+	defer cancel()
+	status, err := client.GetStatus(ctxWithTimeout)
 	if err != nil {
 		return
 	}
diff --git a/monitor/monitor.go b/monitor/monitor.go
index 4b20e14..c5ca9f1 100644
--- a/monitor/monitor.go
+++ b/monitor/monitor.go
@@ -139,6 +139,7 @@ func (m *Monitor) getBlockAndBlockResult(height uint64) (*ctypes.ResultBlockResu
 	logging.Logger.Infof("retrieve greenfield block at height=%d", height)
 	block, blockResults, err := m.executor.GetBlockAndBlockResultAtHeight(int64(height))
 	if err != nil {
+		logging.Logger.Errorf("retrieve greenfield block error at height=%d, err=%v", height, err)
 		return nil, nil, err
 	}
 	return blockResults, block, nil
@@ -147,6 +148,7 @@ func (m *Monitor) getBlockAndBlockResult(height uint64) (*ctypes.ResultBlockResu
 func (m *Monitor) monitorChallengeEvents(block *tmtypes.Block, blockResults *ctypes.ResultBlockResults) error {
 	parsedEvents, err := m.parseEvents(blockResults)
 	if err != nil {
+		logging.Logger.Errorf("failed to parse event, error: %v", err)
 		return err
 	}
 	b := &model.Block{
@@ -156,6 +158,11 @@ func (m *Monitor) monitorChallengeEvents(block *tmtypes.Block, blockResults *cty
 	}
 	events := EntitiesToDtos(uint64(block.Height), parsedEvents)
 	err = m.dataProvider.SaveBlockAndEvents(b, events)
+	if err != nil {
+		logging.Logger.Errorf("failed to save block and events, error: %v", err)
+		return err
+	}
+
 	for _, event := range events {
 		logging.Logger.Debugf("monitor event saved for challengeId: %d %s", event.ChallengeId, time.Now().Format("15:04:05.000000"))
 		m.metricService.SetGnfdSavedEvent(event.ChallengeId)
@@ -163,24 +170,21 @@ func (m *Monitor) monitorChallengeEvents(block *tmtypes.Block, blockResults *cty
 	}
 	m.metricService.SetGnfdSavedBlock(b.Height)
 	m.metricService.IncGnfdSavedBlockCount()
-	if err != nil {
-		return err
-	}
+	logging.Logger.Infof("monitor saved block: %d", block.Height)
+
 	return nil
 }
 
 func (m *Monitor) calNextHeight() (uint64, error) {
 	latestPolledBlock, err := m.dataProvider.GetLatestBlock()
 	if err != nil && err != gorm.ErrRecordNotFound {
-		latestHeight, err := m.executor.GetLatestBlockHeight()
-		if err != nil {
-			return 0, err
-		}
-		return latestHeight, err
+		logging.Logger.Errorf("get latest block from database error: %v", err)
+		return 0, err
 	}
 	if latestPolledBlock.Height == 0 { // a fresh database
 		latestHeight, err := m.executor.GetLatestBlockHeight()
 		if err != nil {
+			logging.Logger.Errorf("get latest block from blockchain error: %v, database height:%d", err, latestPolledBlock.Height)
 			return m.executor.GetCachedBlockHeight()
 		}
 		return latestHeight, nil
@@ -189,6 +193,7 @@ func (m *Monitor) calNextHeight() (uint64, error) {
 
 	latestBlockHeight, err := m.executor.GetLatestBlockHeight()
 	if err != nil {
+		logging.Logger.Errorf("get latest block from blockchain error: %v, database height:%d", err, latestPolledBlock.Height)
 		return 0, err
 	}
 	// pauses challenger for a bit since it already caught the newest block