diff --git a/core/blockchain.go b/core/blockchain.go index dbd0df662c..cb4bd42024 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -90,7 +90,7 @@ type BlockChain struct { cacheConfig *CacheConfig // Cache configuration for pruning db ethdb.Database // Low level persistent database to store final content in - blockExplorerDb int + blockExplorerDb ethdb.Database triegc *prque.Prque // Priority queue mapping block numbers to tries to gc gcproc time.Duration // Accumulates canonical block processing for trie dumping @@ -153,7 +153,7 @@ func NewBlockChain(db ethdb.Database, blockExplorerDb ethdb.Database, cacheConfi chainConfig: chainConfig, cacheConfig: cacheConfig, db: db, - blockExplorerDb: 101, + blockExplorerDb: blockExplorerDb, triegc: prque.New(), stateCache: state.NewDatabase(db), quit: make(chan struct{}), diff --git a/eth/backend.go b/eth/backend.go index a956266a25..45f4bb2dbd 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -115,7 +115,12 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { if err != nil { return nil, err } + // @NOTE:shyft instantiate BlockExplorerDB here? + blockExplorerDb, err := CreateDB(ctx, config, "blockExplorerDb") + if err != nil { + return nil, err + } stopDbUpgrade := upgradeDeduplicateData(chainDb) chainConfig, genesisHash, genesisErr := core.SetupGenesisBlock(chainDb, config.Genesis) if _, ok := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !ok { @@ -153,7 +158,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { vmConfig = vm.Config{EnablePreimageRecording: config.EnablePreimageRecording} cacheConfig = &core.CacheConfig{Disabled: config.NoPruning, TrieNodeLimit: config.TrieCache, TrieTimeLimit: config.TrieTimeout} ) - eth.blockchain, err = core.NewBlockChain(chainDb, chainDb, cacheConfig, eth.chainConfig, eth.engine, vmConfig) + eth.blockchain, err = core.NewBlockChain(chainDb, blockExplorerDb, cacheConfig, eth.chainConfig, eth.engine, vmConfig) if err != nil { return nil, err }