backport: Fix voting power not updated error handler (#139) (#142)

clientcontroller/babylon/babylon.go

@@ -3,6 +3,7 @@ package babylon
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	sdkErr "cosmossdk.io/errors"
 	"cosmossdk.io/math"
@@ -161,6 +162,13 @@ func (bc *BabylonController) QueryFinalityProviderHasPower(fpPk *btcec.PublicKey
 		blockHeight,
 	)
 	if err != nil {
+		// voting power table not updated indicates that no fp has voting power
+		// therefore, it should be treated as the fp having 0 voting power
+		if strings.Contains(err.Error(), btcstakingtypes.ErrVotingPowerTableNotUpdated.Error()) {
+			bc.logger.Info("the voting power table not updated yet")
+			return true, nil
+		}
+
 		return false, fmt.Errorf("failed to query Finality Voting Power at Height %d: %w", blockHeight, err)
 	}
 

finality-provider/service/app.go

@@ -276,14 +276,7 @@ func (app *FinalityProviderApp) SyncFinalityProviderStatus() (fpInstanceRunning
 	for _, fp := range fps {
 		hasPower, err := app.consumerCon.QueryFinalityProviderHasPower(fp.BtcPk, latestBlockHeight)
 		if err != nil {
-			// if ther error is that there is nothing in the voting power table
-			// it should continue and consider the voting power
-			// as zero to start the finality provider and send public randomness
-			allowedErr := fmt.Sprintf("failed to query Finality Voting Power at Height %d: rpc error: code = Unknown desc = %s: unknown request", latestBlockHeight, bstypes.ErrVotingPowerTableNotUpdated.Wrapf("height: %d", latestBlockHeight).Error())
-			if !strings.EqualFold(err.Error(), allowedErr) {
-				// if some other error occured then the finality-provider is not registered in the Babylon chain yet
-				continue
-			}
+			continue
 		}
 
 		bip340PubKey := fp.GetBIP340BTCPK()

finality-provider/service/app_test.go

@@ -195,8 +195,9 @@ func FuzzSyncFinalityProviderStatus(f *testing.F) {
 
 		noVotingPowerTable := r.Int31n(10) > 5
 		if noVotingPowerTable {
-			allowedErr := fmt.Sprintf("failed to query Finality Voting Power at Height %d: rpc error: code = Unknown desc = %s: unknown request", currentHeight, bstypes.ErrVotingPowerTableNotUpdated.Wrapf("height: %d", currentHeight).Error())
-			mockConsumerController.EXPECT().QueryFinalityProviderHasPower(gomock.Any(), gomock.Any()).Return(false, errors.New(allowedErr)).AnyTimes()
+			allowedErr := fmt.Sprintf("failed to query Finality Voting Power at Height %d: rpc error: code = Unknown desc = %s: unknown request",
+				currentHeight, bstypes.ErrVotingPowerTableNotUpdated.Wrapf("height: %d", currentHeight).Error())
+			mockConsumerController.EXPECT().QueryFinalityProviderHasPower(gomock.Any(), gomock.Any()).Return(false, nil).AnyTimes()
 			mockConsumerController.EXPECT().QueryActivatedHeight().Return(uint64(0), errors.New(allowedErr)).AnyTimes()
 		} else {
 			mockConsumerController.EXPECT().QueryFinalityProviderHasPower(gomock.Any(), gomock.Any()).Return(true, nil).AnyTimes()