Skip to content

Commit 1bcbb0b

Browse files
qdm12qdm12
committed
chore(rawdb): migration to plugin/evm/rawdb
See original PR ava-labs/coreth#851
1 parent f1a9b65 commit 1bcbb0b

File tree

103 files changed

+177
-279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+177
-279
lines changed

‎cmd/evm/internal/t8ntool/execution.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232

3333
"github.com/ava-labs/libevm/common"
3434
"github.com/ava-labs/libevm/common/math"
35+
"github.com/ava-labs/libevm/core/rawdb"
3536
"github.com/ava-labs/libevm/core/vm"
3637
"github.com/ava-labs/libevm/crypto"
3738
"github.com/ava-labs/libevm/ethdb"
@@ -41,7 +42,6 @@ import (
4142
"github.com/ava-labs/libevm/triedb"
4243
"github.com/ava-labs/subnet-evm/consensus/misc/eip4844"
4344
"github.com/ava-labs/subnet-evm/core"
44-
"github.com/ava-labs/subnet-evm/core/rawdb"
4545
"github.com/ava-labs/subnet-evm/core/state"
4646
"github.com/ava-labs/subnet-evm/core/types"
4747
"github.com/ava-labs/subnet-evm/params"

‎cmd/evm/runner.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ import (
3838
"time"
3939

4040
"github.com/ava-labs/libevm/common"
41+
"github.com/ava-labs/libevm/core/rawdb"
4142
"github.com/ava-labs/libevm/core/vm"
4243
"github.com/ava-labs/libevm/eth/tracers/logger"
4344
"github.com/ava-labs/libevm/triedb"
4445
"github.com/ava-labs/subnet-evm/cmd/evm/internal/compiler"
4546
"github.com/ava-labs/subnet-evm/cmd/utils"
4647
"github.com/ava-labs/subnet-evm/core"
47-
"github.com/ava-labs/subnet-evm/core/rawdb"
4848
"github.com/ava-labs/subnet-evm/core/state"
4949
"github.com/ava-labs/subnet-evm/core/vm/runtime"
5050
"github.com/ava-labs/subnet-evm/internal/flags"

‎cmd/evm/staterunner.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ import (
3333
"os"
3434

3535
"github.com/ava-labs/libevm/common"
36+
"github.com/ava-labs/libevm/core/rawdb"
3637
"github.com/ava-labs/libevm/core/vm"
3738
"github.com/ava-labs/libevm/eth/tracers/logger"
38-
"github.com/ava-labs/subnet-evm/core/rawdb"
3939
"github.com/ava-labs/subnet-evm/core/state"
4040
"github.com/ava-labs/subnet-evm/tests"
4141
"github.com/urfave/cli/v2"

‎core/bench_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,14 @@ import (
3333

3434
"github.com/ava-labs/libevm/common"
3535
"github.com/ava-labs/libevm/common/math"
36+
"github.com/ava-labs/libevm/core/rawdb"
3637
"github.com/ava-labs/libevm/core/vm"
3738
"github.com/ava-labs/libevm/crypto"
3839
"github.com/ava-labs/libevm/ethdb"
3940
"github.com/ava-labs/subnet-evm/consensus/dummy"
40-
"github.com/ava-labs/subnet-evm/core/rawdb"
4141
"github.com/ava-labs/subnet-evm/core/types"
4242
"github.com/ava-labs/subnet-evm/params"
43+
customrawdb "github.com/ava-labs/subnet-evm/plugin/evm/rawdb"
4344
)
4445

4546
func BenchmarkInsertChain_empty_memdb(b *testing.B) {
@@ -250,7 +251,7 @@ func makeChainForBench(db ethdb.Database, genesis *Genesis, full bool, count uin
250251
rawdb.WriteCanonicalHash(db, hash, n)
251252

252253
if n == 0 {
253-
rawdb.WriteChainConfig(db, hash, genesis.Config)
254+
customrawdb.WriteChainConfig(db, hash, genesis.Config)
254255
}
255256
rawdb.WriteHeadHeaderHash(db, hash)
256257

‎core/blockchain.go‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import (
4141

4242
"github.com/ava-labs/libevm/common"
4343
"github.com/ava-labs/libevm/common/lru"
44+
"github.com/ava-labs/libevm/core/rawdb"
4445
"github.com/ava-labs/libevm/core/vm"
4546
"github.com/ava-labs/libevm/ethdb"
4647
"github.com/ava-labs/libevm/event"
@@ -50,13 +51,13 @@ import (
5051
"github.com/ava-labs/subnet-evm/commontype"
5152
"github.com/ava-labs/subnet-evm/consensus"
5253
"github.com/ava-labs/subnet-evm/consensus/misc/eip4844"
53-
"github.com/ava-labs/subnet-evm/core/rawdb"
5454
"github.com/ava-labs/subnet-evm/core/state"
5555
"github.com/ava-labs/subnet-evm/core/state/snapshot"
5656
"github.com/ava-labs/subnet-evm/core/types"
5757
"github.com/ava-labs/subnet-evm/internal/version"
5858
"github.com/ava-labs/subnet-evm/metrics"
5959
"github.com/ava-labs/subnet-evm/params"
60+
customrawdb "github.com/ava-labs/subnet-evm/plugin/evm/rawdb"
6061
"github.com/ava-labs/subnet-evm/triedb/hashdb"
6162
"github.com/ava-labs/subnet-evm/triedb/pathdb"
6263

@@ -473,7 +474,7 @@ func NewBlockChain(
473474

474475
// if txlookup limit is 0 (uindexing disabled), we don't need to repair the tx index tail.
475476
if bc.cacheConfig.TransactionHistory != 0 {
476-
latestStateSynced := rawdb.GetLatestSyncPerformed(bc.db)
477+
latestStateSynced := customrawdb.GetLatestSyncPerformed(bc.db)
477478
bc.repairTxIndexTail(latestStateSynced)
478479
}
479480

@@ -506,7 +507,7 @@ func (bc *BlockChain) batchBlockAcceptedIndices(batch ethdb.Batch, b *types.Bloc
506507
if !bc.cacheConfig.SkipTxIndexing {
507508
rawdb.WriteTxLookupEntriesByBlock(batch, b)
508509
}
509-
if err := rawdb.WriteAcceptorTip(batch, b.Hash()); err != nil {
510+
if err := customrawdb.WriteAcceptorTip(batch, b.Hash()); err != nil {
510511
return fmt.Errorf("%w: failed to write acceptor tip key", err)
511512
}
512513
return nil
@@ -1808,7 +1809,7 @@ func (bc *BlockChain) initSnapshot(b *types.Header) {
18081809
// state that reprocessing will start from.
18091810
func (bc *BlockChain) reprocessState(current *types.Block, reexec uint64) error {
18101811
origin := current.NumberU64()
1811-
acceptorTip, err := rawdb.ReadAcceptorTip(bc.db)
1812+
acceptorTip, err := customrawdb.ReadAcceptorTip(bc.db)
18121813
if err != nil {
18131814
return fmt.Errorf("%w: unable to get Acceptor tip", err)
18141815
}
@@ -1939,9 +1940,9 @@ func (bc *BlockChain) reprocessState(current *types.Block, reexec uint64) error
19391940

19401941
func (bc *BlockChain) protectTrieIndex() error {
19411942
if !bc.cacheConfig.Pruning {
1942-
return rawdb.WritePruningDisabled(bc.db)
1943+
return customrawdb.WritePruningDisabled(bc.db)
19431944
}
1944-
pruningDisabled, err := rawdb.HasPruningDisabled(bc.db)
1945+
pruningDisabled, err := customrawdb.HasPruningDisabled(bc.db)
19451946
if err != nil {
19461947
return fmt.Errorf("failed to check if the chain has been run with pruning disabled: %w", err)
19471948
}
@@ -2026,7 +2027,7 @@ func (bc *BlockChain) populateMissingTries() error {
20262027
// Write marker to DB to indicate populate missing tries finished successfully.
20272028
// Note: writing the marker here means that we do allow consecutive runs of re-populating
20282029
// missing tries if it does not finish during the prior run.
2029-
if err := rawdb.WritePopulateMissingTries(bc.db); err != nil {
2030+
if err := customrawdb.WritePopulateMissingTries(bc.db); err != nil {
20302031
return fmt.Errorf("failed to write offline pruning success marker: %w", err)
20312032
}
20322033

@@ -2124,9 +2125,9 @@ func (bc *BlockChain) ResetToStateSyncedBlock(block *types.Block) error {
21242125
}
21252126
rawdb.WriteHeadBlockHash(batch, block.Hash())
21262127
rawdb.WriteHeadHeaderHash(batch, block.Hash())
2127-
rawdb.WriteSnapshotBlockHash(batch, block.Hash())
2128+
customrawdb.WriteSnapshotBlockHash(batch, block.Hash())
21282129
rawdb.WriteSnapshotRoot(batch, block.Root())
2129-
if err := rawdb.WriteSyncPerformed(batch, block.NumberU64()); err != nil {
2130+
if err := customrawdb.WriteSyncPerformed(batch, block.NumberU64()); err != nil {
21302131
return err
21312132
}
21322133

‎core/blockchain_log_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import (
99
"testing"
1010

1111
"github.com/ava-labs/libevm/common"
12+
"github.com/ava-labs/libevm/core/rawdb"
1213
"github.com/ava-labs/libevm/core/vm"
1314
"github.com/ava-labs/libevm/crypto"
1415
"github.com/ava-labs/subnet-evm/accounts/abi"
1516
"github.com/ava-labs/subnet-evm/consensus/dummy"
16-
"github.com/ava-labs/subnet-evm/core/rawdb"
1717
"github.com/ava-labs/subnet-evm/core/types"
1818
"github.com/ava-labs/subnet-evm/params"
1919
"github.com/ava-labs/subnet-evm/plugin/evm/upgrade/legacy"

‎core/blockchain_reader.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ import (
3030
"math/big"
3131

3232
"github.com/ava-labs/libevm/common"
33+
"github.com/ava-labs/libevm/core/rawdb"
3334
"github.com/ava-labs/libevm/core/vm"
3435
"github.com/ava-labs/libevm/event"
3536
"github.com/ava-labs/libevm/triedb"
3637
"github.com/ava-labs/subnet-evm/commontype"
3738
"github.com/ava-labs/subnet-evm/consensus"
3839
"github.com/ava-labs/subnet-evm/constants"
39-
"github.com/ava-labs/subnet-evm/core/rawdb"
4040
"github.com/ava-labs/subnet-evm/core/state"
4141
"github.com/ava-labs/subnet-evm/core/state/snapshot"
4242
"github.com/ava-labs/subnet-evm/core/types"

‎core/blockchain_repair_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ import (
3535
"testing"
3636

3737
"github.com/ava-labs/libevm/common"
38+
"github.com/ava-labs/libevm/core/rawdb"
3839
"github.com/ava-labs/libevm/core/vm"
3940
"github.com/ava-labs/libevm/crypto"
4041
"github.com/ava-labs/libevm/triedb"
4142
"github.com/ava-labs/subnet-evm/consensus/dummy"
42-
"github.com/ava-labs/subnet-evm/core/rawdb"
4343
"github.com/ava-labs/subnet-evm/core/types"
4444
"github.com/ava-labs/subnet-evm/params"
4545
"github.com/stretchr/testify/require"

‎core/blockchain_snapshot_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ import (
3939
"testing"
4040

4141
"github.com/ava-labs/libevm/common"
42+
"github.com/ava-labs/libevm/core/rawdb"
4243
"github.com/ava-labs/libevm/core/vm"
4344
"github.com/ava-labs/libevm/ethdb"
4445
"github.com/ava-labs/subnet-evm/consensus"
4546
"github.com/ava-labs/subnet-evm/consensus/dummy"
46-
"github.com/ava-labs/subnet-evm/core/rawdb"
4747
"github.com/ava-labs/subnet-evm/core/types"
4848
"github.com/ava-labs/subnet-evm/params"
4949
"github.com/ava-labs/subnet-evm/plugin/evm/upgrade/legacy"

‎core/blockchain_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,18 @@ import (
1111

1212
"github.com/ava-labs/avalanchego/upgrade"
1313
"github.com/ava-labs/libevm/common"
14+
"github.com/ava-labs/libevm/core/rawdb"
1415
"github.com/ava-labs/libevm/core/vm"
1516
"github.com/ava-labs/libevm/crypto"
1617
"github.com/ava-labs/libevm/eth/tracers/logger"
1718
"github.com/ava-labs/libevm/ethdb"
1819
"github.com/ava-labs/subnet-evm/consensus/dummy"
19-
"github.com/ava-labs/subnet-evm/core/rawdb"
2020
"github.com/ava-labs/subnet-evm/core/state"
2121
"github.com/ava-labs/subnet-evm/core/state/pruner"
2222
"github.com/ava-labs/subnet-evm/core/types"
2323
"github.com/ava-labs/subnet-evm/params"
2424
"github.com/ava-labs/subnet-evm/params/extras"
25+
customrawdb "github.com/ava-labs/subnet-evm/plugin/evm/rawdb"
2526
"github.com/ava-labs/subnet-evm/plugin/evm/upgrade/legacy"
2627
"github.com/holiman/uint256"
2728
)
@@ -239,7 +240,7 @@ func TestCorruptSnapshots(t *testing.T) {
239240
create := func(db ethdb.Database, gspec *Genesis, lastAcceptedHash common.Hash) (*BlockChain, error) {
240241
// Delete the snapshot block hash and state root to ensure that if we die in between writing a snapshot
241242
// diff layer to disk at any point, we can still recover on restart.
242-
rawdb.DeleteSnapshotBlockHash(db)
243+
customrawdb.DeleteSnapshotBlockHash(db)
243244
rawdb.DeleteSnapshotRoot(db)
244245

245246
return createBlockChain(db, pruningConfig, gspec, lastAcceptedHash)

0 commit comments

Comments
 (0)