Merge release-second-guess into main (#3603)

Author: ss-es

crates/hotshot/task-impls/src/da.rs

@@ -436,12 +436,20 @@ impl<TYPES: NodeType, I: NodeImplementation<TYPES>, V: Versions> DaTaskState<TYP
                     );
                     return Ok(());
                 }
-                let epoch_transition_indicator =
-                    if self.consensus.read().await.is_high_qc_ge_root_block() {
-                        EpochTransitionIndicator::InTransition
-                    } else {
+                let consensus_reader = self.consensus.read().await;
+                let epoch_transition_indicator = if consensus_reader.is_high_qc_ge_root_block() {
+                    if self.upgrade_lock.upgraded_drb_and_header(view_number).await
+                        && consensus_reader.is_high_qc_last_block()
+                    {
                         EpochTransitionIndicator::NotInTransition
-                    };
+                    } else {
+                        EpochTransitionIndicator::InTransition
+                    }
+                } else {
+                    EpochTransitionIndicator::NotInTransition
+                };
+                drop(consensus_reader);
+
                 let data: DaProposal2<TYPES> = DaProposal2 {
                     encoded_transactions: Arc::clone(encoded_transactions),
                     metadata: metadata.clone(),

crates/hotshot/task-impls/src/view_sync.rs

@@ -546,19 +546,6 @@ impl<TYPES: NodeType, V: Versions> ViewSyncTaskState<TYPES, V> {
                 );
 
                 self.num_timeouts_tracked += 1;
-                let leader = self
-                    .membership_coordinator
-                    .membership_for_epoch(self.cur_epoch)
-                    .await?
-                    .leader(view_number)
-                    .await?;
-                tracing::warn!(
-                    %leader,
-                    leader_mnemonic = hotshot_types::utils::mnemonic(&leader),
-                    view_number = *view_number,
-                    num_timeouts_tracked = self.num_timeouts_tracked,
-                    "view timed out",
-                );
 
                 if self.num_timeouts_tracked >= 3 {
                     tracing::error!("Too many consecutive timeouts!  This shouldn't happen");
@@ -585,6 +572,19 @@ impl<TYPES: NodeType, V: Versions> ViewSyncTaskState<TYPES, V> {
                     )
                     .await;
                 }
+                let leader = self
+                    .membership_coordinator
+                    .membership_for_epoch(self.cur_epoch)
+                    .await?
+                    .leader(view_number)
+                    .await?;
+                tracing::warn!(
+                    %leader,
+                    leader_mnemonic = hotshot_types::utils::mnemonic(&leader),
+                    view_number = *view_number,
+                    num_timeouts_tracked = self.num_timeouts_tracked,
+                    "view timed out",
+                );
             },
             HotShotEvent::SetFirstEpoch(view, epoch) => {
                 self.first_epoch = Some((*view, *epoch));

crates/hotshot/types/src/consensus.rs

@@ -1394,6 +1394,14 @@ impl<TYPES: NodeType> Consensus<TYPES> {
         let block_height = leaf.height();
         is_ge_epoch_root(block_height, self.epoch_height)
     }
+
+    pub fn is_high_qc_last_block(&self) -> bool {
+        let Some(block_height) = self.high_qc().data.block_number else {
+            tracing::warn!("We don't have a block number for the high QC");
+            return false;
+        };
+        is_last_block(block_height, self.epoch_height)
+    }
 }
 
 /// Alias for the block payload commitment and the associated metadata. The primary data

data/genesis/decaf.toml

@@ -44,4 +44,4 @@ base_fee = "1 wei"
 max_block_size = "10mb"
 fee_recipient = "0x0000000000000000000000000000000000000000"
 fee_contract = "0x42835083fd1d3fc5d799b5f6815ae4bf2623e6d0"
-stake_table_contract = "0x40304fbe94d5e7d1492dd90c53a2d63e8506a037"
+stake_table_contract = "0x40304fbe94d5e7d1492dd90c53a2d63e8506a037"

sequencer/src/request_response/recipient_source.rs

@@ -52,11 +52,12 @@ impl<I: NodeImplementation<SeqTypes>, V: Versions> RecipientSourceTrait<Request,
             Ok(membership) => membership,
             Err(e) => {
                 warn!(
-                    "Failed to get membership for epoch {}: {e:#}. Failing over to genesis",
+                    "Failed to get membership for epoch {}: {e:#}. Failing over to previous epoch",
                     epoch_number
                 );
+                let prev_epoch = epoch_number.saturating_sub(1);
                 self.memberships
-                    .stake_table_for_epoch(Some(EpochNumber::genesis()))
+                    .stake_table_for_epoch(Some(EpochNumber::new(prev_epoch)))
                     .await
                     .with_context(|| "failed to get stake table for epoch")?
             },