From c90cb97d4826972cadf7a715adf74c700b5b6f3c Mon Sep 17 00:00:00 2001 From: xujiacheng Date: Tue, 7 Aug 2018 09:53:43 +0800 Subject: [PATCH] setup runMsgs callback function fo basecoin and basecoin1 --- Gopkg.lock | 6 +++--- examples/basecoin/app/app.go | 1 + examples/basecoin/app/genesis.go | 2 +- examples/basecoin1/app/app.go | 1 + examples/basecoin1/app/genesis.go | 2 +- modules/gov/keeper.go | 6 ++++-- modules/upgrade/keeper.go | 3 ++- modules/upgrade/tally.go | 6 ++---- 8 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index aabbc3f2b6..cc8978722d 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -58,7 +58,7 @@ revision = "d4cc87b860166d00d6b5b9e0d3b3d71d6088d4d4" [[projects]] - branch = "irisnet/develop" + branch = "irisnet/feature_upgrade" name = "github.com/cosmos/cosmos-sdk" packages = [ "baseapp", @@ -101,7 +101,7 @@ "x/stake/tags", "x/stake/types" ] - revision = "b481cfdc58d1c4ad3c84078050c0ac1247a72b42" + revision = "d1523532296d75efcbc8e122df4fbd7635f0530e" source = "https://github.com/irisnet/cosmos-sdk.git" [[projects]] @@ -625,6 +625,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "72fb85a207594a50188596b53c878ca135a29436357f524125763bb8687728b9" + inputs-digest = "a4f8383587dad4a29ba2dfa7bc7a81577e9e4a57f4dba6080ea67653f790f337" solver-name = "gps-cdcl" solver-version = 1 diff --git a/examples/basecoin/app/app.go b/examples/basecoin/app/app.go index 13e5f9b859..00aeeab597 100644 --- 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 index 38bee0080a..67b019f031 100644 --- 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 index 77d78f975c..557b711384 100644 --- 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 index 38bee0080a..67b019f031 100644 --- 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 index 0296f6d12c..60c49101e2 100644 --- 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 index 4477167af6..b87e1fa86d 100644 --- 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 index 6ffe05eb5d..f814e80053 100644 --- 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