pactus-project · themantre · Nov 30, 2024 · Nov 30, 2024
diff --git a/consensus/consensus_test.go b/consensus/consensus_test.go
@@ -638,11 +638,11 @@ func TestHandleQueryVote(t *testing.T) {
 	td.enterNextRound(td.consP)
 	td.addPrepareVote(td.consP, td.RandHash(), height, 2, tIndexY)
 
-	t.Run("Query vote for round 0: should send the decided vote for the round 1", func(t *testing.T) {
+	t.Run("Query vote for round 0: should send the decided vote for the round 0", func(t *testing.T) {
 		rndVote := td.consP.HandleQueryVote(height, 0)
 		assert.Equal(t, vote.VoteTypeCPDecided, rndVote.Type())
 		assert.Equal(t, height, rndVote.Height())
-		assert.Equal(t, int16(1), rndVote.Round())
+		assert.Equal(t, int16(0), rndVote.Round())
 	})
 
 	t.Run("Query vote for round 1: should send the decided vote for the round 1", func(t *testing.T) {
@@ -652,7 +652,7 @@ func TestHandleQueryVote(t *testing.T) {
 		assert.Equal(t, int16(1), rndVote.Round())
 	})
 
-	t.Run("Query vote for round 2: should send the prepare vote for the current round", func(t *testing.T) {
+	t.Run("Query vote for round 2: should send the prepare vote for the round 2", func(t *testing.T) {
 		rndVote := td.consP.HandleQueryVote(height, 2)
 		assert.Equal(t, vote.VoteTypePrepare, rndVote.Type())
 		assert.Equal(t, height, rndVote.Height())

diff --git a/consensus/cp.go b/consensus/cp.go
@@ -321,7 +321,7 @@ func (cp *changeProposer) cpStrongTermination() {
 		}
 		cp.enterNewState(cp.prepareState)
 	} else if cpDecided.HasAnyVoteFor(cp.cpRound, vote.CPValueYes) {
-		cp.round += 1
+		cp.round++
 		cp.cpDecided = 1
 		cp.enterNewState(cp.proposeState)
 

diff --git a/network/dht.go b/network/dht.go
@@ -6,6 +6,7 @@ import (
 	lp2pdht "github.com/libp2p/go-libp2p-kad-dht"
 	lp2pcore "github.com/libp2p/go-libp2p/core"
 	lp2phost "github.com/libp2p/go-libp2p/core/host"
+	"github.com/multiformats/go-multiaddr"
 	"github.com/pactus-project/pactus/util/logger"
 )
 
@@ -19,6 +20,9 @@ type dhtService struct {
 func newDHTService(ctx context.Context, host lp2phost.Host, protocolID lp2pcore.ProtocolID,
 	conf *Config, log *logger.SubLogger,
 ) *dhtService {
+	// A dirty code in LibP2P!!!
+	lp2pdht.DefaultBootstrapPeers = []multiaddr.Multiaddr{}
+
 	mode := lp2pdht.ModeAuto
 	if conf.IsBootstrapper {
 		mode = lp2pdht.ModeServer

diff --git a/network/gossip.go b/network/gossip.go
@@ -35,6 +35,7 @@ func newGossipService(ctx context.Context, host lp2phost.Host, conf *Config,
 		lp2pps.WithMessageSignaturePolicy(lp2pps.StrictNoSign),
 		lp2pps.WithNoAuthor(),
 		lp2pps.WithMessageIdFn(MessageIDFunc),
+		lp2pps.WithSeenMessagesTTL(60 * time.Second),
 	}
 
 	if conf.IsBootstrapper {
@@ -114,19 +115,13 @@ func (g *gossipService) publish(msg []byte, topic *lp2pps.Topic) error {
 }
 
 // JoinTopic joins to the topic with the given name and subscribes to receive topic messages.
-func (g *gossipService) JoinTopic(topicID TopicID, shouldPropagate ShouldPropagate) error {
+func (g *gossipService) JoinTopic(topicID TopicID, evaluator PropagationEvaluator) error {
 	switch topicID {
 	case TopicIDUnspecified:
 		return InvalidTopicError{TopicID: topicID}
 
 	case TopicIDBlock:
-		if g.topicBlock != nil {
-			g.logger.Warn("already subscribed to block topic")
-
-			return nil
-		}
-
-		topic, err := g.joinTopic(topicID, shouldPropagate)
+		topic, err := g.joinTopic(topicID, evaluator)
 		if err != nil {
 			return err
 		}
@@ -135,13 +130,7 @@ func (g *gossipService) JoinTopic(topicID TopicID, shouldPropagate ShouldPropaga
 		return nil
 
 	case TopicIDTransaction:
-		if g.topicTransaction != nil {
-			g.logger.Warn("already subscribed to transaction topic")
-
-			return nil
-		}
-
-		topic, err := g.joinTopic(topicID, shouldPropagate)
+		topic, err := g.joinTopic(topicID, evaluator)
 		if err != nil {
 			return err
 		}
@@ -150,13 +139,7 @@ func (g *gossipService) JoinTopic(topicID TopicID, shouldPropagate ShouldPropaga
 		return nil
 
 	case TopicIDConsensus:
-		if g.topicConsensus != nil {
-			g.logger.Warn("already subscribed to consensus topic")
-
-			return nil
-		}
-
-		topic, err := g.joinTopic(topicID, shouldPropagate)
+		topic, err := g.joinTopic(topicID, evaluator)
 		if err != nil {
 			return err
 		}
@@ -175,7 +158,7 @@ func (g *gossipService) TopicName(topicID TopicID) string {
 
 // joinTopic joins a given topic and registers a validator for it.
 // If successful, it returns the topic and subscribes to it.
-func (g *gossipService) joinTopic(topicID TopicID, shouldPropagate ShouldPropagate) (*lp2pps.Topic, error) {
+func (g *gossipService) joinTopic(topicID TopicID, evaluator PropagationEvaluator) (*lp2pps.Topic, error) {
 	topicName := g.TopicName(topicID)
 	topic, err := g.pubsub.Join(topicName)
 	if err != nil {
@@ -188,7 +171,7 @@ func (g *gossipService) joinTopic(topicID TopicID, shouldPropagate ShouldPropaga
 	}
    
 	err = g.pubsub.RegisterTopicValidator(
-		topicName, g.createValidator(topicID, shouldPropagate))
+		topicName, g.createValidator(topicID, evaluator))
 	if err != nil {
 		return nil, LibP2PError{Err: err}
 	}
@@ -221,7 +204,7 @@ func (g *gossipService) joinTopic(topicID TopicID, shouldPropagate ShouldPropaga
 	return topic, nil
 }
 
-func (g *gossipService) createValidator(topicID TopicID, shouldPropagate ShouldPropagate,
+func (g *gossipService) createValidator(topicID TopicID, evaluator PropagationEvaluator,
 ) func(context.Context, lp2pcore.PeerID, *lp2pps.Message) lp2pps.ValidationResult {
 	return func(_ context.Context, peerId lp2pcore.PeerID, lp2pMsg *lp2pps.Message) lp2pps.ValidationResult {
 		msg := &GossipMessage{
@@ -235,16 +218,26 @@ func (g *gossipService) createValidator(topicID TopicID, shouldPropagate ShouldP
 			return lp2pps.ValidationAccept
 		}
 
-		if !shouldPropagate(msg) {
-			g.logger.Debug("message ignored", "from", peerId, "topic", topicID)
+		switch evaluator(msg) {
+		case Drop:
+			g.logger.Debug("message dropped", "from", peerId, "topic", topicID)
+
+			return lp2pps.ValidationIgnore
+
+		case DropButConsume:
+			g.logger.Debug("message dropped but consumed", "from", peerId, "topic", topicID)
 
 			// Consume the message first
 			g.onReceiveMessage(msg)
 
 			return lp2pps.ValidationIgnore
-		}
 
-		return lp2pps.ValidationAccept
+		case Propagate:
+			return lp2pps.ValidationAccept
+
+		default:
+			panic("unreachable")
+		}
 	}
 }
 

diff --git a/network/gossip_test.go b/network/gossip_test.go
@@ -10,6 +10,21 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+func TestJoinBlockTopic(t *testing.T) {
+	net := makeTestNetwork(t, testConfig(), nil)
+
+	msg := []byte("test-block-topic")
+
+	assert.ErrorIs(t, net.gossip.Broadcast(msg, TopicIDBlock),
+		NotSubscribedError{
+			TopicID: TopicIDBlock,
+		})
+	assert.NoError(t, net.JoinTopic(TopicIDBlock, alwaysPropagate))
+	assert.NoError(t, net.gossip.Broadcast(msg, TopicIDBlock))
+
+	assert.Error(t, net.JoinTopic(TopicIDBlock, alwaysPropagate), "already joined")
+}
+
 func TestJoinConsensusTopic(t *testing.T) {
 	net := makeTestNetwork(t, testConfig(), nil)
 
@@ -21,6 +36,23 @@ func TestJoinConsensusTopic(t *testing.T) {
 		})
 	assert.NoError(t, net.JoinTopic(TopicIDConsensus, alwaysPropagate))
 	assert.NoError(t, net.gossip.Broadcast(msg, TopicIDConsensus))
+
+	assert.Error(t, net.JoinTopic(TopicIDConsensus, alwaysPropagate), "already joined")
+}
+
+func TestJoinTransactionTopic(t *testing.T) {
+	net := makeTestNetwork(t, testConfig(), nil)
+
+	msg := []byte("test-transaction-topic")
+
+	assert.ErrorIs(t, net.gossip.Broadcast(msg, TopicIDTransaction),
+		NotSubscribedError{
+			TopicID: TopicIDTransaction,
+		})
+	assert.NoError(t, net.JoinTopic(TopicIDTransaction, alwaysPropagate))
+	assert.NoError(t, net.gossip.Broadcast(msg, TopicIDTransaction))
+
+	assert.Error(t, net.JoinTopic(TopicIDTransaction, alwaysPropagate), "already joined")
 }
 
 func TestJoinInvalidTopic(t *testing.T) {
@@ -57,31 +89,49 @@ func TestTopicValidator(t *testing.T) {
 	net := makeTestNetwork(t, testConfig(), nil)
 
 	selfID := net.host.ID()
-	propagate := false
+	propagate := Drop
 	validator := net.gossip.createValidator(TopicIDConsensus,
-		func(_ *GossipMessage) bool { return propagate })
+		func(_ *GossipMessage) PropagationPolicy { return propagate })
 
 	tests := []struct {
 		name           string
 		peerID         lp2pcore.PeerID
-		propagate      bool
+		policy         PropagationPolicy
 		expectedResult lp2pps.ValidationResult
 	}{
 		{
 			name:           "Message from self",
-			propagate:      false,
+			policy:         Drop,
+			peerID:         selfID,
+			expectedResult: lp2pps.ValidationAccept,
+		},
+		{
+			name:           "Message from self",
+			policy:         DropButConsume,
+			peerID:         selfID,
+			expectedResult: lp2pps.ValidationAccept,
+		},
+		{
+			name:           "Message from self",
+			policy:         propagate,
 			peerID:         selfID,
 			expectedResult: lp2pps.ValidationAccept,
 		},
 		{
 			name:           "Message from other peer, should not propagate",
-			propagate:      false,
+			policy:         Drop,
+			peerID:         "other-peerID",
+			expectedResult: lp2pps.ValidationIgnore,
+		},
+		{
+			name:           "Message from other peer, should not propagate",
+			policy:         DropButConsume,
 			peerID:         "other-peerID",
 			expectedResult: lp2pps.ValidationIgnore,
 		},
 		{
 			name:           "Message from other peer, should propagate",
-			propagate:      true,
+			policy:         Propagate,
 			peerID:         "other-peerID",
 			expectedResult: lp2pps.ValidationAccept,
 		},
@@ -94,7 +144,7 @@ func TestTopicValidator(t *testing.T) {
 					Data: []byte("some-data"),
 				},
 			}
-			propagate = tt.propagate
+			propagate = tt.policy
 			result := validator(context.Background(), tt.peerID, msg)
 			assert.Equal(t, result, tt.expectedResult)
 		})

diff --git a/network/interface.go b/network/interface.go
@@ -121,9 +121,22 @@ func (*ProtocolsEvents) Type() EventType {
 	return EventTypeProtocols
 }
 
-// ShouldPropagate determines whether a message should be disregarded:
-// it will be neither delivered to the application nor forwarded to the network.
-type ShouldPropagate func(*GossipMessage) bool
+// PropagationPolicy defines the possible actions for how a gossip message should propagate.
+type PropagationPolicy int
+
+const (
+	// Propagate means the message should be forwarded to other peers in the network.
+	Propagate = PropagationPolicy(0)
+
+	// DropButConsume means the message should not be forwarded but should be processed locally.
+	DropButConsume = PropagationPolicy(1)
+
+	// Drop means the message should be discarded without any further processing.
+	Drop = PropagationPolicy(2)
+)
+
+// PropagationEvaluator is a function that evaluates how a gossip message should propagate.
+type PropagationEvaluator func(*GossipMessage) PropagationPolicy
 
 type Network interface {
 	Start() error
@@ -132,7 +145,7 @@ type Network interface {
 	EventChannel() <-chan Event
 	Broadcast([]byte, TopicID)
 	SendTo([]byte, lp2pcore.PeerID)
-	JoinTopic(TopicID, ShouldPropagate) error
+	JoinTopic(TopicID, PropagationEvaluator) error
 	CloseConnection(lp2pcore.PeerID)
 	SelfID() lp2pcore.PeerID
 	NumConnectedPeers() int

diff --git a/network/mock.go b/network/mock.go
@@ -47,7 +47,7 @@ func (mock *MockNetwork) EventChannel() <-chan Event {
 	return mock.EventCh
 }
 
-func (*MockNetwork) JoinTopic(_ TopicID, _ ShouldPropagate) error {
+func (*MockNetwork) JoinTopic(_ TopicID, _ PropagationEvaluator) error {
 	return nil
 }
 

diff --git a/network/network.go b/network/network.go
@@ -390,8 +390,8 @@ func (n *network) Broadcast(msg []byte, topicID TopicID) {
 	}()
 }
 
-func (n *network) JoinTopic(topicID TopicID, sp ShouldPropagate) error {
-	return n.gossip.JoinTopic(topicID, sp)
+func (n *network) JoinTopic(topicID TopicID, evaluator PropagationEvaluator) error {
+	return n.gossip.JoinTopic(topicID, evaluator)
 }
 
 func (n *network) CloseConnection(pid lp2ppeer.ID) {

diff --git a/network/network_test.go b/network/network_test.go
@@ -17,8 +17,8 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func alwaysPropagate(_ *GossipMessage) bool {
-	return true
+func alwaysPropagate(_ *GossipMessage) PropagationPolicy {
+	return Propagate
 }
 
 func makeTestNetwork(t *testing.T, conf *Config, opts []lp2p.Option) *network {
@@ -416,6 +416,24 @@ func TestNetwork(t *testing.T) {
 	})
 }
 
+func TestHostAddrs(t *testing.T) {
+	conf := testConfig()
+	net, err := NewNetwork(conf)
+	assert.NoError(t, err)
+
+	addrs := net.HostAddrs()
+	assert.Contains(t, addrs, fmt.Sprintf("/ip4/127.0.0.1/tcp/%d", conf.DefaultPort))
+	assert.Contains(t, addrs, fmt.Sprintf("/ip4/127.0.0.1/udp/%d/quic-v1", conf.DefaultPort))
+}
+
+func TestNetworkName(t *testing.T) {
+	conf := testConfig()
+	net, err := NewNetwork(conf)
+	assert.NoError(t, err)
+
+	assert.Equal(t, conf.NetworkName, net.Name())
+}
+
 func TestConnections(t *testing.T) {
 	t.Parallel() // run the tests in parallel
 
@@ -454,12 +472,12 @@ func TestConnections(t *testing.T) {
 			no, bootstrapAddr, tt.peerAddr), func(t *testing.T) {
 			t.Parallel() // run the tests in parallel
 
-			testConnection(t, networkP, networkB)
+			checkConnection(t, networkP, networkB)
 		})
 	}
 }
 
-func testConnection(t *testing.T, networkP, networkB *network) {
+func checkConnection(t *testing.T, networkP, networkB *network) {
 	t.Helper()
 
 	assert.EventuallyWithT(t, func(c *assert.CollectT) {