fix: avoid infinite expiry checking loop

babylonlabs-io · Jan 7, 2025 · 40faacd · 40faacd
1 parent 293768a
commit 40faacd
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/internal/services/expiry_checker.go b/internal/services/expiry_checker.go
@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"strconv"
 
+	"github.com/babylonlabs-io/babylon-staking-indexer/internal/db"
 	"github.com/babylonlabs-io/babylon-staking-indexer/internal/types"
-	"github.com/babylonlabs-io/babylon-staking-indexer/internal/utils"
 	"github.com/babylonlabs-io/babylon-staking-indexer/internal/utils/poller"
 	"github.com/rs/zerolog/log"
 )
@@ -52,28 +52,26 @@ func (s *Service) checkExpiry(ctx context.Context) *types.Error {
 			Str("expire_height", strconv.FormatUint(uint64(tlDoc.ExpireHeight), 10)).
 			Msg("checking if delegation is expired")
 
-		// Check if the delegation is in a qualified state to transition to Withdrawable
-		if !utils.Contains(types.QualifiedStatesForWithdrawable(), delegation.State) {
-			log.Debug().
-				Str("staking_tx", delegation.StakingTxHashHex).
-				Str("current_state", delegation.State.String()).
-				Msg("current state is not qualified for withdrawable")
-			continue
-		}
-
-		if err := s.db.UpdateBTCDelegationState(
+		stateUpdateErr := s.db.UpdateBTCDelegationState(
 			ctx,
 			delegation.StakingTxHashHex,
 			types.QualifiedStatesForWithdrawable(),
 			types.StateWithdrawable,
 			&tlDoc.DelegationSubState,
-		); err != nil {
-			log.Error().
-				Str("staking_tx", delegation.StakingTxHashHex).
-				Msg("failed to update BTC delegation state to withdrawable")
-			return types.NewInternalServiceError(
-				fmt.Errorf("failed to update BTC delegation state to withdrawable: %w", err),
-			)
+		)
+		if stateUpdateErr != nil {
+			if db.IsNotFoundError(stateUpdateErr) {
+				log.Debug().
+					Str("staking_tx", delegation.StakingTxHashHex).
+					Msg("Skip updating BTC delegation state to withdrawable as the it's outdated")
+			} else {
+				log.Error().
+					Str("staking_tx", delegation.StakingTxHashHex).
+					Msg("failed to update BTC delegation state to withdrawable")
+				return types.NewInternalServiceError(
+					fmt.Errorf("failed to update BTC delegation state to withdrawable: %w", err),
+				)
+			}
 		}
 
 		if err := s.db.DeleteExpiredDelegation(ctx, delegation.StakingTxHashHex); err != nil {

diff --git a/internal/services/watch_btc_events.go b/internal/services/watch_btc_events.go
@@ -354,7 +354,8 @@ func (s *Service) startWatchingSlashingChange(
 	}
 	slashingChangeTimelockExpireHeight := spendingHeight + stakingParams.UnbondingTimeBlocks
 
-	// Save timelock expire to mark it as Withdrawn (sub state - timelock_slashing/early_unbonding_slashing)
+	// Save timelock expire to mark it as Withdrawable when timelock expires
+	// (sub state - timelock_slashing/early_unbonding_slashing)
 	if err := s.db.SaveNewTimeLockExpire(
 		ctx,
 		delegation.StakingTxHashHex,

diff --git a/internal/types/state.go b/internal/types/state.go
@@ -60,8 +60,10 @@ func QualifiedStatesForWithdrawn() []DelegationState {
 }
 
 // QualifiedStatesForWithdrawable returns the qualified current states for Withdrawable event
+// The "StateWithdrawable" is included b/c sub state can be changed to if
+// user did not withdraw ontime. e.g TIMELOCK change to TIMELOCK_SLASHING
 func QualifiedStatesForWithdrawable() []DelegationState {
-	return []DelegationState{StateUnbonding, StateSlashed}
+	return []DelegationState{StateUnbonding, StateSlashed, StateWithdrawable}
 }
 
 type DelegationSubState string