Do not reinit the explorer db every restart (#3199)

api/service/explorer/service.go

@@ -51,7 +51,7 @@ func New(selfPeer *p2p.Peer) *Service {
 // StartService starts explorer service.
 func (s *Service) StartService() {
 	utils.Logger().Info().Msg("Starting explorer service.")
-	s.Init(true)
+	s.Init()
 	s.server = s.Run()
 }
 
@@ -75,8 +75,8 @@ func GetExplorerPort(nodePort string) string {
 }
 
 // Init is to initialize for ExplorerService.
-func (s *Service) Init(remove bool) {
-	s.Storage = GetStorageInstance(s.IP, s.Port, remove)
+func (s *Service) Init() {
+	s.Storage = GetStorageInstance(s.IP, s.Port)
 }
 
 // Run is to run serving explorer.

api/service/explorer/storage.go

@@ -3,7 +3,6 @@ package explorer
 import (
 	"fmt"
 	"math/big"
-	"os"
 	"path"
 	"sync"
 
@@ -44,25 +43,20 @@ type Storage struct {
 }
 
 // GetStorageInstance returns attack model by using singleton pattern.
-func GetStorageInstance(ip, port string, remove bool) *Storage {
+func GetStorageInstance(ip, port string) *Storage {
 	once.Do(func() {
 		storage = &Storage{}
-		storage.Init(ip, port, remove)
+		storage.Init(ip, port)
 	})
 	return storage
 }
 
 // Init initializes the block update.
-func (storage *Storage) Init(ip, port string, remove bool) {
+func (storage *Storage) Init(ip, port string) {
 	dbFileName := path.Join(nodeconfig.GetDefaultConfig().DBDir, "explorer_storage_"+ip+"_"+port)
 	utils.Logger().Info().Msg("explorer storage folder: " + dbFileName)
 	var err error
-	if remove {
-		var err = os.RemoveAll(dbFileName)
-		if err != nil {
-			utils.Logger().Error().Err(err).Msg("Failed to remove existing database files")
-		}
-	}
+
 	// https://github.com/ethereum/go-ethereum/blob/master/ethdb/leveldb/leveldb.go#L98 options.
 	// We had 0 for handles and cache params before, so set 0s for all of them. Filter opt is the same.
 	options := &opt.Options{
@@ -83,18 +77,18 @@ func (storage *Storage) GetDB() *leveldb.DB {
 
 // Dump extracts information from block and index them into lvdb for explorer.
 func (storage *Storage) Dump(block *types.Block, height uint64) {
-	storage.lock.Lock()
-	defer storage.lock.Unlock()
-	if block == nil {
-		return
-	}
-
 	// Skip dump for redundant blocks with lower block number than the checkpoint block number
 	blockCheckpoint := GetCheckpointKey(block.Header().Number())
 	if _, err := storage.GetDB().Get([]byte(blockCheckpoint), nil); err == nil {
 		return
 	}
 
+	storage.lock.Lock()
+	defer storage.lock.Unlock()
+	if block == nil {
+		return
+	}
+
 	acntsTxns, acntsStakingTxns := computeAccountsTransactionsMapForBlock(block)
 
 	for address, txRecords := range acntsTxns {

api/service/explorer/storage_test.go

@@ -16,7 +16,7 @@ func TestGetAddressKey(t *testing.T) {
 // TestInit ..
 func TestInit(t *testing.T) {
 	nodeconfig.GetDefaultConfig().DBDir = "/tmp"
-	ins := GetStorageInstance("1.1.1.1", "3333", true)
+	ins := GetStorageInstance("1.1.1.1", "3333")
 	if err := ins.GetDB().Put([]byte{1}, []byte{2}, nil); err != nil {
 		t.Fatal("(*LDBDatabase).Put failed:", err)
 	}

node/node_explorer.go

@@ -133,7 +133,7 @@ func (node *Node) AddNewBlockForExplorer(block *types.Block) {
 				Msg("[Explorer] Populating explorer data from state synced blocks")
 			go func() {
 				for blockHeight := int64(block.NumberU64()) - 1; blockHeight >= 0; blockHeight-- {
-					explorer.GetStorageInstance(node.SelfPeer.IP, node.SelfPeer.Port, true).Dump(
+					explorer.GetStorageInstance(node.SelfPeer.IP, node.SelfPeer.Port).Dump(
 						node.Blockchain().GetBlockByNumber(uint64(blockHeight)), uint64(blockHeight))
 				}
 			}()
@@ -150,7 +150,7 @@ func (node *Node) commitBlockForExplorer(block *types.Block) {
 	}
 	// Dump new block into level db.
 	utils.Logger().Info().Uint64("blockNum", block.NumberU64()).Msg("[Explorer] Committing block into explorer DB")
-	explorer.GetStorageInstance(node.SelfPeer.IP, node.SelfPeer.Port, true).Dump(block, block.NumberU64())
+	explorer.GetStorageInstance(node.SelfPeer.IP, node.SelfPeer.Port).Dump(block, block.NumberU64())
 
 	curNum := block.NumberU64()
 	if curNum-100 > 0 {
@@ -163,7 +163,7 @@ func (node *Node) commitBlockForExplorer(block *types.Block) {
 func (node *Node) GetTransactionsHistory(address, txType, order string) ([]common.Hash, error) {
 	addressData := &explorer.Address{}
 	key := explorer.GetAddressKey(address)
-	bytes, err := explorer.GetStorageInstance(node.SelfPeer.IP, node.SelfPeer.Port, false).GetDB().Get([]byte(key), nil)
+	bytes, err := explorer.GetStorageInstance(node.SelfPeer.IP, node.SelfPeer.Port).GetDB().Get([]byte(key), nil)
 	if err != nil {
 		utils.Logger().Debug().Err(err).
 			Msgf("[Explorer] Error retrieving transaction history for address %s", address)
@@ -196,7 +196,7 @@ func (node *Node) GetTransactionsHistory(address, txType, order string) ([]commo
 func (node *Node) GetStakingTransactionsHistory(address, txType, order string) ([]common.Hash, error) {
 	addressData := &explorer.Address{}
 	key := explorer.GetAddressKey(address)
-	bytes, err := explorer.GetStorageInstance(node.SelfPeer.IP, node.SelfPeer.Port, false).GetDB().Get([]byte(key), nil)
+	bytes, err := explorer.GetStorageInstance(node.SelfPeer.IP, node.SelfPeer.Port).GetDB().Get([]byte(key), nil)
 	if err != nil {
 		utils.Logger().Debug().Err(err).
 			Msgf("[Explorer] Staking transaction history for address %s not found", address)
@@ -229,7 +229,7 @@ func (node *Node) GetStakingTransactionsHistory(address, txType, order string) (
 func (node *Node) GetTransactionsCount(address, txType string) (uint64, error) {
 	addressData := &explorer.Address{}
 	key := explorer.GetAddressKey(address)
-	bytes, err := explorer.GetStorageInstance(node.SelfPeer.IP, node.SelfPeer.Port, false).GetDB().Get([]byte(key), nil)
+	bytes, err := explorer.GetStorageInstance(node.SelfPeer.IP, node.SelfPeer.Port).GetDB().Get([]byte(key), nil)
 	if err != nil {
 		utils.Logger().Error().Err(err).Msg("[Explorer] Cannot get storage db instance")
 		return 0, nil
@@ -252,7 +252,7 @@ func (node *Node) GetTransactionsCount(address, txType string) (uint64, error) {
 func (node *Node) GetStakingTransactionsCount(address, txType string) (uint64, error) {
 	addressData := &explorer.Address{}
 	key := explorer.GetAddressKey(address)
-	bytes, err := explorer.GetStorageInstance(node.SelfPeer.IP, node.SelfPeer.Port, false).GetDB().Get([]byte(key), nil)
+	bytes, err := explorer.GetStorageInstance(node.SelfPeer.IP, node.SelfPeer.Port).GetDB().Get([]byte(key), nil)
 	if err != nil {
 		utils.Logger().Error().Err(err).Msg("[Explorer] Cannot get storage db instance")
 		return 0, nil