Add slot info to Bank::get_signature_confirmation_status (#9018)

core/src/rpc.rs

@@ -19,7 +19,7 @@ use solana_ledger::{
     bank_forks::BankForks, blockstore::Blockstore, rooted_slot_iterator::RootedSlotIterator,
 };
 use solana_perf::packet::PACKET_DATA_SIZE;
-use solana_runtime::bank::Bank;
+use solana_runtime::{bank::Bank, status_cache::SignatureConfirmationStatus};
 use solana_sdk::{
     clock::{Slot, UnixTimestamp},
     commitment_config::{CommitmentConfig, CommitmentLevel},
@@ -203,7 +203,9 @@ impl JsonRpcRequestProcessor {
             Ok(sig) => {
                 let status = bank.get_signature_confirmation_status(&sig);
                 match status {
-                    Some((_, result)) => new_response(bank, result.is_ok()),
+                    Some(SignatureConfirmationStatus { status, .. }) => {
+                        new_response(bank, status.is_ok())
+                    }
                     None => new_response(bank, false),
                 }
             }
@@ -227,10 +229,16 @@ impl JsonRpcRequestProcessor {
     ) -> Option<RpcSignatureConfirmation> {
         self.bank(commitment)
             .get_signature_confirmation_status(&signature)
-            .map(|(confirmations, status)| RpcSignatureConfirmation {
-                confirmations,
-                status,
-            })
+            .map(
+                |SignatureConfirmationStatus {
+                     confirmations,
+                     status,
+                     ..
+                 }| RpcSignatureConfirmation {
+                    confirmations,
+                    status,
+                },
+            )
     }
 
     fn get_slot(&self, commitment: Option<CommitmentConfig>) -> Result<u64> {

core/src/storage_stage.rs

@@ -11,7 +11,9 @@ use rand::{Rng, SeedableRng};
 use rand_chacha::ChaChaRng;
 use solana_chacha_cuda::chacha_cuda::chacha_cbc_encrypt_file_many_keys;
 use solana_ledger::{bank_forks::BankForks, blockstore::Blockstore};
-use solana_runtime::{bank::Bank, storage_utils::archiver_accounts};
+use solana_runtime::{
+    bank::Bank, status_cache::SignatureConfirmationStatus, storage_utils::archiver_accounts,
+};
 use solana_sdk::{
     account::Account,
     account_utils::StateMut,
@@ -343,8 +345,13 @@ impl StorageStage {
                 .unwrap()
                 .working_bank()
                 .get_signature_confirmation_status(signature);
-            if let Some((confirmations, res)) = response {
-                if res.is_ok() {
+            if let Some(SignatureConfirmationStatus {
+                confirmations,
+                status,
+                ..
+            }) = response
+            {
+                if status.is_ok() {
                     if confirmed_blocks != confirmations {
                         now = Instant::now();
                         confirmed_blocks = confirmations;