forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-19 13:21:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rename to MerkleDB

Browse source
This commit is contained in:
Guillaume Ballet 2026-04-13 11:47:14 +02:00
parent 6dcb2f58f6
commit d649d93323
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
core/state/database.go
View file

@ -156,11 +156,11 @@ type Trie interface {
IsUBT() bool IsUBT() bool
} }
// MPTDB is an implementation of Database interface for Merkle Patricia Tries. // MerkleDB is an implementation of Database interface for Merkle Patricia Tries.
// It leverages both trie and state snapshot to provide functionalities for state // It leverages both trie and state snapshot to provide functionalities for state
// access. It's meant to be a long-live object and has a few caches inside for // access. It's meant to be a long-live object and has a few caches inside for
// sharing between blocks. // sharing between blocks.
type MPTDB struct { type MerkleDB struct {
triedb *triedb.Database triedb *triedb.Database
codedb *CodeDB codedb *CodeDB
snap *snapshot.Tree snap *snapshot.Tree
@ -177,7 +177,7 @@ func NewDatabase(tdb *triedb.Database, codedb *CodeDB) Database {
codedb: codedb, codedb: codedb,
} }
} }
return &MPTDB{ return &MerkleDB{
triedb: tdb, triedb: tdb,
codedb: codedb, codedb: codedb,
} }
@ -192,13 +192,13 @@ func NewDatabaseForTesting() Database {
// WithSnapshot configures the provided contract code cache. Note that this // WithSnapshot configures the provided contract code cache. Note that this
// registration must be performed before the MPTDB is used. // registration must be performed before the MPTDB is used.
func (db *MPTDB) WithSnapshot(snapshot *snapshot.Tree) Database { func (db *MerkleDB) WithSnapshot(snapshot *snapshot.Tree) Database {
db.snap = snapshot db.snap = snapshot
return db return db
} }
// StateReader returns a state reader associated with the specified state root. // StateReader returns a state reader associated with the specified state root.
func (db *MPTDB) StateReader(stateRoot common.Hash) (StateReader, error) { func (db *MerkleDB) StateReader(stateRoot common.Hash) (StateReader, error) {
var readers []StateReader var readers []StateReader
// Configure the state reader using the standalone snapshot in hash mode. // Configure the state reader using the standalone snapshot in hash mode.
@ -233,7 +233,7 @@ func (db *MPTDB) StateReader(stateRoot common.Hash) (StateReader, error) {
// Reader implements Database, returning a reader associated with the specified // Reader implements Database, returning a reader associated with the specified
// state root. // state root.
func (db *MPTDB) Reader(stateRoot common.Hash) (Reader, error) { func (db *MerkleDB) Reader(stateRoot common.Hash) (Reader, error) {
sr, err := db.StateReader(stateRoot) sr, err := db.StateReader(stateRoot)
if err != nil { if err != nil {
return nil, err return nil, err
@ -244,7 +244,7 @@ func (db *MPTDB) Reader(stateRoot common.Hash) (Reader, error) {
// ReadersWithCacheStats creates a pair of state readers that share the same // ReadersWithCacheStats creates a pair of state readers that share the same
// underlying state reader and internal state cache, while maintaining separate // underlying state reader and internal state cache, while maintaining separate
// statistics respectively. // statistics respectively.
func (db *MPTDB) ReadersWithCacheStats(stateRoot common.Hash) (Reader, Reader, error) { func (db *MerkleDB) ReadersWithCacheStats(stateRoot common.Hash) (Reader, Reader, error) {
r, err := db.StateReader(stateRoot) r, err := db.StateReader(stateRoot)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
@ -256,7 +256,7 @@ func (db *MPTDB) ReadersWithCacheStats(stateRoot common.Hash) (Reader, Reader, e
} }
// OpenTrie opens the main account trie at a specific root hash. // OpenTrie opens the main account trie at a specific root hash.
func (db *MPTDB) OpenTrie(root common.Hash) (Trie, error) { func (db *MerkleDB) OpenTrie(root common.Hash) (Trie, error) {
tr, err := trie.NewStateTrie(trie.StateTrieID(root), db.triedb) tr, err := trie.NewStateTrie(trie.StateTrieID(root), db.triedb)
if err != nil { if err != nil {
return nil, err return nil, err
@ -265,7 +265,7 @@ func (db *MPTDB) OpenTrie(root common.Hash) (Trie, error) {
} }
// OpenStorageTrie opens the storage trie of an account. // OpenStorageTrie opens the storage trie of an account.
func (db *MPTDB) OpenStorageTrie(stateRoot common.Hash, address common.Address, root common.Hash, self Trie) (Trie, error) { func (db *MerkleDB) OpenStorageTrie(stateRoot common.Hash, address common.Address, root common.Hash, self Trie) (Trie, error) {
tr, err := trie.NewStateTrie(trie.StorageTrieID(stateRoot, crypto.Keccak256Hash(address.Bytes()), root), db.triedb) tr, err := trie.NewStateTrie(trie.StorageTrieID(stateRoot, crypto.Keccak256Hash(address.Bytes()), root), db.triedb)
if err != nil { if err != nil {
return nil, err return nil, err
@ -274,19 +274,19 @@ func (db *MPTDB) OpenStorageTrie(stateRoot common.Hash, address common.Address,
} }
// TrieDB retrieves any intermediate trie-node caching layer. // TrieDB retrieves any intermediate trie-node caching layer.
func (db *MPTDB) TrieDB() *triedb.Database { func (db *MerkleDB) TrieDB() *triedb.Database {
return db.triedb return db.triedb
} }
// Snapshot returns the underlying state snapshot. // Snapshot returns the underlying state snapshot.
func (db *MPTDB) Snapshot() *snapshot.Tree { func (db *MerkleDB) Snapshot() *snapshot.Tree {
return db.snap return db.snap
} }
// Commit flushes all pending writes and finalizes the state transition, // Commit flushes all pending writes and finalizes the state transition,
// committing the changes to the underlying storage. It returns an error // committing the changes to the underlying storage. It returns an error
// if the commit fails. // if the commit fails.
func (db *MPTDB) Commit(update *stateUpdate) error { func (db *MerkleDB) Commit(update *stateUpdate) error {
// Short circuit if nothing to commit // Short circuit if nothing to commit
if update.empty() { if update.empty() {
return nil return nil
@ -319,7 +319,7 @@ func (db *MPTDB) Commit(update *stateUpdate) error {
// Iteratee returns a state iteratee associated with the specified state root, // Iteratee returns a state iteratee associated with the specified state root,
// through which the account iterator and storage iterator can be created. // through which the account iterator and storage iterator can be created.
func (db *MPTDB) Iteratee(root common.Hash) (Iteratee, error) { func (db *MerkleDB) Iteratee(root common.Hash) (Iteratee, error) {
return newStateIteratee(true, root, db.triedb, db.snap) return newStateIteratee(true, root, db.triedb, db.snap)
} }