Merge main into minhd-vu/rpc-methods

fix: update p2p package for go-ethereum 1.17.0 RawList API changes

go-ethereum 1.17.0 changed eth protocol types to use rlp.RawList for
lazy decoding optimization:
- BlockHeadersPacket.List replaces BlockHeadersRequest
- BlockBodiesPacket.List replaces BlockBodiesResponse
- PooledTransactionsPacket.List replaces PooledTransactionsResponse
- BlockBody fields now use rlp.RawList instead of slices
- TransactionsPacket embeds rlp.RawList

Updated all p2p code to use .Len() instead of len(), .Items() for
decoding, and rlp.EncodeToRawList() for encoding.

Author: minhd-vu

cmd/p2p/sensor/rpc.go

@@ -13,6 +13,7 @@ import (
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/eth/protocols/eth"
+	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"github.com/rs/zerolog/log"
@@ -475,11 +476,13 @@ func getBlockByNumber(req rpcRequest, conns *p2p.Conns) (any, *rpcError) {
 		cache, found = conns.Blocks().Get(hash)
 		if !found {
 			// Construct cache from head block
+			txList, _ := rlp.EncodeToRawList([]*types.Transaction(head.Block.Transactions()))
+			uncleList, _ := rlp.EncodeToRawList(head.Block.Uncles())
 			cache = p2p.BlockCache{
 				Header: head.Block.Header(),
 				Body: &eth.BlockBody{
-					Transactions: head.Block.Transactions(),
-					Uncles:       head.Block.Uncles(),
+					Transactions: txList,
+					Uncles:       uncleList,
 				},
 				TD: head.TD,
 			}
@@ -527,7 +530,11 @@ func getTransactionByHash(req rpcRequest, conns *p2p.Conns) (any, *rpcError) {
 		if !ok || cache.Body == nil {
 			continue
 		}
-		for i, tx := range cache.Body.Transactions {
+		txs, err := cache.Body.Transactions.Items()
+		if err != nil {
+			continue
+		}
+		for i, tx := range txs {
 			if tx.Hash() == hash {
 				return formatTransactionResponse(tx, blockHash, cache.Header, uint64(i)), nil
 			}
@@ -564,11 +571,12 @@ func getTransactionByBlockHashAndIndex(req rpcRequest, conns *p2p.Conns) (any, *
 		return nil, nil
 	}
 
-	if int(index) >= len(cache.Body.Transactions) {
+	txs, err := cache.Body.Transactions.Items()
+	if err != nil || int(index) >= len(txs) {
 		return nil, nil
 	}
 
-	tx := cache.Body.Transactions[index]
+	tx := txs[index]
 	return formatTransactionResponse(tx, blockHash, cache.Header, index), nil
 }
 
@@ -600,7 +608,7 @@ func getBlockTransactionCountByHash(req rpcRequest, conns *p2p.Conns) (any, *rpc
 	if err != nil || cache.Body == nil {
 		return nil, err
 	}
-	return hexutil.EncodeUint64(uint64(len(cache.Body.Transactions))), nil
+	return hexutil.EncodeUint64(uint64(cache.Body.Transactions.Len())), nil
 }
 
 // getUncleCountByBlockHash returns the uncle count in a block.
@@ -609,7 +617,7 @@ func getUncleCountByBlockHash(req rpcRequest, conns *p2p.Conns) (any, *rpcError)
 	if err != nil || cache.Body == nil {
 		return nil, err
 	}
-	return hexutil.EncodeUint64(uint64(len(cache.Body.Uncles))), nil
+	return hexutil.EncodeUint64(uint64(cache.Body.Uncles.Len())), nil
 }
 
 // formatBlockResponse formats a block cache into the Ethereum JSON-RPC block format.
@@ -666,16 +674,17 @@ func formatBlockResponse(hash common.Hash, cache p2p.BlockCache, fullTx bool) ma
 	}
 
 	// Add transactions
-	if cache.Body != nil && cache.Body.Transactions != nil {
+	if cache.Body != nil && cache.Body.Transactions.Len() > 0 {
+		txs, _ := cache.Body.Transactions.Items()
 		if fullTx {
-			txs := make([]map[string]any, len(cache.Body.Transactions))
-			for i, tx := range cache.Body.Transactions {
-				txs[i] = formatTransactionResponse(tx, hash, header, uint64(i))
+			txResults := make([]map[string]any, len(txs))
+			for i, tx := range txs {
+				txResults[i] = formatTransactionResponse(tx, hash, header, uint64(i))
 			}
-			result["transactions"] = txs
+			result["transactions"] = txResults
 		} else {
-			txHashes := make([]string, len(cache.Body.Transactions))
-			for i, tx := range cache.Body.Transactions {
+			txHashes := make([]string, len(txs))
+			for i, tx := range txs {
 				txHashes[i] = tx.Hash().Hex()
 			}
 			result["transactions"] = txHashes
@@ -685,9 +694,10 @@ func formatBlockResponse(hash common.Hash, cache p2p.BlockCache, fullTx bool) ma
 	}
 
 	// Add uncles
-	if cache.Body != nil && cache.Body.Uncles != nil {
-		uncleHashes := make([]string, len(cache.Body.Uncles))
-		for i, uncle := range cache.Body.Uncles {
+	if cache.Body != nil && cache.Body.Uncles.Len() > 0 {
+		uncles, _ := cache.Body.Uncles.Items()
+		uncleHashes := make([]string, len(uncles))
+		for i, uncle := range uncles {
 			uncleHashes[i] = uncle.Hash().Hex()
 		}
 		result["uncles"] = uncleHashes

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/cenkalti/backoff/v4 v4.3.0
 	github.com/chzyer/readline v1.5.1 // indirect
 	github.com/cockroachdb/pebble v1.1.5
-	github.com/ethereum/go-ethereum v1.16.8
+	github.com/ethereum/go-ethereum v1.17.0
 	github.com/gizak/termui/v3 v3.1.1-0.20231111080052-b3569a6cd52d
 	github.com/google/gofuzz v1.2.0
 	github.com/hashicorp/golang-lru v1.0.2
@@ -77,7 +77,6 @@ require (
 	github.com/spf13/cast v1.10.0 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.3 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
@@ -140,7 +139,6 @@ require (
 	github.com/multiformats/go-multihash v0.2.3 // indirect
 	github.com/multiformats/go-varint v0.0.7 // indirect
 	github.com/nsf/termbox-go v1.1.1 // indirect
-	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_golang v1.23.2
@@ -198,11 +196,9 @@ require (
 	github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
 	github.com/cometbft/cometbft-db v0.14.1 // indirect
 	github.com/cosmos/gogoproto v1.7.0 // indirect
-	github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a // indirect
 	github.com/dgraph-io/badger/v4 v4.2.0 // indirect
 	github.com/dgraph-io/ristretto v0.1.1 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/ethereum/go-verkle v0.2.2 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect

go.sum

@@ -66,8 +66,8 @@ github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEe
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
-github.com/cenkalti/backoff/v5 v5.0.2 h1:rIfFVxEf1QsI7E1ZHfp/B4DF/6QBAUhmgkxc0H7Zss8=
-github.com/cenkalti/backoff/v5 v5.0.2/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
+github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM=
+github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk=
 github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s=
@@ -129,8 +129,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.6 h1:XJtiaUW6dEEqVuZiMTn1ldk455QWwEIsMIJlo
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/crate-crypto/go-eth-kzg v1.4.0 h1:WzDGjHk4gFg6YzV0rJOAsTK4z3Qkz5jd4RE3DAvPFkg=
 github.com/crate-crypto/go-eth-kzg v1.4.0/go.mod h1:J9/u5sWfznSObptgfa92Jq8rTswn6ahQWEuiLHOjCUI=
-github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a h1:W8mUrRp6NOVl3J+MYp5kPMoUZPp7aOYHtaua31lwRHg=
-github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a/go.mod h1:sTwzHBvIzm2RfVCGNEBZgRyjwK40bVoun3ZnGOCafNM=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -180,10 +178,8 @@ github.com/ethereum/c-kzg-4844/v2 v2.1.5 h1:aVtoLK5xwJ6c5RiqO8g8ptJ5KU+2Hdquf6G3
 github.com/ethereum/c-kzg-4844/v2 v2.1.5/go.mod h1:u59hRTTah4Co6i9fDWtiCjTrblJv0UwsqZKCc0GfgUs=
 github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab h1:rvv6MJhy07IMfEKuARQ9TKojGqLVNxQajaXEp/BoqSk=
 github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab/go.mod h1:IuLm4IsPipXKF7CW5Lzf68PIbZ5yl7FFd74l/E0o9A8=
-github.com/ethereum/go-ethereum v1.16.8 h1:LLLfkZWijhR5m6yrAXbdlTeXoqontH+Ga2f9igY7law=
-github.com/ethereum/go-ethereum v1.16.8/go.mod h1:Fs6QebQbavneQTYcA39PEKv2+zIjX7rPUZ14DER46wk=
-github.com/ethereum/go-verkle v0.2.2 h1:I2W0WjnrFUIzzVPwm8ykY+7pL2d4VhlsePn4j7cnFk8=
-github.com/ethereum/go-verkle v0.2.2/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk=
+github.com/ethereum/go-ethereum v1.17.0 h1:2D+1Fe23CwZ5tQoAS5DfwKFNI1HGcTwi65/kRlAVxes=
+github.com/ethereum/go-ethereum v1.17.0/go.mod h1:2W3msvdosS/MCWytpqTcqgFiRYbTH59FxDJzqah120o=
 github.com/fatih/color v1.19.0 h1:Zp3PiM21/9Ld6FzSKyL5c/BULoe/ONr9KlbYVOfG8+w=
 github.com/fatih/color v1.19.0/go.mod h1:zNk67I0ZUT1bEGsSGyCZYZNrHuTkJJB+r6Q9VuMi0LE=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
@@ -299,10 +295,14 @@ github.com/googleapis/gax-go/v2 v2.19.0 h1:fYQaUOiGwll0cGj7jmHT/0nPlcrZDFPrZRhTs
 github.com/googleapis/gax-go/v2 v2.19.0/go.mod h1:w2ROXVdfGEVFXzmlciUU4EdjHgWvB5h2n6x/8XSTTJA=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/grafana/pyroscope-go v1.2.7 h1:VWBBlqxjyR0Cwk2W6UrE8CdcdD80GOFNutj0Kb1T8ac=
+github.com/grafana/pyroscope-go v1.2.7/go.mod h1:o/bpSLiJYYP6HQtvcoVKiE9s5RiNgjYTj1DhiddP2Pc=
+github.com/grafana/pyroscope-go/godeltaprof v0.1.9 h1:c1Us8i6eSmkW+Ez05d3co8kasnuOY813tbMN8i/a3Og=
+github.com/grafana/pyroscope-go/godeltaprof v0.1.9/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU=
 github.com/graph-gophers/graphql-go v1.3.0 h1:Eb9x/q6MFpCLz7jBCiP/WTxjSDrYLR1QY41SORZyNJ0=
 github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 h1:X5VWvz21y3gzm9Nw/kaUeku/1+uBhcekkmy4IkffJww=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1/go.mod h1:Zanoh4+gvIgluNqcfMVTJueD4wSS5hT7zTt4Mrutd90=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 h1:NmZ1PKzSTQbuGHw9DGPFomqkkLWMC+vZCkfs+FHv1Vg=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3/go.mod h1:zQrxl1YP88HQlA6i9c63DSVPFklWpGX4OWAc9bFuaH4=
 github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE=
 github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0=
 github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c=
@@ -420,8 +420,6 @@ github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY=
 github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc=
 github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a h1:dlRvE5fWabOchtH7znfiFCcOvmIYgOeAS5ifBXBlh9Q=
 github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a/go.mod h1:hVoHR2EVESiICEMbg137etN/Lx+lSrHPTD39Z/uE+2s=
-github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
-github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
@@ -583,10 +581,10 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6h
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q=
 go.opentelemetry.io/otel v1.42.0 h1:lSQGzTgVR3+sgJDAU/7/ZMjN9Z+vUip7leaqBKy4sho=
 go.opentelemetry.io/otel v1.42.0/go.mod h1:lJNsdRMxCUIWuMlVJWzecSMuNjE7dOYyWlqOXWkdqCc=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 h1:Ahq7pZmv87yiyn3jeFz/LekZmPLLdKejuO3NcK9MssM=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0/go.mod h1:MJTqhM0im3mRLw1i8uGHnCvUEeS7VwRyxlLC78PA18M=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0 h1:bDMKF3RUSxshZ5OjOTi8rsHGaPKsAt76FaqgvIUySLc=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0/go.mod h1:dDT67G/IkA46Mr2l9Uj7HsQVwsjASyV9SjGofsiUZDA=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0 h1:f0cb2XPmrqn4XMy9PNliTgRKJgS5WcL/u0/WRYGz4t0=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0/go.mod h1:vnakAaFckOMiMtOIhFI2MNH4FYrZzXCYxmb1LlhoGz8=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.39.0 h1:Ckwye2FpXkYgiHX7fyVrN1uA/UYd9ounqqTuSNAv0k4=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.39.0/go.mod h1:teIFJh5pW2y+AN7riv6IBPX2DuesS3HgP39mwOspKwU=
 go.opentelemetry.io/otel/metric v1.42.0 h1:2jXG+3oZLNXEPfNmnpxKDeZsFI5o4J+nz6xUlaFdF/4=
 go.opentelemetry.io/otel/metric v1.42.0/go.mod h1:RlUN/7vTU7Ao/diDkEpQpnz3/92J9ko05BIwxYa2SSI=
 go.opentelemetry.io/otel/sdk v1.42.0 h1:LyC8+jqk6UJwdrI/8VydAq/hvkFKNHZVIWuslJXYsDo=
@@ -595,8 +593,8 @@ go.opentelemetry.io/otel/sdk/metric v1.42.0 h1:D/1QR46Clz6ajyZ3G8SgNlTJKBdGp84q9
 go.opentelemetry.io/otel/sdk/metric v1.42.0/go.mod h1:Ua6AAlDKdZ7tdvaQKfSmnFTdHx37+J4ba8MwVCYM5hc=
 go.opentelemetry.io/otel/trace v1.42.0 h1:OUCgIPt+mzOnaUTpOQcBiM/PLQ/Op7oq6g4LenLmOYY=
 go.opentelemetry.io/otel/trace v1.42.0/go.mod h1:f3K9S+IFqnumBkKhRJMeaZeNk9epyhnCmQh/EysQCdc=
-go.opentelemetry.io/proto/otlp v1.7.0 h1:jX1VolD6nHuFzOYso2E73H85i92Mv8JQYk0K9vz09os=
-go.opentelemetry.io/proto/otlp v1.7.0/go.mod h1:fSKjH6YJ7HDlwzltzyMj036AJ3ejJLCgCSHGj4efDDo=
+go.opentelemetry.io/proto/otlp v1.9.0 h1:l706jCMITVouPOqEnii2fIAuO3IVGBRPV5ICjceRb/A=
+go.opentelemetry.io/proto/otlp v1.9.0/go.mod h1:xE+Cx5E/eEHw+ISFkwPLwCZefwVjY+pqKg1qcK03+/4=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=

p2p/conns.go

@@ -11,6 +11,7 @@ import (
 	"github.com/ethereum/go-ethereum/eth/protocols/eth"
 	ethp2p "github.com/ethereum/go-ethereum/p2p"
 	"github.com/ethereum/go-ethereum/p2p/enode"
+	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/rs/zerolog/log"
 
 	ds "github.com/0xPolygon/polygon-cli/p2p/datastructures"
@@ -177,7 +178,14 @@ func (c *Conns) BroadcastTxs(txs types.Transactions) int {
 			}
 
 			// Send as TransactionsPacket
-			packet := eth.TransactionsPacket(unknownTxs)
+			rawList, err := rlp.EncodeToRawList([]*types.Transaction(unknownTxs))
+			if err != nil {
+				cn.logger.Debug().
+					Err(err).
+					Msg("Failed to encode transactions")
+				return
+			}
+			packet := &eth.TransactionsPacket{RawList: rawList}
 			cn.countMsgSent(packet.Name(), float64(len(unknownTxs)))
 			if err := ethp2p.Send(cn.rw, eth.TransactionsMsg, packet); err != nil {
 				cn.logger.Debug().
@@ -236,7 +244,14 @@ func (c *Conns) BroadcastTxsAlways(txs types.Transactions) int {
 			defer wg.Done()
 
 			// Send as TransactionsPacket
-			packet := eth.TransactionsPacket(txs)
+			rawList, err := rlp.EncodeToRawList([]*types.Transaction(txs))
+			if err != nil {
+				cn.logger.Debug().
+					Err(err).
+					Msg("Failed to encode transactions")
+				return
+			}
+			packet := &eth.TransactionsPacket{RawList: rawList}
 			cn.countMsgSent(packet.Name(), float64(len(txs)))
 			if err := ethp2p.Send(cn.rw, eth.TransactionsMsg, packet); err != nil {
 				cn.logger.Debug().

p2p/database/datastore.go

@@ -596,24 +596,33 @@ func (d *Datastore) writeBlockBody(ctx context.Context, body *eth.BlockBody, has
 
 		modified := false
 
-		if block.Transactions == nil && len(body.Transactions) > 0 {
-			modified = true
-			if d.shouldWriteTransactions {
-				d.writeTransactions(ctx, body.Transactions, tfs)
-			}
-
-			block.Transactions = make([]*datastore.Key, 0, len(body.Transactions))
-			for _, tx := range body.Transactions {
-				block.Transactions = append(block.Transactions, datastore.NameKey(TransactionsKind, tx.Hash().Hex(), nil))
+		if block.Transactions == nil && body.Transactions.Len() > 0 {
+			txs, err := body.Transactions.Items()
+			if err != nil {
+				log.Error().Err(err).Str("hash", hash.Hex()).Msg("Failed to decode transactions from block body")
+			} else {
+				modified = true
+				if d.shouldWriteTransactions {
+					d.writeTransactions(ctx, txs, tfs)
+				}
+				block.Transactions = make([]*datastore.Key, 0, len(txs))
+				for _, tx := range txs {
+					block.Transactions = append(block.Transactions, datastore.NameKey(TransactionsKind, tx.Hash().Hex(), nil))
+				}
 			}
 		}
 
-		if block.Uncles == nil && len(body.Uncles) > 0 {
-			modified = true
-			block.Uncles = make([]*datastore.Key, 0, len(body.Uncles))
-			for _, uncle := range body.Uncles {
-				d.writeBlockHeader(ctx, uncle, tfs, false)
-				block.Uncles = append(block.Uncles, datastore.NameKey(BlocksKind, uncle.Hash().Hex(), nil))
+		if block.Uncles == nil && body.Uncles.Len() > 0 {
+			uncles, err := body.Uncles.Items()
+			if err != nil {
+				log.Error().Err(err).Str("hash", hash.Hex()).Msg("Failed to decode uncles from block body")
+			} else {
+				modified = true
+				block.Uncles = make([]*datastore.Key, 0, len(uncles))
+				for _, uncle := range uncles {
+					d.writeBlockHeader(ctx, uncle, tfs, false)
+					block.Uncles = append(block.Uncles, datastore.NameKey(BlocksKind, uncle.Hash().Hex(), nil))
+				}
 			}
 		}
 

p2p/database/json.go

@@ -261,8 +261,8 @@ func (j *JSONDatabase) WriteBlockBody(ctx context.Context, body *eth.BlockBody,
 		"type":            "block_body",
 		"sensor_id":       j.sensorID,
 		"hash":            hash.Hex(),
-		"tx_count":        len(body.Transactions),
-		"uncle_count":     len(body.Uncles),
+		"tx_count":        body.Transactions.Len(),
+		"uncle_count":     body.Uncles.Len(),
 		"time_first_seen": tfs,
 	}
 

p2p/gasprice.go

@@ -85,7 +85,11 @@ func (o *GasPriceOracle) suggestLegacyGasPrice() *big.Int {
 			continue
 		}
 
-		for _, tx := range cache.Body.Transactions {
+		txs, err := cache.Body.Transactions.Items()
+		if err != nil {
+			continue
+		}
+		for _, tx := range txs {
 			if price := tx.GasPrice(); price != nil && price.Sign() > 0 {
 				prices = append(prices, new(big.Int).Set(price))
 			}
@@ -189,8 +193,12 @@ func (o *GasPriceOracle) getBlockTips(hash common.Hash, limit int, ignoreUnder *
 	}
 
 	// Calculate tips for all transactions
+	txs, err := cache.Body.Transactions.Items()
+	if err != nil {
+		return nil
+	}
 	var allTips []*big.Int
-	for _, tx := range cache.Body.Transactions {
+	for _, tx := range txs {
 		tip := effectiveGasTip(tx, baseFee)
 		if tip != nil && tip.Sign() > 0 {
 			allTips = append(allTips, tip)