Revert "feat: add CancelUnbondingDelegation authz (#21)"

This reverts commit 0ba774f.
InjectiveLabs · Feb 20, 2024 · dd9b704 · dd9b704
1 parent 5f8a994
commit dd9b704
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 158 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,11 +37,11 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
 
+
 ## [v0.47.5](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.47.5) - 2023-09-01
 
 ### Features
 
-* (autz) [#21](https://github.com/evmos/cosmos-sdk/pull/21) Add CancelUnbondingDelegation authz
 * (client/rpc) [#17274](https://github.com/cosmos/cosmos-sdk/pull/17274) Add `QueryEventForTxCmd` cmd to subscribe and wait event for transaction by hash.
 * (keyring) [#17424](https://github.com/cosmos/cosmos-sdk/pull/17424) Allows to import private keys encoded in hex. 
 * (x/bank) [#14224](https://github.com/cosmos/cosmos-sdk/pull/14224) Allow injection of restrictions on transfers using `AppendSendRestriction` or `PrependSendRestriction`.

diff --git a/proto/cosmos/staking/v1beta1/authz.proto b/proto/cosmos/staking/v1beta1/authz.proto
@@ -46,6 +46,4 @@ 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;
 }
diff --git a/x/staking/types/authz.go b/x/staking/types/authz.go
@@ -21,23 +21,14 @@ 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
@@ -52,30 +43,21 @@ func (a StakeAuthorization) MsgTypeURL() string {
 	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 sdkerrors.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. 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.
+// Accept implements Authorization.Accept.
 func (a StakeAuthorization) Accept(ctx sdk.Context, msg sdk.Msg) (authz.AcceptResponse, error) {
-	var (
-		validatorAddress string
-		amount           sdk.Coin
-	)
+	var validatorAddress string
+	var amount sdk.Coin
 
 	switch msg := msg.(type) {
 	case *MsgDelegate:
@@ -87,9 +69,6 @@ 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")
 	}
@@ -118,32 +97,21 @@ 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
 }
 
@@ -181,8 +149,6 @@ 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 "", sdkerrors.Wrapf(authz.ErrUnknownAuthorizationType, "cannot normalize authz type with %T", authzType)
 	}

diff --git a/x/staking/types/authz.pb.go b/x/staking/types/authz.pb.go
diff --git a/x/staking/types/authz_test.go b/x/staking/types/authz_test.go
@@ -48,10 +48,6 @@ func TestAuthzAuthorizations(t *testing.T) {
 	beginRedelAuth, _ := stakingtypes.NewStakeAuthorization([]sdk.ValAddress{val1, val2}, []sdk.ValAddress{}, stakingtypes.AuthorizationType_AUTHORIZATION_TYPE_REDELEGATE, &coin100)
 	require.Equal(t, beginRedelAuth.MsgTypeURL(), sdk.MsgTypeURL(&stakingtypes.MsgBeginRedelegate{}))
 
-	// verify MethodName for CancelUnbondingDelegation
-	cancelUnbondAuth, _ := stakingtypes.NewStakeAuthorization([]sdk.ValAddress{val1, val2}, []sdk.ValAddress{}, stakingtypes.AuthorizationType_AUTHORIZATION_TYPE_CANCEL_UNBONDING_DELEGATION, &coin100)
-	require.Equal(t, cancelUnbondAuth.MsgTypeURL(), sdk.MsgTypeURL(&stakingtypes.MsgCancelUnbondingDelegation{}))
-
 	validators1_2 := []string{val1.String(), val2.String()}
 
 	testCases := []struct {
@@ -281,73 +277,6 @@ func TestAuthzAuthorizations(t *testing.T) {
 			false,
 			nil,
 		},
-		{
-			"cancel unbonding delegation: expect 0 remaining coins",
-			[]sdk.ValAddress{val1},
-			[]sdk.ValAddress{},
-			stakingtypes.AuthorizationType_AUTHORIZATION_TYPE_CANCEL_UNBONDING_DELEGATION,
-			&coin100,
-			stakingtypes.NewMsgCancelUnbondingDelegation(delAddr, val1, ctx.BlockHeight(), coin100),
-			false,
-			true,
-			nil,
-		},
-		{
-			"cancel unbonding delegation: verify remaining coins",
-			[]sdk.ValAddress{val1},
-			[]sdk.ValAddress{},
-			stakingtypes.AuthorizationType_AUTHORIZATION_TYPE_CANCEL_UNBONDING_DELEGATION,
-			&coin100,
-			stakingtypes.NewMsgCancelUnbondingDelegation(delAddr, val1, ctx.BlockHeight(), coin50),
-			false,
-			false,
-			&stakingtypes.StakeAuthorization{
-				Validators: &stakingtypes.StakeAuthorization_AllowList{
-					AllowList: &stakingtypes.StakeAuthorization_Validators{Address: []string{val1.String()}},
-				},
-				MaxTokens:         &coin50,
-				AuthorizationType: stakingtypes.AuthorizationType_AUTHORIZATION_TYPE_CANCEL_UNBONDING_DELEGATION,
-			},
-		},
-		{
-			"cancel unbonding delegation: testing with invalid validator",
-			[]sdk.ValAddress{val1, val2},
-			[]sdk.ValAddress{},
-			stakingtypes.AuthorizationType_AUTHORIZATION_TYPE_CANCEL_UNBONDING_DELEGATION,
-			&coin100,
-			stakingtypes.NewMsgCancelUnbondingDelegation(delAddr, val3, ctx.BlockHeight(), coin50),
-			true,
-			false,
-			nil,
-		},
-		{
-			"cancel unbonding delegation: testing delegate without spent limit",
-			[]sdk.ValAddress{val1, val2},
-			[]sdk.ValAddress{},
-			stakingtypes.AuthorizationType_AUTHORIZATION_TYPE_CANCEL_UNBONDING_DELEGATION,
-			nil,
-			stakingtypes.NewMsgCancelUnbondingDelegation(delAddr, val2, ctx.BlockHeight(), coin100),
-			false,
-			false,
-			&stakingtypes.StakeAuthorization{
-				Validators: &stakingtypes.StakeAuthorization_AllowList{
-					AllowList: &stakingtypes.StakeAuthorization_Validators{Address: validators1_2},
-				},
-				MaxTokens:         nil,
-				AuthorizationType: stakingtypes.AuthorizationType_AUTHORIZATION_TYPE_CANCEL_UNBONDING_DELEGATION,
-			},
-		},
-		{
-			"cancel unbonding delegation: fail cannot undelegate, permission denied",
-			[]sdk.ValAddress{},
-			[]sdk.ValAddress{val1},
-			stakingtypes.AuthorizationType_AUTHORIZATION_TYPE_CANCEL_UNBONDING_DELEGATION,
-			&coin100,
-			stakingtypes.NewMsgCancelUnbondingDelegation(delAddr, val1, ctx.BlockHeight(), coin100),
-			true,
-			false,
-			nil,
-		},
 	}
 
 	for _, tc := range testCases {