From 2406305175593bb8547f5711912dc41c7a26f0f7 Mon Sep 17 00:00:00 2001
From: Ng Wei Han <47109095+weiihann@users.noreply.github.com>
Date: Thu, 28 Nov 2024 16:17:58 +0700
Subject: [PATCH] trie: combine validation loops in VerifyRangeProof (#30823)

Small optimization. It's guaranteed that `len(keys)` == `len(values)`,
so we can combine the checks in a single loop rather than 2 separate
loops.
---
 trie/proof.go | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/trie/proof.go b/trie/proof.go
index 40836fba33..2e527348bf 100644
--- a/trie/proof.go
+++ b/trie/proof.go
@@ -486,13 +486,11 @@ func VerifyRangeProof(rootHash common.Hash, firstKey []byte, keys [][]byte, valu
 		return false, fmt.Errorf("inconsistent proof data, keys: %d, values: %d", len(keys), len(values))
 	}
 	// Ensure the received batch is monotonic increasing and contains no deletions
-	for i := 0; i < len(keys)-1; i++ {
-		if bytes.Compare(keys[i], keys[i+1]) >= 0 {
+	for i := 0; i < len(keys); i++ {
+		if i < len(keys)-1 && bytes.Compare(keys[i], keys[i+1]) >= 0 {
 			return false, errors.New("range is not monotonically increasing")
 		}
-	}
-	for _, value := range values {
-		if len(value) == 0 {
+		if len(values[i]) == 0 {
 			return false, errors.New("range contains deletion")
 		}
 	}