Skip to content

Commit

Permalink
triedb/pathdb: fix panic in recoverable (#29107)
Browse files Browse the repository at this point in the history
* triedb/pathdb: fix panic in recoverable

* triedb/pathdb: add todo

* triedb/pathdb: rename

* triedb/pathdb: rename
  • Loading branch information
rjl493456442 authored and Francesco4203 committed Nov 5, 2024
1 parent 36c4706 commit 02b6593
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
4 changes: 2 additions & 2 deletions core/rawdb/schema_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func TestResolveAccountTrieNodeKey(t *testing.T) {
},
{
name: "storage prefixed",
inputKey: append(trieNodeStoragePrefix, bytes4...),
inputKey: append(TrieNodeStoragePrefix, bytes4...),
expectedCheck: false,
expectedKey: nil,
},
Expand Down Expand Up @@ -175,7 +175,7 @@ func TestResolveStorageTrieNode(t *testing.T) {
},
{
name: "storage prefixed hash 20 length 4",
inputKey: append(append(trieNodeStoragePrefix, bytes20...), bytes4...),
inputKey: append(append(TrieNodeStoragePrefix, bytes20...), bytes4...),
expectedCheck: false,
expectedHash: common.Hash{},
expectedKey: nil,
Expand Down
13 changes: 9 additions & 4 deletions trie/triedb/pathdb/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -397,18 +397,23 @@ func (db *Database) Recoverable(root common.Hash) bool {
if *id >= dl.stateID() {
return false
}

// This is a temporary workaround for the unavailability of the freezer in
// dev mode. As a consequence, the Pathdb loses the ability for deep reorg
// in certain cases.
// TODO(rjl493456442): Implement the in-memory ancient store.
if db.freezer == nil {
return false
}
// Ensure the requested state is a canonical state and all state
// histories in range [id+1, disklayer.ID] are present and complete.
parent := root
return checkHistories(db.freezer, *id+1, dl.stateID()-*id, func(m *meta) error {
if m.parent != parent {
if m.parent != root {
return errors.New("unexpected state history")
}
if len(m.incomplete) > 0 {
return errors.New("incomplete state history")
}
parent = m.root
root = m.root
return nil
}) == nil
}
Expand Down

0 comments on commit 02b6593

Please sign in to comment.