Merge pull request #135 from getamis/feature/nil-proposal

alanchchen · web-flow · commit 4d6d5073cd23 · 2017-07-31T22:07:29.000-05:00
consensus/istanbul: make sure we have right proposal when starting Istanbul core
diff --git a/consensus/istanbul/backend/engine.go b/consensus/istanbul/backend/engine.go
@@ -559,8 +559,10 @@ func (sb *backend) Start(chain consensus.ChainReader, inserter func(types.Blocks
 		}
 		lastProposer = p
 	}
-	block := chain.GetBlock(curHeader.Hash(), lastSequence.Uint64())
-	if err := sb.core.Start(lastSequence, lastProposer, block); err != nil {
+	// We don't need block body so we create a header only block.
+	// The proposal is only for validator set calculation.
+	lastProposal := types.NewBlockWithHeader(curHeader)
+	if err := sb.core.Start(lastSequence, lastProposer, lastProposal); err != nil {
 		return err
 	}
 	sb.coreStarted = true

Original file line number	Diff line number	Diff line change
`@@ -559,8 +559,10 @@ func (sb *backend) Start(chain consensus.ChainReader, inserter func(types.Blocks`
`559`	`559`	`}`
`560`	`560`	`lastProposer = p`
`561`	`561`	`}`
`562`		`- block := chain.GetBlock(curHeader.Hash(), lastSequence.Uint64())`
`563`		`- if err := sb.core.Start(lastSequence, lastProposer, block); err != nil {`
	`562`	`+ // We don't need block body so we create a header only block.`
	`563`	`+ // The proposal is only for validator set calculation.`
	`564`	`+ lastProposal := types.NewBlockWithHeader(curHeader)`
	`565`	`+ if err := sb.core.Start(lastSequence, lastProposer, lastProposal); err != nil {`
`564`	`566`	`return err`
`565`	`567`	`}`
`566`	`568`	`sb.coreStarted = true`