Clean up gossip (#744)

Author: anusha-ctrl

plugin/evm/block_builder.go

@@ -17,16 +17,6 @@ import (
 )
 
 const (
-	// waitBlockTime is the amount of time to wait for BuildBlock to be
-	// called by the engine before deciding whether or not to gossip the
-	// transaction that triggered the PendingTxs message to the engine.
-	//
-	// This is done to reduce contention in the network when there is no
-	// preferred producer. If we did not wait here, we may gossip a new
-	// transaction to a peer while building a block that will conflict with
-	// whatever the peer makes.
-	waitBlockTime = 100 * time.Millisecond
-
 	// Minimum amount of time to wait after building a block before attempting to build a block
 	// a second time without changing the contents of the mempool.
 	minBlockBuildingRetryDelay = 500 * time.Millisecond
@@ -166,9 +156,6 @@ func (b *blockBuilder) awaitSubmittedTxs() {
 				b.signalTxsReady()
 
 				if b.gossiper != nil && len(ethTxsEvent.Txs) > 0 {
-					// Give time for this node to build a block before attempting to
-					// gossip
-					time.Sleep(waitBlockTime)
 					// [GossipTxs] will block unless [gossiper.txsToGossipChan] (an
 					// unbuffered channel) is listened on
 					if err := b.gossiper.GossipTxs(ethTxsEvent.Txs); err != nil {

plugin/evm/gossiper.go

@@ -34,6 +34,10 @@ const (
 	// [txsGossipInterval] is how often we attempt to gossip newly seen
 	// transactions to other nodes.
 	txsGossipInterval = 500 * time.Millisecond
+
+	// [minGossipBatchInterval] is the minimum amount of time that must pass
+	// before our last gossip to peers.
+	minGossipBatchInterval = 50 * time.Millisecond
 )
 
 // Gossiper handles outgoing gossip of transactions
@@ -323,7 +327,7 @@ func (n *pushGossiper) sendTxs(txs []*types.Transaction) error {
 }
 
 func (n *pushGossiper) gossipTxs(force bool) (int, error) {
-	if (!force && time.Since(n.lastGossiped) < txsGossipInterval) || len(n.txsToGossip) == 0 {
+	if (!force && time.Since(n.lastGossiped) < minGossipBatchInterval) || len(n.txsToGossip) == 0 {
 		return 0, nil
 	}
 	n.lastGossiped = time.Now()