Impose upgrade proposal with restrictions

irisnet · Nov 23, 2018 · 03f202b · 03f202b
1 parent 5ac6110
commit 03f202b
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 11 deletions.
diff --git a/app/app.go b/app/app.go
@@ -139,7 +139,7 @@ func NewIrisApp(logger log.Logger, db dbm.DB, traceStore io.Writer, baseAppOptio
 		app.cdc,
 		app.keyStake, app.tkeyStake,
 		app.bankKeeper, app.paramsKeeper.Subspace(stake.DefaultParamspace),
-		app.RegisterCodespace(stake.DefaultCodespace),
+		stake.DefaultCodespace,
 	)
 	app.mintKeeper = mint.NewKeeper(app.cdc, app.keyMint,
 		app.paramsKeeper.Subspace(mint.DefaultParamspace),
@@ -150,32 +150,32 @@ func NewIrisApp(logger log.Logger, db dbm.DB, traceStore io.Writer, baseAppOptio
 		app.keyDistr,
 		app.paramsKeeper.Subspace(distr.DefaultParamspace),
 		app.bankKeeper, &stakeKeeper, app.feeCollectionKeeper,
-		app.RegisterCodespace(stake.DefaultCodespace),
+		distr.DefaultCodespace,
 	)
 	app.slashingKeeper = slashing.NewKeeper(
 		app.cdc,
 		app.keySlashing,
 		&stakeKeeper, app.paramsKeeper.Subspace(slashing.DefaultParamspace),
-		app.RegisterCodespace(slashing.DefaultCodespace),
+		slashing.DefaultCodespace,
 	)
 
 	app.govKeeper = gov.NewKeeper(
 		app.cdc,
 		app.keyGov,
 		app.bankKeeper, &stakeKeeper,
-		app.RegisterCodespace(gov.DefaultCodespace),
+		gov.DefaultCodespace,
 	)
 
 	app.recordKeeper = record.NewKeeper(
 		app.cdc,
 		app.keyRecord,
-		app.RegisterCodespace(record.DefaultCodespace),
+		record.DefaultCodespace,
 	)
 	app.serviceKeeper = service.NewKeeper(
 		app.cdc,
 		app.keyService,
 		app.bankKeeper,
-		app.RegisterCodespace(service.DefaultCodespace),
+		service.DefaultCodespace,
 	)
 
 	// register the staking hooks

diff --git a/modules/gov/errors.go b/modules/gov/errors.go
@@ -24,6 +24,7 @@ const (
 	////////////////////  iris begin  ///////////////////////////
 	CodeInvalidParam            sdk.CodeType = 12
 	CodeInvalidParamOp          sdk.CodeType = 13
+	CodeSwitchPeriodInProcess   sdk.CodeType = 14
 	////////////////////  iris end  /////////////////////////////
 )
 
@@ -78,4 +79,8 @@ func ErrInvalidParam(codespace sdk.CodespaceType) sdk.Error {
 func ErrInvalidParamOp(codespace sdk.CodespaceType, opStr string) sdk.Error {
 	return sdk.NewError(codespace, CodeInvalidParamOp, fmt.Sprintf("Op '%s' is not valid", opStr))
 }
+
+func ErrSwitchPeriodInProcess(codespace sdk.CodespaceType) sdk.Error {
+	return sdk.NewError(codespace, CodeSwitchPeriodInProcess, fmt.Sprintf("Software Upgrade Switch Period is in process."))
+}
 ////////////////////  iris end  /////////////////////////////
diff --git a/modules/gov/handler.go b/modules/gov/handler.go
@@ -8,6 +8,7 @@ import (
 	"strconv"
 	"encoding/json"
 	"github.com/irisnet/irishub/modules/gov/params"
+	"github.com/irisnet/irishub/modules/upgrade/params"
 )
 
 // Handle all "gov" type messages.
@@ -30,9 +31,13 @@ func NewHandler(keeper Keeper) sdk.Handler {
 func handleMsgSubmitProposal(ctx sdk.Context, keeper Keeper, msg MsgSubmitProposal) sdk.Result {
 	////////////////////  iris begin  ///////////////////////////
 	proposal := keeper.NewProposal(ctx, msg.Title, msg.Description, msg.ProposalType,msg.Param)
+	if msg.ProposalType == ProposalTypeSoftwareUpgrade {
+		if upgradeparams.GetCurrentUpgradeProposalId(ctx) != 0 {
+			return ErrSwitchPeriodInProcess(keeper.codespace).Result()
+		}
+	}
 	////////////////////  iris end  /////////////////////////////
 
-
 	err, votingStarted := keeper.AddDeposit(ctx, proposal.GetProposalID(), msg.Proposer, msg.InitialDeposit)
 	if err != nil {
 		return err.Result()

diff --git a/modules/gov/proposal_upgrade.go b/modules/gov/proposal_upgrade.go
@@ -14,10 +14,14 @@ type SoftwareUpgradeProposal struct {
 
 func (sp *SoftwareUpgradeProposal) Execute(ctx sdk.Context, k Keeper) error {
 	logger := ctx.Logger().With("module", "x/gov")
-	logger.Info("Execute SoftwareProposal begin", "info", fmt.Sprintf("current height:%d", ctx.BlockHeight()))
 
-    upgradeparams.SetCurrentUpgradeProposalId(ctx,sp.ProposalID)
-	upgradeparams.SetProposalAcceptHeight(ctx,ctx.BlockHeight())
+	if upgradeparams.GetCurrentUpgradeProposalId(ctx) == 0 {
+		upgradeparams.SetCurrentUpgradeProposalId(ctx,sp.ProposalID)
+		upgradeparams.SetProposalAcceptHeight(ctx,ctx.BlockHeight())
+		logger.Info("Execute SoftwareProposal begin", "info", fmt.Sprintf("current height:%d", ctx.BlockHeight()))
+	} else {
+		logger.Info("Software Upgrade Switch Period is in process.", "info", fmt.Sprintf("current height:%d", ctx.BlockHeight()))
+	}
 
 	return nil
 }
diff --git a/modules/service/error.go b/modules/service/error.go
@@ -6,7 +6,7 @@ import (
 )
 
 const (
-	DefaultCodespace sdk.CodespaceType = 6
+	DefaultCodespace sdk.CodespaceType = 8
 
 	CodeInvalidIDL               sdk.CodeType = 100
 	CodeSvcDefExists             sdk.CodeType = 101