Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

trie/proof: fix pbss trie proof generate bug; #117

Merged
merged 1 commit into from
Sep 26, 2023
Merged

trie/proof: fix pbss trie proof generate bug; #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 15 additions & 17 deletions trie/proof.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,17 +118,15 @@ func (t *StateTrie) Prove(key []byte, proofDb ethdb.KeyValueWriter) error {
// If the trie contains the key, the returned node is the node that contains the
// value for the key. If nodes is specified, the traversed nodes are appended to
// it.
func (t *Trie) traverseNodes(tn node, key []byte, nodes *[]node, epoch types.StateEpoch, updateEpoch bool) (node, error) {

var prefix []byte

for len(key) > 0 && tn != nil {
func (t *Trie) traverseNodes(tn node, prefixKey, suffixKey []byte, nodes *[]node, epoch types.StateEpoch, updateEpoch bool) (node, error) {
for len(suffixKey) > 0 && tn != nil {
log.Info("traverseNodes loop", "prefix", common.Bytes2Hex(prefixKey), "suffix", common.Bytes2Hex(suffixKey), "n", tn.fstring(""))
switch n := tn.(type) {
case *shortNode:
if len(key) >= len(n.Key) && bytes.Equal(n.Key, key[:len(n.Key)]) {
if len(suffixKey) >= len(n.Key) && bytes.Equal(n.Key, suffixKey[:len(n.Key)]) {
tn = n.Val
prefix = append(prefix, n.Key...)
key = key[len(n.Key):]
prefixKey = append(prefixKey, n.Key...)
suffixKey = suffixKey[len(n.Key):]
if nodes != nil {
*nodes = append(*nodes, n)
}
Expand All @@ -142,8 +140,8 @@ func (t *Trie) traverseNodes(tn node, key []byte, nodes *[]node, epoch types.Sta
// if there is a extern node, must put the val
hn, isExternNode := n.Val.(hashNode)
if isExternNode && nodes != nil {
prefix = append(prefix, n.Key...)
nextBlob, err := t.reader.node(prefix, common.BytesToHash(hn))
prefixKey = append(prefixKey, n.Key...)
nextBlob, err := t.reader.node(prefixKey, common.BytesToHash(hn))
if err != nil {
log.Error("Unhandled next trie error in traverseNodes", "err", err)
return nil, err
Expand All @@ -152,9 +150,9 @@ func (t *Trie) traverseNodes(tn node, key []byte, nodes *[]node, epoch types.Sta
*nodes = append(*nodes, next)
}
case *fullNode:
tn = n.Children[key[0]]
prefix = append(prefix, key[0])
key = key[1:]
tn = n.Children[suffixKey[0]]
prefixKey = append(prefixKey, suffixKey[0])
suffixKey = suffixKey[1:]
if nodes != nil {
*nodes = append(*nodes, n)
}
Expand All @@ -164,7 +162,7 @@ func (t *Trie) traverseNodes(tn node, key []byte, nodes *[]node, epoch types.Sta
// loaded blob will be tracked, while it's not required here since
// all loaded nodes won't be linked to trie at all and track nodes
// may lead to out-of-memory issue.
blob, err := t.reader.node(prefix, common.BytesToHash(n))
blob, err := t.reader.node(prefixKey, common.BytesToHash(n))
if err != nil {
log.Error("Unhandled trie error in traverseNodes", "err", err)
return nil, err
Expand All @@ -173,7 +171,7 @@ func (t *Trie) traverseNodes(tn node, key []byte, nodes *[]node, epoch types.Sta
// clean cache or the database, they are all in their own
// copy and safe to use unsafe decoder.
tn = mustDecodeNodeUnsafe(n, blob)
if err = t.resolveEpochMeta(tn, epoch, prefix); err != nil {
if err = t.resolveEpochMeta(tn, epoch, prefixKey); err != nil {
return nil, err
}
default:
Expand All @@ -199,15 +197,15 @@ func (t *Trie) ProvePath(key []byte, prefixKeyHex []byte, proofDb ethdb.KeyValue
// traverse down using the prefixKeyHex
var nodes []node
tn := t.root
startNode, err := t.traverseNodes(tn, prefixKeyHex, nil, 0, false) // obtain the node where the prefixKeyHex leads to
startNode, err := t.traverseNodes(tn, nil, prefixKeyHex, nil, 0, false) // obtain the node where the prefixKeyHex leads to
if err != nil {
return err
}

key = key[len(prefixKeyHex):] // obtain the suffix key

// traverse through the suffix key
_, err = t.traverseNodes(startNode, key, &nodes, 0, false)
_, err = t.traverseNodes(startNode, prefixKeyHex, key, &nodes, 0, false)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion trie/triedb/pathdb/difflayer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (dl *diffLayer) node(owner common.Hash, path []byte, hash common.Hash, dept
// bubble up an error here. It shouldn't happen at all.
if n.Hash != hash {
dirtyFalseMeter.Mark(1)
log.Error("Unexpected trie node in diff layer", "owner", owner, "path", path, "expect", hash, "got", n.Hash)
log.Error("Unexpected trie node in diff layer", "root", dl.root, "owner", owner, "path", path, "expect", hash, "got", n.Hash)
return nil, newUnexpectedNodeError("diff", hash, n.Hash, owner, path)
}
dirtyHitMeter.Mark(1)
Expand Down
Loading