refactor: Move AssembledAnchorBlock into stackslib

Author: jbencin

stackslib/src/chainstate/stacks/miner.rs

@@ -66,6 +66,28 @@ use crate::monitoring::{
 use crate::net::relay::Relayer;
 use crate::net::Error as net_error;
 
+/// Fully-assembled Stacks anchored, block as well as some extra metadata pertaining to how it was
+/// linked to the burnchain and what view(s) the miner had of the burnchain before and after
+/// completing the block.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct AssembledAnchorBlock {
+    /// Consensus hash of the parent Stacks block
+    pub parent_consensus_hash: ConsensusHash,
+    /// Burnchain tip's block hash when we finished mining
+    pub my_burn_hash: BurnchainHeaderHash,
+    /// Burnchain tip's block height when we finished mining
+    pub my_block_height: u64,
+    /// Burnchain tip's block hash when we started mining (could be different)
+    pub orig_burn_hash: BurnchainHeaderHash,
+    /// The block we produced
+    pub anchored_block: StacksBlock,
+    /// The attempt count of this block (multiple blocks will be attempted per burnchain block)
+    pub attempt: u64,
+    /// Epoch timestamp in milliseconds when we started producing the block.
+    pub tenure_begin: u128,
+}
+impl_file_io_serde_json!(AssembledAnchorBlock);
+
 /// System status for mining.
 /// The miner can be Ready, in which case a miner is allowed to run
 /// The miner can be Blocked, in which case the miner *should not start* and/or *should terminate*

stackslib/src/main.rs

@@ -1988,14 +1988,12 @@ fn replay_mock_mining(argv: Vec<String>) {
     let print_help_and_exit = || -> ! {
         let n = &argv[0];
         eprintln!("Usage:");
-        eprintln!("  {n} <mock-miner-output-dir>");
+        eprintln!("  {n} <chainstate-path> <mock-miner-output-path>");
         process::exit(1);
     };
 
     // Process CLI args
-    let chainstate_path = argv
-        .get(2)
-        .unwrap_or_else(|| print_help_and_exit());
+    let chainstate_path = argv.get(2).unwrap_or_else(|| print_help_and_exit());
 
     let blocks_path = argv
         .get(3)
@@ -2058,8 +2056,8 @@ fn replay_mock_mining(argv: Vec<String>) {
 
     for (bh, filename) in indexed_files {
         let filepath = blocks_path.join(filename);
-        // let block = AssembledAnchorBlock::deserialize_from_file(&filepath)
-        //     .unwrap_or_else(|e| panic!("Error reading block {bh} from file: {e}"));
+        let block = AssembledAnchorBlock::deserialize_from_file(&filepath)
+            .unwrap_or_else(|e| panic!("Error reading block {bh} from file: {e}"));
         debug!("Replaying block from {filepath:?}";
             "block_height" => bh,
             "block" => ?block

testnet/stacks-node/src/neon_node.rs

@@ -167,7 +167,8 @@ use stacks::chainstate::stacks::address::PoxAddress;
 use stacks::chainstate::stacks::db::blocks::StagingBlock;
 use stacks::chainstate::stacks::db::{StacksChainState, StacksHeaderInfo, MINER_REWARD_MATURITY};
 use stacks::chainstate::stacks::miner::{
-    signal_mining_blocked, signal_mining_ready, BlockBuilderSettings, StacksMicroblockBuilder,
+    signal_mining_blocked, signal_mining_ready, AssembledAnchorBlock, BlockBuilderSettings,
+    StacksMicroblockBuilder,
 };
 use stacks::chainstate::stacks::{
     CoinbasePayload, Error as ChainstateError, StacksBlock, StacksBlockBuilder, StacksBlockHeader,
@@ -234,28 +235,6 @@ pub(crate) enum MinerThreadResult {
     ),
 }
 
-/// Fully-assembled Stacks anchored, block as well as some extra metadata pertaining to how it was
-/// linked to the burnchain and what view(s) the miner had of the burnchain before and after
-/// completing the block.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AssembledAnchorBlock {
-    /// Consensus hash of the parent Stacks block
-    parent_consensus_hash: ConsensusHash,
-    /// Burnchain tip's block hash when we finished mining
-    my_burn_hash: BurnchainHeaderHash,
-    /// Burnchain tip's block height when we finished mining
-    my_block_height: u64,
-    /// Burnchain tip's block hash when we started mining (could be different)
-    orig_burn_hash: BurnchainHeaderHash,
-    /// The block we produced
-    anchored_block: StacksBlock,
-    /// The attempt count of this block (multiple blocks will be attempted per burnchain block)
-    attempt: u64,
-    /// Epoch timestamp in milliseconds when we started producing the block.
-    tenure_begin: u128,
-}
-impl_file_io_serde_json!(AssembledAnchorBlock);
-
 /// Miner chain tip, on top of which to build microblocks
 #[derive(Debug, Clone, PartialEq)]
 pub struct MinerTip {