upgrade newPriceHeap

core/txpool/blobpool/evictheap.go

@@ -24,6 +24,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/holiman/uint256"
+	"golang.org/x/exp/maps"
 )
 
 // evictHeap is a helper data structure to keep track of the cheapest bottleneck
@@ -49,20 +50,17 @@ type evictHeap struct {
 func newPriceHeap(basefee *uint256.Int, blobfee *uint256.Int, index *map[common.Address][]*blobTxMeta) *evictHeap {
 	heap := &evictHeap{
 		metas: index,
-		index: make(map[common.Address]int),
+		index: make(map[common.Address]int, len(*index)),
 	}
 	// Populate the heap in account sort order. Not really needed in practice,
 	// but it makes the heap initialization deterministic and less annoying to
 	// test in unit tests.
-	addrs := make([]common.Address, 0, len(*index))
-	for addr := range *index {
-		addrs = append(addrs, addr)
-	}
+	addrs := maps.Keys(*index)
 	sort.Slice(addrs, func(i, j int) bool { return bytes.Compare(addrs[i][:], addrs[j][:]) < 0 })
 
+	heap.addrs = addrs
 	for _, addr := range addrs {
 		heap.index[addr] = len(heap.addrs)
-		heap.addrs = append(heap.addrs, addr)
 	}
 	heap.reinit(basefee, blobfee, true)
 	return heap