Merge pull request #108 from MrXJC/jiacheng/software-upgrade

setup runMsgs callback function fo basecoin and basecoin1
irisnet · Aug 7, 2018 · 86ac510 · 86ac510
2 parents 2e40979 + c90cb97
commit 86ac510
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 12 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/examples/basecoin/app/app.go b/examples/basecoin/app/app.go
@@ -113,6 +113,7 @@ func NewBasecoinApp(logger log.Logger, db dbm.DB, traceStore io.Writer, baseAppO
 	app.SetInitChainer(app.initChainer)
 	app.SetBeginBlocker(app.BeginBlocker)
 	app.SetEndBlocker(app.EndBlocker)
+	app.SetRunMsg(app.runMsgs)
 	app.SetAnteHandler(auth.NewAnteHandler(app.accountMapper, app.feeCollectionKeeper))
 	app.MountStoresIAVL(app.keyMain, app.keyAccount, app.keyStake, app.keySlashing, app.keyGov, app.keyFeeCollection, app.keyUpgrade)
 

diff --git a/examples/basecoin/app/genesis.go b/examples/basecoin/app/genesis.go
@@ -54,7 +54,7 @@ var (
 	flagName       = "name"
 	flagClientHome = "home-client"
 	flagOWK        = "owk"
-	denom          = "basecoin"
+	denom          = "iris"
 
 	// bonded tokens given to genesis validators/accounts
 	freeFermionVal = int64(100)

diff --git a/examples/basecoin1/app/app.go b/examples/basecoin1/app/app.go
@@ -119,6 +119,7 @@ func NewBasecoinApp(logger log.Logger, db dbm.DB, traceStore io.Writer, baseAppO
 	app.SetInitChainer(app.initChainer)
 	app.SetBeginBlocker(app.BeginBlocker)
 	app.SetEndBlocker(app.EndBlocker)
+	app.SetRunMsg(app.runMsgs)
 	app.SetAnteHandler(auth.NewAnteHandler(app.accountMapper, app.feeCollectionKeeper))
 	app.MountStoresIAVL(app.keyMain, app.keyAccount, app.keyIBC, app.keyStake, app.keySlashing, app.keyGov, app.keyFeeCollection, app.keyUpgrade)
 

diff --git a/examples/basecoin1/app/genesis.go b/examples/basecoin1/app/genesis.go
@@ -54,7 +54,7 @@ var (
 	flagName       = "name"
 	flagClientHome = "home-client"
 	flagOWK        = "owk"
-	denom          = "basecoin"
+	denom          = "iris"
 
 	// bonded tokens given to genesis validators/accounts
 	freeFermionVal = int64(100)

diff --git a/modules/gov/keeper.go b/modules/gov/keeper.go
@@ -136,8 +136,10 @@ func (keeper Keeper) activateVotingPeriod(ctx sdk.Context, proposal Proposal) {
 
 var (
 	defaultMinDeposit       int64 = 10
-	defaultMaxDepositPeriod int64 = 10
-	defaultVotingPeriod     int64 = 10
+	//defaultMaxDepositPeriod int64 = 10000
+	//defaultVotingPeriod     int64 = 10000
+	defaultMaxDepositPeriod int64 = 2 // for test
+	defaultVotingPeriod     int64 = 2 // for test
 )
 
 // Gets procedure from store. TODO: move to global param store and allow for updating of this

diff --git a/modules/upgrade/keeper.go b/modules/upgrade/keeper.go
@@ -8,7 +8,8 @@ import (
 )
 
 const (
-	defaultSwitchPeriod     int64 = 57600	// 2 days
+	//defaultSwitchPeriod     int64 = 57600	// 2 days
+	defaultSwitchPeriod     int64 = 10	// for test
 )
 
 type Keeper struct {

diff --git a/modules/upgrade/tally.go b/modules/upgrade/tally.go
@@ -14,14 +14,12 @@ func tally(ctx sdk.Context, k Keeper) (passes bool) {
 
 		totalVotingPower := sdk.ZeroRat()
 		switchVotingPower:= sdk.ZeroRat()
-
 	    for _,validator :=range k.sk.GetAllValidators(ctx) {
-			totalVotingPower.Add(validator.GetPower())
+			totalVotingPower = totalVotingPower.Add(validator.GetPower())
 	   	    if _,ok := k.GetSwitch(ctx,proposalID,validator.Owner);ok {
-				switchVotingPower.Add(validator.GetPower())
+				switchVotingPower = switchVotingPower.Add(validator.GetPower())
 		    }
 	    }
-
 		// If more than 95% of validator update , do switch
 		if switchVotingPower.Quo(totalVotingPower).GT(Threshold) {
 			return true