chore: handle shadow block case

Author: jcnelson

stackslib/src/net/api/getsortition.rs

@@ -30,6 +30,7 @@ use {serde, serde_json};
 use crate::chainstate::burn::db::sortdb::SortitionDB;
 use crate::chainstate::burn::BlockSnapshot;
 use crate::chainstate::nakamoto::{NakamotoBlock, NakamotoChainState, NakamotoStagingBlocksConn};
+use crate::chainstate::nakamoto::StacksDBIndexed;
 use crate::chainstate::stacks::db::StacksChainState;
 use crate::chainstate::stacks::Error as ChainError;
 use crate::net::api::getblock_v3::NakamotoBlockStream;
@@ -85,6 +86,11 @@ pub struct SortitionInfo {
     pub consensus_hash: ConsensusHash,
     /// Boolean indicating whether or not there was a succesful sortition (i.e. a winning
     ///  block or miner was chosen).
+    ///
+    /// This will *also* be true if this sortition corresponds to a shadow block.  This is because
+    /// the signer does not distinguish between shadow blocks and blocks with sortitions, so until
+    /// we can update the signer and this interface, we'll have to report the presence of a shadow
+    /// block tenure in a way that the signer currently understands.
     pub was_sortition: bool,
     /// If sortition occurred, and the miner's VRF key registration
     ///  associated a nakamoto mining pubkey with their commit, this
@@ -150,13 +156,25 @@ impl GetSortitionHandler {
     fn get_sortition_info(
         sortition_sn: BlockSnapshot,
         sortdb: &SortitionDB,
+        chainstate: &mut StacksChainState,
+        tip: &StacksBlockId
     ) -> Result<SortitionInfo, ChainError> {
+        let is_shadow = chainstate.nakamoto_blocks_db().is_shadow_tenure(&sortition_sn.consensus_hash)?;
         let (miner_pk_hash160, stacks_parent_ch, committed_block_hash, last_sortition_ch) =
-            if !sortition_sn.sortition {
+            if !sortition_sn.sortition && !is_shadow {
                 let handle = sortdb.index_handle(&sortition_sn.sortition_id);
                 let last_sortition =
                     handle.get_last_snapshot_with_sortition(sortition_sn.block_height)?;
                 (None, None, None, Some(last_sortition.consensus_hash))
+            } else if !sortition_sn.sortition && is_shadow {
+                // this is a shadow tenure.
+                let parent_tenure_ch = chainstate.index_conn().get_parent_tenure_consensus_hash(tip, &sortition_sn.consensus_hash)?
+                    .ok_or_else(|| DBError::NotFoundError)?;
+    
+                let parent_tenure_start_header = NakamotoChainState::get_nakamoto_tenure_start_block_header(&mut chainstate.index_conn(), tip, &parent_tenure_ch)?
+                    .ok_or_else(|| DBError::NotFoundError)?;
+
+                (Some(Hash160([0x00; 20])), Some(parent_tenure_ch.clone()), Some(BlockHeaderHash(parent_tenure_start_header.index_block_hash().0)), Some(parent_tenure_ch))
             } else {
                 let block_commit = SortitionDB::get_block_commit(sortdb.conn(), &sortition_sn.winning_block_txid, &sortition_sn.sortition_id)?
                         .ok_or_else(|| {
@@ -211,7 +229,7 @@ impl GetSortitionHandler {
             sortition_id: sortition_sn.sortition_id,
             parent_sortition_id: sortition_sn.parent_sortition_id,
             consensus_hash: sortition_sn.consensus_hash,
-            was_sortition: sortition_sn.sortition,
+            was_sortition: sortition_sn.sortition || is_shadow,
             miner_pk_hash160,
             stacks_parent_ch,
             last_sortition_ch,
@@ -277,7 +295,7 @@ impl RPCRequestHandler for GetSortitionHandler {
         _contents: HttpRequestContents,
         node: &mut StacksNodeState,
     ) -> Result<(HttpResponsePreamble, HttpResponseContents), NetError> {
-        let result = node.with_node_state(|network, sortdb, _chainstate, _mempool, _rpc_args| {
+        let result = node.with_node_state(|network, sortdb, chainstate, _mempool, _rpc_args| {
             let query_result = match self.query {
                 QuerySpecifier::Latest => Ok(Some(network.burnchain_tip.clone())),
                 QuerySpecifier::ConsensusHash(ref consensus_hash) => {
@@ -306,7 +324,7 @@ impl RPCRequestHandler for GetSortitionHandler {
                 }
             };
             let sortition_sn = query_result?.ok_or_else(|| ChainError::NoSuchBlockError)?;
-            Self::get_sortition_info(sortition_sn, sortdb)
+            Self::get_sortition_info(sortition_sn, sortdb, chainstate, &network.stacks_tip.block_id())
         });
 
         let block = match result {
@@ -334,13 +352,13 @@ impl RPCRequestHandler for GetSortitionHandler {
         if self.query == QuerySpecifier::LatestAndLast {
             // if latest **and** last are requested, lookup the sortition info for last_sortition_ch
             if let Some(last_sortition_ch) = last_sortition_ch {
-                let result = node.with_node_state(|_, sortdb, _, _, _| {
+                let result = node.with_node_state(|network, sortdb, chainstate, _, _| {
                     let last_sortition_sn = SortitionDB::get_block_snapshot_consensus(
                         sortdb.conn(),
                         &last_sortition_ch,
                     )?
                     .ok_or_else(|| ChainError::NoSuchBlockError)?;
-                    Self::get_sortition_info(last_sortition_sn, sortdb)
+                    Self::get_sortition_info(last_sortition_sn, sortdb, chainstate, &network.stacks_tip.block_id())
                 });
                 let last_block = match result {
                     Ok(block) => block,