core: set path mode as default

bnb-chain · Feb 28, 2024 · f7e6956 · f7e6956
1 parent b7b64da
commit f7e6956
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/core/blockchain.go b/core/blockchain.go
@@ -199,7 +199,7 @@ var defaultCacheConfig = &CacheConfig{
 	SnapshotLimit:  256,
 	TriesInMemory:  128,
 	SnapshotWait:   true,
-	StateScheme:    rawdb.HashScheme,
+	StateScheme:    rawdb.PathScheme,
 }
 
 // DefaultCacheConfigWithScheme returns a deep copied default cache config with
@@ -2035,7 +2035,7 @@ func (bc *BlockChain) insertChain(chain types.Blocks, setHead bool) (int, error)
 			go throwaway.TriePrefetchInAdvance(block, signer)
 		}
 
-		//Process block using the parent state as reference point
+		// Process block using the parent state as reference point
 		if bc.pipeCommit {
 			statedb.EnablePipeCommit()
 		}

diff --git a/core/chain_makers.go b/core/chain_makers.go
@@ -32,6 +32,7 @@ import (
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/trie"
+	"github.com/ethereum/go-ethereum/trie/triedb/pathdb"
 )
 
 // BlockGen creates blocks for testing.
@@ -339,8 +340,9 @@ func GenerateChain(config *params.ChainConfig, parent *types.Block, engine conse
 		}
 		return nil, nil
 	}
-	// Forcibly use hash-based state scheme for retaining all nodes in disk.
-	triedb := trie.NewDatabase(db, trie.HashDefaults)
+
+	// Forcibly use path-based state scheme for retaining all nodes in disk.
+	triedb := trie.NewDatabase(db, &trie.Config{PathDB: pathdb.Defaults})
 	defer triedb.Close()
 
 	for i := 0; i < n; i++ {

diff --git a/core/rawdb/accessors_trie.go b/core/rawdb/accessors_trie.go
@@ -333,10 +333,10 @@ func ParseStateScheme(provided string, disk ethdb.Database) (string, error) {
 	stored := ReadStateScheme(disk)
 	if provided == "" {
 		if stored == "" {
-			// use default scheme for empty database, flip it when
-			// path mode is chosen as default
-			log.Info("State scheme set to default", "scheme", "hash")
-			return HashScheme, nil
+			// use default scheme for empty database, now path mode
+			// is chosen as default
+			log.Info("State scheme set to default", "scheme", PathScheme)
+			return PathScheme, nil
 		}
 		log.Info("State scheme set to already existing disk db", "scheme", stored)
 		return stored, nil // reuse scheme of persistent scheme