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

.github/workflows/ci.yml

@@ -111,7 +111,7 @@ jobs:
           path: avalanchego
           token: ${{ secrets.AVALANCHE_PAT }}
       - name: Run e2e tests
-        uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@df4a8e531761a55d6878d6d2f16e9acb023de19d
+        uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@3b08d6131a00bd55349321a58ae7e6cfcff8635e
         with:
           run: ./scripts/run_task.sh test-e2e-ci
           prometheus_url: ${{ secrets.PROMETHEUS_URL || '' }}
@@ -139,7 +139,7 @@ jobs:
           ref: ${{ github.event.inputs.avalanchegoBranch }}
           path: avalanchego
       - name: Run Warp E2E Tests
-        uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@df4a8e531761a55d6878d6d2f16e9acb023de19d
+        uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@3b08d6131a00bd55349321a58ae7e6cfcff8635e
         with:
           run: ./scripts/run_task.sh test-e2e-warp-ci
           artifact_prefix: warp

core/blockchain.go

@@ -40,13 +40,14 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/ava-labs/avalanchego/database"
 	"github.com/ava-labs/avalanchego/vms/evm/acp176"
+	"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
 	"github.com/ava-labs/coreth/consensus"
 	"github.com/ava-labs/coreth/core/extstate"
 	"github.com/ava-labs/coreth/core/state/snapshot"
 	"github.com/ava-labs/coreth/internal/version"
 	"github.com/ava-labs/coreth/params"
-	"github.com/ava-labs/coreth/plugin/evm/customrawdb"
 	"github.com/ava-labs/coreth/plugin/evm/customtypes"
 	"github.com/ava-labs/coreth/triedb/firewood"
 	"github.com/ava-labs/coreth/triedb/hashdb"
