add nonce to block vote

otherwise it gets deduped at network layer

cmd/consensus/.gitignore

@@ -0,0 +1,2 @@
+*.log
+data*

cmd/consensus/run.sh

@@ -0,0 +1,27 @@
+#/bin/sh
+
+echo "Running 1"
+./consensus \
+--entries consensus-0000000000000000000000000000000000000000000000000000000000000001@localhost:8001=1000,consensus-0000000000000000000000000000000000000000000000000000000000000002@localhost:8002=1000,consensus-0000000000000000000000000000000000000000000000000000000000000003@localhost:8003=1000 \
+--connections 2 \
+--nodeid 0000000000000000000000000000000000000000000000000000000000000001 \
+--datadir ./data1 \
+&>./node1.log &
+
+echo "Running 2"
+./consensus \
+--entries consensus-0000000000000000000000000000000000000000000000000000000000000001@localhost:8001=1000,consensus-0000000000000000000000000000000000000000000000000000000000000002@localhost:8002=1000,consensus-0000000000000000000000000000000000000000000000000000000000000003@localhost:8003=1000  \
+--connections 2 \
+--nodeid 0000000000000000000000000000000000000000000000000000000000000002 \
+--datadir ./data2 \
+&>./node2.log &
+
+echo "Running 3"
+./consensus \
+--entries consensus-0000000000000000000000000000000000000000000000000000000000000001@localhost:8001=1000,consensus-0000000000000000000000000000000000000000000000000000000000000002@localhost:8002=1000,consensus-0000000000000000000000000000000000000000000000000000000000000003@localhost:8003=1000  \
+--connections 2 \
+--nodeid 0000000000000000000000000000000000000000000000000000000000000003 \
+--datadir ./data3 \
+&>./node3.log &
+
+echo "Done"

cmd/scaffold.go

@@ -95,10 +95,10 @@ func (fnb *FlowNodeBuilder) enqueueNetworkInit() {
 
 		codec := json.NewCodec()
 
-		mw, err := libp2p.NewMiddleware(fnb.Logger, codec, fnb.Me.Address(), fnb.Me.NodeID())
+		mw, err := libp2p.NewMiddleware(fnb.Logger.Level(zerolog.Disabled), codec, fnb.Me.Address(), fnb.Me.NodeID())
 		fnb.MustNot(err).Msg("could not initialize flow middleware")
 
-		net, err := libp2p.NewNetwork(fnb.Logger, codec, fnb.State, fnb.Me, mw, 10e6)
+		net, err := libp2p.NewNetwork(fnb.Logger.Level(zerolog.Disabled), codec, fnb.State, fnb.Me, mw, 10e6)
 		fnb.MustNot(err).Msg("could not initialize flow network")
 		fnb.Network = net
 		return net

engine/simulation/coldstuff/engine.go

@@ -4,6 +4,7 @@ package coldstuff
 
 import (
 	"fmt"
+	"math/rand"
 	"time"
 
 	"github.com/dgraph-io/badger/v2"
@@ -480,6 +481,7 @@ func (e *Engine) voteOnProposal() error {
 	// send vote for proposal to leader
 	vote := &coldstuff.BlockVote{
 		BlockID: candidate.ID(),
+		Nonce:   rand.Uint64(),
 	}
 	err := e.con.Submit(vote, e.round.Leader().NodeID)
 	if err != nil {

model/coldstuff/blockVote.go

@@ -9,4 +9,5 @@ import (
 // BlockVote is a coldstuff consensus event to vote for a block.
 type BlockVote struct {
 	BlockID flow.Identifier
+	Nonce   uint64
 }