CommitTransactionDetails - include result (#7246)

Author: apfitzge

core/src/banking_stage/committer.rs

@@ -20,6 +20,7 @@ use {
         transaction_commit_result::{TransactionCommitResult, TransactionCommitResultExtensions},
         transaction_processing_result::TransactionProcessingResult,
     },
+    solana_transaction_error::TransactionError,
     std::{num::Saturating, sync::Arc},
 };
 
@@ -28,8 +29,9 @@ pub enum CommitTransactionDetails {
     Committed {
         compute_units: u64,
         loaded_accounts_data_size: u32,
+        result: Result<(), TransactionError>,
     },
-    NotCommitted,
+    NotCommitted(TransactionError),
 }
 
 #[derive(Clone)]
@@ -85,8 +87,9 @@ impl Committer {
                     loaded_accounts_data_size: committed_tx
                         .loaded_account_stats
                         .loaded_accounts_data_size,
+                    result: committed_tx.status.clone(),
                 },
-                Err(_) => CommitTransactionDetails::NotCommitted,
+                Err(err) => CommitTransactionDetails::NotCommitted(err.clone()),
             })
             .collect();
 

core/src/banking_stage/consumer.rs

@@ -401,7 +401,13 @@ impl Consumer {
             } else {
                 (
                     0,
-                    vec![CommitTransactionDetails::NotCommitted; processing_results.len()],
+                    processing_results
+                        .into_iter()
+                        .map(|processing_result| match processing_result {
+                            Ok(_) => unreachable!("processed transaction count is 0"),
+                            Err(err) => CommitTransactionDetails::NotCommitted(err),
+                        })
+                        .collect(),
                 )
             };
 
@@ -997,7 +1003,12 @@ mod tests {
         assert!(retryable_transaction_indexes.is_empty());
         assert_eq!(
             commit_transactions_result.ok(),
-            Some(vec![CommitTransactionDetails::NotCommitted; 1])
+            Some(vec![
+                CommitTransactionDetails::NotCommitted(
+                    TransactionError::AccountLoadedTwice
+                );
+                1
+            ])
         );
 
         poh_recorder
@@ -1135,7 +1146,7 @@ mod tests {
         );
         assert_matches!(
             commit_transactions_result.get(1),
-            Some(CommitTransactionDetails::NotCommitted)
+            Some(CommitTransactionDetails::NotCommitted(_))
         );
         assert_eq!(retryable_transaction_indexes, vec![1]);
 
@@ -1145,14 +1156,15 @@ mod tests {
                     CommitTransactionDetails::Committed {
                         compute_units,
                         loaded_accounts_data_size,
+                        result: _,
                     } => (
                         *compute_units,
                         CostModel::calculate_loaded_accounts_data_size_cost(
                             *loaded_accounts_data_size,
                             &bank.feature_set,
                         ),
                     ),
-                    CommitTransactionDetails::NotCommitted => {
+                    CommitTransactionDetails::NotCommitted(_err) => {
                         unreachable!()
                     }
                 };
@@ -1791,6 +1803,7 @@ mod tests {
         let CommitTransactionDetails::Committed {
             compute_units,
             loaded_accounts_data_size,
+            result: _,
         } = consumer_output
             .execute_and_commit_transactions_output
             .commit_transactions_result

core/src/banking_stage/qos_service.rs

@@ -197,6 +197,7 @@ impl QosService {
                         CommitTransactionDetails::Committed {
                             compute_units,
                             loaded_accounts_data_size,
+                            result: _,
                         } => {
                             cost_tracker.update_execution_cost(
                                 tx_cost,
@@ -207,7 +208,7 @@ impl QosService {
                                 ),
                             );
                         }
-                        CommitTransactionDetails::NotCommitted => {
+                        CommitTransactionDetails::NotCommitted(_err) => {
                             cost_tracker.remove(tx_cost);
                         }
                     }
@@ -750,6 +751,7 @@ mod tests {
                         + execute_units_adjustment,
                     loaded_accounts_data_size: loaded_accounts_data_size
                         + loaded_accounts_data_size_adjustment,
+                    result: Ok(()),
                 })
                 .collect();
             let final_txs_cost = total_txs_cost
@@ -871,13 +873,16 @@ mod tests {
                 .enumerate()
                 .map(|(n, tx_cost)| {
                     if n % 2 == 0 {
-                        CommitTransactionDetails::NotCommitted
+                        CommitTransactionDetails::NotCommitted(
+                            TransactionError::InsufficientFundsForFee,
+                        )
                     } else {
                         CommitTransactionDetails::Committed {
                             compute_units: tx_cost.as_ref().unwrap().programs_execution_cost()
                                 + execute_units_adjustment,
                             loaded_accounts_data_size: loaded_accounts_data_size
                                 + loaded_accounts_data_size_adjustment,
+                            result: Ok(()),
                         }
                     }
                 })