core: eth: fix transaction propagation

Author: MariusVanDerWijden

core/types/tx_blob_with_blob.go

@@ -35,11 +35,20 @@ type innerType struct {
 }
 
 func (tx *BlobTxWithBlobs) DecodeRLP(s *rlp.Stream) error {
-	b, err := s.Bytes()
-	if err != nil {
+	kind, _, err := s.Kind()
+	switch {
+	case err != nil:
 		return err
+	case kind == rlp.List:
+		tx.Transaction = new(Transaction)
+		return tx.Transaction.DecodeRLP(s)
+	default:
+		b, err := s.Bytes()
+		if err != nil {
+			return err
+		}
+		return tx.UnmarshalBinary(b)
 	}
-	return tx.UnmarshalBinary(b)
 }
 
 func (tx *BlobTxWithBlobs) EncodeRLP(w io.Writer) error {

eth/handler_eth_test.go

@@ -463,8 +463,6 @@ func testTransactionPropagation(t *testing.T, protocol uint) {
 	}
 }
 
-func TestBlobTransactionPropagation66(t *testing.T) { testBlobTransactionPropagation(t, eth.ETH66) }
-func TestBlobTransactionPropagation67(t *testing.T) { testBlobTransactionPropagation(t, eth.ETH67) }
 func TestBlobTransactionPropagation68(t *testing.T) { testBlobTransactionPropagation(t, eth.ETH68) }
 
 func testBlobTransactionPropagation(t *testing.T, protocol uint) {

eth/protocols/eth/handlers.go

@@ -542,6 +542,7 @@ func handlePooledTransactions66(backend Backend, msg Decoder, peer *Peer) error
 	// Transactions can be processed, parse all of them and deliver to the pool
 	var txs PooledTransactionsPacket66
 	if err := msg.Decode(&txs); err != nil {
+		fmt.Println(err)
 		return fmt.Errorf("%w: message %v: %v", errDecode, msg, err)
 	}
 	for i, tx := range txs.PooledTransactionsPacket {