Merge pull request bnb-chain#3242 from bnb-chain/develop

Merge develop to master for v1.5.18

Author: zzzckck

cmd/geth/dbcmd.go

@@ -1438,7 +1438,7 @@ func inspectHistory(ctx *cli.Context) error {
 		if header == nil {
 			return 0, fmt.Errorf("block #%d is not existent", blockNumber)
 		}
-		id := rawdb.ReadStateID(db, header.Root)
+		id := rawdb.ReadStateID(db.GetStateStore(), header.Root)
 		if id == nil {
 			first, last, err := triedb.HistoryRange()
 			if err == nil {

core/rawdb/ancient_utils.go

@@ -143,11 +143,7 @@ func InspectFreezerTable(ancient string, freezerName string, tableName string, s
 	)
 	switch freezerName {
 	case ChainFreezerName:
-		if multiDatabase {
-			path, tables = resolveChainFreezerDir(filepath.Dir(ancient)+"/block/ancient"), chainFreezerNoSnappy
-		} else {
-			path, tables = resolveChainFreezerDir(ancient), chainFreezerNoSnappy
-		}
+		path, tables = resolveChainFreezerDir(ancient), chainFreezerNoSnappy
 
 	case MerkleStateFreezerName, VerkleStateFreezerName:
 		if multiDatabase {

core/vm/lightclient/v2/lightclient_test.go

@@ -132,7 +132,7 @@ func TestEncodeConsensusState(t *testing.T) {
 		require.NoError(t, err)
 
 		if !bytes.Equal(csBytes, expectCsBytes) {
-			t.Fatalf("Consensus state mimatch, expect: %s, real:%s\n", testcase.consensusStateBytes, hex.EncodeToString(csBytes))
+			t.Fatalf("Consensus state mismatch, expect: %s, real:%s\n", testcase.consensusStateBytes, hex.EncodeToString(csBytes))
 		}
 	}
 }
@@ -148,11 +148,11 @@ func TestDecodeConsensusState(t *testing.T) {
 		require.NoError(t, err)
 
 		if cs.ChainID != testcase.chainID {
-			t.Fatalf("Chain ID mimatch, expect: %s, real:%s\n", testcase.chainID, cs.ChainID)
+			t.Fatalf("Chain ID mismatch, expect: %s, real:%s\n", testcase.chainID, cs.ChainID)
 		}
 
 		if cs.Height != testcase.height {
-			t.Fatalf("Height mimatch, expect: %d, real:%d\n", testcase.height, cs.Height)
+			t.Fatalf("Height mismatch, expect: %d, real:%d\n", testcase.height, cs.Height)
 		}
 
 		nextValidatorSetHashBytes, err := hex.DecodeString(testcase.nextValidatorSetHash)
@@ -161,7 +161,7 @@ func TestDecodeConsensusState(t *testing.T) {
 		}
 
 		if !bytes.Equal(cs.NextValidatorSetHash, nextValidatorSetHashBytes) {
-			t.Fatalf("Next validator set hash mimatch, expect: %s, real:%s\n", testcase.nextValidatorSetHash, hex.EncodeToString(cs.NextValidatorSetHash))
+			t.Fatalf("Next validator set hash mismatch, expect: %s, real:%s\n", testcase.nextValidatorSetHash, hex.EncodeToString(cs.NextValidatorSetHash))
 		}
 	}
 }

eth/fetcher/block_fetcher.go

@@ -768,7 +768,7 @@ func (f *BlockFetcher) loop() {
 			}
 		case entry := <-f.quickBlockFetchingCh:
 			annHash := entry.announce.hash
-			// if there is error or timeout, and the shcedule have not started, just retry the fetch
+			// if there is error or timeout, and the schedule have not started, just retry the fetch
 			if entry.err != nil {
 				quickBlockFetchingErrMeter.Mark(1)
 				log.Debug("Quick block fetching err", "hash", annHash, "err", entry.err)

node/node.go

@@ -774,7 +774,6 @@ func (n *Node) OpenAndMergeDatabase(name string, namespace string, readonly bool
 	var (
 		err                          error
 		stateDiskDb                  ethdb.Database
-		disableChainDbFreeze         = false
 		chainDataHandles             = config.DatabaseHandles
 		chainDbCache                 = config.DatabaseCache
 		stateDbCache, stateDbHandles int
@@ -791,17 +790,16 @@ func (n *Node) OpenAndMergeDatabase(name string, namespace string, readonly bool
 
 		stateDbCache = config.DatabaseCache - chainDbCache
 		stateDbHandles = config.DatabaseHandles - chainDataHandles
-		disableChainDbFreeze = true
 	}
 
-	chainDB, err := n.OpenDatabaseWithFreezer(name, chainDbCache, chainDataHandles, config.DatabaseFreezer, namespace, readonly, disableChainDbFreeze)
+	chainDB, err := n.OpenDatabaseWithFreezer(name, chainDbCache, chainDataHandles, config.DatabaseFreezer, namespace, readonly, false)
 	if err != nil {
 		return nil, err
 	}
 
 	if isMultiDatabase {
 		// Allocate half of the  handles and chainDbCache to this separate state data database
-		stateDiskDb, err = n.OpenDatabaseWithFreezer(name+"/state", stateDbCache, stateDbHandles, "", "eth/db/statedata/", readonly, true)
+		stateDiskDb, err = n.OpenDatabaseWithFreezer(name+"/state", stateDbCache, stateDbHandles, "", "eth/db/statedata/", readonly, false)
 		if err != nil {
 			return nil, err
 		}