checkpoint

Author: cmwaters

consensus/byzantine_test.go

@@ -219,23 +219,29 @@ func TestByzantinePrevoteEquivocation(t *testing.T) {
 		block := lazyProposer.blockExec.CreateProposalBlock(
 			lazyProposer.Height, lazyProposer.state, commit, proposerAddr,
 		)
+		blockHash := block.Hash()
 		blockParts := block.MakePartSet(types.BlockPartSizeBytes)
 
+		keys, err := lazyProposer.txFetcher.FetchKeysFromTxs(context.Background(), block.Txs.ToSliceOfBytes())
+		require.NoError(t, err)
+		block.Txs = types.ToTxs(keys)
+
 		// Flush the WAL. Otherwise, we may not recompute the same proposal to sign,
 		// and the privValidator will refuse to sign anything.
 		if err := lazyProposer.wal.FlushAndSync(); err != nil {
 			lazyProposer.Logger.Error("Error flushing to disk")
 		}
 
 		// Make proposal
-		propBlockID := types.BlockID{Hash: block.Hash(), PartSetHeader: blockParts.Header()}
+		propBlockID := types.BlockID{Hash: blockHash, PartSetHeader: blockParts.Header()}
 		proposal := types.NewProposal(height, round, lazyProposer.TwoThirdPrevoteRound, propBlockID)
 		p := proposal.ToProto()
 		if err := lazyProposer.privValidator.SignProposal(lazyProposer.state.ChainID, p); err == nil {
 			proposal.Signature = p.Signature
 
 			// send proposal and block parts on internal msg queue
 			lazyProposer.sendInternalMessage(msgInfo{&ProposalMessage{proposal}, ""})
+			lazyProposer.sendInternalMessage(msgInfo{&CompactBlockMessage{block}, ""})
 			for i := 0; i < int(blockParts.Total()); i++ {
 				part := blockParts.GetPart(i)
 				lazyProposer.sendInternalMessage(msgInfo{&BlockPartMessage{lazyProposer.Height, lazyProposer.Round, part}, ""})
@@ -294,7 +300,7 @@ func TestByzantinePrevoteEquivocation(t *testing.T) {
 		}
 	case <-time.After(20 * time.Second):
 		for i, reactor := range reactors {
-			t.Logf("Consensus Reactor %d\n%v", i, reactor)
+			t.Logf("Consensus Reactor %d\n%v", i, reactor.conS.GetRoundState())
 		}
 		t.Fatalf("Timed out waiting for validators to commit evidence")
 	}

consensus/reactor.go

@@ -583,7 +583,6 @@ OUTER_LOOP:
 
 		// Send compact block
 		if !prs.Block && rs.ProposalBlockParts.HasHeader(prs.ProposalBlockPartSetHeader) {
-			logger.Info("Peer has proposal but not block", "height", prs.Height, "round", prs.Round)
 			if rs.ProposalCompactBlock != nil {
 				compactBlock, err := rs.ProposalCompactBlock.ToProto()
 				if err != nil {
@@ -1414,6 +1413,7 @@ func (ps *PeerState) ApplyNewRoundStepMessage(msg *NewRoundStepMessage) {
 	ps.PRS.StartTime = startTime
 	if psHeight != msg.Height || psRound != msg.Round {
 		ps.PRS.Proposal = false
+		ps.PRS.Block = false
 		ps.PRS.ProposalBlockPartSetHeader = types.PartSetHeader{}
 		ps.PRS.ProposalBlockParts = nil
 		ps.PRS.ProposalPOLRound = -1

consensus/state.go

@@ -1193,11 +1193,13 @@ func (cs *State) isProposer(address []byte) bool {
 func (cs *State) defaultDecideProposal(height int64, round int32) {
 	var block *types.Block
 	var blockParts *types.PartSet
+	var blockHash []byte
 
 	// Decide on block
 	if cs.TwoThirdPrevoteBlock != nil {
 		// If there is valid block, choose that.
 		block, blockParts = cs.TwoThirdPrevoteBlock, cs.TwoThirdPrevoteBlockParts
+		blockHash = block.Hash()
 	} else {
 		// Create a new proposal block from state/txs from the mempool.
 		block = cs.createProposalBlock()
@@ -1206,6 +1208,7 @@ func (cs *State) defaultDecideProposal(height int64, round int32) {
 		}
 		fmt.Println(block)
 		blockParts = block.MakePartSet(types.BlockPartSizeBytes)
+		blockHash = block.Hash()
 		fmt.Println("generated blockParts", blockParts.Header(), "squareSize", block.Data.SquareSize, "numTxs", len(block.Txs))
 
 		keys, err := cs.txFetcher.FetchKeysFromTxs(context.Background(), block.Txs.ToSliceOfBytes())
@@ -1226,7 +1229,7 @@ func (cs *State) defaultDecideProposal(height int64, round int32) {
 	}
 
 	// Make proposal
-	propBlockID := types.BlockID{Hash: block.Hash(), PartSetHeader: blockParts.Header()}
+	propBlockID := types.BlockID{Hash: blockHash, PartSetHeader: blockParts.Header()}
 	proposal := types.NewProposal(height, round, cs.TwoThirdPrevoteRound, propBlockID)
 	p := proposal.ToProto()
 	if err := cs.privValidator.SignProposal(cs.state.ChainID, p); err == nil {
@@ -1953,6 +1956,11 @@ func (cs *State) addCompactBlock(msg *CompactBlockMessage, peerID p2p.ID) error
 	compactBlock := msg.Block
 	height := compactBlock.Height
 
+	if cs.ProposalBlock != nil {
+		// We already have the proposal block.
+		return nil	
+	}
+
 	// Blocks might be reused, so round mismatch is OK
 	if cs.Height != height {
 		cs.Logger.Debug("received compact block from wrong height", "height", height)
@@ -2450,7 +2458,7 @@ func (cs *State) signAddVote(msgType cmtproto.SignedMsgType, hash []byte, header
 	vote, err := cs.signVote(msgType, hash, header)
 	if err == nil {
 		cs.sendInternalMessage(msgInfo{&VoteMessage{vote}, ""})
-		cs.Logger.Debug("signed and pushed vote", "height", cs.Height, "round", cs.Round, "vote", vote)
+		cs.Logger.Info("signed and pushed vote", "height", cs.Height, "round", cs.Round, "vote", vote)
 		return vote
 	}
 

consensus/types/peer_round_state.go

@@ -54,6 +54,7 @@ func (prs PeerRoundState) StringIndented(indent string) string {
 	return fmt.Sprintf(`PeerRoundState{
 %s  %v/%v/%v @%v
 %s  Proposal %v -> %v
+%s	Block %v
 %s  POL      %v (round %v)
 %s  Prevotes   %v
 %s  Precommits %v
@@ -62,6 +63,7 @@ func (prs PeerRoundState) StringIndented(indent string) string {
 %s}`,
 		indent, prs.Height, prs.Round, prs.Step, prs.StartTime,
 		indent, prs.ProposalBlockPartSetHeader, prs.ProposalBlockParts,
+		indent, prs.Block,
 		indent, prs.ProposalPOL, prs.ProposalPOLRound,
 		indent, prs.Prevotes,
 		indent, prs.Precommits,