update round source

crates/sui-core/src/authority.rs

@@ -2153,21 +2153,20 @@ impl AuthorityState {
                     .map_err(|err| {
                         warn!(
                             "Ignoring malformed transaction (failed to verify) from {}: {:?}",
-                            transaction.certificate.header.author, err
+                            transaction.sender_authority(),
+                            err
                         );
                     })?;
             }
             ConsensusTransactionKind::CheckpointSignature(data) => {
-                if AuthorityName::from(&transaction.certificate.origin())
-                    != data.summary.auth_signature.authority
-                {
+                if transaction.sender_authority() != data.summary.auth_signature.authority {
                     warn!("CheckpointSignature authority {} does not match narwhal certificate source {}", data.summary.auth_signature.authority, transaction.certificate.origin() );
                     return Err(());
                 }
                 data.verify(&self.committee()).map_err(|err|{
                     warn!(
                         "Ignoring malformed checkpoint signature (failed to verify) from {}, sequence {}: {:?}",
-                        transaction.certificate.header.author, data.summary.summary.sequence_number, err
+                        transaction.sender_authority(), data.summary.summary.sequence_number, err
                     );
                 })?;
             }

crates/sui-core/src/consensus_handler.rs

@@ -11,6 +11,7 @@ use narwhal_types::ConsensusOutput;
 use std::collections::hash_map::DefaultHasher;
 use std::hash::{Hash, Hasher};
 use std::sync::{Arc, Mutex};
+use sui_types::base_types::AuthorityName;
 use sui_types::messages::ConsensusTransaction;
 use tracing::{debug, instrument, warn};
 
@@ -69,12 +70,12 @@ impl ExecutionState for ConsensusHandler {
         // TODO [2533]: use this once integrating Narwhal reconfiguration
         consensus_output: ConsensusOutput,
     ) {
-        let _scope = monitored_scope("HandleConsensusOutputFull");
+        let _scope = monitored_scope("HandleConsensusOutput");
         let mut sequenced_transactions = Vec::new();
         let mut seq = 0;
 
+        let round = consensus_output.sub_dag.round();
         for (cert, batches) in consensus_output.batches {
-            let round = cert.header.round;
             let author = cert.header.author.clone();
             let output_cert = Arc::new(cert);
             for batch in batches {
@@ -125,7 +126,7 @@ impl ExecutionState for ConsensusHandler {
                 .verify_consensus_transaction(sequenced_transaction)
             {
                 Ok(verified_transaction) => verified_transaction,
-                Err(()) => return,
+                Err(()) => continue,
             };
 
             self.state
@@ -156,6 +157,12 @@ pub struct SequencedConsensusTransaction {
     pub transaction: ConsensusTransaction,
 }
 
+impl SequencedConsensusTransaction {
+    pub fn sender_authority(&self) -> AuthorityName {
+        (&self.certificate.header.author).into()
+    }
+}
+
 pub struct VerifiedSequencedConsensusTransaction(pub SequencedConsensusTransaction);
 
 #[cfg(test)]

narwhal/node/tests/reconfigure.rs

@@ -101,7 +101,7 @@ impl SimpleExecutionState {
         // Change epoch every few certificates. Note that empty certificates are not provided to
         // this function (they are immediately skipped).
         let mut epoch = self.committee.lock().unwrap().epoch();
-        if transaction >= epoch && change_epoch {
+        if change_epoch {
             epoch += 1;
             {
                 let mut guard = self.committee.lock().unwrap();