fix update group member error

e2e/tests/storage_test.go

@@ -221,7 +221,7 @@ func (s *StorageTestSuite) TestCreateGroup() {
 	member2 := s.GenAndChargeAccounts(1, 1000000)[0]
 	membersToAdd := []sdk.AccAddress{member2.GetAddr()}
 	membersToDelete := []sdk.AccAddress{member.GetAddr()}
-	msgUpdateGroupMember := storagetypes.NewMsgUpdateGroupMember(owner.GetAddr(), groupName, membersToAdd, membersToDelete)
+	msgUpdateGroupMember := storagetypes.NewMsgUpdateGroupMember(owner.GetAddr(), owner.GetAddr(), groupName, membersToAdd, membersToDelete)
 	s.SendTxBlock(msgUpdateGroupMember, owner)
 
 	// 5. HeadGroupMember (delete)

proto/greenfield/storage/query.proto

@@ -91,7 +91,7 @@ service Query {
 
   // Queries a list of ListGroup items.
   rpc ListGroup(QueryListGroupRequest) returns (QueryListGroupResponse) {
-    option (google.api.http).get = "/bnb-chain/greenfield/storage/list_group";
+    option (google.api.http).get = "/bnb-chain/greenfield/storage/list_group/{group_owner}";
   }
 
   // Queries a list of HeadGroupMember items.

proto/greenfield/storage/tx.proto

@@ -217,12 +217,14 @@ message MsgUpdateGroupMember {
 
   // operator is the account address of the operator who has the UpdateGroupMember permission of the group.
   string operator = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
+  // group_owner is the account address of the group owner
+  string group_owner = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"];
   // group_name is the name of the group which to be updated
-  string group_name = 2;
+  string group_name = 3;
   // members_to_add is a list of members account address which will be add to the group
-  repeated string members_to_add = 3 [(cosmos_proto.scalar) = "cosmos.AddressString"];
+  repeated string members_to_add = 4 [(cosmos_proto.scalar) = "cosmos.AddressString"];
   // members_to_delete is a list of members account address which will be remove from the group
-  repeated string members_to_delete = 4 [(cosmos_proto.scalar) = "cosmos.AddressString"];
+  repeated string members_to_delete = 5 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 }
 
 message MsgUpdateGroupMemberResponse {}

x/permission/types/keys.go

@@ -36,8 +36,6 @@ var (
 	PolicyByIDPrefix = []byte{0x31}
 
 	PolicySequencePrefix = []byte{0x41}
-
-	GroupMemberPolicyPrefix = []byte{0x51}
 )
 
 func GetPolicyForAccountKey(resourceID math.Uint, resourceType resource.ResourceType, addr sdk.AccAddress) []byte {
@@ -87,7 +85,3 @@ func GetObjectPolicyForGroupKey(resourceID math.Uint) []byte {
 func GetPolicyByIDKey(policyID math.Uint) []byte {
 	return append(PolicyByIDPrefix, policyID.Bytes()...)
 }
-
-func GetGroupMemberPolicyPrefix(groupID math.Uint, member sdk.AccAddress) []byte {
-	return append(GroupMemberPolicyPrefix, append(groupID.Bytes(), member.Bytes()...)...)
-}

x/storage/client/cli/tx.go

@@ -530,6 +530,7 @@ func CmdUpdateGroupMember() *cobra.Command {
 				memberAddrsToDelete = append(memberAddrsToDelete, memberAddr)
 			}
 			msg := types.NewMsgUpdateGroupMember(
+				clientCtx.GetFromAddress(),
 				clientCtx.GetFromAddress(),
 				argGroupName,
 				memberAddrsToAdd,

x/storage/keeper/cross_app_group.go

@@ -359,7 +359,7 @@ func (app *GroupApp) handleUpdateGroupMemberSynPackage(ctx sdk.Context, header *
 	err = app.storageKeeper.UpdateGroupMember(
 		ctx,
 		updateGroupPackage.Operator,
-		groupInfo.GroupName,
+		groupInfo,
 		options,
 	)
 	if err != nil {

x/storage/keeper/keeper.go

@@ -868,11 +868,7 @@ func (k Keeper) LeaveGroup(
 	return nil
 }
 
-func (k Keeper) UpdateGroupMember(ctx sdk.Context, operator sdk.AccAddress, groupName string, opts UpdateGroupMemberOptions) error {
-	groupInfo, found := k.GetGroupInfo(ctx, operator, groupName)
-	if !found {
-		return types.ErrNoSuchGroup
-	}
+func (k Keeper) UpdateGroupMember(ctx sdk.Context, operator sdk.AccAddress, groupInfo *types.GroupInfo, opts UpdateGroupMemberOptions) error {
 	if groupInfo.SourceType != opts.SourceType {
 		return types.ErrSourceTypeMismatch
 	}

x/storage/keeper/msg_server.go

@@ -243,7 +243,13 @@ func (k msgServer) UpdateGroupMember(goCtx context.Context, msg *types.MsgUpdate
 
 	operator := sdk.MustAccAddressFromHex(msg.Operator)
 
-	err := k.Keeper.UpdateGroupMember(ctx, operator, msg.GroupName, UpdateGroupMemberOptions{
+	groupOwner := sdk.MustAccAddressFromHex(msg.GroupOwner)
+
+	groupInfo, found := k.GetGroupInfo(ctx, groupOwner, msg.GroupName)
+	if !found {
+		return nil, types.ErrNoSuchGroup
+	}
+	err := k.Keeper.UpdateGroupMember(ctx, operator, groupInfo, UpdateGroupMemberOptions{
 		SourceType:      types.SOURCE_TYPE_ORIGIN,
 		MembersToAdd:    msg.MembersToAdd,
 		MembersToDelete: msg.MembersToDelete,

x/storage/types/message.go

@@ -796,7 +796,7 @@ func (msg *MsgLeaveGroup) ValidateBasic() error {
 }
 
 func NewMsgUpdateGroupMember(
-	operator sdk.AccAddress, groupName string, membersToAdd []sdk.AccAddress,
+	operator sdk.AccAddress, groupOwner sdk.AccAddress, groupName string, membersToAdd []sdk.AccAddress,
 	membersToDelete []sdk.AccAddress) *MsgUpdateGroupMember {
 	var membersAddrToAdd, membersAddrToDelete []string
 	for _, member := range membersToAdd {
@@ -807,6 +807,7 @@ func NewMsgUpdateGroupMember(
 	}
 	return &MsgUpdateGroupMember{
 		Operator:        operator.String(),
+		GroupOwner:      groupOwner.String(),
 		GroupName:       groupName,
 		MembersToAdd:    membersAddrToAdd,
 		MembersToDelete: membersAddrToDelete,
@@ -844,6 +845,12 @@ func (msg *MsgUpdateGroupMember) ValidateBasic() error {
 	if err != nil {
 		return errors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid operator address (%s)", err)
 	}
+
+	_, err = sdk.AccAddressFromHexUnsafe(msg.GroupOwner)
+	if err != nil {
+		return errors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid group owner address (%s)", err)
+	}
+
 	err = s3util.CheckValidGroupName(msg.GroupName)
 	if err != nil {
 		return err