fix(core/genesis): persist upgrade bytes before compat checks

- Also modify Dockerfile to isolate the avalanchego source to not become
  part of the build context of the main project.
- Revert the previous docker related changes.

Author: powerslider

.dockerignore

@@ -7,7 +7,3 @@
 
 LICENSE
 *.md
-# Exclude Go test files from Docker build context to prevent test-only code being compiled into images
-**/*_test.go
-# Safeguard for any stray non-_test helper that could be cached/pulled in CI
-network/test_network.go

Dockerfile

@@ -8,19 +8,27 @@ FROM --platform=$BUILDPLATFORM golang:1.24.7-bookworm AS builder
 
 WORKDIR /build
 
-# Copy avalanche dependencies first (intermediate docker image caching)
-# Copy avalanchego directory if present (for manual CI case, which uses local dependency)
-COPY go.mod go.sum avalanchego* ./
-# Download avalanche dependencies using go mod
-RUN go mod download && go mod tidy
+# Copy module files first (improves Docker layer caching)
+COPY go.mod go.sum ./
+# Download module dependencies
+RUN go mod download
 
 # Copy the code into the container
 COPY . .
 
+# If a local avalanchego source directory is present in the repository (manual CI case),
+# move it outside the module root and update the replace directive to point to it so
+# avalanchego sources are not flattened into this module's package tree.
+RUN if [ -d ./avalanchego ]; then \
+  mkdir -p /third_party && \
+  mv ./avalanchego /third_party/avalanchego && \
+  go mod edit -replace github.com/ava-labs/avalanchego=./third_party/avalanchego && \
+  go mod tidy; \
+fi
+
 # Ensure pre-existing builds are not available for inclusion in the final image
 RUN [ -d ./build ] && rm -rf ./build/* || true
 
-
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 

compatibility.json

@@ -1,15 +1,15 @@
 {
   "rpcChainVMProtocolVersion": {
+    "v0.7.0": 38,
+    "v0.7.1": 39,
     "v0.7.10": 43,
-    "v0.7.9": 43,
-    "v0.7.8": 43,
-    "v0.7.7": 42,
-    "v0.7.6": 42,
-    "v0.7.5": 41,
-    "v0.7.4": 40,
-    "v0.7.3": 39,
     "v0.7.2": 39,
-    "v0.7.1": 39,
-    "v0.7.0": 38
+    "v0.7.3": 39,
+    "v0.7.4": 40,
+    "v0.7.5": 41,
+    "v0.7.6": 42,
+    "v0.7.7": 42,
+    "v0.7.8": 43,
+    "v0.7.9": 43
   }
-}
+}

core/genesis.go

@@ -182,17 +182,26 @@ func SetupGenesisBlock(
 		return newcfg, common.Hash{}, err
 	}
 
-	// Read stored config into a local extras copy to avoid mutating shared extras concurrently.
-	extraCopy := *params.GetExtra(newcfg)
-	storedcfg := customrawdb.ReadChainConfig(db, stored, &extraCopy)
+	// Read stored config. We'll persist the new config (including upgrade bytes)
+	// prior to compatibility checks to ensure on-disk state is up to date.
+	extra := params.GetExtra(newcfg)
+	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, *params.GetExtra(newcfg))
+		customrawdb.WriteChainConfig(db, stored, newcfg, *extra)
 		return newcfg, stored, nil
 	}
 
+	// Persist the new chain config (and upgrade bytes) to disk now to avoid
+	// spurious compatibility failures due to missing upgrade bytes on older databases.
+	customrawdb.WriteChainConfig(db, stored, newcfg, *extra)
+
+	// Re-read stored config into a fresh extras copy for a clean comparison.
+	storedExtra := *params.GetExtra(newcfg)
+	storedcfg = customrawdb.ReadChainConfig(db, stored, &storedExtra)
+
 	// Notes on the following line:
 	// - this is needed in coreth to handle the case where existing nodes do not
 	//   have the Berlin or London forks initialized by block number on disk.
@@ -226,9 +235,8 @@ func SetupGenesisBlock(
 			return newcfg, stored, compatErr
 		}
 	}
-	// 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, *params.GetExtra(newcfg))
+	// Chain config has already been written above.
+	// Write is idempotent but not required here.
 	return newcfg, stored, nil
 }
 

network/peer_tracker.go

@@ -12,9 +12,9 @@ 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"
 
 	safemath "github.com/ava-labs/avalanchego/utils/math"
-	evmmetrics "github.com/ava-labs/libevm/metrics" // alias to avoid name collision with local 'metrics' in this package
 )
 
 const (
@@ -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        evmmetrics.Gauge
+	numTrackedPeers        metrics.Gauge
 	trackedPeers           set.Set[ids.NodeID] // peers that we have sent a request to
-	numResponsivePeers     evmmetrics.Gauge
+	numResponsivePeers     metrics.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 evmmetrics.GaugeFloat64
+	averageBandwidthMetric metrics.GaugeFloat64
 	averageBandwidth       safemath.Averager
 }
 
 func NewPeerTracker() *peerTracker {
 	return &peerTracker{
 		peers:                  make(map[ids.NodeID]*peerInfo),
-		numTrackedPeers:        evmmetrics.GetOrRegisterGauge("net_tracked_peers", nil),
+		numTrackedPeers:        metrics.GetOrRegisterGauge("net_tracked_peers", nil),
 		trackedPeers:           make(set.Set[ids.NodeID]),
-		numResponsivePeers:     evmmetrics.GetOrRegisterGauge("net_responsive_peers", nil),
+		numResponsivePeers:     metrics.GetOrRegisterGauge("net_responsive_peers", nil),
 		responsivePeers:        make(set.Set[ids.NodeID]),
 		bandwidthHeap:          safemath.NewMaxAveragerHeap(),
-		averageBandwidthMetric: evmmetrics.GetOrRegisterGaugeFloat64("net_average_bandwidth", nil),
+		averageBandwidthMetric: metrics.GetOrRegisterGaugeFloat64("net_average_bandwidth", nil),
 		averageBandwidth:       safemath.NewAverager(0, bandwidthHalflife, time.Now()),
 	}
 }

network/stats/stats.go

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

scripts/build_docker_image.sh

@@ -2,19 +2,6 @@
 
 set -euo pipefail
 
-# If set, ensure a clean git workspace before building to avoid stray files in context
-if [[ -n "${CLEAN_CONTEXT:-}" ]]; then
-  echo "Cleaning build context (git clean -fdx)"
-  git -C "$(dirname "$0")/.." clean -fdx
-fi
-
-# If set, disable build cache for docker buildx
-if [[ -n "${NO_CACHE:-}" ]]; then
-  DOCKER_NO_CACHE="--no-cache"
-else
-  DOCKER_NO_CACHE=""
-fi
-
 # If set to non-empty, prompts the building of a multi-arch image when the image
 # name indicates use of a registry.
 #
@@ -47,7 +34,7 @@ ALLOW_TAG_LATEST="${ALLOW_TAG_LATEST:-}"
 # simplifies creation of multi-arch images.
 #
 # Reference: https://docs.docker.com/build/buildkit/
-DOCKER_CMD="docker buildx build ${DOCKER_NO_CACHE}"
+DOCKER_CMD="docker buildx build"
 ispush=0
 if [[ -n "${PUBLISH}" ]]; then
   echo "Pushing $IMAGE_NAME:$BUILD_IMAGE_ID"

scripts/tests.build_docker_image.sh

@@ -36,8 +36,6 @@ build_and_test() {
     VM_ID=$"${vm_id}" \
     IMAGE_NAME="${imagename}" \
     AVALANCHEGO_LOCAL_IMAGE_NAME="${avalanchego_local_image_name}" \
-    CLEAN_CONTEXT=1 \
-    NO_CACHE=1 \
     ./scripts/build_docker_image.sh
 
   echo "listing images"