Merge pull request #69 from getamis/feature/round_robin_proposer

consensus/pbft: round robin proposer selection

Author: markya0616

consensus/pbft/core/core.go

@@ -181,7 +181,7 @@ func (c *core) startNewRound(newView *pbft.View, roundChange bool) {
 	c.current = newSnapshot(newView, c.backend.Validators())
 
 	// Calculate new proposer
-	//c.backend.Validators().CalcProposer(c.proposerSeed())
+	c.backend.Validators().CalcProposer(c.proposerSeed())
 	c.waitingForRoundChange = false
 	c.setState(StateAcceptRequest)
 	if roundChange {

consensus/pbft/core/handler.go

@@ -28,17 +28,16 @@ func (c *core) Start(lastSequence *big.Int, lastProposer common.Address) error {
 	// initial last commit sequence and proposer
 	c.lastProposer = lastProposer
 
-	// Tests will handle events itself, so we have to make subscribeEvents()
-	// be able to call in test.
-	c.subscribeEvents()
-
-	go c.handleEvents()
-
 	c.startNewRound(&pbft.View{
 		Sequence: new(big.Int).Add(lastSequence, common.Big1),
 		Round:    common.Big0,
 	}, false)
 
+	// Tests will handle events itself, so we have to make subscribeEvents()
+	// be able to call in test.
+	c.subscribeEvents()
+	go c.handleEvents()
+
 	return nil
 }
 

consensus/pbft/core/preprepare.go

@@ -26,7 +26,7 @@ func (c *core) sendPreprepare(request *pbft.Request) {
 	logger := c.logger.New("state", c.state)
 	curView := c.currentView()
 
-	if c.isPrimary() {
+	if c.current.sequence.Cmp(request.Proposal.Number()) == 0 && c.isPrimary() {
 		preprepare, err := Encode(&pbft.Preprepare{
 			View:     curView,
 			Proposal: request.Proposal,

consensus/pbft/core/types.go

@@ -17,14 +17,14 @@
 package core
 
 import (
+	"fmt"
 	"io"
 	"math/big"
 
-	"gopkg.in/karalabe/cookiejar.v2/collections/prque"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/consensus/pbft"
 	"github.com/ethereum/go-ethereum/rlp"
+	"gopkg.in/karalabe/cookiejar.v2/collections/prque"
 )
 
 type Engine interface {
@@ -156,6 +156,10 @@ func (m *message) Decode(val interface{}) error {
 	return rlp.DecodeBytes(m.Msg, val)
 }
 
+func (m *message) String() string {
+	return fmt.Sprintf("{Code: %v, Address: %v}", m.Code, m.Address.Hex())
+}
+
 // ==============================================
 //
 // helper functions

consensus/pbft/types.go

@@ -17,6 +17,7 @@
 package pbft
 
 import (
+	"fmt"
 	"io"
 	"math/big"
 
@@ -45,6 +46,8 @@ type Proposal interface {
 	EncodeRLP(w io.Writer) error
 
 	DecodeRLP(s *rlp.Stream) error
+
+	String() string
 }
 
 type Request struct {
@@ -137,3 +140,7 @@ func (b *Subject) DecodeRLP(s *rlp.Stream) error {
 	b.View, b.Digest = subject.View, subject.Digest
 	return nil
 }
+
+func (b *Subject) String() string {
+	return fmt.Sprintf("{View: %v, Digest: %v}", b.View, b.Digest.Hex())
+}