From 50a53fb68fbdc4ad1ad836cb7765a794b7b45d72 Mon Sep 17 00:00:00 2001
From: Cirrus Gai <greferry@gmail.com>
Date: Mon, 18 Sep 2023 15:07:03 +0800
Subject: [PATCH] chore: Fix panic situation when the latest block is not
 queried (#101)

---
 service/validator_instance.go | 37 +++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/service/validator_instance.go b/service/validator_instance.go
index 538b734aa94ce..fa8c00e3e4e21 100644
--- a/service/validator_instance.go
+++ b/service/validator_instance.go
@@ -234,7 +234,7 @@ func (v *ValidatorInstance) Start() error {
 }
 
 func (v *ValidatorInstance) bootstrap() (uint64, error) {
-	latestBlock, err := v.getLatestBlock()
+	latestBlock, err := v.getLatestBlockWithRetry()
 	if err != nil {
 		return 0, err
 	}
@@ -539,7 +539,7 @@ func (v *ValidatorInstance) randomnessCommitmentLoop() {
 	for {
 		select {
 		case <-commitRandTicker.C:
-			tipBlock, err := v.getLatestBlock()
+			tipBlock, err := v.getLatestBlockWithRetry()
 			if err != nil {
 				v.logger.WithFields(logrus.Fields{
 					"err":        err,
@@ -595,12 +595,14 @@ func (v *ValidatorInstance) checkLaggingLoop() {
 				continue
 			}
 
-			latestBlock, err := v.getLatestBlock()
+			latestBlock, err := v.getLatestBlockWithRetry()
 			if err != nil {
 				v.logger.WithFields(logrus.Fields{
 					"err":        err,
 					"btc_pk_hex": v.GetBtcPkHex(),
 				}).Error("failed to get the latest block of the consumer chain")
+				// TODO should terminate the validator instance from the outside
+				continue
 			}
 
 			if v.checkLagging(latestBlock) {
@@ -1126,13 +1128,28 @@ func (v *ValidatorInstance) getCommittedPrivPubRand(height uint64) (*eots.Privat
 	return privRand, nil
 }
 
-func (v *ValidatorInstance) getLatestBlock() (*types.BlockInfo, error) {
-	res, err := v.cc.QueryBestHeader()
-	if err != nil {
+func (v *ValidatorInstance) getLatestBlockWithRetry() (*types.BlockInfo, error) {
+	var latestBlock *types.BlockInfo
+
+	if err := retry.Do(func() error {
+		headerResult, err := v.cc.QueryBestHeader()
+		if err != nil {
+			return err
+		}
+		latestBlock = &types.BlockInfo{
+			Height:         uint64(headerResult.Header.Height),
+			LastCommitHash: headerResult.Header.LastCommitHash,
+		}
+		return nil
+	}, RtyAtt, RtyDel, RtyErr, retry.OnRetry(func(n uint, err error) {
+		v.logger.WithFields(logrus.Fields{
+			"attempt":      n + 1,
+			"max_attempts": RtyAttNum,
+			"error":        err,
+		}).Debug("failed to query the consumer chain for the latest block")
+	})); err != nil {
 		return nil, err
 	}
-	return &types.BlockInfo{
-		Height:         uint64(res.Header.Height),
-		LastCommitHash: res.Header.LastCommitHash,
-	}, nil
+
+	return latestBlock, nil
 }