Revert "trie: make rhs-proof align with last key in range proofs (eth…

…ereum#28311)"

This reverts commit 51d0547.

cmd/devp2p/internal/ethtest/snap.go

@@ -536,7 +536,11 @@ func (s *Suite) snapGetAccountRange(t *utesting.T, tc *accRangeTest) error {
  }
  proofdb := nodes.Set()
 
- _, err = trie.VerifyRangeProof(tc.root, tc.origin[:], keys, accounts, proofdb)
+ var end []byte
+ if len(keys) > 0 {
+ end = keys[len(keys)-1]
+ }
+ _, err = trie.VerifyRangeProof(tc.root, tc.origin[:], end, keys, accounts, proofdb)
  return err
 }
 

core/state/snapshot/generate.go

@@ -247,6 +247,11 @@ func (dl *diskLayer) proveRange(ctx *generatorContext, trieId *trie.ID, prefix [
  ctx.stats.Log("Trie missing, state snapshotting paused", dl.root, dl.genMarker)
  return nil, errMissingTrie
  }
+ // Firstly find out the key of last iterated element.
+ var last []byte
+ if len(keys) > 0 {
+ last = keys[len(keys)-1]
+ }
  // Generate the Merkle proofs for the first and last element
  if origin == nil {
  origin = common.Hash{}.Bytes()
@@ -261,9 +266,9 @@ func (dl *diskLayer) proveRange(ctx *generatorContext, trieId *trie.ID, prefix [
  tr: tr,
  }, nil
  }
- if len(keys) > 0 {
- if err := tr.Prove(keys[len(keys)-1], proof); err != nil {
- log.Debug("Failed to prove range", "kind", kind, "last", keys[len(keys)-1], "err", err)
+ if last != nil {
+ if err := tr.Prove(last, proof); err != nil {
+ log.Debug("Failed to prove range", "kind", kind, "last", last, "err", err)
  return &proofResult{
  keys: keys,
  vals: vals,
@@ -275,7 +280,7 @@ func (dl *diskLayer) proveRange(ctx *generatorContext, trieId *trie.ID, prefix [
  }
  // Verify the snapshot segment with range prover, ensure that all flat states
  // in this range correspond to merkle trie.
- cont, err := trie.VerifyRangeProof(root, origin, keys, vals, proof)
+ cont, err := trie.VerifyRangeProof(root, origin, last, keys, vals, proof)
  return &proofResult{
  keys: keys,
  vals: vals,

eth/protocols/snap/sync.go

@@ -2401,7 +2401,13 @@ func (s *Syncer) OnAccounts(peer SyncPeer, id uint64, hashes []common.Hash, acco
  for i, node := range proof {
  nodes[i] = node
  }
- cont, err := trie.VerifyRangeProof(root, req.origin[:], keys, accounts, nodes.Set())
+ proofdb := nodes.Set()
+
+ var end []byte
+ if len(keys) > 0 {
+ end = keys[len(keys)-1]
+ }
+ cont, err := trie.VerifyRangeProof(root, req.origin[:], end, keys, accounts, proofdb)
  if err != nil {
  logger.Warn("Account range failed proof", "err", err)
  // Signal this request as failed, and ready for rescheduling
@@ -2653,7 +2659,7 @@ func (s *Syncer) OnStorage(peer SyncPeer, id uint64, hashes [][]common.Hash, slo
  if len(nodes) == 0 {
  // No proof has been attached, the response must cover the entire key
  // space and hash to the origin root.
- _, err = trie.VerifyRangeProof(req.roots[i], nil, keys, slots[i], nil)
+ _, err = trie.VerifyRangeProof(req.roots[i], nil, nil, keys, slots[i], nil)
  if err != nil {
  s.scheduleRevertStorageRequest(req) // reschedule request
  logger.Warn("Storage slots failed proof", "err", err)
@@ -2664,7 +2670,11 @@ func (s *Syncer) OnStorage(peer SyncPeer, id uint64, hashes [][]common.Hash, slo
  // returned data is indeed part of the storage trie
  proofdb := nodes.Set()
 
- cont, err = trie.VerifyRangeProof(req.roots[i], req.origin[:], keys, slots[i], proofdb)
+ var end []byte
+ if len(keys) > 0 {
+ end = keys[len(keys)-1]
+ }
+ cont, err = trie.VerifyRangeProof(req.roots[i], req.origin[:], end, keys, slots[i], proofdb)
  if err != nil {
  s.scheduleRevertStorageRequest(req) // reschedule request
  logger.Warn("Storage range failed proof", "err", err)

tests/fuzzers/rangeproof/rangeproof-fuzzer.go

@@ -128,7 +128,7 @@ func (f *fuzzer) fuzz() int {
  if len(keys) == 0 {
  return 0
  }
- var first = keys[0]
+ var first, last = keys[0], keys[len(keys)-1]
  testcase %= 6
  switch testcase {
  case 0:
@@ -165,7 +165,7 @@ func (f *fuzzer) fuzz() int {
  }
  ok = 1
  //nodes, subtrie
- hasMore, err := trie.VerifyRangeProof(tr.Hash(), first, keys, vals, proof)
+ hasMore, err := trie.VerifyRangeProof(tr.Hash(), first, last, keys, vals, proof)
  if err != nil {
  if hasMore {
  panic("err != nil && hasMore == true")

trie/proof.go

@@ -481,7 +481,7 @@ func hasRightElement(node node, key []byte) bool {
 // Note: This method does not verify that the proof is of minimal form. If the input
 // proofs are 'bloated' with neighbour leaves or random data, aside from the 'useful'
 // data, then the proof will still be accepted.
-func VerifyRangeProof(rootHash common.Hash, firstKey []byte, keys [][]byte, values [][]byte, proof ethdb.KeyValueReader) (bool, error) {
+func VerifyRangeProof(rootHash common.Hash, firstKey []byte, lastKey []byte, keys [][]byte, values [][]byte, proof ethdb.KeyValueReader) (bool, error) {
  if len(keys) != len(values) {
  return false, fmt.Errorf("inconsistent proof data, keys: %d, values: %d", len(keys), len(values))
  }
@@ -520,7 +520,6 @@ func VerifyRangeProof(rootHash common.Hash, firstKey []byte, keys [][]byte, valu
  }
  return false, nil
  }
- var lastKey = keys[len(keys)-1]
  // 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.
  if len(keys) == 1 && bytes.Equal(firstKey, lastKey) {