chore(customrawdb): delete customrawdb package and switch to avalanchego imports

.github/workflows/tests.yml

@@ -97,7 +97,7 @@ jobs:
       - name: Setup Contracts
         run: ./scripts/run_task.sh setup-contracts
       - name: Run Warp E2E Tests
-        uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@84e9aebcfbc04602865f4c0a3e8b46a27409a3f5
+        uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@fff1df9564d3fa86899780d73e887d9ee5b9b54e
         with:
           run: ./scripts/run_task.sh test-e2e-warp-ci
           artifact_prefix: warp
@@ -122,7 +122,7 @@ jobs:
         with:
           go-version-file: "go.mod"
       - name: Run E2E Load Tests
-        uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@84e9aebcfbc04602865f4c0a3e8b46a27409a3f5
+        uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@fff1df9564d3fa86899780d73e887d9ee5b9b54e
         with:
           run: ./scripts/run_task.sh test-e2e-load-ci
           artifact_prefix: load

Dockerfile

@@ -4,23 +4,35 @@
 ARG AVALANCHEGO_NODE_IMAGE="invalid-image"
 
 # ============= Compilation Stage ================
-FROM --platform=$BUILDPLATFORM golang:1.24.7-bookworm AS builder
+FROM --platform=$BUILDPLATFORM golang:1.24.8-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 . .
 
+# Ensure we never keep a stale local replace when no local module is present
+RUN go mod edit -dropreplace github.com/ava-labs/avalanchego || true
+
+# If a local avalanchego source dir is present, move it outside the module tree.
+# Only add a replace if the moved directory is a standalone module with go.mod,
+# otherwise drop any existing replace so upstream is used.
+RUN if [ -d ./avalanchego ]; then \
+  mkdir -p /third_party && mv ./avalanchego /third_party/avalanchego; \
+  if [ -f /third_party/avalanchego/go.mod ]; then \
+    go mod edit -replace github.com/ava-labs/avalanchego=/third_party/avalanchego; \
+    go mod tidy; \
+  fi; \
+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/bench_test.go

