fix(network,core): adapt to avalanchego APIs, fix metrics clash, stabilize chain config I/O

- Alias libevm metrics import to evmmetrics and update usages to avoid symbol collision
with local metrics in the network and network/stats packages.
- Pass a copied extras object into customrawdb ReadChainConfig/WriteChainConfig to avoid data
races and shared-mutation bugs under new avalanchego versions.

Author: powerslider

core/genesis.go

@@ -182,14 +182,15 @@ func SetupGenesisBlock(
 		return newcfg, common.Hash{}, err
 	}
 
-	extra := params.GetExtra(newcfg)
+	// Avoid mutating shared extras attached to newcfg (tests may reuse global configs).
+	extra := *params.GetExtra(newcfg)
 
-	storedcfg := customrawdb.ReadChainConfig(db, stored, extra)
+	storedcfg := customrawdb.ReadChainConfig(db, stored, &extra)
 	// If there is no previously stored chain config, write the chain config to disk.
 	if storedcfg == nil {
 		// Note: this can happen since we did not previously write the genesis block and chain config in the same batch.
 		log.Warn("Found genesis block without chain config")
-		customrawdb.WriteChainConfig(db, stored, newcfg, *extra)
+		customrawdb.WriteChainConfig(db, stored, newcfg, extra)
 		return newcfg, stored, nil
 	}
 
@@ -228,7 +229,7 @@ func SetupGenesisBlock(
 	}
 	// Required to write the chain config to disk to ensure both the chain config and upgrade bytes are persisted to disk.
 	// Note: this intentionally removes an extra check from upstream.
-	customrawdb.WriteChainConfig(db, stored, newcfg, *extra)
+	customrawdb.WriteChainConfig(db, stored, newcfg, extra)
 	return newcfg, stored, nil
 }
 
@@ -405,8 +406,9 @@ func (g *Genesis) Commit(db ethdb.Database, triedb *triedb.Database) (*types.Blo
 	rawdb.WriteHeadBlockHash(batch, block.Hash())
 	rawdb.WriteHeadHeaderHash(batch, block.Hash())
 
-	extra := params.GetExtra(config)
-	customrawdb.WriteChainConfig(batch, block.Hash(), config, *extra)
+	// Avoid mutating shared extras attached to config
+	extraCommit := *params.GetExtra(config)
+	customrawdb.WriteChainConfig(batch, block.Hash(), config, extraCommit)
 	if err := batch.Write(); err != nil {
 		return nil, fmt.Errorf("failed to write genesis block: %w", err)
 	}

network/peer_tracker.go

@@ -12,7 +12,7 @@ import (
 	"github.com/ava-labs/avalanchego/utils/set"
 	"github.com/ava-labs/avalanchego/version"
 	"github.com/ava-labs/libevm/log"
-	"github.com/ava-labs/libevm/metrics"
+	evmmetrics "github.com/ava-labs/libevm/metrics" // alias to avoid name collision with local 'metrics' in this package
 
 	safemath "github.com/ava-labs/avalanchego/utils/math"
 )
@@ -42,24 +42,24 @@ type peerInfo struct {
 // Note: is not thread safe, caller must handle synchronization.
 type peerTracker struct {
 	peers                  map[ids.NodeID]*peerInfo // all peers we are connected to
-	numTrackedPeers        metrics.Gauge
+	numTrackedPeers        evmmetrics.Gauge
 	trackedPeers           set.Set[ids.NodeID] // peers that we have sent a request to
-	numResponsivePeers     metrics.Gauge
+	numResponsivePeers     evmmetrics.Gauge
 	responsivePeers        set.Set[ids.NodeID]   // peers that responded to the last request they were sent
 	bandwidthHeap          safemath.AveragerHeap // tracks bandwidth peers are responding with
-	averageBandwidthMetric metrics.GaugeFloat64
+	averageBandwidthMetric evmmetrics.GaugeFloat64
 	averageBandwidth       safemath.Averager
 }
 
 func NewPeerTracker() *peerTracker {
 	return &peerTracker{
 		peers:                  make(map[ids.NodeID]*peerInfo),
-		numTrackedPeers:        metrics.GetOrRegisterGauge("net_tracked_peers", nil),
+		numTrackedPeers:        evmmetrics.GetOrRegisterGauge("net_tracked_peers", nil),
 		trackedPeers:           make(set.Set[ids.NodeID]),
-		numResponsivePeers:     metrics.GetOrRegisterGauge("net_responsive_peers", nil),
+		numResponsivePeers:     evmmetrics.GetOrRegisterGauge("net_responsive_peers", nil),
 		responsivePeers:        make(set.Set[ids.NodeID]),
 		bandwidthHeap:          safemath.NewMaxAveragerHeap(),
-		averageBandwidthMetric: metrics.GetOrRegisterGaugeFloat64("net_average_bandwidth", nil),
+		averageBandwidthMetric: evmmetrics.GetOrRegisterGaugeFloat64("net_average_bandwidth", nil),
 		averageBandwidth:       safemath.NewAverager(0, bandwidthHalflife, time.Now()),
 	}
 }

network/stats/stats.go

@@ -6,7 +6,7 @@ package stats
 import (
 	"time"
 
-	"github.com/ava-labs/libevm/metrics"
+	evmmetrics "github.com/ava-labs/libevm/metrics" // alias to avoid name collision with local 'metrics' in this package
 )
 
 // RequestHandlerStats provides the interface for metrics for app requests.
@@ -16,8 +16,8 @@ type RequestHandlerStats interface {
 }
 
 type requestHandlerStats struct {
-	timeUntilDeadline metrics.Timer
-	droppedRequests   metrics.Counter
+	timeUntilDeadline evmmetrics.Timer
+	droppedRequests   evmmetrics.Counter
 }
 
 func (h *requestHandlerStats) IncDeadlineDroppedRequest() {
@@ -30,7 +30,7 @@ func (h *requestHandlerStats) UpdateTimeUntilDeadline(duration time.Duration) {
 
 func NewRequestHandlerStats() RequestHandlerStats {
 	return &requestHandlerStats{
-		timeUntilDeadline: metrics.GetOrRegisterTimer("net_req_time_until_deadline", nil),
-		droppedRequests:   metrics.GetOrRegisterCounter("net_req_deadline_dropped", nil),
+		timeUntilDeadline: evmmetrics.GetOrRegisterTimer("net_req_time_until_deadline", nil),
+		droppedRequests:   evmmetrics.GetOrRegisterCounter("net_req_deadline_dropped", nil),
 	}
 }