feature(staking): operator key rotation

x/staking/keeper/delegation.go

@@ -850,7 +850,7 @@ func (k Keeper) Unbond(
  }
 
  valAddr, err1 := k.validatorAddressCodec.StringToBytes(delegation.GetValidatorAddr())
- if err != nil {
+ if err1 != nil {
  return amount, err1
  }
 

x/staking/keeper/grpc_query.go

@@ -10,7 +10,6 @@ import (
 
  "cosmossdk.io/collections"
  "cosmossdk.io/store/prefix"
- storetypes "cosmossdk.io/store/types"
  "cosmossdk.io/x/staking/types"
 
  "github.com/cosmos/cosmos-sdk/runtime"
@@ -414,14 +413,13 @@ func (k Querier) Redelegations(ctx context.Context, req *types.QueryRedelegation
  var pageRes *query.PageResponse
  var err error
 
- store := runtime.KVStoreAdapter(k.environment.KVStoreService.OpenKVStore(ctx))
  switch {
  case req.DelegatorAddr != "" && req.SrcValidatorAddr != "" && req.DstValidatorAddr != "":
  redels, err = queryRedelegation(ctx, k, req)
  case req.DelegatorAddr == "" && req.SrcValidatorAddr != "" && req.DstValidatorAddr == "":
- redels, pageRes, err = queryRedelegationsFromSrcValidator(ctx, store, k, req)
+ redels, pageRes, err = queryRedelegationsFromSrcValidator(ctx, k, req)
  default:
- redels, pageRes, err = queryAllRedelegations(ctx, store, k, req)
+ redels, pageRes, err = queryAllRedelegations(ctx, k, req)
  }
  if err != nil {
  return nil, status.Error(codes.Internal, err.Error())
@@ -526,7 +524,7 @@ func queryRedelegation(ctx context.Context, k Querier, req *types.QueryRedelegat
  return redels, nil
 }
 
-func queryRedelegationsFromSrcValidator(ctx context.Context, store storetypes.KVStore, k Querier, req *types.QueryRedelegationsRequest) (types.Redelegations, *query.PageResponse, error) {
+func queryRedelegationsFromSrcValidator(ctx context.Context, k Querier, req *types.QueryRedelegationsRequest) (types.Redelegations, *query.PageResponse, error) {
  valAddr, err := k.validatorAddressCodec.StringToBytes(req.SrcValidatorAddr)
  if err != nil {
  return nil, nil, err
@@ -542,7 +540,7 @@ func queryRedelegationsFromSrcValidator(ctx context.Context, store storetypes.KV
  }, query.WithCollectionPaginationTriplePrefix[[]byte, []byte, []byte](valAddr))
 }
 
-func queryAllRedelegations(ctx context.Context, store storetypes.KVStore, k Querier, req *types.QueryRedelegationsRequest) (redels types.Redelegations, res *query.PageResponse, err error) {
+func queryAllRedelegations(ctx context.Context, k Querier, req *types.QueryRedelegationsRequest) (redels types.Redelegations, res *query.PageResponse, err error) {
  delAddr, err := k.authKeeper.AddressCodec().StringToBytes(req.DelegatorAddr)
  if err != nil {
  return nil, nil, err

x/staking/keeper/msg_server.go

@@ -716,3 +716,37 @@ func (k msgServer) RotateConsPubKey(ctx context.Context, msg *types.MsgRotateCon
 
  return res, nil
 }
+
+// RotateOperatorPubKey rotates the operator public key of a validator.
+// It takes a RotateOperatorPubKey message as input and updates the operator address of the corresponding validator.
+// If the provided public key is not of type cryptotypes.PubKey, it returns an error.
+// It returns the RotateOperatorPubKeyResponse message and any error encountered during the process.
+func (k msgServer) RotateOperatorPubKey(ctx context.Context, msg *types.MsgRotateOperatorPubKey) (res *types.MsgRotateOperatorPubKeyResponse, err error) {
+ cv := msg.NewPubkey.GetCachedValue()
+ pk, ok := cv.(cryptotypes.PubKey)
+ if !ok {
+ return nil, errorsmod.Wrapf(sdkerrors.ErrInvalidType, "expecting cryptotypes.PubKey, got %T", cv)
+ }
+
+ addr, err := k.validatorAddressCodec.StringToBytes(msg.ValidatorAddress)
+ if err != nil {
+ return nil, err
+ }
+ validator, err := k.GetValidator(ctx, addr)
+ if err != nil {
+ return nil, err
+ }
+
+ operAddr, err := k.authKeeper.AddressCodec().BytesToString(pk.Bytes())
+ if err != nil {
+ return nil, err
+ }
+
+ validator.OperatorAddress = operAddr
+
+ if err := k.SetValidator(ctx, validator); err != nil {
+ return nil, err
+ }
+
+ return res, nil
+}

x/staking/keeper/validator.go

@@ -440,7 +440,7 @@ func (k Keeper) InsertUnbondingValidatorQueue(ctx context.Context, val types.Val
  if err != nil {
  return err
  }
- addrs = append(addrs, val.OperatorAddress)
+ addrs = append(addrs, val.OperatorAddress) // TODO: why use operator instead of consensus as the idenfier?
  return k.SetUnbondingValidatorsQueue(ctx, val.UnbondingTime, val.UnbondingHeight, addrs)
 }
 

x/staking/proto/cosmos/staking/v1beta1/tx.proto

@@ -50,6 +50,11 @@ service Msg {
  // of a validator.
  // Since: cosmos-sdk 0.51
  rpc RotateConsPubKey(MsgRotateConsPubKey) returns (MsgRotateConsPubKeyResponse);
+
+ // RotateOperatorPubKey defines an operation for rotating the operator keys
+ // of a validator.
+ // Since: cosmos-sdk 0.51
+ rpc RotateOperatorPubKey(MsgRotateOperatorPubKey) returns (MsgRotateOperatorPubKeyResponse);
 }
 
 // MsgCreateValidator defines a SDK message for creating a new validator.
@@ -230,3 +235,22 @@ message MsgRotateConsPubKey {
 //
 // Since: cosmos-sdk 0.51
 message MsgRotateConsPubKeyResponse {}
+
+// MsgRotateOperatorPubKey
+message MsgRotateOperatorPubKey {
+ option (cosmos.msg.v1.signer) = "validator_address";
+ option (amino.name) = "cosmos-sdk/MsgRotateOperatorPubKey";
+
+ option (gogoproto.goproto_getters) = false;
+ option (gogoproto.equal) = false;
+
+ string validator_address = 1 [(cosmos_proto.scalar) = "cosmos.ValidatorAddressString"];
+ google.protobuf.Any new_pubkey = 2
+ [(cosmos_proto.accepts_interface) = "cosmos.crypto.PubKey", (cosmos_proto.scalar) = "cosmos.PubKey"];
+}
+
+// MsgRotateOperatorPubKeyResponse defines the response structure for executing a
+// MsgRotateOperatorPubKey message.
+//
+// Since: cosmos-sdk 0.51
+message MsgRotateOperatorPubKeyResponse {}