set age to 0 on epoch cross

solana-labs · Apr 28, 2023 · 3bb55b4 · 3bb55b4
1 parent e22981b
commit 3bb55b4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/core/src/banking_stage/consumer.rs b/core/src/banking_stage/consumer.rs
@@ -462,7 +462,7 @@ impl Consumer {
         &self,
         bank: &Arc<Bank>,
         txs: &[SanitizedTransaction],
-        max_slot_ages: &[Slot],
+        max_slot_ages: &mut [Slot],
     ) -> ProcessTransactionBatchOutput {
         let (
             (transaction_costs, transactions_qos_results, cost_model_throttled_transactions_count),
@@ -478,6 +478,7 @@ impl Consumer {
             .map(|(tx, max_slot_age, qos_result)| match qos_result {
                 Ok(_) => {
                     if *max_slot_age < bank.slot() {
+                        *max_slot_age = 0; // Sentinal value to indicate transaction was sanitized before epoch boundary
                         Err(TransactionError::BlockhashNotFound)
                     } else {
                         // TODO: Need to check that look-up tables have not been closed

diff --git a/core/src/banking_stage/worker.rs b/core/src/banking_stage/worker.rs
@@ -109,10 +109,13 @@ impl Worker {
     }
 
     /// Consume a single batch.
-    fn consume(&self, bank: &Arc<Bank>, consume_work: ConsumeWork) -> Result<(), WorkerError> {
-        let summary =
-            self.consumer
-                .process_and_record_transactions(bank, &consume_work.transactions, 0);
+    fn consume(&self, bank: &Arc<Bank>, mut consume_work: ConsumeWork) -> Result<(), WorkerError> {
+        let summary = self.consumer.process_and_record_aged_transactions(
+            bank,
+            &consume_work.transactions,
+            &mut consume_work.max_age_slots,
+        );
+
         self.consumed_sender.send(FinishedConsumeWork {
             work: consume_work,
             retryable_indexes: summary