Manual v1.0 backports (#9025)

automerge

runtime/src/bank.rs

@@ -13,7 +13,7 @@ use crate::{
         deserialize_atomicbool, deserialize_atomicu64, serialize_atomicbool, serialize_atomicu64,
     },
     stakes::Stakes,
-    status_cache::{SlotDelta, StatusCache},
+    status_cache::{SignatureConfirmationStatus, SlotDelta, StatusCache},
     storage_utils,
     storage_utils::StorageAccounts,
     system_instruction_processor::{get_system_account_kind, SystemAccountKind},
@@ -1820,14 +1820,14 @@ impl Bank {
     pub fn get_signature_confirmation_status(
         &self,
         signature: &Signature,
-    ) -> Option<(usize, Result<()>)> {
+    ) -> Option<SignatureConfirmationStatus<Result<()>>> {
         let rcache = self.src.status_cache.read().unwrap();
         rcache.get_signature_status_slow(signature, &self.ancestors)
     }
 
     pub fn get_signature_status(&self, signature: &Signature) -> Option<Result<()>> {
         self.get_signature_confirmation_status(signature)
-            .map(|v| v.1)
+            .map(|v| v.status)
     }
 
     pub fn has_signature(&self, signature: &Signature) -> bool {

runtime/src/bank_client.rs

@@ -1,4 +1,4 @@
-use crate::bank::Bank;
+use crate::{bank::Bank, status_cache::SignatureConfirmationStatus};
 use solana_sdk::{
     account::Account,
     client::{AsyncClient, Client, SyncClient},
@@ -188,8 +188,13 @@ impl SyncClient for BankClient {
         let mut confirmed_blocks = 0;
         loop {
             let response = self.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;

runtime/src/status_cache.rs

@@ -32,6 +32,13 @@ type SlotDeltaMap<T> = HashMap<Slot, SignatureStatus<T>>;
 // construct a new one. Usually derived from a status cache's `SlotDeltaMap`
 pub type SlotDelta<T> = (Slot, bool, SignatureStatus<T>);
 
+#[derive(Debug, PartialEq)]
+pub struct SignatureConfirmationStatus<T> {
+    pub slot: Slot,
+    pub confirmations: usize,
+    pub status: T,
+}
+
 #[derive(Clone, Debug)]
 pub struct StatusCache<T: Serialize + Clone> {
     cache: StatusMap<T>,
@@ -100,7 +107,7 @@ impl<T: Serialize + Clone> StatusCache<T> {
         &self,
         sig: &Signature,
         ancestors: &HashMap<Slot, usize>,
-    ) -> Option<(usize, T)> {
+    ) -> Option<SignatureConfirmationStatus<T>> {
         trace!("get_signature_status_slow");
         let mut keys = vec![];
         let mut val: Vec<_> = self.cache.iter().map(|(k, _)| *k).collect();
@@ -110,10 +117,15 @@ impl<T: Serialize + Clone> StatusCache<T> {
             trace!("get_signature_status_slow: trying {}", blockhash);
             if let Some((forkid, res)) = self.get_signature_status(sig, blockhash, ancestors) {
                 trace!("get_signature_status_slow: got {}", forkid);
-                return ancestors
+                let confirmations = ancestors
                     .get(&forkid)
-                    .map(|id| (*id, res.clone()))
-                    .or_else(|| Some((ancestors.len(), res)));
+                    .copied()
+                    .unwrap_or_else(|| ancestors.len());
+                return Some(SignatureConfirmationStatus {
+                    slot: forkid,
+                    confirmations,
+                    status: res,
+                });
             }
         }
         None
@@ -272,7 +284,11 @@ mod tests {
         );
         assert_eq!(
             status_cache.get_signature_status_slow(&sig, &ancestors),
-            Some((1, ()))
+            Some(SignatureConfirmationStatus {
+                slot: 0,
+                confirmations: 1,
+                status: ()
+            })
         );
     }
 
@@ -317,7 +333,11 @@ mod tests {
         status_cache.add_root(0);
         assert_eq!(
             status_cache.get_signature_status_slow(&sig, &ancestors),
-            Some((ancestors.len(), ()))
+            Some(SignatureConfirmationStatus {
+                slot: 0,
+                confirmations: ancestors.len(),
+                status: ()
+            })
         );
     }