core: set path mode as default

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()
 		}

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++ {

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

core/state/database.go

@@ -185,6 +185,7 @@ func (db *cachingDB) OpenTrie(root common.Hash) (Trie, error) {
 	}
 	tr, err := trie.NewStateTrie(trie.StateTrieID(root), db.triedb)
 	if err != nil {
+		fmt.Println("Failed to open trie: ", err)
 		return nil, err
 	}
 	return tr, nil

trie/database.go

@@ -109,12 +109,12 @@ func NewDatabase(diskdb ethdb.Database, config *Config) *Database {
 	// Sanitize the config and use the default one if it's not specified.
 	dbScheme := rawdb.ReadStateScheme(diskdb)
 	if config == nil {
-		if dbScheme == rawdb.PathScheme {
+		if dbScheme == rawdb.HashScheme {
+			config = HashDefaults
+		} else {
 			config = &Config{
 				PathDB: pathdb.Defaults,
 			}
-		} else {
-			config = HashDefaults
 		}
 	}
 	if config.PathDB == nil && config.HashDB == nil {
@@ -136,7 +136,7 @@ func NewDatabase(diskdb ethdb.Database, config *Config) *Database {
 	/*
 	 * 1. First, initialize db according to the user config
 	 * 2. Second, initialize the db according to the scheme already used by db
-	 * 3. Last, use the default scheme, namely hash scheme
+	 * 3. Last, use the default scheme, namely path scheme
 	 */
 	if config.HashDB != nil {
 		if rawdb.ReadStateScheme(diskdb) == rawdb.PathScheme {
@@ -148,16 +148,16 @@ func NewDatabase(diskdb ethdb.Database, config *Config) *Database {
 			log.Warn("incompatible state scheme", "old", rawdb.HashScheme, "new", rawdb.PathScheme)
 		}
 		db.backend = pathdb.New(diskdb, config.PathDB)
-	} else if strings.Compare(dbScheme, rawdb.PathScheme) == 0 {
-		if config.PathDB == nil {
-			config.PathDB = pathdb.Defaults
-		}
-		db.backend = pathdb.New(diskdb, config.PathDB)
-	} else {
+	} else if strings.Compare(dbScheme, rawdb.HashScheme) == 0 {
 		if config.HashDB == nil {
 			config.HashDB = hashdb.Defaults
 		}
 		db.backend = hashdb.New(diskdb, config.HashDB, mptResolver{})
+	} else {
+		if config.PathDB == nil {
+			config.PathDB = pathdb.Defaults
+		}
+		db.backend = pathdb.New(diskdb, config.PathDB)
 	}
 	return db
 }