roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

trie: fix range prover (#24266)

Browse Source
This commit is contained in:
rjl493456442 2022-01-21 17:41:51 +08:00 committed by GitHub
parent c029cdc90b
commit ae45c97d3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
trie/proof.go
View File

@ -406,7 +406,7 @@ func unset(parent node, child node, key []byte, pos int, removeLeft bool) error
} }
// hasRightElement returns the indicator whether there exists more elements // hasRightElement returns the indicator whether there exists more elements
// in the right side of the given path. The given path can point to an existent // on the right side of the given path. The given path can point to an existent
// key or a non-existent one. This function has the assumption that the whole // key or a non-existent one. This function has the assumption that the whole
// path should already be resolved. // path should already be resolved.
func hasRightElement(node node, key []byte) bool { func hasRightElement(node node, key []byte) bool {
@ -505,7 +505,7 @@ func VerifyRangeProof(rootHash common.Hash, firstKey []byte, lastKey []byte, key
if val != nil || hasRightElement(root, firstKey) { if val != nil || hasRightElement(root, firstKey) {
return false, errors.New("more entries available") return false, errors.New("more entries available")
} }
return hasRightElement(root, firstKey), nil return false, nil
} }
// Special case, there is only one element and two edge keys are same. // Special case, there is only one element and two edge keys are same.
// In this case, we can't construct two edge paths. So handle it here. // In this case, we can't construct two edge paths. So handle it here.
@ -563,7 +563,7 @@ func VerifyRangeProof(rootHash common.Hash, firstKey []byte, lastKey []byte, key
if tr.Hash() != rootHash { if tr.Hash() != rootHash {
return false, fmt.Errorf("invalid proof, want hash %x, got %x", rootHash, tr.Hash()) return false, fmt.Errorf("invalid proof, want hash %x, got %x", rootHash, tr.Hash())
} }
return hasRightElement(root, keys[len(keys)-1]), nil return hasRightElement(tr.root, keys[len(keys)-1]), nil
} }
// get returns the child of the given node. Return nil if the // get returns the child of the given node. Return nil if the