From 127e7407e449acacb832c68ea68dd07ee9906992 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 9 Apr 2021 21:36:44 +0000
Subject: [PATCH] Fill in not-yet-finalized block-time if possible (#16460)
 (#16462)

(cherry picked from commit 8bc0bdd40b4e930f32f5ac904041471e77174eeb)

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

diff --git a/core/src/rpc.rs b/core/src/rpc.rs
index f4f60556fb..ebfe759840 100644
--- a/core/src/rpc.rs
+++ b/core/src/rpc.rs
@@ -1214,12 +1214,18 @@ impl JsonRpcRequestProcessor {
                 self.blockstore.get_rooted_transaction(signature)
             };
             match transaction.unwrap_or(None) {
-                Some(confirmed_transaction) => {
+                Some(mut confirmed_transaction) => {
                     if commitment.is_confirmed()
                         && confirmed_bank // should be redundant
                             .status_cache_ancestors()
                             .contains(&confirmed_transaction.slot)
                     {
+                        if confirmed_transaction.block_time.is_none() {
+                            let r_bank_forks = self.bank_forks.read().unwrap();
+                            confirmed_transaction.block_time = r_bank_forks
+                                .get(confirmed_transaction.slot)
+                                .map(|bank| bank.clock().unix_timestamp);
+                        }
                         return Ok(Some(confirmed_transaction.encode(encoding)));
                     }
                     if confirmed_transaction.slot