@@ -32,6 +32,7 @@ import (
 	"math/big"
 	"testing"
 
+	"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/common/math"
 	"github.com/ava-labs/libevm/core/rawdb"
@@ -42,7 +43,6 @@ import (
 	ethparams "github.com/ava-labs/libevm/params"
 	"github.com/ava-labs/subnet-evm/consensus/dummy"
 	"github.com/ava-labs/subnet-evm/params"
-	"github.com/ava-labs/subnet-evm/plugin/evm/customrawdb"
 )
 
 func BenchmarkInsertChain_empty_memdb(b *testing.B) {
@@ -253,7 +253,8 @@ func makeChainForBench(db ethdb.Database, genesis *Genesis, full bool, count uin
 		rawdb.WriteCanonicalHash(db, hash, n)
 
 		if n == 0 {
-			customrawdb.WriteChainConfig(db, hash, genesis.Config)
+			extra := params.GetExtra(genesis.Config)
+			customrawdb.WriteChainConfig(db, hash, genesis.Config, *extra)
 		}
 		rawdb.WriteHeadHeaderHash(db, hash)
 

core/blockchain.go

@@ -41,6 +41,7 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/common/lru"
 	"github.com/ava-labs/libevm/consensus/misc/eip4844"
@@ -61,7 +62,6 @@ import (
 	"github.com/ava-labs/subnet-evm/internal/version"
 	"github.com/ava-labs/subnet-evm/params"
 	"github.com/ava-labs/subnet-evm/plugin/evm/customlogs"
-	"github.com/ava-labs/subnet-evm/plugin/evm/customrawdb"
 	"github.com/ava-labs/subnet-evm/plugin/evm/customtypes"
 	"github.com/ava-labs/subnet-evm/triedb/firewood"
 	"github.com/ava-labs/subnet-evm/triedb/hashdb"

core/blockchain_repair_test.go

@@ -35,6 +35,7 @@ import (
 	"math/big"
 	"testing"
 
+	"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/core/rawdb"
 	"github.com/ava-labs/libevm/core/types"
@@ -44,7 +45,6 @@ import (
 	"github.com/ava-labs/libevm/triedb"
 	"github.com/ava-labs/subnet-evm/consensus/dummy"
 	"github.com/ava-labs/subnet-evm/params"
-	"github.com/ava-labs/subnet-evm/plugin/evm/customrawdb"
 	"github.com/stretchr/testify/require"
 )
 

core/blockchain_test.go

@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/ava-labs/avalanchego/upgrade"
+	"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/core/rawdb"
 	"github.com/ava-labs/libevm/core/types"
@@ -22,7 +23,6 @@ import (
 	"github.com/ava-labs/subnet-evm/core/state/pruner"
 	"github.com/ava-labs/subnet-evm/params"
 	"github.com/ava-labs/subnet-evm/params/extras"
-	"github.com/ava-labs/subnet-evm/plugin/evm/customrawdb"
 	"github.com/ava-labs/subnet-evm/plugin/evm/upgrade/legacy"
 
 	ethparams "github.com/ava-labs/libevm/params"

core/genesis.go

@@ -32,8 +32,10 @@ import (
 	"errors"
 	"fmt"
 	"math/big"
+	"strings"
 	"time"
 
+	"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/common/hexutil"
 	"github.com/ava-labs/libevm/common/math"
@@ -49,7 +51,6 @@ import (
 	"github.com/ava-labs/libevm/triedb"
 	"github.com/ava-labs/subnet-evm/core/extstate"
 	"github.com/ava-labs/subnet-evm/params"
-	"github.com/ava-labs/subnet-evm/plugin/evm/customrawdb"
 	"github.com/ava-labs/subnet-evm/plugin/evm/customtypes"
 	"github.com/ava-labs/subnet-evm/plugin/evm/upgrade/legacy"
 	"github.com/ava-labs/subnet-evm/triedb/pathdb"
@@ -177,25 +178,31 @@ func SetupGenesisBlock(
 		return genesis.Config, common.Hash{}, &GenesisMismatchError{stored, hash}
 	}
 	// Get the existing chain configuration.
-	newcfg := genesis.Config
-	if err := newcfg.CheckConfigForkOrder(); err != nil {
-		return newcfg, common.Hash{}, err
+	newCfg := genesis.Config
+	if err := newCfg.CheckConfigForkOrder(); err != nil {
+		return newCfg, common.Hash{}, err
 	}
-	storedcfg := customrawdb.ReadChainConfig(db, stored)
+
+	// Read stored config into a local extras copy to avoid mutating the
+	// caller's attached extras (which may be concurrently accessed in tests).
+	// We'll persist the new config (including upgrade bytes) using the attached
+	// extras below to ensure on-disk state is up to date.
+	readExtra := *params.GetExtra(newCfg)
+	storedCfg := customrawdb.ReadChainConfig(db, stored, &readExtra)
 	// If there is no previously stored chain config, write the chain config to disk.
-	if storedcfg == nil {
+	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)
-		return newcfg, stored, nil
+		customrawdb.WriteChainConfig(db, stored, newCfg, *params.GetExtra(newCfg))
+		return newCfg, stored, nil
 	}
 
 	// 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.
 	//   See https://github.com/ava-labs/coreth/pull/667/files
 	// - this is not needed in subnet-evm but it does not impact it either
-	if err := params.SetEthUpgrades(storedcfg); err != nil {
+	if err := params.SetEthUpgrades(storedCfg); err != nil {
 		return genesis.Config, common.Hash{}, err
 	}
 	// Check config compatibility and write the config. Compatibility errors
@@ -208,25 +215,31 @@ func SetupGenesisBlock(
 	// when we start syncing from scratch, the last accepted block
 	// will be genesis block
 	if lastBlock == nil {
-		return newcfg, common.Hash{}, errors.New("missing last accepted block")
+		return newCfg, common.Hash{}, errors.New("missing last accepted block")
 	}
 	height := lastBlock.NumberU64()
 	timestamp := lastBlock.Time()
-	if skipChainConfigCheckCompatible {
-		log.Info("skipping verifying activated network upgrades on chain config")
-	} else {
-		compatErr := storedcfg.CheckCompatible(newcfg, height, timestamp)
-		if compatErr != nil && ((height != 0 && compatErr.RewindToBlock != 0) || (timestamp != 0 && compatErr.RewindToTime != 0)) {
-			storedData, _ := params.ToWithUpgradesJSON(storedcfg).MarshalJSON()
-			newData, _ := params.ToWithUpgradesJSON(newcfg).MarshalJSON()
-			log.Error("found mismatch between config on database vs. new config", "storedConfig", string(storedData), "newConfig", string(newData), "err", compatErr)
-			return newcfg, stored, compatErr
+
+	// If the chain hasn't advanced past genesis (height 0), persist the new
+	// chain config (including upgrade bytes) before compatibility checks so
+	// subsequent restarts see the updated upgrades and do not flag them as
+	// retroactive enables.
+	if height == 0 {
+		storedCfg = persistChainConfigAndReload(db, stored, newCfg)
+	}
+
+	if !skipChainConfigCheckCompatible {
+		if _, err := reconcileCompatibility(db, stored, storedCfg, newCfg, height, timestamp); err != nil {
+			logCompatibilityMismatch(storedCfg, newCfg, err)
+			return newCfg, stored, err
 		}
+	} else {
+		log.Info("skipping verifying activated network upgrades on chain config")
 	}
-	// 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)
-	return newcfg, stored, nil
+
+	// Persist the new chain config (including upgrade bytes) now that compatibility is verified.
+	customrawdb.WriteChainConfig(db, stored, newCfg, *params.GetExtra(newCfg))
+	return newCfg, stored, nil
 }
 
 // IsVerkle indicates whether the state is already stored in a verkle
@@ -401,7 +414,9 @@ func (g *Genesis) Commit(db ethdb.Database, triedb *triedb.Database) (*types.Blo
 	rawdb.WriteCanonicalHash(batch, block.Hash(), block.NumberU64())
 	rawdb.WriteHeadBlockHash(batch, block.Hash())
 	rawdb.WriteHeadHeaderHash(batch, block.Hash())
-	customrawdb.WriteChainConfig(batch, block.Hash(), config)
+
+	extra := params.GetExtra(config)
+	customrawdb.WriteChainConfig(batch, block.Hash(), config, *extra)
 	if err := batch.Write(); err != nil {
 		return nil, fmt.Errorf("failed to write genesis block: %w", err)
 	}
@@ -453,3 +468,54 @@ func ReadBlockByHash(db ethdb.Reader, hash common.Hash) *types.Block {
 	}
 	return rawdb.ReadBlock(db, hash, *blockNumber)
 }
+
+// reconcileCompatibility checks compatibility between the stored and new chain configs.
+// If the only incompatibility is missing precompile upgrade metadata, it persists the
+// new config (including upgrade bytes) and returns a refreshed stored config view.
+// Otherwise, it returns the compatibility error.
+func reconcileCompatibility(
+	db ethdb.Database,
+	genesisHash common.Hash,
+	storedCfg *params.ChainConfig,
+	newCfg *params.ChainConfig,
+	height uint64,
+	timestamp uint64,
+) (*params.ChainConfig, error) {
+	compatErr := storedCfg.CheckCompatible(newCfg, height, timestamp)
+	needsRewind := compatErr != nil && ((height != 0 && compatErr.RewindToBlock != 0) || (timestamp != 0 && compatErr.RewindToTime != 0))
+	if !needsRewind {
+		return storedCfg, nil
+	}
+	if !isPrecompileUpgradeOnlyIncompatibility(compatErr) {
+		return nil, compatErr
+	}
+	// Only precompile upgrade metadata differs: write upgrades and proceed.
+	refreshed := persistChainConfigAndReload(db, genesisHash, newCfg)
+	return refreshed, nil
+}
+
+// persistChainConfigAndReload writes the provided chain config (including upgrade bytes)
+// and returns a fresh view of the stored config using a separate extras copy.
+func persistChainConfigAndReload(db ethdb.Database, genesisHash common.Hash, cfg *params.ChainConfig) *params.ChainConfig {
+	customrawdb.WriteChainConfig(db, genesisHash, cfg, *params.GetExtra(cfg))
+	refreshedExtra := *params.GetExtra(cfg)
+	return customrawdb.ReadChainConfig(db, genesisHash, &refreshedExtra)
+}
+
+// isPrecompileUpgradeOnlyIncompatibility returns true if the compatibility error
+// pertains exclusively to precompile upgrade activation metadata being absent on disk.
+// In such cases, persisting the new chain config (including upgrade bytes) resolves
+// the mismatch without requiring a rewind.
+func isPrecompileUpgradeOnlyIncompatibility(err *ethparams.ConfigCompatError) bool {
+	if err == nil {
+		return false
+	}
+	return strings.Contains(err.What, "PrecompileUpgrade[")
+}
+
+// logCompatibilityMismatch emits a structured error comparing stored and new configs.
+func logCompatibilityMismatch(storedCfg, newCfg *params.ChainConfig, err error) {
+	storedData, _ := params.ToWithUpgradesJSON(storedCfg).MarshalJSON()
+	newData, _ := params.ToWithUpgradesJSON(newCfg).MarshalJSON()
+	log.Error("found mismatch between config on database vs. new config", "storedConfig", string(storedData), "newConfig", string(newData), "err", err)
+}

core/genesis_test.go

@@ -36,6 +36,7 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/core/rawdb"
 	"github.com/ava-labs/libevm/core/state"
@@ -48,7 +49,6 @@ import (
 	"github.com/ava-labs/subnet-evm/consensus/dummy"
 	"github.com/ava-labs/subnet-evm/params"
 	"github.com/ava-labs/subnet-evm/params/extras"
-	"github.com/ava-labs/subnet-evm/plugin/evm/customrawdb"
 	"github.com/ava-labs/subnet-evm/plugin/evm/upgrade/legacy"
 	"github.com/ava-labs/subnet-evm/precompile/allowlist"
 	"github.com/ava-labs/subnet-evm/precompile/contracts/deployerallowlist"

core/state/pruner/pruner.go

@@ -38,6 +38,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/core/rawdb"
 	"github.com/ava-labs/libevm/core/types"
@@ -47,7 +48,6 @@ import (
 	"github.com/ava-labs/libevm/trie"
 	"github.com/ava-labs/libevm/triedb"
 	"github.com/ava-labs/subnet-evm/core/state/snapshot"
-	"github.com/ava-labs/subnet-evm/plugin/evm/customrawdb"
 )
 
 const (

core/state/snapshot/disklayer_test.go

@@ -31,11 +31,11 @@ import (
 	"bytes"
 	"testing"
 
+	"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/core/rawdb"
 	"github.com/ava-labs/libevm/ethdb/memorydb"
 	"github.com/ava-labs/libevm/rlp"
-	"github.com/ava-labs/subnet-evm/plugin/evm/customrawdb"
 )
 
 // reverse reverses the contents of a byte slice. It's used to update random accs

core/state/snapshot/generate.go

@@ -32,6 +32,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/core/rawdb"
 	"github.com/ava-labs/libevm/core/types"
@@ -40,7 +41,6 @@ import (
 	"github.com/ava-labs/libevm/rlp"
 	"github.com/ava-labs/libevm/trie"
 	"github.com/ava-labs/libevm/triedb"
-	"github.com/ava-labs/subnet-evm/plugin/evm/customrawdb"
 	"github.com/ava-labs/subnet-evm/utils"
 )