From 7fc85b8c9b64a17484d0f5c6a24cae8b02cb11d6 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 29 Jul 2021 03:56:54 +0000
Subject: [PATCH] Fix erroneous default start_slot (#18948) (#18951)

(cherry picked from commit 578f2aa22b117143f3809f0edd0dc020b44ebddd)

Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
---
 core/src/rpc.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/src/rpc.rs b/core/src/rpc.rs
index edfb1d11ef..2e248a20af 100644
--- a/core/src/rpc.rs
+++ b/core/src/rpc.rs
@@ -1054,7 +1054,10 @@ impl JsonRpcRequestProcessor {
             .map_err(|_| Error::internal_error())?
             .filter(|&slot| slot <= end_slot && slot <= highest_confirmed_root)
             .collect();
-        let last_element = blocks.last().cloned().unwrap_or_default();
+        let last_element = blocks
+            .last()
+            .cloned()
+            .unwrap_or_else(|| start_slot.saturating_sub(1));
 
         // Maybe add confirmed blocks
         if commitment.is_confirmed() && last_element < end_slot {