Continue deduping system tx on end-of-epoch (MystenLabs#15216)

## Description Fixes simtest failures on epoch change.
daphnica · Dec 6, 2023 · dc09959 · dc09959
1 parent 6f3c4e8
commit dc09959
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/crates/sui-core/src/authority/authority_per_epoch_store.rs b/crates/sui-core/src/authority/authority_per_epoch_store.rs
@@ -121,6 +121,8 @@ pub enum ConsensusCertificateResult {
     Defered(DeferralKey),
     /// Everything else, e.g. AuthorityCapabilities, CheckpointSignatures, etc.
     ConsensusMessage,
+    /// A system message in consensus was ignored (e.g. because of end of epoch).
+    IgnoredSystem,
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug, Default, PartialEq, Eq)]
@@ -2320,7 +2322,8 @@ impl AuthorityPerEpochStore {
                         .push(tx.clone());
                 }
                 ConsensusCertificateResult::ConsensusMessage => notifications.push(key.clone()),
-                // Note: ignored transactions must not be recorded as processed. Otherwise
+                ConsensusCertificateResult::IgnoredSystem => (),
+                // Note: ignored external transactions must not be recorded as processed. Otherwise
                 // they may not get reverted after restart during epoch change.
                 ConsensusCertificateResult::Ignored => ignored = true,
             }
@@ -2580,15 +2583,6 @@ impl AuthorityPerEpochStore {
                 panic!("process_consensus_transaction called with external RandomnessStateUpdate");
             }
             SequencedConsensusTransactionKind::System(system_transaction) => {
-                if let TransactionKind::RandomnessStateUpdate(rsu) =
-                    &system_transaction.data().intent_message().value.kind()
-                {
-                    batch.insert_batch(
-                        &self.tables.randomness_rounds_written,
-                        [(RandomnessRound(rsu.randomness_round), ())],
-                    )?;
-                }
-
                 if !self
                     .get_reconfig_state_read_lock_guard()
                     .should_accept_consensus_certs()
@@ -2597,7 +2591,16 @@ impl AuthorityPerEpochStore {
                         "Ignoring system transaction {:?} because of end of epoch",
                         system_transaction.digest()
                     );
-                    return Ok(ConsensusCertificateResult::Ignored);
+                    return Ok(ConsensusCertificateResult::IgnoredSystem);
+                }
+
+                if let TransactionKind::RandomnessStateUpdate(rsu) =
+                    &system_transaction.data().intent_message().value.kind()
+                {
+                    batch.insert_batch(
+                        &self.tables.randomness_rounds_written,
+                        [(RandomnessRound(rsu.randomness_round), ())],
+                    )?;
                 }
 
                 // If needed we can support owned object system transactions as well...

diff --git a/crates/sui-core/src/consensus_handler.rs b/crates/sui-core/src/consensus_handler.rs
@@ -604,7 +604,10 @@ impl<T, C> ConsensusHandler<T, C> {
                 .randomness_obj_initial_shared_version()
                 .expect("randomness state obj must exist"),
         );
-        debug!("created randomness state update transaction: {transaction:?}");
+        debug!(
+            "created randomness state update transaction: {:?}",
+            transaction.digest()
+        );
         VerifiedExecutableTransaction::new_system(transaction, self.epoch())
     }