don't broadcast blob txs per eip-4844 (ethereum#77)

eth/handler.go

@@ -636,13 +636,17 @@ func (h *handler) BroadcastTransactions(txs types.Transactions) {
 		annos = make(map[*ethPeer][]common.Hash) // Set peer->hash to announce
 
 	)
-	// Broadcast transactions to a batch of peers not knowing about it
+	// Broadcast transactions to a batch of peers not knowing about it, exluding
+	// only blob transactions which are never to be broadcast per EIP-4844
 	for _, tx := range txs {
 		peers := h.peers.peersWithoutTransaction(tx.Hash())
-		// Send the tx unconditionally to a subset of our peers
-		numDirect := int(math.Sqrt(float64(len(peers))))
-		for _, peer := range peers[:numDirect] {
-			txset[peer] = append(txset[peer], tx.Hash())
+		var numDirect int
+		if tx.Type() != types.BlobTxType {
+			// Send the tx unconditionally to a subset of our peers
+			numDirect = int(math.Sqrt(float64(len(peers))))
+			for _, peer := range peers[:numDirect] {
+				txset[peer] = append(txset[peer], tx.Hash())
+			}
 		}
 		// For the remaining peers, send announcement only
 		for _, peer := range peers[numDirect:] {

eth/handler_eth_test.go

@@ -72,6 +72,13 @@ func (h *testEthHandler) Handle(peer *eth.Peer, packet eth.Packet) error {
 		return nil
 
 	case *eth.TransactionsPacket:
+		txs := packet.Unwrap()
+		for i, tx := range txs {
+			if tx.Type() == types.BlobTxType {
+				// blob txs should never be broadcast
+				return fmt.Errorf("transaction %v is a blob tx", i)
+			}
+		}
 		h.txBroadcasts.Send(packet.Unwrap())
 		return nil
 

eth/protocols/eth/handlers.go

@@ -524,6 +524,13 @@ func handleTransactions(backend Backend, msg Decoder, peer *Peer) error {
 		if tx == nil {
 			return fmt.Errorf("%w: transaction %d is nil", errDecode, i)
 		}
+		// TODO(eip-4844): implement penalizing of clients who send unrequested
+		// blob transactions. While we're interop testing we'll go ahead and
+		// accept any that happen to come our way.
+		/*if tx.Tx.Type() == types.BlobTxType {
+			// blob txs should never be broadcast
+			return fmt.Errorf("transaction %v is a blob tx", i)
+		}*/
 		peer.markTransaction(tx.Hash())
 	}
 	return backend.Handle(peer, &txs)