fix: remove tags field from existed msgs

deployment/localup/localup_fullnode.sh

@@ -33,7 +33,7 @@ function init_fullnode() {
         cp ${workspace}/.local/validator0/config/config.toml ${workspace}/.local/dataseed${i}/config/config.toml
 
         # set state sync info
-        sed -i 'N;s/\# starting from the height of the snapshot\.\nenable = false/\# starting from the height of the snapshot\.\nenable = true/Mg'sed -i -e 'N;s/\# starting from the height of the snapshot\.\nenable = false/\# starting from the height of the snapshot\.\nenable = true/g' ${workspace}/.local/dataseed${i}/config/config.toml
+        sed -i -e 'N;s/\# starting from the height of the snapshot\.\nenable = false/\# starting from the height of the snapshot\.\nenable = true/g' ${workspace}/.local/dataseed${i}/config/config.toml
         sed -i -e "s/trust_height = 0/trust_height = ${trust_height}/g" ${workspace}/.local/dataseed${i}/config/config.toml
         sed -i -e "s/trust_hash = \"\"/trust_hash = \"${trust_hash}\"/g" ${workspace}/.local/dataseed${i}/config/config.toml
         sed -i -e "s/rpc_servers = \"\"/rpc_servers = \"${rpc_servers}\"/g" ${workspace}/.local/dataseed${i}/config/config.toml

proto/greenfield/storage/events.proto

@@ -38,8 +38,6 @@ message EventCreateBucket {
   uint32 global_virtual_group_family_id = 10;
   // status define the status of the bucket.
   BucketStatus status = 11;
-  // tags define the tag of the bucket
-  ResourceTags tags = 12;
 }
 
 // EventDeleteBucket is emitted on MsgDeleteBucket
@@ -140,8 +138,6 @@ message EventCreateObject {
   repeated bytes checksums = 16;
   // local_virtual_group_id defines the unique id of lvg which the object stored
   uint32 local_virtual_group_id = 17;
-  // tags define the tag of the object
-  ResourceTags tags = 18;
 }
 
 // EventCancelCreateObject is emitted on MsgCancelCreateObject
@@ -296,8 +292,6 @@ message EventCreateGroup {
   SourceType source_type = 4;
   // extra defines extra info for the group
   string extra = 5;
-  // tags define the tag of the group
-  ResourceTags tags = 6;
 }
 
 // EventDeleteGroup is emitted on MsgDeleteGroup

proto/greenfield/storage/tx.proto

@@ -89,9 +89,6 @@ message MsgCreateBucket {
   // The available read data for each user is the sum of the free read data provided by SP and
   // the ChargeReadQuota specified here.
   uint64 charged_read_quota = 7;
-
-  // tags defines a list of tags which will be set to the bucket
-  ResourceTags tags = 8 [(gogoproto.nullable) = false];
 }
 
 message MsgCreateBucketResponse {
@@ -159,9 +156,6 @@ message MsgCreateObject {
 
   // redundancy_type can be ec or replica
   RedundancyType redundancy_type = 9;
-
-  // tags defines a list of tags which will be set to the object
-  ResourceTags tags = 10 [(gogoproto.nullable) = false];
 }
 
 message MsgCreateObjectResponse {
@@ -287,9 +281,6 @@ message MsgCreateGroup {
 
   // extra defines extra info for the group
   string extra = 3;
-
-  // tags defines a list of tags which will be set to the group
-  ResourceTags tags = 4 [(gogoproto.nullable) = false];
 }
 
 message MsgCreateGroupResponse {

x/storage/client/cli/tx.go

@@ -17,6 +17,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/version"
 	"github.com/spf13/cobra"
 
+	types2 "github.com/bnb-chain/greenfield/types"
 	"github.com/bnb-chain/greenfield/types/common"
 	gnfderrors "github.com/bnb-chain/greenfield/types/errors"
 	"github.com/bnb-chain/greenfield/x/storage/types"
@@ -124,7 +125,7 @@ func CmdCreateBucket() *cobra.Command {
 			if err != nil {
 				return err
 			}
-			msg := types.NewMsgCreateBucket(
+			msgCreateBucket := types.NewMsgCreateBucket(
 				clientCtx.GetFromAddress(),
 				argBucketName,
 				visibilityType,
@@ -134,15 +135,20 @@ func CmdCreateBucket() *cobra.Command {
 				approveSignatureBytes,
 				chargedReadQuota,
 			)
-			if tags != nil {
-				msg.Tags = *tags
+			if err := msgCreateBucket.ValidateBasic(); err != nil {
+				return err
 			}
 
-			if err := msg.ValidateBasic(); err != nil {
-				return err
+			if tags != nil {
+				grn := types2.NewBucketGRN(argBucketName)
+				msgSetTag := types.NewMsgSetTag(clientCtx.GetFromAddress(), grn.String(), tags)
+				if err := msgSetTag.ValidateBasic(); err != nil {
+					return err
+				}
+				return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msgCreateBucket, msgSetTag)
 			}
 
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msgCreateBucket)
 		},
 	}
 
@@ -325,7 +331,7 @@ func CmdCreateObject() *cobra.Command {
 				return types.ErrInvalidRedundancyType
 			}
 
-			msg := types.NewMsgCreateObject(
+			msgCreateObject := types.NewMsgCreateObject(
 				clientCtx.GetFromAddress(),
 				argBucketName,
 				argObjectName,
@@ -337,14 +343,20 @@ func CmdCreateObject() *cobra.Command {
 				approveTimeoutHeight,
 				approveSignatureBytes,
 			)
-			if tags != nil {
-				msg.Tags = *tags
+			if err := msgCreateObject.ValidateBasic(); err != nil {
+				return err
 			}
 
-			if err := msg.ValidateBasic(); err != nil {
-				return err
+			if tags != nil {
+				grn := types2.NewObjectGRN(argBucketName, argObjectName)
+				msgSetTag := types.NewMsgSetTag(clientCtx.GetFromAddress(), grn.String(), tags)
+				if err := msgSetTag.ValidateBasic(); err != nil {
+					return err
+				}
+				return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msgCreateObject, msgSetTag)
 			}
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
+
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msgCreateObject)
 		},
 	}
 
@@ -541,19 +553,25 @@ func CmdCreateGroup() *cobra.Command {
 			tagsStr, _ := cmd.Flags().GetString(FlagTags)
 			tags := GetTags(tagsStr)
 
-			msg := types.NewMsgCreateGroup(
+			msgCreateGroup := types.NewMsgCreateGroup(
 				clientCtx.GetFromAddress(),
 				argGroupName,
 				extra,
 			)
-			if tags != nil {
-				msg.Tags = *tags
+			if err := msgCreateGroup.ValidateBasic(); err != nil {
+				return err
 			}
 
-			if err := msg.ValidateBasic(); err != nil {
-				return err
+			if tags != nil {
+				grn := types2.NewGroupGRN(clientCtx.GetFromAddress(), argGroupName)
+				msgSetTag := types.NewMsgSetTag(clientCtx.GetFromAddress(), grn.String(), tags)
+				if err := msgSetTag.ValidateBasic(); err != nil {
+					return err
+				}
+				return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msgCreateGroup, msgSetTag)
 			}
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
+
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msgCreateGroup)
 		},
 	}
 

x/storage/keeper/keeper.go

@@ -139,7 +139,6 @@ func (k Keeper) CreateBucket(
 		ChargedReadQuota:           opts.ChargedReadQuota,
 		PaymentAddress:             paymentAcc.String(),
 		GlobalVirtualGroupFamilyId: gvgFamily.Id,
-		Tags:                       opts.Tags,
 	}
 
 	internalBucketInfo := types.InternalBucketInfo{PriceTime: ctx.BlockTime().Unix()}
@@ -174,7 +173,6 @@ func (k Keeper) CreateBucket(
 		PaymentAddress:             bucketInfo.PaymentAddress,
 		PrimarySpId:                sp.Id,
 		GlobalVirtualGroupFamilyId: bucketInfo.GlobalVirtualGroupFamilyId,
-		Tags:                       bucketInfo.Tags,
 	}); err != nil {
 		return sdkmath.Uint{}, err
 	}
@@ -618,7 +616,6 @@ func (k Keeper) CreateObject(
 		RedundancyType: opts.RedundancyType,
 		SourceType:     opts.SourceType,
 		Checksums:      opts.Checksums,
-		Tags:           opts.Tags,
 	}
 
 	if objectInfo.PayloadSize == 0 {
@@ -658,7 +655,6 @@ func (k Keeper) CreateObject(
 		SourceType:          objectInfo.SourceType,
 		Checksums:           objectInfo.Checksums,
 		LocalVirtualGroupId: objectInfo.LocalVirtualGroupId,
-		Tags:                opts.Tags,
 	}); err != nil {
 		return objectInfo.Id, err
 	}
@@ -1259,7 +1255,6 @@ func (k Keeper) CreateGroup(
 		Id:         k.GenNextGroupId(ctx),
 		GroupName:  groupName,
 		Extra:      opts.Extra,
-		Tags:       opts.Tags,
 	}
 
 	// Can not create a group with the same name.
@@ -1278,7 +1273,6 @@ func (k Keeper) CreateGroup(
 		GroupId:    groupInfo.Id,
 		SourceType: groupInfo.SourceType,
 		Extra:      opts.Extra,
-		Tags:       opts.Tags,
 	}); err != nil {
 		return sdkmath.ZeroUint(), err
 	}

x/storage/keeper/msg_server.go

@@ -45,7 +45,6 @@ func (k msgServer) CreateBucket(goCtx context.Context, msg *types.MsgCreateBucke
 		SourceType:        types.SOURCE_TYPE_ORIGIN,
 		PrimarySpApproval: msg.PrimarySpApproval,
 		ApprovalMsgBytes:  msg.GetApprovalBytes(),
-		Tags:              &msg.Tags,
 	})
 	if err != nil {
 		return nil, err
@@ -122,7 +121,6 @@ func (k msgServer) CreateObject(goCtx context.Context, msg *types.MsgCreateObjec
 		Checksums:         msg.ExpectChecksums,
 		PrimarySpApproval: msg.PrimarySpApproval,
 		ApprovalMsgBytes:  msg.GetApprovalBytes(),
-		Tags:              &msg.Tags,
 	})
 	if err != nil {
 		return nil, err
@@ -234,7 +232,7 @@ func (k msgServer) CreateGroup(goCtx context.Context, msg *types.MsgCreateGroup)
 
 	ownerAcc := sdk.MustAccAddressFromHex(msg.Creator)
 
-	id, err := k.Keeper.CreateGroup(ctx, ownerAcc, msg.GroupName, storagetypes.CreateGroupOptions{Extra: msg.Extra, Tags: &msg.Tags})
+	id, err := k.Keeper.CreateGroup(ctx, ownerAcc, msg.GroupName, storagetypes.CreateGroupOptions{Extra: msg.Extra})
 	if err != nil {
 		return nil, err
 	}