Merge pull request #189 from MrXJC/gog/jiacheng

update gog parameters
irisnet · Aug 31, 2018 · edd92e5 · edd92e5
2 parents c98369e + fe54007
commit edd92e5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -31,7 +31,7 @@
 #  source = "https://github.com/irisnet/cosmos-sdk.git"
 #  version = "=v0.23.0-iris1"
   source = "https://github.com/irisnet/cosmos-sdk.git"
-  branch = "irisnet/hotfix-v0.23.0-iris2"
+  branch = "irisnet/gog"
 
 [[override]]
   name = "github.com/golang/protobuf"

diff --git a/app/app.go b/app/app.go
@@ -182,11 +182,11 @@ func (app *IrisApp) initChainer(ctx sdk.Context, req abci.RequestInitChain) abci
 	gov.InitGenesis(ctx, app.govKeeper, gov.GenesisState{
 		StartingProposalID: 1,
 		DepositProcedure: gov.DepositProcedure{
-			MinDeposit:       sdk.Coins{sdk.Coin{Denom: "iris", Amount: sdk.NewInt(int64(10)).Mul(gov.Pow10(18))}},
-			MaxDepositPeriod: 40,
+			MinDeposit:       sdk.Coins{sdk.Coin{Denom: "iris", Amount: sdk.NewInt(int64(1000)).Mul(gov.Pow10(18))}},
+			MaxDepositPeriod: 1440,
 		},
 		VotingProcedure: gov.VotingProcedure{
-			VotingPeriod: 40,
+			VotingPeriod: 20000,
 		},
 		TallyingProcedure: gov.TallyingProcedure{
 			Threshold:         sdk.NewRat(1, 2),

diff --git a/modules/gov/handler.go b/modules/gov/handler.go
@@ -105,6 +105,7 @@ func EndBlocker(ctx sdk.Context, keeper Keeper) (tags sdk.Tags, nonVotingVals []
 		inactiveProposal := keeper.InactiveProposalQueuePop(ctx)
 		if inactiveProposal.GetStatus() == StatusDepositPeriod {
 			proposalIDBytes := keeper.cdc.MustMarshalBinaryBare(inactiveProposal.GetProposalID())
+			keeper.RefundDeposits(ctx, inactiveProposal.GetProposalID())
 			keeper.DeleteProposal(ctx, inactiveProposal)
 			tags.AppendTag("action", []byte("proposalDropped"))
 			tags.AppendTag("proposalId", proposalIDBytes)

diff --git a/version/version.go b/version/version.go
@@ -7,15 +7,15 @@ import (
 )
 
 // Version - Iris Version
-const Version = "0.4.0-GOG"
+const Version = "Game Of Genesis"
 
 func GetCmdVersion(storeName string, cdc *wire.Codec) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "version",
 		Short: "Show version info",
 		RunE: func(cmd *cobra.Command, args []string) error {
 
-			fmt.Printf("v%s\n", Version)
+			fmt.Printf("%s\n", Version)
 			return nil
 		},
 	}