diff --git a/accounts/abi/bind/bind_extra_test.go b/accounts/abi/bind/bind_extra_test.go index 80e5932648..76519605bd 100644 --- a/accounts/abi/bind/bind_extra_test.go +++ b/accounts/abi/bind/bind_extra_test.go @@ -18,11 +18,12 @@ import ( "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/crypto" + "github.com/stretchr/testify/require" ) // TestGetSenderNativeAssetCall checks that the NativeAssetCall proxies the // caller address This behavior is disabled on the network and is only to test -// previous behavior. Note the test uses ApricotPhase2Config. +// previous behavior. Note the test uses [params.TestApricotPhase2Config]. func TestGetSenderNativeAssetCall(t *testing.T) { // pragma solidity >=0.8.0 <0.9.0; // contract GetSenderNativeAssetCall { @@ -34,7 +35,7 @@ func TestGetSenderNativeAssetCall(t *testing.T) { // _sender = msg.sender; // } // } - rawABI := `[ + const rawABI = `[ { "inputs": [], "name": "getSender", @@ -51,17 +52,17 @@ func TestGetSenderNativeAssetCall(t *testing.T) { } ]` bytecode := common.FromHex(`6080604052348015600f57600080fd5b506101608061001f6000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c806350c36a521461003b5780635e01eb5a14610045575b600080fd5b610043610063565b005b61004d6100a5565b60405161005a919061010f565b60405180910390f35b336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006100f9826100ce565b9050919050565b610109816100ee565b82525050565b60006020820190506101246000830184610100565b9291505056fea26469706673582212209023ce54f38e749b58f44e8da750354578080ce16df95037b7305ed7e480c36d64736f6c634300081b0033`) - setSenderMethodName := "setSender" - getSenderMethodName := "getSender" + const setSenderMethodName = "setSender" + const getSenderMethodName = "getSender" parsedABI, err := abi.JSON(bytes.NewReader([]byte(rawABI))) - if err != nil { - t.Fatalf("Failed to parse ABI: %v", err) - } + require.NoError(t, err, "Failed to parse ABI") // Generate a new random account and a funded simulator - key, _ := crypto.GenerateKey() - auth, _ := bind.NewKeyedTransactorWithChainID(key, big.NewInt(1337)) + key, err := crypto.GenerateKey() + require.NoError(t, err, "Failed to generate key") + auth, err := bind.NewKeyedTransactorWithChainID(key, big.NewInt(1337)) + require.NoError(t, err, "Failed to create transactor") alloc := types.GenesisAlloc{auth.From: {Balance: big.NewInt(1000000000000000000)}} atApricotPhase2 := func(nodeConf *node.Config, ethConf *ethconfig.Config) { chainConfig := *params.TestApricotPhase2Config @@ -73,13 +74,14 @@ func TestGetSenderNativeAssetCall(t *testing.T) { Backend: b, Client: b.Client(), } - defer sim.Close() + t.Cleanup(func() { + err = sim.Close() + require.NoError(t, err, "Failed to close simulator") + }) // Deploy the get/setSender contract _, _, interactor, err := bind.DeployContract(auth, parsedABI, bytecode, sim) - if err != nil { - t.Fatalf("Failed to deploy interactor contract: %v", err) - } + require.NoError(t, err, "Failed to deploy interactor contract") sim.Commit(false) // Setting NativeAssetCall in the transact opts will proxy the call through @@ -91,21 +93,15 @@ func TestGetSenderNativeAssetCall(t *testing.T) { AssetAmount: big.NewInt(0), }, } - if _, err := interactor.Transact(opts, setSenderMethodName); err != nil { - t.Fatalf("Failed to set sender: %v", err) - } + _, err = interactor.Transact(opts, setSenderMethodName) + require.NoError(t, err, "Failed to set sender") sim.Commit(true) - var results []interface{} - if err := interactor.Call(nil, &results, getSenderMethodName); err != nil { - t.Fatalf("Failed to get sender: %v", err) - } - if len(results) != 1 { - t.Fatalf("Expected one result, got %d", len(results)) - } - if addr, ok := results[0].(common.Address); !ok { - t.Fatalf("Expected address, got %T", results[0]) - } else if addr != auth.From { - t.Fatalf("Address mismatch: have '%v'", addr) - } + var results []any + err = interactor.Call(nil, &results, getSenderMethodName) + require.NoError(t, err, "Failed to get sender") + require.Len(t, results, 1) + addr, ok := results[0].(common.Address) + require.Truef(t, ok, "Expected %T, got %T", common.Address{}, results[0]) + require.Equal(t, addr, auth.From, "Address mismatch") } diff --git a/core/bench_test.go b/core/bench_test.go index 4e98a6a600..a126ce6ee1 100644 --- a/core/bench_test.go +++ b/core/bench_test.go @@ -32,11 +32,11 @@ import ( "testing" "github.com/ava-labs/coreth/consensus/dummy" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/math" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/ethdb" diff --git a/core/blockchain.go b/core/blockchain.go index 595a6a17a3..75f7967dc2 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -41,16 +41,17 @@ import ( "github.com/ava-labs/coreth/consensus" "github.com/ava-labs/coreth/consensus/misc/eip4844" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/state/snapshot" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/internal/version" "github.com/ava-labs/coreth/params" + customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb" "github.com/ava-labs/coreth/triedb/hashdb" "github.com/ava-labs/coreth/triedb/pathdb" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/lru" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/event" @@ -448,7 +449,7 @@ 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 := rawdb.GetLatestSyncPerformed(bc.db) + latestStateSynced := customrawdb.GetLatestSyncPerformed(bc.db) bc.repairTxIndexTail(latestStateSynced) } @@ -481,7 +482,7 @@ func (bc *BlockChain) batchBlockAcceptedIndices(batch ethdb.Batch, b *types.Bloc if !bc.cacheConfig.SkipTxIndexing { rawdb.WriteTxLookupEntriesByBlock(batch, b) } - if err := rawdb.WriteAcceptorTip(batch, b.Hash()); err != nil { + if err := customrawdb.WriteAcceptorTip(batch, b.Hash()); err != nil { return fmt.Errorf("%w: failed to write acceptor tip key", err) } return nil @@ -1745,7 +1746,7 @@ func (bc *BlockChain) initSnapshot(b *types.Header) { // state that reprocessing will start from. func (bc *BlockChain) reprocessState(current *types.Block, reexec uint64) error { origin := current.NumberU64() - acceptorTip, err := rawdb.ReadAcceptorTip(bc.db) + acceptorTip, err := customrawdb.ReadAcceptorTip(bc.db) if err != nil { return fmt.Errorf("%w: unable to get Acceptor tip", err) } @@ -1876,9 +1877,9 @@ func (bc *BlockChain) reprocessState(current *types.Block, reexec uint64) error func (bc *BlockChain) protectTrieIndex() error { if !bc.cacheConfig.Pruning { - return rawdb.WritePruningDisabled(bc.db) + return customrawdb.WritePruningDisabled(bc.db) } - pruningDisabled, err := rawdb.HasPruningDisabled(bc.db) + pruningDisabled, err := customrawdb.HasPruningDisabled(bc.db) if err != nil { return fmt.Errorf("failed to check if the chain has been run with pruning disabled: %w", err) } @@ -1963,7 +1964,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 := rawdb.WritePopulateMissingTries(bc.db); err != nil { + if err := customrawdb.WritePopulateMissingTries(bc.db); err != nil { return fmt.Errorf("failed to write offline pruning success marker: %w", err) } @@ -2061,9 +2062,9 @@ func (bc *BlockChain) ResetToStateSyncedBlock(block *types.Block) error { } rawdb.WriteHeadBlockHash(batch, block.Hash()) rawdb.WriteHeadHeaderHash(batch, block.Hash()) - rawdb.WriteSnapshotBlockHash(batch, block.Hash()) + customrawdb.WriteSnapshotBlockHash(batch, block.Hash()) rawdb.WriteSnapshotRoot(batch, block.Root()) - if err := rawdb.WriteSyncPerformed(batch, block.NumberU64()); err != nil { + if err := customrawdb.WriteSyncPerformed(batch, block.NumberU64()); err != nil { return err } diff --git a/core/blockchain_log_test.go b/core/blockchain_log_test.go index b7a35d797c..909424d8b4 100644 --- a/core/blockchain_log_test.go +++ b/core/blockchain_log_test.go @@ -10,11 +10,11 @@ import ( "github.com/ava-labs/coreth/accounts/abi" "github.com/ava-labs/coreth/consensus/dummy" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap3" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/stretchr/testify/require" diff --git a/core/blockchain_reader.go b/core/blockchain_reader.go index 96199417ee..3dcdd24e7e 100644 --- a/core/blockchain_reader.go +++ b/core/blockchain_reader.go @@ -28,12 +28,12 @@ package core import ( "github.com/ava-labs/coreth/consensus" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/state/snapshot" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/event" "github.com/ava-labs/libevm/triedb" diff --git a/core/blockchain_repair_test.go b/core/blockchain_repair_test.go index 3c9cbefdbe..6315e50c67 100644 --- a/core/blockchain_repair_test.go +++ b/core/blockchain_repair_test.go @@ -35,11 +35,11 @@ import ( "testing" "github.com/ava-labs/coreth/consensus/dummy" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap3" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/triedb" diff --git a/core/blockchain_snapshot_test.go b/core/blockchain_snapshot_test.go index 41fdb39a28..b891de80ac 100644 --- a/core/blockchain_snapshot_test.go +++ b/core/blockchain_snapshot_test.go @@ -40,11 +40,11 @@ import ( "github.com/ava-labs/coreth/consensus" "github.com/ava-labs/coreth/consensus/dummy" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap3" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/ethdb" ) diff --git a/core/blockchain_test.go b/core/blockchain_test.go index 42cf5e0dc6..0d412b25d1 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -11,14 +11,15 @@ import ( "github.com/ava-labs/avalanchego/upgrade" "github.com/ava-labs/coreth/consensus/dummy" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/state/pruner" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/params/extras" + customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap3" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/eth/tracers/logger" @@ -239,7 +240,7 @@ func TestCorruptSnapshots(t *testing.T) { create := func(db ethdb.Database, gspec *Genesis, lastAcceptedHash common.Hash) (*BlockChain, error) { // Delete the snapshot block hash and state root to ensure that if we die in between writing a snapshot // diff layer to disk at any point, we can still recover on restart. - rawdb.DeleteSnapshotBlockHash(db) + customrawdb.DeleteSnapshotBlockHash(db) rawdb.DeleteSnapshotRoot(db) return createBlockChain(db, pruningConfig, gspec, lastAcceptedHash) diff --git a/core/bloom_indexer.go b/core/bloom_indexer.go index 01152ec8f9..e21c3dcf55 100644 --- a/core/bloom_indexer.go +++ b/core/bloom_indexer.go @@ -21,10 +21,10 @@ import ( "time" "github.com/ava-labs/coreth/core/bloombits" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/bitutil" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" ) diff --git a/core/chain_indexer.go b/core/chain_indexer.go index e5b098fae0..53c0812b24 100644 --- a/core/chain_indexer.go +++ b/core/chain_indexer.go @@ -35,9 +35,9 @@ import ( "sync/atomic" "time" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/event" "github.com/ava-labs/libevm/log" diff --git a/core/chain_indexer_test.go b/core/chain_indexer_test.go index f284c33f45..afd394a01e 100644 --- a/core/chain_indexer_test.go +++ b/core/chain_indexer_test.go @@ -35,9 +35,9 @@ import ( "testing" "time" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" ) // Runs multiple tests with randomized parameters. diff --git a/core/chain_makers.go b/core/chain_makers.go index 663c43c70e..a1f218d19b 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -32,12 +32,12 @@ import ( "github.com/ava-labs/coreth/consensus" "github.com/ava-labs/coreth/consensus/misc/eip4844" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/header" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/triedb" diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go index 06b482388d..95f4b860b7 100644 --- a/core/chain_makers_test.go +++ b/core/chain_makers_test.go @@ -31,10 +31,10 @@ import ( "math/big" "github.com/ava-labs/coreth/consensus/dummy" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/triedb" diff --git a/core/extstate/test_statedb.go b/core/extstate/test_statedb.go index f6ed3ed77c..3da7113b5a 100644 --- a/core/extstate/test_statedb.go +++ b/core/extstate/test_statedb.go @@ -5,10 +5,10 @@ package extstate import ( "testing" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/precompile/contract" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/stretchr/testify/require" ) diff --git a/core/genesis.go b/core/genesis.go index 86e0fad430..51b08f106b 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -33,7 +33,6 @@ import ( "fmt" "math/big" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" @@ -42,6 +41,7 @@ import ( "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/hexutil" "github.com/ava-labs/libevm/common/math" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/trie" diff --git a/core/genesis_extra_test.go b/core/genesis_extra_test.go index 6701fefe0e..462586537e 100644 --- a/core/genesis_extra_test.go +++ b/core/genesis_extra_test.go @@ -31,12 +31,12 @@ import ( "testing" "time" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/params/extras" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/triedb" "github.com/stretchr/testify/require" ) diff --git a/core/genesis_test.go b/core/genesis_test.go index 2ed8bf4ce5..6fe90b3404 100644 --- a/core/genesis_test.go +++ b/core/genesis_test.go @@ -34,7 +34,6 @@ import ( "testing" "github.com/ava-labs/coreth/consensus/dummy" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/params/extras" @@ -43,6 +42,7 @@ import ( "github.com/ava-labs/coreth/triedb/pathdb" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/trie" diff --git a/core/headerchain.go b/core/headerchain.go index e7cf80ac4b..1ac23eadc4 100644 --- a/core/headerchain.go +++ b/core/headerchain.go @@ -34,11 +34,11 @@ import ( "sync/atomic" "github.com/ava-labs/coreth/consensus" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/lru" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" ) diff --git a/core/headerchain_test.go b/core/headerchain_test.go index e71ce94496..c6c7463b44 100644 --- a/core/headerchain_test.go +++ b/core/headerchain_test.go @@ -34,11 +34,11 @@ import ( "github.com/ava-labs/coreth/consensus" "github.com/ava-labs/coreth/consensus/dummy" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap3" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" ) diff --git a/core/rawdb/imports.go b/core/rawdb/imports.go deleted file mode 100644 index 4702fb915e..0000000000 --- a/core/rawdb/imports.go +++ /dev/null @@ -1,127 +0,0 @@ -// (c) 2025, Ava Labs, Inc. All rights reserved. -// See the file LICENSE for licensing terms. - -package rawdb - -import ( - ethrawdb "github.com/ava-labs/libevm/core/rawdb" -) - -// Types used directly as their upstream definition. -type ( - LegacyTxLookupEntry = ethrawdb.LegacyTxLookupEntry - OpenOptions = ethrawdb.OpenOptions -) - -// Constants used directly as their upstream definition. -const ( - PathScheme = ethrawdb.PathScheme -) - -// Variables used directly as their upstream definition. -var ( - BloomBitsIndexPrefix = ethrawdb.BloomBitsIndexPrefix - CodePrefix = ethrawdb.CodePrefix -) - -// Functions used directly as their upstream definition. -var ( - DeleteAccountSnapshot = ethrawdb.DeleteAccountSnapshot - DeleteAccountTrieNode = ethrawdb.DeleteAccountTrieNode - DeleteBlock = ethrawdb.DeleteBlock - DeleteCanonicalHash = ethrawdb.DeleteCanonicalHash - DeleteSnapshotRoot = ethrawdb.DeleteSnapshotRoot - DeleteStorageSnapshot = ethrawdb.DeleteStorageSnapshot - DeleteStorageTrieNode = ethrawdb.DeleteStorageTrieNode - DeleteTrieJournal = ethrawdb.DeleteTrieJournal - DeleteTrieNode = ethrawdb.DeleteTrieNode - ExistsAccountTrieNode = ethrawdb.ExistsAccountTrieNode - FindCommonAncestor = ethrawdb.FindCommonAncestor - HasBody = ethrawdb.HasBody - HasCode = ethrawdb.HasCode - HasHeader = ethrawdb.HasHeader - HashScheme = ethrawdb.HashScheme - HasLegacyTrieNode = ethrawdb.HasLegacyTrieNode - HasReceipts = ethrawdb.HasReceipts - IsCodeKey = ethrawdb.IsCodeKey - IterateStorageSnapshots = ethrawdb.IterateStorageSnapshots - NewDatabase = ethrawdb.NewDatabase - NewDatabaseWithFreezer = ethrawdb.NewDatabaseWithFreezer - NewKeyLengthIterator = ethrawdb.NewKeyLengthIterator - NewLevelDBDatabase = ethrawdb.NewLevelDBDatabase - NewMemoryDatabase = ethrawdb.NewMemoryDatabase - NewStateFreezer = ethrawdb.NewStateFreezer - NewTable = ethrawdb.NewTable - Open = ethrawdb.Open - ParseStateScheme = ethrawdb.ParseStateScheme - PopUncleanShutdownMarker = ethrawdb.PopUncleanShutdownMarker - PushUncleanShutdownMarker = ethrawdb.PushUncleanShutdownMarker - ReadAccountSnapshot = ethrawdb.ReadAccountSnapshot - ReadAccountTrieNode = ethrawdb.ReadAccountTrieNode - ReadAllHashes = ethrawdb.ReadAllHashes - ReadBlock = ethrawdb.ReadBlock - ReadBloomBits = ethrawdb.ReadBloomBits - ReadBody = ethrawdb.ReadBody - ReadCanonicalHash = ethrawdb.ReadCanonicalHash - ReadChainConfig = ethrawdb.ReadChainConfig - ReadCode = ethrawdb.ReadCode - ReadDatabaseVersion = ethrawdb.ReadDatabaseVersion - ReadHeadBlock = ethrawdb.ReadHeadBlock - ReadHeadBlockHash = ethrawdb.ReadHeadBlockHash - ReadHeader = ethrawdb.ReadHeader - ReadHeaderNumber = ethrawdb.ReadHeaderNumber - ReadHeadFastBlockHash = ethrawdb.ReadHeadFastBlockHash - ReadHeadHeaderHash = ethrawdb.ReadHeadHeaderHash - ReadLastPivotNumber = ethrawdb.ReadLastPivotNumber - ReadLegacyTrieNode = ethrawdb.ReadLegacyTrieNode - ReadLogs = ethrawdb.ReadLogs - ReadPersistentStateID = ethrawdb.ReadPersistentStateID - ReadPreimage = ethrawdb.ReadPreimage - ReadRawReceipts = ethrawdb.ReadRawReceipts - ReadReceipts = ethrawdb.ReadReceipts - ReadSkeletonSyncStatus = ethrawdb.ReadSkeletonSyncStatus - ReadSnapshotDisabled = ethrawdb.ReadSnapshotDisabled - ReadSnapshotGenerator = ethrawdb.ReadSnapshotGenerator - ReadSnapshotJournal = ethrawdb.ReadSnapshotJournal - ReadSnapshotRecoveryNumber = ethrawdb.ReadSnapshotRecoveryNumber - ReadSnapshotRoot = ethrawdb.ReadSnapshotRoot - ReadSnapshotSyncStatus = ethrawdb.ReadSnapshotSyncStatus - ReadSnapSyncStatusFlag = ethrawdb.ReadSnapSyncStatusFlag - ReadStateID = ethrawdb.ReadStateID - ReadStorageSnapshot = ethrawdb.ReadStorageSnapshot - ReadStorageTrieNode = ethrawdb.ReadStorageTrieNode - ReadTransaction = ethrawdb.ReadTransaction - ReadTrieJournal = ethrawdb.ReadTrieJournal - ReadTxIndexTail = ethrawdb.ReadTxIndexTail - ReadTxLookupEntry = ethrawdb.ReadTxLookupEntry - SnapshotAccountPrefix = ethrawdb.SnapshotAccountPrefix - SnapshotStoragePrefix = ethrawdb.SnapshotStoragePrefix - UnindexTransactions = ethrawdb.UnindexTransactions - UpdateUncleanShutdownMarker = ethrawdb.UpdateUncleanShutdownMarker - WriteAccountSnapshot = ethrawdb.WriteAccountSnapshot - WriteAccountTrieNode = ethrawdb.WriteAccountTrieNode - WriteBlock = ethrawdb.WriteBlock - WriteBloomBits = ethrawdb.WriteBloomBits - WriteBody = ethrawdb.WriteBody - WriteCanonicalHash = ethrawdb.WriteCanonicalHash - WriteChainConfig = ethrawdb.WriteChainConfig - WriteCode = ethrawdb.WriteCode - WriteDatabaseVersion = ethrawdb.WriteDatabaseVersion - WriteHeadBlockHash = ethrawdb.WriteHeadBlockHash - WriteHeader = ethrawdb.WriteHeader - WriteHeadHeaderHash = ethrawdb.WriteHeadHeaderHash - WriteLegacyTrieNode = ethrawdb.WriteLegacyTrieNode - WritePersistentStateID = ethrawdb.WritePersistentStateID - WritePreimages = ethrawdb.WritePreimages - WriteReceipts = ethrawdb.WriteReceipts - WriteSnapshotGenerator = ethrawdb.WriteSnapshotGenerator - WriteSnapshotRoot = ethrawdb.WriteSnapshotRoot - WriteSnapSyncStatusFlag = ethrawdb.WriteSnapSyncStatusFlag - WriteStateID = ethrawdb.WriteStateID - WriteStorageSnapshot = ethrawdb.WriteStorageSnapshot - WriteStorageTrieNode = ethrawdb.WriteStorageTrieNode - WriteTrieJournal = ethrawdb.WriteTrieJournal - WriteTrieNode = ethrawdb.WriteTrieNode - WriteTxIndexTail = ethrawdb.WriteTxIndexTail - WriteTxLookupEntriesByBlock = ethrawdb.WriteTxLookupEntriesByBlock -) diff --git a/core/state/database.go b/core/state/database.go index b810bf2c3d..f0fdec065d 100644 --- a/core/state/database.go +++ b/core/state/database.go @@ -30,9 +30,9 @@ import ( "errors" "fmt" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/lru" + "github.com/ava-labs/libevm/core/rawdb" ethstate "github.com/ava-labs/libevm/core/state" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/ethdb" diff --git a/core/state/pruner/bloom.go b/core/state/pruner/bloom.go index a228b84f8f..8231d21b68 100644 --- a/core/state/pruner/bloom.go +++ b/core/state/pruner/bloom.go @@ -31,8 +31,8 @@ import ( "errors" "os" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/log" bloomfilter "github.com/holiman/bloomfilter/v2" ) diff --git a/core/state/pruner/pruner.go b/core/state/pruner/pruner.go index a71ba5601b..0f22628d42 100644 --- a/core/state/pruner/pruner.go +++ b/core/state/pruner/pruner.go @@ -37,10 +37,11 @@ import ( "strings" "time" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state/snapshot" "github.com/ava-labs/coreth/core/types" + customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/rlp" @@ -217,7 +218,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 := rawdb.WriteOfflinePruning(maindb); err != nil { + if err := customrawdb.WriteOfflinePruning(maindb); err != nil { return fmt.Errorf("failed to write offline pruning success marker: %w", err) } diff --git a/core/state/snapshot/conversion.go b/core/state/snapshot/conversion.go index ea2b8f7c79..80e01f0764 100644 --- a/core/state/snapshot/conversion.go +++ b/core/state/snapshot/conversion.go @@ -35,9 +35,9 @@ import ( "sync" "time" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/rlp" diff --git a/core/state/snapshot/disklayer.go b/core/state/snapshot/disklayer.go index 87fc3f4e2f..bb962df5d1 100644 --- a/core/state/snapshot/disklayer.go +++ b/core/state/snapshot/disklayer.go @@ -31,10 +31,10 @@ import ( "sync" "time" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/rlp" "github.com/ava-labs/libevm/triedb" diff --git a/core/state/snapshot/disklayer_test.go b/core/state/snapshot/disklayer_test.go index 1f76dbf1e0..c463c18552 100644 --- a/core/state/snapshot/disklayer_test.go +++ b/core/state/snapshot/disklayer_test.go @@ -30,8 +30,9 @@ import ( "bytes" "testing" - "github.com/ava-labs/coreth/core/rawdb" + customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb" "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" ) @@ -106,7 +107,7 @@ func TestDiskMerge(t *testing.T) { rawdb.WriteAccountSnapshot(db, conNukeCache, conNukeCache[:]) rawdb.WriteStorageSnapshot(db, conNukeCache, conNukeCacheSlot, conNukeCacheSlot[:]) - rawdb.WriteSnapshotBlockHash(db, baseBlockHash) + customrawdb.WriteSnapshotBlockHash(db, baseBlockHash) rawdb.WriteSnapshotRoot(db, baseRoot) // Create a disk layer based on the above and cache in some data @@ -297,7 +298,7 @@ func TestDiskPartialMerge(t *testing.T) { insertAccount(conNukeCache, conNukeCache[:]) insertStorage(conNukeCache, conNukeCacheSlot, conNukeCacheSlot[:]) - rawdb.WriteSnapshotBlockHash(db, baseBlockHash) + customrawdb.WriteSnapshotBlockHash(db, baseBlockHash) rawdb.WriteSnapshotRoot(db, baseRoot) // Create a disk layer based on the above using a random progress marker @@ -452,7 +453,7 @@ func TestDiskGeneratorPersistence(t *testing.T) { rawdb.WriteAccountSnapshot(db, accOne, accOne[:]) rawdb.WriteStorageSnapshot(db, accOne, accOneSlotOne, accOneSlotOne[:]) rawdb.WriteStorageSnapshot(db, accOne, accOneSlotTwo, accOneSlotTwo[:]) - rawdb.WriteSnapshotBlockHash(db, baseBlockHash) + customrawdb.WriteSnapshotBlockHash(db, baseBlockHash) rawdb.WriteSnapshotRoot(db, baseRoot) // Create a disk layer based on all above updates @@ -527,7 +528,7 @@ func TestDiskSeek(t *testing.T) { baseRoot := randomHash() baseBlockHash := randomHash() - rawdb.WriteSnapshotBlockHash(db, baseBlockHash) + customrawdb.WriteSnapshotBlockHash(db, baseBlockHash) rawdb.WriteSnapshotRoot(db, baseRoot) snaps := NewTestTree(db, baseBlockHash, baseRoot) diff --git a/core/state/snapshot/generate.go b/core/state/snapshot/generate.go index 1021cd1ed6..a4cc64d790 100644 --- a/core/state/snapshot/generate.go +++ b/core/state/snapshot/generate.go @@ -31,10 +31,11 @@ import ( "fmt" "time" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" + customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/rlp" @@ -62,7 +63,7 @@ func generateSnapshot(diskdb ethdb.KeyValueStore, triedb *triedb.Database, cache batch = diskdb.NewBatch() genMarker = []byte{} // Initialized but empty! ) - rawdb.WriteSnapshotBlockHash(batch, blockHash) + customrawdb.WriteSnapshotBlockHash(batch, blockHash) rawdb.WriteSnapshotRoot(batch, root) journalProgress(batch, genMarker, stats) if err := batch.Write(); err != nil { diff --git a/core/state/snapshot/generate_test.go b/core/state/snapshot/generate_test.go index fe1b33f17b..eb1a47b6a5 100644 --- a/core/state/snapshot/generate_test.go +++ b/core/state/snapshot/generate_test.go @@ -32,11 +32,11 @@ import ( "testing" "time" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/triedb/hashdb" "github.com/ava-labs/coreth/triedb/pathdb" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/rlp" diff --git a/core/state/snapshot/iterator.go b/core/state/snapshot/iterator.go index addae92deb..ae4d8d6718 100644 --- a/core/state/snapshot/iterator.go +++ b/core/state/snapshot/iterator.go @@ -31,8 +31,8 @@ import ( "fmt" "sort" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" ethsnapshot "github.com/ava-labs/libevm/core/state/snapshot" "github.com/ava-labs/libevm/ethdb" ) diff --git a/core/state/snapshot/iterator_test.go b/core/state/snapshot/iterator_test.go index b2862407b2..b522ce0db0 100644 --- a/core/state/snapshot/iterator_test.go +++ b/core/state/snapshot/iterator_test.go @@ -34,8 +34,8 @@ import ( "math/rand" "testing" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" ) // TestAccountIteratorBasics tests some simple single-layer(diff and disk) iteration diff --git a/core/state/snapshot/journal.go b/core/state/snapshot/journal.go index f793ffb832..9c3cdc2f9b 100644 --- a/core/state/snapshot/journal.go +++ b/core/state/snapshot/journal.go @@ -32,8 +32,9 @@ import ( "fmt" "time" - "github.com/ava-labs/coreth/core/rawdb" + customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/rlp" @@ -59,7 +60,7 @@ type journalGenerator struct { 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 := rawdb.ReadSnapshotBlockHash(diskdb) + baseBlockHash := customrawdb.ReadSnapshotBlockHash(diskdb) if baseBlockHash == (common.Hash{}) { return nil, false, errors.New("missing or corrupted snapshot, no snapshot block hash") } diff --git a/core/state/snapshot/snapshot.go b/core/state/snapshot/snapshot.go index 06a16fc416..c9257b24ff 100644 --- a/core/state/snapshot/snapshot.go +++ b/core/state/snapshot/snapshot.go @@ -34,8 +34,9 @@ import ( "sync" "time" - "github.com/ava-labs/coreth/core/rawdb" + customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" ethsnapshot "github.com/ava-labs/libevm/core/state/snapshot" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/libevm/stateconf" @@ -636,7 +637,7 @@ func diffToDisk(bottom *diffLayer) (*diskLayer, bool, error) { base.abortGeneration() // Put the deletion in the batch writer, flush all updates in the final step. - rawdb.DeleteSnapshotBlockHash(batch) + customrawdb.DeleteSnapshotBlockHash(batch) rawdb.DeleteSnapshotRoot(batch) // Mark the original base as stale as we're going to create a new wrapper @@ -728,7 +729,7 @@ func diffToDisk(bottom *diffLayer) (*diskLayer, bool, error) { } } // Update the snapshot block marker and write any remainder data - rawdb.WriteSnapshotBlockHash(batch, bottom.blockHash) + customrawdb.WriteSnapshotBlockHash(batch, bottom.blockHash) rawdb.WriteSnapshotRoot(batch, bottom.root) // Write out the generator progress marker and report diff --git a/core/state/snapshot/snapshot_test.go b/core/state/snapshot/snapshot_test.go index cc98830e13..4fb1fdecee 100644 --- a/core/state/snapshot/snapshot_test.go +++ b/core/state/snapshot/snapshot_test.go @@ -33,9 +33,9 @@ import ( "testing" "time" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/rlp" "github.com/holiman/uint256" ) diff --git a/core/state/snapshot/utils.go b/core/state/snapshot/utils.go index 4a31a25a76..020a7aee3c 100644 --- a/core/state/snapshot/utils.go +++ b/core/state/snapshot/utils.go @@ -31,8 +31,8 @@ import ( "fmt" "time" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" ) diff --git a/core/state/snapshot/wipe.go b/core/state/snapshot/wipe.go index c5dffd648e..70f8f8bfcb 100644 --- a/core/state/snapshot/wipe.go +++ b/core/state/snapshot/wipe.go @@ -30,8 +30,9 @@ import ( "bytes" "time" - "github.com/ava-labs/coreth/core/rawdb" + customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" ) @@ -43,7 +44,7 @@ import ( func WipeSnapshot(db ethdb.KeyValueStore, full bool) chan struct{} { // Wipe the snapshot root marker synchronously if full { - rawdb.DeleteSnapshotBlockHash(db) + customrawdb.DeleteSnapshotBlockHash(db) rawdb.DeleteSnapshotRoot(db) } // Wipe everything else asynchronously diff --git a/core/state/snapshot/wipe_test.go b/core/state/snapshot/wipe_test.go index 5fc6110bd0..a6ee55cd1c 100644 --- a/core/state/snapshot/wipe_test.go +++ b/core/state/snapshot/wipe_test.go @@ -30,8 +30,9 @@ import ( "math/rand" "testing" - "github.com/ava-labs/coreth/core/rawdb" + customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb/memorydb" ) @@ -43,7 +44,7 @@ func TestWipe(t *testing.T) { for i := 0; i < 128; i++ { rawdb.WriteAccountSnapshot(db, randomHash(), randomHash().Bytes()) } - rawdb.WriteSnapshotBlockHash(db, randomHash()) + customrawdb.WriteSnapshotBlockHash(db, randomHash()) rawdb.WriteSnapshotRoot(db, randomHash()) // Add some random non-snapshot data too to make wiping harder @@ -70,7 +71,7 @@ func TestWipe(t *testing.T) { if items := count(); items != 128 { t.Fatalf("snapshot size mismatch: have %d, want %d", items, 128) } - if hash := rawdb.ReadSnapshotBlockHash(db); hash == (common.Hash{}) { + if hash := customrawdb.ReadSnapshotBlockHash(db); hash == (common.Hash{}) { t.Errorf("snapshot block hash marker mismatch: have %#x, want ", hash) } if hash := rawdb.ReadSnapshotRoot(db); hash == (common.Hash{}) { @@ -94,7 +95,7 @@ func TestWipe(t *testing.T) { t.Fatalf("misc item count mismatch: have %d, want %d", items, 1000) } - if hash := rawdb.ReadSnapshotBlockHash(db); hash != (common.Hash{}) { + if hash := customrawdb.ReadSnapshotBlockHash(db); hash != (common.Hash{}) { t.Errorf("snapshot block hash marker remained after wipe: %#x", hash) } if hash := rawdb.ReadSnapshotRoot(db); hash != (common.Hash{}) { diff --git a/core/state/state_test.go b/core/state/state_test.go index 1b9484514b..a78197bf63 100644 --- a/core/state/state_test.go +++ b/core/state/state_test.go @@ -29,9 +29,9 @@ package state import ( "testing" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" ) diff --git a/core/state/statedb_multicoin_test.go b/core/state/statedb_multicoin_test.go index 95cc98ef71..127e260861 100644 --- a/core/state/statedb_multicoin_test.go +++ b/core/state/statedb_multicoin_test.go @@ -7,10 +7,10 @@ import ( "math/big" "testing" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state/snapshot" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/crypto" "github.com/holiman/uint256" ) diff --git a/core/state_processor_test.go b/core/state_processor_test.go index aa0e65894c..fb78dc5d6b 100644 --- a/core/state_processor_test.go +++ b/core/state_processor_test.go @@ -35,7 +35,6 @@ import ( "github.com/ava-labs/coreth/consensus" "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/consensus/misc/eip4844" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/params/extras" @@ -46,6 +45,7 @@ import ( "github.com/ava-labs/coreth/plugin/evm/upgrade/cortina" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/trie" diff --git a/core/state_transition_test.go b/core/state_transition_test.go index 72d70b896a..0aba925a7c 100644 --- a/core/state_transition_test.go +++ b/core/state_transition_test.go @@ -32,7 +32,6 @@ import ( "testing" "github.com/ava-labs/coreth/consensus/dummy" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/nativeasset" @@ -40,6 +39,7 @@ import ( "github.com/ava-labs/coreth/plugin/evm/upgrade/ap0" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap1" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/stretchr/testify/require" diff --git a/core/test_blockchain.go b/core/test_blockchain.go index d5a2acc3ab..b12e00038b 100644 --- a/core/test_blockchain.go +++ b/core/test_blockchain.go @@ -10,12 +10,12 @@ import ( "time" "github.com/ava-labs/coreth/consensus/dummy" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap4" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/ethdb" "github.com/holiman/uint256" diff --git a/core/txindexer.go b/core/txindexer.go index 4dc963b94c..f7932b762f 100644 --- a/core/txindexer.go +++ b/core/txindexer.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/ava-labs/coreth/core/rawdb" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" ) diff --git a/core/txindexer_test.go b/core/txindexer_test.go index b1bbdc83db..53eb6a2fe5 100644 --- a/core/txindexer_test.go +++ b/core/txindexer_test.go @@ -22,10 +22,10 @@ import ( "testing" "github.com/ava-labs/coreth/consensus/dummy" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/ethdb" "github.com/stretchr/testify/require" diff --git a/core/txpool/blobpool/blobpool_test.go b/core/txpool/blobpool/blobpool_test.go index 05c734a427..d245105b4a 100644 --- a/core/txpool/blobpool/blobpool_test.go +++ b/core/txpool/blobpool/blobpool_test.go @@ -41,7 +41,6 @@ import ( "github.com/ava-labs/coreth/consensus/misc/eip4844" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/txpool" "github.com/ava-labs/coreth/core/types" @@ -49,6 +48,7 @@ import ( "github.com/ava-labs/coreth/plugin/evm/header" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap3" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/crypto/kzg4844" "github.com/ava-labs/libevm/ethdb/memorydb" diff --git a/core/txpool/legacypool/legacypool2_test.go b/core/txpool/legacypool/legacypool2_test.go index dd10a4ab46..baf094273c 100644 --- a/core/txpool/legacypool/legacypool2_test.go +++ b/core/txpool/legacypool/legacypool2_test.go @@ -30,10 +30,10 @@ import ( "math/big" "testing" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/event" "github.com/holiman/uint256" diff --git a/core/txpool/legacypool/legacypool_test.go b/core/txpool/legacypool/legacypool_test.go index a193510b2d..8f754a2ce8 100644 --- a/core/txpool/legacypool/legacypool_test.go +++ b/core/txpool/legacypool/legacypool_test.go @@ -40,12 +40,12 @@ import ( "time" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/txpool" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/event" "github.com/ava-labs/libevm/trie" diff --git a/core/types/hashing_test.go b/core/types/hashing_test.go index 94dd5631d2..b4063265cc 100644 --- a/core/types/hashing_test.go +++ b/core/types/hashing_test.go @@ -34,10 +34,10 @@ import ( mrand "math/rand" "testing" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/hexutil" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/rlp" "github.com/ava-labs/libevm/trie" diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index 191608fa8e..3e6a45130b 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -30,13 +30,13 @@ import ( "math" "math/big" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/params/extras" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap3" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/holiman/uint256" diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index bef1a5bd93..33f8e265e7 100644 --- a/core/vm/runtime/runtime_test.go +++ b/core/vm/runtime/runtime_test.go @@ -36,13 +36,13 @@ import ( "github.com/ava-labs/coreth/accounts/abi" "github.com/ava-labs/coreth/consensus" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/eth/tracers" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/asm" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/eth/tracers/logger" diff --git a/eth/api_debug.go b/eth/api_debug.go index e5073e4f63..e018072829 100644 --- a/eth/api_debug.go +++ b/eth/api_debug.go @@ -32,13 +32,13 @@ import ( "fmt" "time" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/internal/ethapi" "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/hexutil" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/rlp" diff --git a/eth/api_debug_test.go b/eth/api_debug_test.go index 926e4de48d..7eff3a47b5 100644 --- a/eth/api_debug_test.go +++ b/eth/api_debug_test.go @@ -33,9 +33,9 @@ import ( "strings" "testing" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/triedb" "github.com/holiman/uint256" diff --git a/eth/backend.go b/eth/backend.go index 59ec5bd056..8e53574a9e 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -38,7 +38,6 @@ import ( "github.com/ava-labs/coreth/consensus" "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/bloombits" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state/pruner" "github.com/ava-labs/coreth/core/txpool" "github.com/ava-labs/coreth/core/txpool/legacypool" @@ -52,9 +51,11 @@ import ( "github.com/ava-labs/coreth/miner" "github.com/ava-labs/coreth/node" "github.com/ava-labs/coreth/params" + customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb" "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/accounts" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/event" @@ -415,13 +416,13 @@ func (s *Ethereum) precheckPopulateMissingTries() error { if s.config.PopulateMissingTries == nil { // Delete the populate missing tries marker to indicate that the node started with // populate missing tries disabled. - if err := rawdb.DeletePopulateMissingTries(s.chainDb); err != nil { + if err := customrawdb.DeletePopulateMissingTries(s.chainDb); err != nil { return fmt.Errorf("failed to write populate missing tries disabled marker: %w", err) } return nil } - if lastRun, err := rawdb.ReadPopulateMissingTries(s.chainDb); err == nil { + if lastRun, err := customrawdb.ReadPopulateMissingTries(s.chainDb); err == nil { log.Error("Populate missing tries is not meant to be left enabled permanently. Please disable populate missing tries and allow your node to start successfully before running again.") return fmt.Errorf("cannot start chain with populate missing tries enabled on consecutive starts (last=%v)", lastRun) } @@ -438,7 +439,7 @@ func (s *Ethereum) handleOfflinePruning(cacheConfig *core.CacheConfig, gspec *co if !s.config.OfflinePruning { // Delete the offline pruning marker to indicate that the node started with offline pruning disabled. - if err := rawdb.DeleteOfflinePruning(s.chainDb); err != nil { + if err := customrawdb.DeleteOfflinePruning(s.chainDb); err != nil { return fmt.Errorf("failed to write offline pruning disabled marker: %w", err) } return nil @@ -448,7 +449,7 @@ func (s *Ethereum) handleOfflinePruning(cacheConfig *core.CacheConfig, gspec *co // to the last accepted block before pruning begins. // If offline pruning marker is on disk, then we force the node to be started with offline pruning disabled // before allowing another run of offline pruning. - if lastRun, err := rawdb.ReadOfflinePruning(s.chainDb); err == nil { + if lastRun, err := customrawdb.ReadOfflinePruning(s.chainDb); err == nil { log.Error("Offline pruning is not meant to be left enabled permanently. Please disable offline pruning and allow your node to start successfully before running offline pruning again.") return fmt.Errorf("cannot start chain with offline pruning enabled on consecutive starts (last=%v)", lastRun) } diff --git a/eth/bloombits.go b/eth/bloombits.go index 2fddfc0707..775b0c708d 100644 --- a/eth/bloombits.go +++ b/eth/bloombits.go @@ -29,8 +29,8 @@ package eth import ( "time" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/libevm/common/bitutil" + "github.com/ava-labs/libevm/core/rawdb" ) const ( diff --git a/eth/filters/bench_test.go b/eth/filters/bench_test.go index 26a478235a..46d0da3545 100644 --- a/eth/filters/bench_test.go +++ b/eth/filters/bench_test.go @@ -33,10 +33,10 @@ import ( "time" "github.com/ava-labs/coreth/core/bloombits" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/bitutil" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" ) diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go index ea180d0eed..9117a6a351 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -40,13 +40,14 @@ import ( "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/bloombits" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/interfaces" "github.com/ava-labs/coreth/internal/ethapi" "github.com/ava-labs/coreth/params" + customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb" "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/event" "github.com/stretchr/testify/require" @@ -97,7 +98,7 @@ func (b *testBackend) HeaderByNumber(ctx context.Context, blockNr rpc.BlockNumbe switch blockNr { case rpc.FinalizedBlockNumber: var err error - hash, err = rawdb.ReadAcceptorTip(b.db) + hash, err = customrawdb.ReadAcceptorTip(b.db) if err != nil { return nil, err } diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go index 583f97ad8e..b43a97f101 100644 --- a/eth/filters/filter_test.go +++ b/eth/filters/filter_test.go @@ -37,11 +37,12 @@ import ( "github.com/ava-labs/coreth/accounts/abi" "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" + customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb" "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/triedb" @@ -273,7 +274,7 @@ func TestFilters(t *testing.T) { // Set block 998 as Finalized (-3) // bc.SetFinalized(chain[998].Header()) - err = rawdb.WriteAcceptorTip(db, chain[998].Hash()) + err = customrawdb.WriteAcceptorTip(db, chain[998].Hash()) require.NoError(t, err) for i, tc := range []struct { diff --git a/eth/gasprice/gasprice_test.go b/eth/gasprice/gasprice_test.go index 78fadf452a..1d5d284541 100644 --- a/eth/gasprice/gasprice_test.go +++ b/eth/gasprice/gasprice_test.go @@ -34,7 +34,6 @@ import ( "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" @@ -44,6 +43,7 @@ import ( "github.com/ava-labs/coreth/plugin/evm/upgrade/ap4" "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/event" diff --git a/eth/state_accessor.go b/eth/state_accessor.go index 858fa7ce73..29eea5f425 100644 --- a/eth/state_accessor.go +++ b/eth/state_accessor.go @@ -33,11 +33,11 @@ import ( "time" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/eth/tracers" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/trie" diff --git a/eth/tracers/api_test.go b/eth/tracers/api_test.go index e91108822d..cab08f9222 100644 --- a/eth/tracers/api_test.go +++ b/eth/tracers/api_test.go @@ -40,7 +40,6 @@ import ( "github.com/ava-labs/coreth/consensus" "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/internal/ethapi" @@ -48,6 +47,7 @@ import ( "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/hexutil" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/eth/tracers/logger" diff --git a/eth/tracers/tracers_test.go b/eth/tracers/tracers_test.go index b8703f9772..311613fecc 100644 --- a/eth/tracers/tracers_test.go +++ b/eth/tracers/tracers_test.go @@ -31,11 +31,11 @@ import ( "testing" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/tests" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/eth/tracers/logger" diff --git a/ethclient/simulated/backend.go b/ethclient/simulated/backend.go index f58e3dff8b..8971b3704c 100644 --- a/ethclient/simulated/backend.go +++ b/ethclient/simulated/backend.go @@ -25,7 +25,6 @@ import ( "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/constants" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/eth" "github.com/ava-labs/coreth/eth/ethconfig" @@ -35,6 +34,7 @@ import ( "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" ) var _ eth.PushGossiper = (*fakePushGossiper)(nil) diff --git a/internal/ethapi/api_test.go b/internal/ethapi/api_test.go index 288f59bdf9..2a845c7531 100644 --- a/internal/ethapi/api_test.go +++ b/internal/ethapi/api_test.go @@ -45,7 +45,6 @@ import ( "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/bloombits" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/internal/blocktest" @@ -57,6 +56,7 @@ import ( "github.com/ava-labs/libevm/accounts/keystore" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/hexutil" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/crypto/kzg4844" diff --git a/internal/shutdowncheck/shutdown_tracker.go b/internal/shutdowncheck/shutdown_tracker.go index 9499a91032..29e2ac9017 100644 --- a/internal/shutdowncheck/shutdown_tracker.go +++ b/internal/shutdowncheck/shutdown_tracker.go @@ -29,8 +29,8 @@ package shutdowncheck import ( "time" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" ) diff --git a/nativeasset/contract_test.go b/nativeasset/contract_test.go index 133cff9106..cfa2b7e268 100644 --- a/nativeasset/contract_test.go +++ b/nativeasset/contract_test.go @@ -7,11 +7,11 @@ import ( "math/big" "testing" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state" . "github.com/ava-labs/coreth/nativeasset" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" ethtypes "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/holiman/uint256" diff --git a/plugin/evm/atomic_syncer_test.go b/plugin/evm/atomic_syncer_test.go index 3da14280a1..584a5feecc 100644 --- a/plugin/evm/atomic_syncer_test.go +++ b/plugin/evm/atomic_syncer_test.go @@ -16,7 +16,6 @@ import ( "github.com/ava-labs/avalanchego/database/memdb" "github.com/ava-labs/avalanchego/database/versiondb" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/plugin/evm/config" "github.com/ava-labs/coreth/plugin/evm/message" syncclient "github.com/ava-labs/coreth/sync/client" @@ -24,6 +23,7 @@ import ( handlerstats "github.com/ava-labs/coreth/sync/handlers/stats" "github.com/ava-labs/coreth/sync/syncutils" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/trie" "github.com/ava-labs/libevm/triedb" ) diff --git a/plugin/evm/atomic_trie.go b/plugin/evm/atomic_trie.go index ea961191ee..c7e77dd694 100644 --- a/plugin/evm/atomic_trie.go +++ b/plugin/evm/atomic_trie.go @@ -14,12 +14,12 @@ import ( "github.com/ava-labs/avalanchego/utils/units" "github.com/ava-labs/avalanchego/utils/wrappers" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/plugin/evm/atomic" "github.com/ava-labs/coreth/plugin/evm/database" "github.com/ava-labs/coreth/triedb/hashdb" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/trie" diff --git a/plugin/evm/block.go b/plugin/evm/block.go index db531e1be8..c6938bfd59 100644 --- a/plugin/evm/block.go +++ b/plugin/evm/block.go @@ -15,7 +15,6 @@ import ( "github.com/ava-labs/libevm/rlp" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/params/extras" @@ -23,6 +22,7 @@ import ( "github.com/ava-labs/coreth/plugin/evm/header" "github.com/ava-labs/coreth/precompile/precompileconfig" "github.com/ava-labs/coreth/predicate" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/snow/consensus/snowman" diff --git a/plugin/evm/gossip_test.go b/plugin/evm/gossip_test.go index 6ece03b203..678bcaaf40 100644 --- a/plugin/evm/gossip_test.go +++ b/plugin/evm/gossip_test.go @@ -12,13 +12,13 @@ import ( "github.com/ava-labs/avalanchego/network/p2p/gossip" "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/txpool" "github.com/ava-labs/coreth/core/txpool/legacypool" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/prometheus/client_golang/prometheus" diff --git a/plugin/evm/prestate_tracer_test.go b/plugin/evm/prestate_tracer_test.go index 8de9762efa..6d9fa353bb 100644 --- a/plugin/evm/prestate_tracer_test.go +++ b/plugin/evm/prestate_tracer_test.go @@ -13,12 +13,12 @@ import ( "unicode" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/eth/tracers" "github.com/ava-labs/coreth/tests" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/math" + "github.com/ava-labs/libevm/core/rawdb" ethtypes "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" ) diff --git a/core/rawdb/accessors_metadata_ext.go b/plugin/evm/rawdb/accessors_metadata_ext.go similarity index 100% rename from core/rawdb/accessors_metadata_ext.go rename to plugin/evm/rawdb/accessors_metadata_ext.go diff --git a/core/rawdb/accessors_snapshot_ext.go b/plugin/evm/rawdb/accessors_snapshot_ext.go similarity index 87% rename from core/rawdb/accessors_snapshot_ext.go rename to plugin/evm/rawdb/accessors_snapshot_ext.go index c842056f3a..36b95d9913 100644 --- a/core/rawdb/accessors_snapshot_ext.go +++ b/plugin/evm/rawdb/accessors_snapshot_ext.go @@ -5,6 +5,7 @@ package rawdb import ( "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" ) @@ -39,7 +40,7 @@ func DeleteSnapshotBlockHash(db ethdb.KeyValueWriter) { // IterateAccountSnapshots returns an iterator for walking all of the accounts in the snapshot func IterateAccountSnapshots(db ethdb.Iteratee) ethdb.Iterator { - it := db.NewIterator(SnapshotAccountPrefix, nil) - keyLen := len(SnapshotAccountPrefix) + common.HashLength - return NewKeyLengthIterator(it, keyLen) + it := db.NewIterator(rawdb.SnapshotAccountPrefix, nil) + keyLen := len(rawdb.SnapshotAccountPrefix) + common.HashLength + return rawdb.NewKeyLengthIterator(it, keyLen) } diff --git a/core/rawdb/accessors_state_sync.go b/plugin/evm/rawdb/accessors_state_sync.go similarity index 96% rename from core/rawdb/accessors_state_sync.go rename to plugin/evm/rawdb/accessors_state_sync.go index 1b4b1ad1ae..aea34edf6f 100644 --- a/core/rawdb/accessors_state_sync.go +++ b/plugin/evm/rawdb/accessors_state_sync.go @@ -8,6 +8,7 @@ import ( "github.com/ava-labs/avalanchego/utils/wrappers" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" ) @@ -49,7 +50,7 @@ func DeleteCodeToFetch(db ethdb.KeyValueWriter, hash common.Hash) { // hashes that are pending syncing. It is the caller's responsibility to // unpack the key and call Release on the returned iterator. func NewCodeToFetchIterator(db ethdb.Iteratee) ethdb.Iterator { - return NewKeyLengthIterator( + return rawdb.NewKeyLengthIterator( db.NewIterator(CodeToFetchPrefix, nil), codeToFetchKeyLength, ) @@ -70,7 +71,7 @@ func NewSyncSegmentsIterator(db ethdb.Iteratee, root common.Hash) ethdb.Iterator copy(segmentsPrefix, syncSegmentsPrefix) copy(segmentsPrefix[len(syncSegmentsPrefix):], root[:]) - return NewKeyLengthIterator( + return rawdb.NewKeyLengthIterator( db.NewIterator(segmentsPrefix, nil), syncSegmentsKeyLength, ) @@ -116,7 +117,7 @@ func packSyncSegmentKey(root common.Hash, start common.Hash) []byte { // added for syncing (beginning at seek). It is the caller's responsibility to unpack // the key and call Release on the returned iterator. func NewSyncStorageTriesIterator(db ethdb.Iteratee, seek []byte) ethdb.Iterator { - return NewKeyLengthIterator(db.NewIterator(syncStorageTriesPrefix, seek), syncStorageTriesKeyLength) + return rawdb.NewKeyLengthIterator(db.NewIterator(syncStorageTriesPrefix, seek), syncStorageTriesKeyLength) } // WriteSyncStorageTrie adds a storage trie for account (with the given root) to be synced. @@ -168,7 +169,7 @@ func WriteSyncPerformed(db ethdb.KeyValueWriter, blockNumber uint64) error { // NewSyncPerformedIterator returns an iterator over all block numbers the VM // has state synced to. func NewSyncPerformedIterator(db ethdb.Iteratee) ethdb.Iterator { - return NewKeyLengthIterator(db.NewIterator(syncPerformedPrefix, nil), syncPerformedKeyLength) + return rawdb.NewKeyLengthIterator(db.NewIterator(syncPerformedPrefix, nil), syncPerformedKeyLength) } // UnpackSyncPerformedKey returns the block number from keys the iterator returned diff --git a/core/rawdb/accessors_state_sync_test.go b/plugin/evm/rawdb/accessors_state_sync_test.go similarity index 90% rename from core/rawdb/accessors_state_sync_test.go rename to plugin/evm/rawdb/accessors_state_sync_test.go index ea204937f8..2ad6de7265 100644 --- a/core/rawdb/accessors_state_sync_test.go +++ b/plugin/evm/rawdb/accessors_state_sync_test.go @@ -7,12 +7,13 @@ import ( "testing" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/stretchr/testify/require" ) func TestClearPrefix(t *testing.T) { require := require.New(t) - db := NewMemoryDatabase() + db := rawdb.NewMemoryDatabase() // add a key that should be cleared require.NoError(WriteSyncSegment(db, common.Hash{1}, common.Hash{})) diff --git a/core/rawdb/database_ext.go b/plugin/evm/rawdb/database_ext.go similarity index 100% rename from core/rawdb/database_ext.go rename to plugin/evm/rawdb/database_ext.go diff --git a/core/rawdb/database_ext_test.go b/plugin/evm/rawdb/database_ext_test.go similarity index 98% rename from core/rawdb/database_ext_test.go rename to plugin/evm/rawdb/database_ext_test.go index f9519c0e9e..879afdae9b 100644 --- a/core/rawdb/database_ext_test.go +++ b/plugin/evm/rawdb/database_ext_test.go @@ -7,6 +7,7 @@ import ( "fmt" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" ) @@ -17,7 +18,7 @@ func ExampleInspectDatabase() { // Extra metadata keys: (17 + 32) + (12 + 32) = 93 bytes WriteSnapshotBlockHash(db, common.Hash{}) - WriteSnapshotRoot(db, common.Hash{}) + rawdb.WriteSnapshotRoot(db, common.Hash{}) // Trie segments: (77 + 2) + 1 = 80 bytes _ = WriteSyncSegment(db, common.Hash{}, common.Hash{}) // Storage tries to fetch: 76 + 1 = 77 bytes diff --git a/core/rawdb/schema_ext.go b/plugin/evm/rawdb/schema_ext.go similarity index 100% rename from core/rawdb/schema_ext.go rename to plugin/evm/rawdb/schema_ext.go diff --git a/plugin/evm/syncervm_client.go b/plugin/evm/syncervm_client.go index e6efd34a49..d0da18a713 100644 --- a/plugin/evm/syncervm_client.go +++ b/plugin/evm/syncervm_client.go @@ -14,7 +14,6 @@ import ( commonEng "github.com/ava-labs/avalanchego/snow/engine/common" "github.com/ava-labs/avalanchego/snow/engine/snowman/block" "github.com/ava-labs/avalanchego/vms/components/chain" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state/snapshot" "github.com/ava-labs/coreth/eth" "github.com/ava-labs/coreth/params" @@ -22,6 +21,7 @@ import ( syncclient "github.com/ava-labs/coreth/sync/client" "github.com/ava-labs/coreth/sync/statesync" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" ) diff --git a/plugin/evm/syncervm_test.go b/plugin/evm/syncervm_test.go index aab53572a0..b4422eae10 100644 --- a/plugin/evm/syncervm_test.go +++ b/plugin/evm/syncervm_test.go @@ -31,16 +31,17 @@ import ( "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/constants" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/atomic" "github.com/ava-labs/coreth/plugin/evm/database" + customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb" "github.com/ava-labs/coreth/predicate" statesyncclient "github.com/ava-labs/coreth/sync/client" "github.com/ava-labs/coreth/sync/statesync" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/rlp" @@ -662,12 +663,12 @@ func generateAndAcceptBlocks(t *testing.T, vm *VM, numBlocks int, gen func(int, // assertSyncPerformedHeights iterates over all heights the VM has synced to and // verifies it matches [expected]. func assertSyncPerformedHeights(t *testing.T, db ethdb.Iteratee, expected map[uint64]struct{}) { - it := rawdb.NewSyncPerformedIterator(db) + it := customrawdb.NewSyncPerformedIterator(db) defer it.Release() found := make(map[uint64]struct{}, len(expected)) for it.Next() { - found[rawdb.UnpackSyncPerformedKey(it.Key())] = struct{}{} + found[customrawdb.UnpackSyncPerformedKey(it.Key())] = struct{}{} } require.NoError(t, it.Error()) require.Equal(t, expected, found) diff --git a/plugin/evm/vm.go b/plugin/evm/vm.go index 61ec8a4eae..c182ad1e3a 100644 --- a/plugin/evm/vm.go +++ b/plugin/evm/vm.go @@ -28,7 +28,6 @@ import ( "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/constants" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/txpool" "github.com/ava-labs/coreth/core/types" @@ -48,6 +47,7 @@ import ( "github.com/ava-labs/coreth/plugin/evm/upgrade/ap5" "github.com/ava-labs/coreth/triedb/hashdb" "github.com/ava-labs/coreth/utils" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/metrics" "github.com/ava-labs/libevm/triedb" diff --git a/plugin/evm/vm_database.go b/plugin/evm/vm_database.go index 958f22db57..8ec3b22b15 100644 --- a/plugin/evm/vm_database.go +++ b/plugin/evm/vm_database.go @@ -9,9 +9,9 @@ import ( avalanchedatabase "github.com/ava-labs/avalanchego/database" "github.com/ava-labs/avalanchego/database/prefixdb" "github.com/ava-labs/avalanchego/database/versiondb" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/plugin/evm/database" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/log" ) diff --git a/plugin/evm/vm_warp_test.go b/plugin/evm/vm_warp_test.go index fc131b4639..dccf79dbeb 100644 --- a/plugin/evm/vm_warp_test.go +++ b/plugin/evm/vm_warp_test.go @@ -27,7 +27,6 @@ import ( "github.com/ava-labs/avalanchego/vms/components/chain" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/eth/tracers" "github.com/ava-labs/coreth/params" @@ -41,6 +40,7 @@ import ( "github.com/ava-labs/coreth/utils" "github.com/ava-labs/coreth/warp" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/crypto" "github.com/stretchr/testify/require" ) diff --git a/scripts/eth-allowed-packages.txt b/scripts/eth-allowed-packages.txt index 98fb94b34c..5522a5e8d6 100644 --- a/scripts/eth-allowed-packages.txt +++ b/scripts/eth-allowed-packages.txt @@ -10,6 +10,7 @@ "github.com/ava-labs/libevm/common/math" "github.com/ava-labs/libevm/common/prque" "github.com/ava-labs/libevm/core/asm" +"github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/crypto/blake2b" diff --git a/sync/client/client.go b/sync/client/client.go index 6a1348679e..a8a2c8de63 100644 --- a/sync/client/client.go +++ b/sync/client/client.go @@ -23,10 +23,10 @@ import ( "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/log" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/peer" "github.com/ava-labs/coreth/plugin/evm/message" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/trie" ) diff --git a/sync/client/client_test.go b/sync/client/client_test.go index a45438bab6..56ff1585c2 100644 --- a/sync/client/client_test.go +++ b/sync/client/client_test.go @@ -17,7 +17,6 @@ import ( "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/message" @@ -26,6 +25,7 @@ import ( handlerstats "github.com/ava-labs/coreth/sync/handlers/stats" "github.com/ava-labs/coreth/sync/syncutils" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/triedb" ) diff --git a/sync/handlers/block_request_test.go b/sync/handlers/block_request_test.go index bd9bf8ce4f..4b0bc3720d 100644 --- a/sync/handlers/block_request_test.go +++ b/sync/handlers/block_request_test.go @@ -12,12 +12,12 @@ import ( "github.com/ava-labs/avalanchego/utils/units" "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/message" "github.com/ava-labs/coreth/sync/handlers/stats" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/rlp" "github.com/ava-labs/libevm/triedb" diff --git a/sync/handlers/code_request.go b/sync/handlers/code_request.go index 5f0b3ee59d..64dba81aba 100644 --- a/sync/handlers/code_request.go +++ b/sync/handlers/code_request.go @@ -10,10 +10,10 @@ import ( "github.com/ava-labs/avalanchego/codec" "github.com/ava-labs/avalanchego/ids" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/plugin/evm/message" "github.com/ava-labs/coreth/sync/handlers/stats" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" ) diff --git a/sync/handlers/code_request_test.go b/sync/handlers/code_request_test.go index 13c9306ac9..944118b3e4 100644 --- a/sync/handlers/code_request_test.go +++ b/sync/handlers/code_request_test.go @@ -11,10 +11,10 @@ import ( "github.com/ava-labs/coreth/params" "github.com/ava-labs/avalanchego/ids" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/plugin/evm/message" "github.com/ava-labs/coreth/sync/handlers/stats" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/ethdb/memorydb" "github.com/stretchr/testify/assert" diff --git a/sync/handlers/leafs_request_test.go b/sync/handlers/leafs_request_test.go index a98f398cb4..c6888dad4d 100644 --- a/sync/handlers/leafs_request_test.go +++ b/sync/handlers/leafs_request_test.go @@ -10,13 +10,13 @@ import ( "testing" "github.com/ava-labs/avalanchego/ids" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state/snapshot" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/plugin/evm/message" "github.com/ava-labs/coreth/sync/handlers/stats" "github.com/ava-labs/coreth/sync/syncutils" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/trie" diff --git a/sync/statesync/code_syncer.go b/sync/statesync/code_syncer.go index 196fefea58..f52874c88a 100644 --- a/sync/statesync/code_syncer.go +++ b/sync/statesync/code_syncer.go @@ -11,10 +11,11 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/set" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/plugin/evm/message" + customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb" statesyncclient "github.com/ava-labs/coreth/sync/client" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" ) @@ -104,16 +105,16 @@ func (c *codeSyncer) start(ctx context.Context) { // Clean out any codeToFetch markers from the database that are no longer needed and // add any outstanding markers to the queue. func (c *codeSyncer) addCodeToFetchFromDBToQueue() error { - it := rawdb.NewCodeToFetchIterator(c.DB) + it := customrawdb.NewCodeToFetchIterator(c.DB) defer it.Release() batch := c.DB.NewBatch() codeHashes := make([]common.Hash, 0) for it.Next() { - codeHash := common.BytesToHash(it.Key()[len(rawdb.CodeToFetchPrefix):]) + codeHash := common.BytesToHash(it.Key()[len(customrawdb.CodeToFetchPrefix):]) // If we already have the codeHash, delete the marker from the database and continue if rawdb.HasCode(c.DB, codeHash) { - rawdb.DeleteCodeToFetch(batch, codeHash) + customrawdb.DeleteCodeToFetch(batch, codeHash) // Write the batch to disk if it has reached the ideal batch size. if batch.ValueSize() > ethdb.IdealBatchSize { if err := batch.Write(); err != nil { @@ -186,7 +187,7 @@ func (c *codeSyncer) fulfillCodeRequest(ctx context.Context, codeHashes []common c.lock.Lock() batch := c.DB.NewBatch() for i, codeHash := range codeHashes { - rawdb.DeleteCodeToFetch(batch, codeHash) + customrawdb.DeleteCodeToFetch(batch, codeHash) c.outstandingCodeHashes.Remove(ids.ID(codeHash)) rawdb.WriteCode(batch, codeHash, codeByteSlices[i]) } @@ -211,7 +212,7 @@ func (c *codeSyncer) addCode(codeHashes []common.Hash) error { if !c.outstandingCodeHashes.Contains(ids.ID(codeHash)) && !rawdb.HasCode(c.DB, codeHash) { selectedCodeHashes = append(selectedCodeHashes, codeHash) c.outstandingCodeHashes.Add(ids.ID(codeHash)) - rawdb.AddCodeToFetch(batch, codeHash) + customrawdb.AddCodeToFetch(batch, codeHash) } } c.lock.Unlock() diff --git a/sync/statesync/code_syncer_test.go b/sync/statesync/code_syncer_test.go index c1741760d4..07c4ab41d9 100644 --- a/sync/statesync/code_syncer_test.go +++ b/sync/statesync/code_syncer_test.go @@ -9,12 +9,13 @@ import ( "testing" "github.com/ava-labs/avalanchego/utils" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/plugin/evm/message" + customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb" statesyncclient "github.com/ava-labs/coreth/sync/client" "github.com/ava-labs/coreth/sync/handlers" handlerstats "github.com/ava-labs/coreth/sync/handlers/stats" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/ethdb/memorydb" "github.com/stretchr/testify/assert" @@ -134,7 +135,7 @@ func TestCodeSyncerAddsInProgressCodeHashes(t *testing.T) { codeHash := crypto.Keccak256Hash(codeBytes) testCodeSyncer(t, codeSyncerTest{ setupCodeSyncer: func(c *codeSyncer) { - rawdb.AddCodeToFetch(c.DB, codeHash) + customrawdb.AddCodeToFetch(c.DB, codeHash) }, codeRequestHashes: nil, codeByteSlices: [][]byte{codeBytes}, @@ -155,7 +156,7 @@ func TestCodeSyncerAddsMoreInProgressThanQueueSize(t *testing.T) { testCodeSyncer(t, codeSyncerTest{ setupCodeSyncer: func(c *codeSyncer) { for _, codeHash := range codeHashes { - rawdb.AddCodeToFetch(c.DB, codeHash) + customrawdb.AddCodeToFetch(c.DB, codeHash) } c.codeHashes = make(chan common.Hash, numCodeSlices/2) }, diff --git a/sync/statesync/sync_helpers.go b/sync/statesync/sync_helpers.go index 22874b0017..f23104aa77 100644 --- a/sync/statesync/sync_helpers.go +++ b/sync/statesync/sync_helpers.go @@ -4,9 +4,9 @@ package statesync import ( - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/trie" ) diff --git a/sync/statesync/sync_test.go b/sync/statesync/sync_test.go index 14a096a7fd..fde8584404 100644 --- a/sync/statesync/sync_test.go +++ b/sync/statesync/sync_test.go @@ -13,7 +13,6 @@ import ( "testing" "time" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state/snapshot" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/plugin/evm/message" @@ -22,6 +21,7 @@ import ( handlerstats "github.com/ava-labs/coreth/sync/handlers/stats" "github.com/ava-labs/coreth/sync/syncutils" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/rlp" diff --git a/sync/statesync/test_sync.go b/sync/statesync/test_sync.go index e3083e3484..efd0cf3260 100644 --- a/sync/statesync/test_sync.go +++ b/sync/statesync/test_sync.go @@ -8,11 +8,12 @@ import ( "math/rand" "testing" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" + customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb" "github.com/ava-labs/coreth/sync/syncutils" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/rlp" @@ -25,7 +26,7 @@ import ( // Also verifies any code referenced by the EVM state is present in [clientTrieDB] and the hash is correct. func assertDBConsistency(t testing.TB, root common.Hash, clientDB ethdb.Database, serverTrieDB, clientTrieDB *triedb.Database) { numSnapshotAccounts := 0 - accountIt := rawdb.IterateAccountSnapshots(clientDB) + accountIt := customrawdb.IterateAccountSnapshots(clientDB) defer accountIt.Release() for accountIt.Next() { if !bytes.HasPrefix(accountIt.Key(), rawdb.SnapshotAccountPrefix) || len(accountIt.Key()) != len(rawdb.SnapshotAccountPrefix)+common.HashLength { diff --git a/sync/statesync/trie_queue.go b/sync/statesync/trie_queue.go index 3c8f3abf23..ec4134b4c4 100644 --- a/sync/statesync/trie_queue.go +++ b/sync/statesync/trie_queue.go @@ -4,7 +4,7 @@ package statesync import ( - "github.com/ava-labs/coreth/core/rawdb" + "github.com/ava-labs/coreth/plugin/evm/rawdb" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/ethdb" ) diff --git a/sync/statesync/trie_segments.go b/sync/statesync/trie_segments.go index 19e52a1bac..fd0018b4f2 100644 --- a/sync/statesync/trie_segments.go +++ b/sync/statesync/trie_segments.go @@ -11,11 +11,12 @@ import ( "sync" "github.com/ava-labs/avalanchego/utils/wrappers" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/plugin/evm/message" + customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb" syncclient "github.com/ava-labs/coreth/sync/client" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/trie" @@ -86,7 +87,7 @@ func (t *trieToSync) loadSegments() error { // Get an iterator for segments for t.root and see if we find anything. // This lets us check if this trie was previously segmented, in which // case we need to restore the same segments on resume. - it := rawdb.NewSyncSegmentsIterator(t.sync.db, t.root) + it := customrawdb.NewSyncSegmentsIterator(t.sync.db, t.root) defer it.Release() // Track the previously added segment as we loop over persisted values. @@ -99,7 +100,7 @@ func (t *trieToSync) loadSegments() error { // key immediately prior to the segment we found on disk. // This is because we do not persist the beginning of // the first segment. - _, segmentStart := rawdb.UnpackSyncSegmentKey(it.Key()) + _, segmentStart := customrawdb.UnpackSyncSegmentKey(it.Key()) segmentStartPos := binary.BigEndian.Uint16(segmentStart[:wrappers.ShortLen]) t.addSegment(prevSegmentStart, addPadding(segmentStartPos-1, 0xff)) @@ -232,7 +233,7 @@ func (t *trieToSync) segmentFinished(ctx context.Context, idx int) error { } // remove all segments for this root from persistent storage - if err := rawdb.ClearSyncSegments(t.sync.db, t.root); err != nil { + if err := customrawdb.ClearSyncSegments(t.sync.db, t.root); err != nil { return err } return t.task.OnFinish() @@ -301,7 +302,7 @@ func (t *trieToSync) createSegments(numSegments int) error { // create the segments segment := t.addSegment(startBytes, endBytes) - if err := rawdb.WriteSyncSegment(t.sync.db, t.root, common.BytesToHash(segment.start)); err != nil { + if err := customrawdb.WriteSyncSegment(t.sync.db, t.root, common.BytesToHash(segment.start)); err != nil { return err } } diff --git a/sync/statesync/trie_sync_tasks.go b/sync/statesync/trie_sync_tasks.go index a0c4d4845f..928287cc1e 100644 --- a/sync/statesync/trie_sync_tasks.go +++ b/sync/statesync/trie_sync_tasks.go @@ -6,10 +6,10 @@ package statesync import ( "fmt" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/sync/syncutils" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/rlp" diff --git a/tests/state_test_util.go b/tests/state_test_util.go index 714ad125a8..ca820456a4 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -27,13 +27,13 @@ package tests import ( - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/state/snapshot" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/triedb/hashdb" "github.com/ava-labs/coreth/triedb/pathdb" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/triedb" "github.com/holiman/uint256" diff --git a/triedb/hashdb/database.go b/triedb/hashdb/database.go index 2fd9bf6d43..2a2652fa26 100644 --- a/triedb/hashdb/database.go +++ b/triedb/hashdb/database.go @@ -33,10 +33,10 @@ import ( "sync" "time" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/metrics" diff --git a/triedb/pathdb/database.go b/triedb/pathdb/database.go index c38c54fca8..5bbf83cf29 100644 --- a/triedb/pathdb/database.go +++ b/triedb/pathdb/database.go @@ -32,10 +32,10 @@ import ( "io" "sync" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/trie/trienode" diff --git a/triedb/pathdb/database_test.go b/triedb/pathdb/database_test.go index bf1934c97b..1f079279e6 100644 --- a/triedb/pathdb/database_test.go +++ b/triedb/pathdb/database_test.go @@ -33,9 +33,9 @@ import ( "math/rand" "testing" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/rlp" "github.com/ava-labs/libevm/trie/testutil" diff --git a/triedb/pathdb/difflayer_test.go b/triedb/pathdb/difflayer_test.go index d7f975ffad..08f20084eb 100644 --- a/triedb/pathdb/difflayer_test.go +++ b/triedb/pathdb/difflayer_test.go @@ -30,8 +30,8 @@ import ( "bytes" "testing" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/trie/testutil" "github.com/ava-labs/libevm/trie/trienode" ) diff --git a/triedb/pathdb/disklayer.go b/triedb/pathdb/disklayer.go index c13b46e710..ab8e19d10e 100644 --- a/triedb/pathdb/disklayer.go +++ b/triedb/pathdb/disklayer.go @@ -32,8 +32,8 @@ import ( "sync" "github.com/VictoriaMetrics/fastcache" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/trie/trienode" diff --git a/triedb/pathdb/journal.go b/triedb/pathdb/journal.go index a245e7f8c3..535b7680c0 100644 --- a/triedb/pathdb/journal.go +++ b/triedb/pathdb/journal.go @@ -33,9 +33,9 @@ import ( "io" "time" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/rlp" diff --git a/triedb/pathdb/nodebuffer.go b/triedb/pathdb/nodebuffer.go index 7a461b60ad..54466cc51f 100644 --- a/triedb/pathdb/nodebuffer.go +++ b/triedb/pathdb/nodebuffer.go @@ -31,8 +31,8 @@ import ( "time" "github.com/VictoriaMetrics/fastcache" - "github.com/ava-labs/coreth/core/rawdb" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log"