ret error if UnbondingOnHoldRefCount is negative

cosmos · Aug 3, 2022 · db20718 · db20718
1 parent af6ee93
commit db20718
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/x/staking/keeper/unbonding.go b/x/staking/keeper/unbonding.go
@@ -4,6 +4,7 @@ import (
 	"encoding/binary"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/staking/types"
 )
 
@@ -252,6 +253,14 @@ func (k Keeper) unbondingDelegationEntryCanComplete(ctx sdk.Context, id uint64)
 		return false, nil
 	}
 
+	if ubd.Entries[i].UnbondingOnHoldRefCount <= 0 {
+		return true,
+			sdkerrors.Wrapf(
+				types.ErrUnbondingOnHoldRefCountNegative,
+				"undelegation unbondingId(%d), expecting UnbondingOnHoldRefCount > 0, got %T",
+				id, ubd.Entries[i].UnbondingOnHoldRefCount,
+			)
+	}
 	ubd.Entries[i].UnbondingOnHoldRefCount--
 
 	// Check if entry is matured.
@@ -302,6 +311,14 @@ func (k Keeper) redelegationEntryCanComplete(ctx sdk.Context, id uint64) (found
 		return false, nil
 	}
 
+	if red.Entries[i].UnbondingOnHoldRefCount <= 0 {
+		return true,
+			sdkerrors.Wrapf(
+				types.ErrUnbondingOnHoldRefCountNegative,
+				"redelegation unbondingId(%d), expecting UnbondingOnHoldRefCount > 0, got %T",
+				id, red.Entries[i].UnbondingOnHoldRefCount,
+			)
+	}
 	red.Entries[i].UnbondingOnHoldRefCount--
 
 	if !red.Entries[i].OnHold() && red.Entries[i].IsMature(ctx.BlockHeader().Time) {
@@ -329,6 +346,14 @@ func (k Keeper) validatorUnbondingCanComplete(ctx sdk.Context, id uint64) (found
 		return false, nil
 	}
 
+	if val.UnbondingOnHoldRefCount <= 0 {
+		return true,
+			sdkerrors.Wrapf(
+				types.ErrUnbondingOnHoldRefCountNegative,
+				"val(%s), expecting UnbondingOnHoldRefCount > 0, got %T",
+				val.OperatorAddress, val.UnbondingOnHoldRefCount,
+			)
+	}
 	val.UnbondingOnHoldRefCount--
 	k.SetValidator(ctx, val)
 

diff --git a/x/staking/types/errors.go b/x/staking/types/errors.go
@@ -50,4 +50,5 @@ var (
 	ErrNoHistoricalInfo                = sdkerrors.Register(ModuleName, 38, "no historical info found")
 	ErrEmptyValidatorPubKey            = sdkerrors.Register(ModuleName, 39, "empty validator public key")
 	ErrUnbondingNotFound               = sdkerrors.Register(ModuleName, 40, "unbonding operation not found")
+	ErrUnbondingOnHoldRefCountNegative = sdkerrors.Register(ModuleName, 41, "cannot un-hold unbonding operation that is not on hold")
 )