refine the code

Author: alexgao001

app/upgrade.go

@@ -1,6 +1,8 @@
 package app
 
 import (
+	virtualgroupmodule "github.com/bnb-chain/greenfield/x/virtualgroup"
+	virtualgrouptypes "github.com/bnb-chain/greenfield/x/virtualgroup/types"
 	serverconfig "github.com/cosmos/cosmos-sdk/server/config"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
@@ -87,8 +89,8 @@ func (app *App) registerPampasUpgradeHandler() {
 			app.GashubKeeper.DeleteMsgGasParams(ctx, "/greenfield.virtualgroup.MsgSwapOut")
 			app.GashubKeeper.DeleteMsgGasParams(ctx, "/greenfield.virtualgroup.MsgCompleteSwapOut")
 			app.GashubKeeper.DeleteMsgGasParams(ctx, "/greenfield.virtualgroup.MsgCancelSwapOut")
-			//app.GashubKeeper.DeleteMsgGasParams(ctx, "/greenfield.virtualgroup.MsgStorageProviderExit")
-			//app.GashubKeeper.DeleteMsgGasParams(ctx, "/greenfield.virtualgroup.MsgCompleteStorageProviderExit")
+			app.GashubKeeper.DeleteMsgGasParams(ctx, "/greenfield.virtualgroup.MsgStorageProviderExit")
+			app.GashubKeeper.DeleteMsgGasParams(ctx, "/greenfield.virtualgroup.MsgCompleteStorageProviderExit")
 
 			// disable bucket migration.
 			app.GashubKeeper.DeleteMsgGasParams(ctx, "/greenfield.storage.MsgMigrateBucket")
@@ -126,7 +128,6 @@ func (app *App) registerManchurianUpgradeHandler() {
 	app.UpgradeKeeper.SetUpgradeInitializer(upgradetypes.Manchurian,
 		func() error {
 			app.Logger().Info("Init Manchurian upgrade")
-
 			return nil
 		})
 }
@@ -141,7 +142,7 @@ func (app *App) registerHulunbeierUpgradeHandler() {
 			app.GashubKeeper.SetMsgGasParams(ctx, *gashubtypes.NewMsgGasParamsWithFixedGas("/greenfield.virtualgroup.MsgCancelSwapIn", 1.2e3))
 			app.GashubKeeper.SetMsgGasParams(ctx, *gashubtypes.NewMsgGasParamsWithFixedGas("/greenfield.virtualgroup.MsgCompleteSwapIn", 1.2e3))
 
-			app.GashubKeeper.SetMsgGasParams(ctx, *gashubtypes.NewMsgGasParamsWithFixedGas("/greenfield.virtualgroup.MsgStorageProviderForceExit", 1.2e3))
+			app.GashubKeeper.SetMsgGasParams(ctx, *gashubtypes.NewMsgGasParamsWithFixedGas("/greenfield.virtualgroup.MsgStorageProviderForcedExit", 1.2e3))
 			app.GashubKeeper.SetMsgGasParams(ctx, *gashubtypes.NewMsgGasParamsWithFixedGas("/greenfield.virtualgroup.MsgStorageProviderExit", 1.2e3))
 			app.GashubKeeper.SetMsgGasParams(ctx, *gashubtypes.NewMsgGasParamsWithFixedGas("/greenfield.virtualgroup.MsgCompleteStorageProviderExit", 1.2e3))
 
@@ -152,7 +153,11 @@ func (app *App) registerHulunbeierUpgradeHandler() {
 	app.UpgradeKeeper.SetUpgradeInitializer(upgradetypes.Hulunbeier,
 		func() error {
 			app.Logger().Info("Init Hulunbeier upgrade")
-
+			mm, ok := app.mm.Modules[virtualgrouptypes.ModuleName].(*virtualgroupmodule.AppModule)
+			if !ok {
+				panic("*virtualgroupmodule.AppModule not found")
+			}
+			mm.SetConsensusVersion(2)
 			return nil
 		})
 }

e2e/tests/virtualgroup_test.go

@@ -1012,7 +1012,7 @@ func (s *VirtualGroupTestSuite) TestSPExit2() {
 	s.Require().Error(err)
 }
 
-func (s *VirtualGroupTestSuite) TestSPForceExit() {
+func (s *VirtualGroupTestSuite) TestSPForcedExit() {
 
 	ctx := context.Background()
 	user := s.GenAndChargeAccounts(1, 1000000)[0]
@@ -1041,9 +1041,9 @@ func (s *VirtualGroupTestSuite) TestSPForceExit() {
 
 	// 3. create a proposal that puts SP-x to FORCE_EXIT
 	govAddr := authtypes.NewModuleAddress(govtypes.ModuleName).String()
-	msgForceExit := virtualgroupmoduletypes.NewMsgStorageProviderForceExit(govAddr, spx.OperatorKey.GetAddr())
+	msgForcedExit := virtualgroupmoduletypes.NewMsgStorageProviderForcedExit(govAddr, spx.OperatorKey.GetAddr())
 
-	proposal, err := v1.NewMsgSubmitProposal([]sdk.Msg{msgForceExit}, sdk.NewCoins(sdk.NewCoin("BNB", sdk.NewInt(1000000000000000000))),
+	proposal, err := v1.NewMsgSubmitProposal([]sdk.Msg{msgForcedExit}, sdk.NewCoins(sdk.NewCoin("BNB", sdk.NewInt(1000000000000000000))),
 		s.Validator.GetAddr().String(), "", "put SP to force exit status", "put SP to force exit status")
 	s.Require().NoError(err)
 	txBroadCastResp, err := s.SendTxBlockWithoutCheck(proposal, s.Validator)

proto/greenfield/virtualgroup/events.proto

@@ -165,9 +165,9 @@ message EventStorageProviderExit {
 message EventCompleteStorageProviderExit {
   // The id of the storage provider who complete exit
   uint32 storage_provider_id = 1;
-  // The operator address which initials the complete exit transaction, for itself or another SP
+  // The operator address which initials the complete exit transaction.
   string operator_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"];
-  // The storage address which completes the exit
+  // The storage provider address which completes the exit
   string storage_provider_address = 3 [(cosmos_proto.scalar) = "cosmos.AddressString"];
   // total_deposit defines the number of tokens deposited by this storage provider for staking.
   string total_deposit = 4 [
@@ -179,7 +179,7 @@ message EventCompleteStorageProviderExit {
   bool forced_exit = 5;
 }
 
-message EventSwapIn {
+message EventReserveSwapIn {
   // The id of the storage provider who wants to swap in
   uint32 storage_provider_id = 1;
   // The id of the gvg family which the storage provider wants to swap in as primary sp
@@ -188,6 +188,8 @@ message EventSwapIn {
   uint32 global_virtual_group_id = 3;
   // The id of the target sp who will be swapped
   uint32 target_sp_id = 4;
+  // the expiration time of this reserved swapIn
+  uint64 expiration_time = 5;
 }
 
 message EventCompleteSwapIn {
@@ -212,7 +214,7 @@ message EventCancelSwapIn {
   uint32 target_sp_id = 4;
 }
 
-message EventStorageProviderForceExit {
+message EventStorageProviderForcedExit {
   // The id of the storage provider who wants to exit
   uint32 storage_provider_id = 1;
 }

proto/greenfield/virtualgroup/tx.proto

@@ -33,9 +33,9 @@ service Msg {
   rpc CancelSwapIn(MsgCancelSwapIn) returns (MsgCancelSwapInResponse);
   rpc CompleteSwapIn(MsgCompleteSwapIn) returns (MsgCompleteSwapInResponse);
 
-  // StorageProviderForceExit defines a governance operation for a SP force exit
+  // StorageProviderForcedExit defines a governance operation for a SP to be forced to exit
   // The authority is defined in the keeper.
-  rpc StorageProviderForceExit(MsgStorageProviderForceExit) returns (MsgStorageProviderForceExitResponse);
+  rpc StorageProviderForcedExit(MsgStorageProviderForcedExit) returns (MsgStorageProviderForcedExitResponse);
 }
 
 // MsgUpdateParams is the Msg/UpdateParams request type.
@@ -192,7 +192,7 @@ message MsgCompleteStorageProviderExit {
   // storage_provider defines the operator account address of the storage provider who will exit
   string storage_provider = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 
-  // operator defines the operator account address of the storage provider who initials this transaction.
+  // operator defines the operator account address who initials this transaction.
   string operator = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 }
 
@@ -210,7 +210,7 @@ message MsgReserveSwapIn {
   // it it set to zero, it represents that the operator swap in as the secondary storage provider.
   uint32 global_virtual_group_family_id = 3;
   // global_virtual_group_id is a global virtual group ID associated with the swap in.
-  // It allows to be empty only when the operator is the primary storage provider.
+  // It allows to be empty only when the operator wants to be the successor primary storage provider in a family.
   uint32 global_virtual_group_id = 4;
 }
 
@@ -219,14 +219,14 @@ message MsgReserveSwapInResponse {}
 message MsgCompleteSwapIn {
   option (cosmos.msg.v1.signer) = "storage_provider";
 
-  // storage_provider defines the operator account address of the storage provider who want to swap into the virtual group family or global virtual group.
+  // storage_provider defines the operator account address of the storage provider who wants to swap into the virtual group family or global virtual group.
   string storage_provider = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
   // virtual_group_family_id is the identifier of the virtual group family.
   // if it set to non-zero, it represents that the operator swap in as the primary storage provider
   // it it set to zero, it represents that the operator swap in as the secondary storage provider.
   uint32 global_virtual_group_family_id = 2;
   // global_virtual_group_id is a global virtual group ID associated with the swap in.
-  // It allows to be empty only when the operator is the primary storage provider.
+  // It allows to be empty only when the operator wants to be the successor primary storage provider in a family.
   uint32 global_virtual_group_id = 3;
 }
 
@@ -242,21 +242,21 @@ message MsgCancelSwapIn {
   // it it set to zero, it represents that the operator swap in as the secondary storage provider.
   uint32 global_virtual_group_family_id = 2;
   // global_virtual_group_id is a global virtual group IDs associated with the swap in.
-  // It allows to be empty only when the operator is the primary storage provider.
+  // It allows to be empty only when the operator wants to be the successor primary storage provider in a family.
   uint32 global_virtual_group_id = 3;
 }
 
 message MsgCancelSwapInResponse {}
 
 // this line is used by starport scaffolding # proto/tx/message
-message MsgStorageProviderForceExit {
+message MsgStorageProviderForcedExit {
   option (cosmos.msg.v1.signer) = "authority";
 
   // authority is the address that controls the module (defaults to x/gov unless overwritten).
   string authority = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 
-  // storage_provider defines the account address of the storage provider which need to force exit
+  // storage_provider defines the account address of the storage provider forced to exit
   string storage_provider = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 }
 
-message MsgStorageProviderForceExitResponse {}
+message MsgStorageProviderForcedExitResponse {}

proto/greenfield/virtualgroup/types.proto

@@ -81,7 +81,7 @@ message SwapOutInfo {
 }
 
 message SwapInInfo {
-  // successor_sp_id defines the id of sp who want to join the family or GVG
+  // successor_sp_id defines the id of SP who wants to join the family or GVG
   uint32 successor_sp_id = 1;
   // target_sp_id is the id of SP in the family or GVG to be swapped.
   uint32 target_sp_id = 2;

swagger/static/swagger.yaml

@@ -6253,7 +6253,7 @@ paths:
                     type: integer
                     format: int64
                     title: >-
-                      successor_sp_id defines the id of sp who want to join the
+                      successor_sp_id defines the id of SP who wants to join the
                       family or GVG
                   target_sp_id:
                     type: integer
@@ -37142,7 +37142,7 @@ definitions:
             type: integer
             format: int64
             title: >-
-              successor_sp_id defines the id of sp who want to join the family
+              successor_sp_id defines the id of SP who wants to join the family
               or GVG
           target_sp_id:
             type: integer
@@ -37159,7 +37159,7 @@ definitions:
         type: integer
         format: int64
         title: >-
-          successor_sp_id defines the id of sp who want to join the family or
+          successor_sp_id defines the id of SP who wants to join the family or
           GVG
       target_sp_id:
         type: integer

x/storage/keeper/keeper.go

@@ -904,13 +904,6 @@ func (k Keeper) DeleteObject(
 	}
 
 	spInState := k.MustGetPrimarySPForBucket(ctx, bucketInfo)
-
-	if ctx.IsUpgraded(upgradetypes.Hulunbeier) {
-		if spInState.Status == sptypes.STATUS_GRACEFUL_EXITING || spInState.Status == sptypes.STATUS_FORCED_EXITING {
-			return types.ErrUpdateQuotaFailed.Wrapf("The SP is in %s, object can not be deleted", spInState.Status)
-		}
-	}
-
 	internalBucketInfo := k.MustGetInternalBucketInfo(ctx, bucketInfo.Id)
 
 	err := k.UnChargeObjectStoreFee(ctx, spInState.Id, bucketInfo, internalBucketInfo, objectInfo)