fix: disable tx fetching

Author: minhd-vu

p2p/log.go

@@ -43,6 +43,10 @@ func (count *MessageCount) Load() MessageCount {
 		Pings:               atomic.LoadInt64(&count.Pings),
 		Errors:              atomic.LoadInt64(&count.Errors),
 		Disconnects:         atomic.LoadInt64(&count.Disconnects),
+		NewWitness:          atomic.LoadInt64(&count.NewWitness),
+		NewWitnessHashes:    atomic.LoadInt64(&count.NewWitnessHashes),
+		GetWitnessRequest:   atomic.LoadInt64(&count.GetWitnessRequest),
+		Witness:             atomic.LoadInt64(&count.Witness),
 	}
 }
 
@@ -60,6 +64,10 @@ func (count *MessageCount) Clear() {
 	atomic.StoreInt64(&count.Pings, 0)
 	atomic.StoreInt64(&count.Errors, 0)
 	atomic.StoreInt64(&count.Disconnects, 0)
+	atomic.StoreInt64(&count.NewWitness, 0)
+	atomic.StoreInt64(&count.NewWitnessHashes, 0)
+	atomic.StoreInt64(&count.GetWitnessRequest, 0)
+	atomic.StoreInt64(&count.Witness, 0)
 }
 
 // IsEmpty checks whether the sum of all the counts is empty. Make sure to call

p2p/rlpx.go

@@ -197,26 +197,26 @@ func (c *rlpxConn) ReadAndServe(count *MessageCount) error {
 
 				var hashes []common.Hash
 				for _, hash := range *msg {
-					headersRequest := &GetBlockHeaders{
-						GetBlockHeadersRequest: &eth.GetBlockHeadersRequest{
-							// Providing both the hash and number will result in a `both origin
-							// hash and number` error.
-							Origin: eth.HashOrNumber{Hash: hash.Hash},
-							Amount: 1,
-						},
-					}
-
-					if err := c.Write(headersRequest); err != nil {
-						c.logger.Error().Err(err).Msg("Failed to write GetBlockHeaders request")
-					}
-
-					bodiesRequest := &GetBlockBodies{
-						GetBlockBodiesRequest: []common.Hash{hash.Hash},
-					}
-
-					if err := c.Write(bodiesRequest); err != nil {
-						c.logger.Error().Err(err).Msg("Failed to write GetBlockBodies request")
-					}
+					// headersRequest := &GetBlockHeaders{
+					// 	GetBlockHeadersRequest: &eth.GetBlockHeadersRequest{
+					// 		// Providing both the hash and number will result in a `both origin
+					// 		// hash and number` error.
+					// 		Origin: eth.HashOrNumber{Hash: hash.Hash},
+					// 		Amount: 1,
+					// 	},
+					// }
+					//
+					// if err := c.Write(headersRequest); err != nil {
+					// 	c.logger.Error().Err(err).Msg("Failed to write GetBlockHeaders request")
+					// }
+					//
+					// bodiesRequest := &GetBlockBodies{
+					// 	GetBlockBodiesRequest: []common.Hash{hash.Hash},
+					// }
+
+					// if err := c.Write(bodiesRequest); err != nil {
+					// 	c.logger.Error().Err(err).Msg("Failed to write GetBlockBodies request")
+					// }
 
 					hashes = append(hashes, hash.Hash)
 				}
@@ -244,29 +244,29 @@ func (c *rlpxConn) ReadAndServe(count *MessageCount) error {
 					log.Error().Err(err).Msg("Failed to write GetWitnessPacket request")
 				}
 			case *Transactions:
-				atomic.AddInt64(&count.Transactions, int64(len(*msg)))
-				c.logger.Trace().Msgf("Received %v Transactions", len(*msg))
+				// atomic.AddInt64(&count.Transactions, int64(len(*msg)))
+				// c.logger.Trace().Msgf("Received %v Transactions", len(*msg))
 			case *PooledTransactions:
-				atomic.AddInt64(&count.Transactions, int64(len(msg.PooledTransactionsResponse)))
-				c.logger.Trace().Msgf("Received %v PooledTransactions", len(msg.PooledTransactionsResponse))
+				// atomic.AddInt64(&count.Transactions, int64(len(msg.PooledTransactionsResponse)))
+				// c.logger.Trace().Msgf("Received %v PooledTransactions", len(msg.PooledTransactionsResponse))
 			case *NewPooledTransactionHashes:
-				if err := c.processNewPooledTransactionHashes(count, msg.Hashes); err != nil {
-					return err
-				}
+				// if err := c.processNewPooledTransactionHashes(count, msg.Hashes); err != nil {
+				// 	return err
+				// }
 			case *NewPooledTransactionHashes66:
-				if err := c.processNewPooledTransactionHashes(count, *msg); err != nil {
-					return err
-				}
+				// if err := c.processNewPooledTransactionHashes(count, *msg); err != nil {
+				// 	return err
+				// }
 			case *GetPooledTransactions:
-				atomic.AddInt64(&count.TransactionRequests, int64(len(msg.GetPooledTransactionsRequest)))
-				c.logger.Trace().Msgf("Received %v GetPooledTransactions request", len(msg.GetPooledTransactionsRequest))
+				// atomic.AddInt64(&count.TransactionRequests, int64(len(msg.GetPooledTransactionsRequest)))
+				// c.logger.Trace().Msgf("Received %v GetPooledTransactions request", len(msg.GetPooledTransactionsRequest))
 
-				res := &PooledTransactions{
-					RequestId: msg.RequestId,
-				}
-				if err := c.Write(res); err != nil {
-					c.logger.Error().Err(err).Msg("Failed to write PooledTransactions response")
-				}
+				// res := &PooledTransactions{
+				// 	RequestId: msg.RequestId,
+				// }
+				// if err := c.Write(res); err != nil {
+				// 	c.logger.Error().Err(err).Msg("Failed to write PooledTransactions response")
+				// }
 			case *Error:
 				atomic.AddInt64(&count.Errors, 1)
 				c.logger.Trace().Err(msg.Unwrap()).Msg("Received Error")