@@ -488,7 +489,10 @@ func NewBlockChain(
 
 	// if txlookup limit is 0 (uindexing disabled), we don't need to repair the tx index tail.
 	if bc.cacheConfig.TransactionHistory != 0 {
-		latestStateSynced := customrawdb.GetLatestSyncPerformed(bc.db)
+		latestStateSynced, err := customrawdb.GetLatestSyncPerformed(bc.db)
+		if err != nil {
+			return nil, fmt.Errorf("failed to get latest state synced: %w", err)
+		}
 		bc.repairTxIndexTail(latestStateSynced)
 	}
 
@@ -1832,7 +1836,11 @@ func (bc *BlockChain) initSnapshot(b *types.Header) {
 func (bc *BlockChain) reprocessState(current *types.Block, reexec uint64) error {
 	origin := current.NumberU64()
 	acceptorTip, err := customrawdb.ReadAcceptorTip(bc.db)
-	if err != nil {
+	// If no acceptor tip exists, treat it as empty hash (not initialized).
+	switch {
+	case errors.Is(err, database.ErrNotFound):
+		acceptorTip = common.Hash{}
+	case err != nil:
 		return fmt.Errorf("%w: unable to get Acceptor tip", err)
 	}
 	log.Info("Loaded Acceptor tip", "hash", acceptorTip)
@@ -2060,7 +2068,7 @@ func (bc *BlockChain) populateMissingTries() error {
 	// Write marker to DB to indicate populate missing tries finished successfully.
 	// Note: writing the marker here means that we do allow consecutive runs of re-populating
 	// missing tries if it does not finish during the prior run.
-	if err := customrawdb.WritePopulateMissingTries(bc.db); err != nil {
+	if err := customrawdb.WritePopulateMissingTries(bc.db, time.Now()); err != nil {
 		return fmt.Errorf("failed to write offline pruning success marker: %w", err)
 	}
 

core/blockchain_repair_test.go

@@ -35,9 +35,9 @@ import (
 	"math/big"
 	"testing"
 
+	"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
 	"github.com/ava-labs/coreth/consensus/dummy"
 	"github.com/ava-labs/coreth/params"
-	"github.com/ava-labs/coreth/plugin/evm/customrawdb"
 	"github.com/ava-labs/coreth/plugin/evm/upgrade/ap3"
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/core/rawdb"

core/blockchain_test.go

@@ -34,10 +34,10 @@ import (
 	"testing"
 
 	"github.com/ava-labs/avalanchego/upgrade"
+	"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
 	"github.com/ava-labs/coreth/consensus/dummy"
 	"github.com/ava-labs/coreth/core/state/pruner"
 	"github.com/ava-labs/coreth/params"
-	"github.com/ava-labs/coreth/plugin/evm/customrawdb"
 	"github.com/ava-labs/coreth/plugin/evm/upgrade/ap3"
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/core/rawdb"

core/genesis_test.go

@@ -35,10 +35,10 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
 	"github.com/ava-labs/coreth/consensus/dummy"
 	"github.com/ava-labs/coreth/params"
 	"github.com/ava-labs/coreth/params/extras"
-	"github.com/ava-labs/coreth/plugin/evm/customrawdb"
 	"github.com/ava-labs/coreth/plugin/evm/upgrade/ap3"
 	"github.com/ava-labs/coreth/precompile/contracts/warp"
 	"github.com/ava-labs/coreth/triedb/firewood"

core/state/pruner/pruner.go

@@ -38,8 +38,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
 	"github.com/ava-labs/coreth/core/state/snapshot"
-	"github.com/ava-labs/coreth/plugin/evm/customrawdb"
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/core/rawdb"
 	"github.com/ava-labs/libevm/core/types"
@@ -219,7 +219,7 @@ func prune(maindb ethdb.Database, stateBloom *stateBloom, bloomPath string, star
 
 	// Write marker to DB to indicate offline pruning finished successfully. We write before calling os.RemoveAll
 	// to guarantee that if the node dies midway through pruning, then this will run during RecoverPruning.
-	if err := customrawdb.WriteOfflinePruning(maindb); err != nil {
+	if err := customrawdb.WriteOfflinePruning(maindb, time.Now()); err != nil {
 		return fmt.Errorf("failed to write offline pruning success marker: %w", err)
 	}
 

core/state/snapshot/disklayer_test.go

@@ -31,7 +31,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/ava-labs/coreth/plugin/evm/customrawdb"
+	"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"

core/state/snapshot/generate.go

@@ -32,7 +32,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/ava-labs/coreth/plugin/evm/customrawdb"
+	"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
 	"github.com/ava-labs/coreth/utils"
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/core/rawdb"

core/state/snapshot/journal.go

@@ -33,7 +33,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/ava-labs/coreth/plugin/evm/customrawdb"
+	"github.com/ava-labs/avalanchego/database"
+	"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"
@@ -42,6 +43,15 @@ import (
 	"github.com/ava-labs/libevm/triedb"
 )
 
+var (
+	errSnapshotNotFound          = errors.New("snapshot not found")
+	errSnapshotBlockHashEmpty    = errors.New("missing or corrupted snapshot, no snapshot block hash")
+	errSnapshotBlockHashMismatch = errors.New("snapshot block hash mismatch")
+	errSnapshotRootEmpty         = errors.New("missing or corrupted snapshot, no snapshot root")
+	errSnapshotRootMismatch      = errors.New("snapshot root mismatch")
+	errSnapshotGeneratorMissing  = errors.New("missing snapshot generator")
+)
+
 // journalGenerator is a disk layer entry containing the generator progress marker.
 type journalGenerator struct {
 	// Indicator that whether the database was in progress of being wiped.
@@ -59,29 +69,34 @@ type journalGenerator struct {
 // store. If loading the snapshot from disk is successful, this function also
 // returns a boolean indicating whether or not the snapshot is fully generated.
 func loadSnapshot(diskdb ethdb.KeyValueStore, triedb *triedb.Database, cache int, blockHash, root common.Hash, noBuild bool) (snapshot, bool, error) {
-	// Retrieve the block number and hash of the snapshot, failing if no snapshot
-	// is present in the database (or crashed mid-update).
-	baseBlockHash := customrawdb.ReadSnapshotBlockHash(diskdb)
-	if baseBlockHash == (common.Hash{}) {
-		return nil, false, errors.New("missing or corrupted snapshot, no snapshot block hash")
-	}
-	if baseBlockHash != blockHash {
-		return nil, false, fmt.Errorf("block hash stored on disk (%#x) does not match last accepted (%#x)", baseBlockHash, blockHash)
+	// Retrieve the block hash of the snapshot, failing if no snapshot is present.
+	baseBlockHash, err := customrawdb.ReadSnapshotBlockHash(diskdb)
+	switch {
+	case errors.Is(err, database.ErrNotFound):
+		return nil, false, fmt.Errorf("%w: %w", errSnapshotNotFound, err)
+	case err != nil:
+		return nil, false, fmt.Errorf("failed to read snapshot block hash: %w", err)
+	case baseBlockHash == (common.Hash{}):
+		return nil, false, errSnapshotBlockHashEmpty
+	case baseBlockHash != blockHash:
+		return nil, false, fmt.Errorf("%w: stored %#x, expected %#x", errSnapshotBlockHashMismatch, baseBlockHash, blockHash)
 	}
+
+	// Retrieve and validate the snapshot root.
 	baseRoot := rawdb.ReadSnapshotRoot(diskdb)
-	if baseRoot == (common.Hash{}) {
-		return nil, false, errors.New("missing or corrupted snapshot, no snapshot root")
-	}
-	if baseRoot != root {
-		return nil, false, fmt.Errorf("root stored on disk (%#x) does not match last accepted (%#x)", baseRoot, root)
+	switch {
+	case baseRoot == (common.Hash{}):
+		return nil, false, errSnapshotRootEmpty
+	case baseRoot != root:
+		return nil, false, fmt.Errorf("%w: stored %#x, expected %#x", errSnapshotRootMismatch, baseRoot, root)
 	}
 
 	// Retrieve the disk layer generator. It must exist, no matter the
 	// snapshot is fully generated or not. Otherwise the entire disk
 	// layer is invalid.
 	generatorBlob := rawdb.ReadSnapshotGenerator(diskdb)
 	if len(generatorBlob) == 0 {
-		return nil, false, errors.New("missing snapshot generator")
+		return nil, false, errSnapshotGeneratorMissing
 	}
 	var generator journalGenerator
 	if err := rlp.DecodeBytes(generatorBlob, &generator); err != nil {

core/state/snapshot/snapshot.go

@@ -35,7 +35,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ava-labs/coreth/plugin/evm/customrawdb"
+	"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/core/rawdb"
 	ethsnapshot "github.com/ava-labs/libevm/core/state/snapshot"

core/state/snapshot/wipe.go

@@ -31,7 +31,7 @@ import (
 	"bytes"
 	"time"
 
-	"github.com/ava-labs/coreth/plugin/evm/customrawdb"
+	"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"

core/state/snapshot/wipe_test.go

@@ -28,10 +28,12 @@
 package snapshot
 
 import (
+	"errors"
 	"math/rand"
 	"testing"
 
-	"github.com/ava-labs/coreth/plugin/evm/customrawdb"
+	"github.com/ava-labs/avalanchego/database"
+	"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"
@@ -40,17 +42,17 @@ import (
 // Tests that given a database with random data content, all parts of a snapshot
 // can be crrectly wiped without touching anything else.
 func TestWipe(t *testing.T) {
-	// Create a database with some random snapshot data
+	// Create a database with some random snapshot data.
 	db := memorydb.New()
 	for i := 0; i < 128; i++ {
 		rawdb.WriteAccountSnapshot(db, randomHash(), randomHash().Bytes())
 	}
 	customrawdb.WriteSnapshotBlockHash(db, randomHash())
 	rawdb.WriteSnapshotRoot(db, randomHash())
 
-	// Add some random non-snapshot data too to make wiping harder
+	// Add some random non-snapshot data too to make wiping harder.
 	for i := 0; i < 500; i++ {
-		// Generate keys with wrong length for a state snapshot item
+		// Generate keys with wrong length for a state snapshot item.
 		keysuffix := make([]byte, 31)
 		rand.Read(keysuffix)
 		db.Put(append(rawdb.SnapshotAccountPrefix, keysuffix...), randomHash().Bytes())
@@ -68,38 +70,49 @@ func TestWipe(t *testing.T) {
 		}
 		return items
 	}
-	// Sanity check that all the keys are present
+	// Verify snapshot data exists before wipe.
 	if items := count(); items != 128 {
-		t.Fatalf("snapshot size mismatch: have %d, want %d", items, 128)
+		t.Fatalf("snapshot size mismatch before wipe: have %d, want %d", items, 128)
 	}
-	if hash := customrawdb.ReadSnapshotBlockHash(db); hash == (common.Hash{}) {
-		t.Errorf("snapshot block hash marker mismatch: have %#x, want <not-nil>", hash)
+	blockHash, err := customrawdb.ReadSnapshotBlockHash(db)
+	switch {
+	case err != nil:
+		t.Fatalf("failed to read snapshot block hash before wipe: %v", err)
+	case blockHash == (common.Hash{}):
+		t.Fatalf("snapshot block hash is empty before wipe")
 	}
-	if hash := rawdb.ReadSnapshotRoot(db); hash == (common.Hash{}) {
-		t.Errorf("snapshot block root marker mismatch: have %#x, want <not-nil>", hash)
+	if root := rawdb.ReadSnapshotRoot(db); root == (common.Hash{}) {
+		t.Fatalf("snapshot root is empty before wipe")
 	}
-	// Wipe all snapshot entries from the database
+
+	// Wipe all snapshot entries from the database.
 	<-WipeSnapshot(db, true)
 
-	// Iterate over the database end ensure no snapshot information remains
+	// Verify snapshot data is removed.
 	if items := count(); items != 0 {
-		t.Fatalf("snapshot size mismatch: have %d, want %d", items, 0)
+		t.Fatalf("snapshot size mismatch after wipe: have %d, want %d", items, 0)
 	}
-	// Iterate over the database and ensure miscellaneous items are present
+	// Verify miscellaneous items are preserved.
 	items := 0
 	it := db.NewIterator(nil, nil)
 	defer it.Release()
 	for it.Next() {
 		items++
 	}
 	if items != 1000 {
-		t.Fatalf("misc item count mismatch: have %d, want %d", items, 1000)
+		t.Fatalf("misc item count mismatch after wipe: have %d, want %d", items, 1000)
 	}
 
-	if hash := customrawdb.ReadSnapshotBlockHash(db); hash != (common.Hash{}) {
-		t.Errorf("snapshot block hash marker remained after wipe: %#x", hash)
+	// Verify snapshot markers are removed.
+	blockHash, err = customrawdb.ReadSnapshotBlockHash(db)
+	switch {
+	case errors.Is(err, database.ErrNotFound): // Expected: marker was deleted.
+	case err != nil:
+		t.Errorf("unexpected error reading snapshot block hash after wipe: %v", err)
+	case blockHash != (common.Hash{}):
+		t.Errorf("snapshot block hash marker remained after wipe: %#x", blockHash)
 	}
-	if hash := rawdb.ReadSnapshotRoot(db); hash != (common.Hash{}) {
-		t.Errorf("snapshot block root marker remained after wipe: %#x", hash)
+	if root := rawdb.ReadSnapshotRoot(db); root != (common.Hash{}) {
+		t.Errorf("snapshot root marker remained after wipe: %#x", root)
 	}
 }

core/state_manager.go

@@ -30,7 +30,7 @@ package core
 import (
 	"fmt"
 
-	"github.com/ava-labs/coreth/plugin/evm/customrawdb"
+	"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/core/types"
 	"github.com/ava-labs/libevm/ethdb"

eth/api_debug.go

@@ -33,8 +33,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
 	"github.com/ava-labs/coreth/internal/ethapi"
-	"github.com/ava-labs/coreth/plugin/evm/customrawdb"
 	"github.com/ava-labs/coreth/rpc"
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/common/hexutil"

eth/backend.go

@@ -36,6 +36,7 @@ import (
 	"time"
 
 	"github.com/ava-labs/avalanchego/utils/timer/mockable"
+	"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
 	"github.com/ava-labs/coreth/consensus"
 	"github.com/ava-labs/coreth/core"
 	"github.com/ava-labs/coreth/core/state/pruner"
@@ -50,7 +51,6 @@ import (
 	"github.com/ava-labs/coreth/miner"
 	"github.com/ava-labs/coreth/node"
 	"github.com/ava-labs/coreth/params"
-	"github.com/ava-labs/coreth/plugin/evm/customrawdb"
 	"github.com/ava-labs/coreth/rpc"
 	"github.com/ava-labs/libevm/accounts"
 	"github.com/ava-labs/libevm/common"
@@ -151,7 +151,7 @@ func New(
 		"snapshot clean", common.StorageSize(config.SnapshotCache)*1024*1024,
 	)
 
-	scheme, err := customrawdb.ParseStateSchemeExt(config.StateScheme, chainDb)
+	scheme, err := customrawdb.ParseStateScheme(config.StateScheme, chainDb)
 	if err != nil {
 		return nil, err
 	}

eth/filters/filter_system_test.go

@@ -39,11 +39,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
 	"github.com/ava-labs/coreth/consensus/dummy"
 	"github.com/ava-labs/coreth/core"
 	"github.com/ava-labs/coreth/internal/ethapi"
 	"github.com/ava-labs/coreth/params"
-	"github.com/ava-labs/coreth/plugin/evm/customrawdb"
 	"github.com/ava-labs/coreth/plugin/evm/customtypes"
 	"github.com/ava-labs/coreth/rpc"
 	ethereum "github.com/ava-labs/libevm"