forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-18 10:50:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix some incorrect shuffling

Browse source
This commit is contained in:
Guillaume Ballet 2026-02-05 10:06:25 +01:00
parent c61d2d307d
commit 9f89625a0d
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
core/state/database.go
View file

@ -309,11 +309,7 @@ func (db *CachingDB) ReadersWithCacheStats(stateRoot common.Hash) (ReaderWithSta
func (db *CachingDB) OpenTrie(root common.Hash) (Trie, error) { func (db *CachingDB) OpenTrie(root common.Hash) (Trie, error) {
reader, err := db.triedb.StateReader(root) reader, err := db.triedb.StateReader(root)
if err != nil { if err != nil {
tr, err := trie.NewStateTrie(trie.StateTrieID(root), db.triedb) return nil, err
if err != nil {
return nil, err
}
return tr, nil
} }
flatReader := newFlatReader(reader) flatReader := newFlatReader(reader)
@ -328,17 +324,14 @@ func (db *CachingDB) OpenTrie(root common.Hash) (Trie, error) {
return bt, nil return bt, nil
} }
base, err := trie.NewStateTrie(trie.StateTrieID(root), db.triedb) base, err := trie.NewStateTrie(trie.StateTrieID(ts.BaseRoot), db.triedb)
if err != nil { if err != nil {
return nil, fmt.Errorf("could not create base trie in OpenTrie: %w", err) return nil, fmt.Errorf("could not create base trie in OpenTrie: %w", err)
} }
return transitiontrie.NewTransitionTrie(base, bt, false), nil return transitiontrie.NewTransitionTrie(base, bt, false), nil
} }
tr, err := trie.NewStateTrie(trie.StateTrieID(root), db.triedb)
if err != nil { return trie.NewStateTrie(trie.StateTrieID(root), db.triedb)
return nil, err
}
return tr, nil
} }
// OpenStorageTrie opens the storage trie of an account. // OpenStorageTrie opens the storage trie of an account.