feat: add MsgCancelUnbondingDelegation to Staking Authorization (#15164)

Co-authored-by: MalteHerrmann <[email protected]>
Co-authored-by: Marko <[email protected]>

CHANGELOG.md

@@ -62,6 +62,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Improvements
 
+* (x/authz) [#15164](https://github.com/cosmos/cosmos-sdk/pull/15164) Add `MsgCancelUnbondingDelegation` to staking authorization
 * (server) [#15358](https://github.com/cosmos/cosmos-sdk/pull/15358) Add `server.InterceptConfigsAndCreateContext` as alternative to `server.InterceptConfigsPreRunHandler` which does not set the server context and the default SDK logger.
 * [#15011](https://github.com/cosmos/cosmos-sdk/pull/15011) Introduce `cosmossdk.io/log` package to provide a consistent logging interface through the SDK. CometBFT logger is now replaced by `cosmossdk.io/log.Logger`.
 * (x/auth) [#14758](https://github.com/cosmos/cosmos-sdk/pull/14758) Allow transaction event queries to directly passed to Tendermint, which will allow for full query operator support, e.g. `>`.

proto/cosmos/staking/v1beta1/authz.proto

@@ -46,4 +46,6 @@ enum AuthorizationType {
   AUTHORIZATION_TYPE_UNDELEGATE = 2;
   // AUTHORIZATION_TYPE_REDELEGATE defines an authorization type for Msg/BeginRedelegate
   AUTHORIZATION_TYPE_REDELEGATE = 3;
+  // AUTHORIZATION_TYPE_CANCEL_UNBONDING_DELEGATION defines an authorization type for Msg/MsgCancelUnbondingDelegation
+  AUTHORIZATION_TYPE_CANCEL_UNBONDING_DELEGATION = 4;
 }

x/staking/types/authz.go

@@ -23,14 +23,23 @@ func NewStakeAuthorization(allowed []sdk.ValAddress, denied []sdk.ValAddress, au
 
 	a := StakeAuthorization{}
 	if allowedValidators != nil {
-		a.Validators = &StakeAuthorization_AllowList{AllowList: &StakeAuthorization_Validators{Address: allowedValidators}}
+		a.Validators = &StakeAuthorization_AllowList{
+			AllowList: &StakeAuthorization_Validators{
+				Address: allowedValidators,
+			},
+		}
 	} else {
-		a.Validators = &StakeAuthorization_DenyList{DenyList: &StakeAuthorization_Validators{Address: deniedValidators}}
+		a.Validators = &StakeAuthorization_DenyList{
+			DenyList: &StakeAuthorization_Validators{
+				Address: deniedValidators,
+			},
+		}
 	}
 
 	if amount != nil {
 		a.MaxTokens = amount
 	}
+
 	a.AuthorizationType = authzType
 
 	return &a, nil
@@ -42,24 +51,34 @@ func (a StakeAuthorization) MsgTypeURL() string {
 	if err != nil {
 		panic(err)
 	}
+
 	return authzType
 }
 
+// ValidateBasic performs a stateless validation of the fields.
+// It fails if MaxTokens is either undefined or negative or if the authorization
+// is unspecified.
 func (a StakeAuthorization) ValidateBasic() error {
 	if a.MaxTokens != nil && a.MaxTokens.IsNegative() {
 		return errorsmod.Wrapf(authz.ErrNegativeMaxTokens, "negative coin amount: %v", a.MaxTokens)
 	}
+
 	if a.AuthorizationType == AuthorizationType_AUTHORIZATION_TYPE_UNSPECIFIED {
 		return authz.ErrUnknownAuthorizationType
 	}
 
 	return nil
 }
 
-// Accept implements Authorization.Accept.
+// Accept implements Authorization.Accept. It checks, that the validator is not in the denied list,
+// and, should the allowed list not be empty, if the validator is in the allowed list.
+// If these conditions are met, the authorization amount is validated and if successful, the
+// corresponding AcceptResponse is returned.
 func (a StakeAuthorization) Accept(ctx sdk.Context, msg sdk.Msg) (authz.AcceptResponse, error) {
-	var validatorAddress string
-	var amount sdk.Coin
+	var (
+		validatorAddress string
+		amount           sdk.Coin
+	)
 
 	switch msg := msg.(type) {
 	case *MsgDelegate:
@@ -71,6 +90,9 @@ func (a StakeAuthorization) Accept(ctx sdk.Context, msg sdk.Msg) (authz.AcceptRe
 	case *MsgBeginRedelegate:
 		validatorAddress = msg.ValidatorDstAddress
 		amount = msg.Amount
+	case *MsgCancelUnbondingDelegation:
+		validatorAddress = msg.ValidatorAddress
+		amount = msg.Amount
 	default:
 		return authz.AcceptResponse{}, sdkerrors.ErrInvalidRequest.Wrap("unknown msg type")
 	}
@@ -99,21 +121,32 @@ func (a StakeAuthorization) Accept(ctx sdk.Context, msg sdk.Msg) (authz.AcceptRe
 
 	if a.MaxTokens == nil {
 		return authz.AcceptResponse{
-			Accept: true, Delete: false,
-			Updated: &StakeAuthorization{Validators: a.GetValidators(), AuthorizationType: a.GetAuthorizationType()},
+			Accept: true,
+			Delete: false,
+			Updated: &StakeAuthorization{
+				Validators:        a.GetValidators(),
+				AuthorizationType: a.GetAuthorizationType(),
+			},
 		}, nil
 	}
 
 	limitLeft, err := a.MaxTokens.SafeSub(amount)
 	if err != nil {
 		return authz.AcceptResponse{}, err
 	}
+
 	if limitLeft.IsZero() {
 		return authz.AcceptResponse{Accept: true, Delete: true}, nil
 	}
+
 	return authz.AcceptResponse{
-		Accept: true, Delete: false,
-		Updated: &StakeAuthorization{Validators: a.GetValidators(), AuthorizationType: a.GetAuthorizationType(), MaxTokens: &limitLeft},
+		Accept: true,
+		Delete: false,
+		Updated: &StakeAuthorization{
+			Validators:        a.GetValidators(),
+			AuthorizationType: a.GetAuthorizationType(),
+			MaxTokens:         &limitLeft,
+		},
 	}, nil
 }
 
@@ -151,6 +184,8 @@ func normalizeAuthzType(authzType AuthorizationType) (string, error) {
 		return sdk.MsgTypeURL(&MsgUndelegate{}), nil
 	case AuthorizationType_AUTHORIZATION_TYPE_REDELEGATE:
 		return sdk.MsgTypeURL(&MsgBeginRedelegate{}), nil
+	case AuthorizationType_AUTHORIZATION_TYPE_CANCEL_UNBONDING_DELEGATION:
+		return sdk.MsgTypeURL(&MsgCancelUnbondingDelegation{}), nil
 	default:
 		return "", errorsmod.Wrapf(authz.ErrUnknownAuthorizationType, "cannot normalize authz type with %T", authzType)
 	}