From 749be06ddcc0eabd0d15b6ccfd3c5678c2618032 Mon Sep 17 00:00:00 2001 From: HaoyangLiu Date: Sat, 29 Sep 2018 20:55:54 +0800 Subject: [PATCH] bugfix: can't sync block from height 0 with iris1 --- examples/irishub-bugfix-2/app/app.go | 10 +++++----- examples/irishub1/app/app.go | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/irishub-bugfix-2/app/app.go b/examples/irishub-bugfix-2/app/app.go index ba1879843..cffc14cf0 100644 --- a/examples/irishub-bugfix-2/app/app.go +++ b/examples/irishub-bugfix-2/app/app.go @@ -204,11 +204,11 @@ func (app *IrisApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) ab // application updates every end block func (app *IrisApp) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.ResponseEndBlock { - validatorUpdates := stake.EndBlocker(ctx, app.stakeKeeper) - tags := gov.EndBlocker(ctx, app.govKeeper) + validatorUpdates := stake.EndBlocker(ctx, app.stakeKeeper) tags.AppendTags(upgrade.EndBlocker(ctx, app.upgradeKeeper)) - + // Add these new validators to the addr -> pubkey map. + app.slashingKeeper.AddValidators(ctx, validatorUpdates) return abci.ResponseEndBlock{ ValidatorUpdates: validatorUpdates, Tags: tags, @@ -247,10 +247,10 @@ func (app *IrisApp) initChainer(ctx sdk.Context, req abci.RequestInitChain) abci StartingProposalID: 1, DepositProcedure: govparams.DepositProcedure{ MinDeposit: sdk.Coins{minDeposit}, - MaxDepositPeriod: 10, + MaxDepositPeriod: 30, }, VotingProcedure: govparams.VotingProcedure{ - VotingPeriod: 10, + VotingPeriod: 30, }, TallyingProcedure: govparams.TallyingProcedure{ Threshold: sdk.NewRat(1, 2), diff --git a/examples/irishub1/app/app.go b/examples/irishub1/app/app.go index 35f408058..ca1386acf 100644 --- a/examples/irishub1/app/app.go +++ b/examples/irishub1/app/app.go @@ -201,11 +201,11 @@ func (app *IrisApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) ab // application updates every end block func (app *IrisApp) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.ResponseEndBlock { - validatorUpdates := stake.EndBlocker(ctx, app.stakeKeeper) - tags := gov.EndBlocker(ctx, app.govKeeper) + validatorUpdates := stake.EndBlocker(ctx, app.stakeKeeper) tags.AppendTags(upgrade.EndBlocker(ctx, app.upgradeKeeper)) - + // Add these new validators to the addr -> pubkey map. + app.slashingKeeper.AddValidators(ctx, validatorUpdates) return abci.ResponseEndBlock{ ValidatorUpdates: validatorUpdates, Tags: tags, @@ -244,10 +244,10 @@ func (app *IrisApp) initChainer(ctx sdk.Context, req abci.RequestInitChain) abci StartingProposalID: 1, DepositProcedure: govparams.DepositProcedure{ MinDeposit: sdk.Coins{minDeposit}, - MaxDepositPeriod: 10, + MaxDepositPeriod: 30, }, VotingProcedure: govparams.VotingProcedure{ - VotingPeriod: 10, + VotingPeriod: 30, }, TallyingProcedure: govparams.TallyingProcedure{ Threshold: sdk.NewRat(1, 2),