forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

trie: add comments

Browse source
This commit is contained in:
rjl493456442 2019-05-07 19:10:33 +08:00
parent 04dccfb25a
commit de84bcb7db
2 changed files with 2 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
trie/proof.go
View file

@ -103,10 +103,9 @@ func (t *SecureTrie) Prove(key []byte, fromLevel uint, proofDb ethdb.Writer) err
// VerifyProof checks merkle proofs. The given proof must contain the value for // VerifyProof checks merkle proofs. The given proof must contain the value for
// key in a trie with the given root hash. VerifyProof returns an error if the // key in a trie with the given root hash. VerifyProof returns an error if the
// proof contains invalid trie nodes or the wrong value. // proof contains invalid trie nodes or the wrong value.
//
// Note, the method assumes that all key-values in proofDb satisfy key = hash(value).
func VerifyProof(rootHash common.Hash, key []byte, proofDb ethdb.Reader) (value []byte, nodes int, err error) { func VerifyProof(rootHash common.Hash, key []byte, proofDb ethdb.Reader) (value []byte, nodes int, err error) {
hasher := newHasher(nil)
defer returnHasherToPool(hasher)
key = keybytesToHex(key) key = keybytesToHex(key)
wantHash := rootHash wantHash := rootHash
for i := 0; ; i++ { for i := 0; ; i++ {
@ -114,9 +113,6 @@ func VerifyProof(rootHash common.Hash, key []byte, proofDb ethdb.Reader) (value
if buf == nil { if buf == nil {
return nil, i, fmt.Errorf("proof node %d (hash %064x) missing", i, wantHash) return nil, i, fmt.Errorf("proof node %d (hash %064x) missing", i, wantHash)
} }
if !bytes.Equal(hasher.makeHashNode(buf), wantHash.Bytes()) {
return nil, i, fmt.Errorf("proof node %d (hash %064x) invalid", i, wantHash)
}
n, err := decodeNode(wantHash[:], buf) n, err := decodeNode(wantHash[:], buf)
if err != nil { if err != nil {
return nil, i, fmt.Errorf("bad proof node %d: %v", i, err) return nil, i, fmt.Errorf("bad proof node %d: %v", i, err)

29
trie/proof_test.go
View file

@ -125,35 +125,6 @@ func TestBadProof(t *testing.T) {
} }
} }
func TestMutateValueProof(t *testing.T) {
trie, vals := randomTrie(800)
root := trie.Hash()
for i, prover := range makeProvers(trie) {
for _, kv := range vals {
proof := prover(kv.k)
if proof == nil {
t.Fatalf("prover %d: nil proof", i)
}
it := proof.NewIterator()
for i, d := 0, mrand.Intn(proof.Len()); i <= d; i++ {
it.Next()
}
key := it.Key()
val, _ := proof.Get(key)
proof.Delete(key)
it.Release()
origin := crypto.Keccak256(val)
mutateByte(val)
proof.Put(origin, val)
if _, _, err := VerifyProof(root, kv.k, proof); err == nil {
t.Fatalf("prover %d: expected proof to fail for key %x", i, kv.k)
}
}
}
}
// Tests that missing keys can also be proven. The test explicitly uses a single // Tests that missing keys can also be proven. The test explicitly uses a single
// entry trie and checks for missing keys both before and after the single entry. // entry trie and checks for missing keys both before and after the single entry.
func TestMissingKeyProof(t *testing.T) { func TestMissingKeyProof(t *testing.T) {