Mutants next/stackslib 8 shards 2/source

.github/workflows/bitcoin-tests.yml

@@ -69,6 +69,7 @@ jobs:
           - tests::neon_integrations::test_problematic_txs_are_not_stored
           - tests::neon_integrations::use_latest_tip_integration_test
           - tests::should_succeed_handling_malformed_and_valid_txs
+          - tests::nakamoto_integrations::simple_neon_integration
     steps:
       ## Setup test environment
       - name: Setup Test Environment

Cargo.toml

@@ -15,6 +15,8 @@ members = [
 # Dependencies we want to keep the same between workspace members
 [workspace.dependencies]  
 wsts = "5.0"
+rand_core = "0.6"
+rand = "0.8"
 
 # Use a bit more than default optimization for
 #  dev builds to speed up test execution

clarity/Cargo.toml

@@ -15,7 +15,7 @@ resolver = "2"
 
 [lib]
 name = "clarity"
-path = "./src/libclarity.rs"
+path = "./src/lib.rs"
 
 [dependencies]
 rand = "0.7.3"

libsigner/Cargo.toml

@@ -13,7 +13,7 @@ edition = "2021"
 
 [lib]
 name = "libsigner"
-path = "./src/libsigner.rs"
+path = "./src/lib.rs"
 
 [dependencies]
 clarity = { path = "../clarity" }

stacks-common/Cargo.toml

@@ -15,7 +15,7 @@ edition = "2021"
 
 [lib]
 name = "stacks_common"
-path = "./src/libcommon.rs"
+path = "./src/lib.rs"
 
 [dependencies]
 rand = "0.7.3"

stackslib/src/burnchains/bitcoin/indexer.rs

@@ -46,7 +46,8 @@ use crate::burnchains::{
     Burnchain, BurnchainBlockHeader, Error as burnchain_error, MagicBytes, BLOCKSTACK_MAGIC_MAINNET,
 };
 use crate::core::{
-    StacksEpoch, STACKS_EPOCHS_MAINNET, STACKS_EPOCHS_REGTEST, STACKS_EPOCHS_TESTNET,
+    StacksEpoch, StacksEpochExtension, STACKS_EPOCHS_MAINNET, STACKS_EPOCHS_REGTEST,
+    STACKS_EPOCHS_TESTNET,
 };
 use crate::util_lib::db::Error as DBError;
 
@@ -91,7 +92,7 @@ impl TryFrom<u32> for BitcoinNetworkType {
 /// Get the default epochs definitions for the given BitcoinNetworkType.
 /// Should *not* be used except by the BitcoinIndexer when no epochs vector
 /// was specified.
-fn get_bitcoin_stacks_epochs(network_id: BitcoinNetworkType) -> Vec<StacksEpoch> {
+pub fn get_bitcoin_stacks_epochs(network_id: BitcoinNetworkType) -> Vec<StacksEpoch> {
     match network_id {
         BitcoinNetworkType::Mainnet => STACKS_EPOCHS_MAINNET.to_vec(),
         BitcoinNetworkType::Testnet => STACKS_EPOCHS_TESTNET.to_vec(),
@@ -1030,13 +1031,7 @@ impl BurnchainIndexer for BitcoinIndexer {
     ///
     /// It is an error (panic) to set custom epochs if running on `Mainnet`.
     fn get_stacks_epochs(&self) -> Vec<StacksEpoch> {
-        match self.config.epochs {
-            Some(ref epochs) => {
-                assert!(self.runtime.network_id != BitcoinNetworkType::Mainnet);
-                epochs.clone()
-            }
-            None => get_bitcoin_stacks_epochs(self.runtime.network_id),
-        }
+        StacksEpoch::get_epochs(self.runtime.network_id, self.config.epochs.as_ref())
     }
 
     /// Read downloaded headers within a range

stackslib/src/chainstate/nakamoto/coordinator/mod.rs

@@ -169,7 +169,7 @@ pub fn get_nakamoto_reward_cycle_info<U: RewardSetProvider>(
         .epoch_id;
 
     assert!(
-        epoch_at_height >= StacksEpochId::Epoch30,
+        epoch_at_height >= StacksEpochId::Epoch25,
         "FATAL: called a nakamoto function outside of epoch 3"
     );
 
@@ -216,22 +216,40 @@ pub fn get_nakamoto_reward_cycle_info<U: RewardSetProvider>(
         }
 
         // find the first Stacks block processed in the prepare phase
-        let Some(prepare_start_block_header) =
+        let parent_block_id = if let Some(nakamoto_start_block) =
             NakamotoChainState::get_nakamoto_tenure_start_block_header(
                 chain_state.db(),
                 &sn.consensus_hash,
+            )? {
+            nakamoto_start_block
+                .anchored_header
+                .as_stacks_nakamoto()
+                // TODO: maybe `get_nakamoto_tenure_start_block_header` should
+                //       return a type that doesn't require this unwrapping?
+                .expect("FATAL: queried non-Nakamoto tenure start header")
+                .parent_block_id
+        } else {
+            let Some(block_header) =
+                StacksChainState::get_stacks_block_header_info_by_consensus_hash(
+                    chain_state.db(),
+                    &sn.consensus_hash,
+                )?
+            else {
+                // no header for this snapshot (possibly invalid)
+                debug!("Failed to find block by consensus hash"; "consensus_hash" => %sn.consensus_hash);
+                continue;
+            };
+            let Some(parent_block_id) = StacksChainState::get_parent_block_id(
+                chain_state.db(),
+                &block_header.index_block_hash(),
             )?
-        else {
-            // no header for this snapshot (possibly invalid)
-            continue;
+            else {
+                debug!("Failed to get parent block"; "block_id" => %block_header.index_block_hash());
+                continue;
+            };
+            parent_block_id
         };
 
-        let parent_block_id = &prepare_start_block_header
-            .anchored_header
-            .as_stacks_nakamoto()
-            .expect("FATAL: queried non-Nakamoto tenure start header")
-            .parent_block_id;
-
         // find the tenure-start block of the tenure of the parent of this Stacks block.
         // in epoch 2, this is the preceding anchor block
         // in nakamoto, this is the tenure-start block of the preceding tenure

stackslib/src/chainstate/nakamoto/miner.rs

@@ -498,7 +498,7 @@ impl NakamotoBlockBuilder {
             state_root_hash
         );
 
-        info!(
+        debug!(
             "Miner: mined Nakamoto block";
             "consensus_hash" => %block.header.consensus_hash,
             "block_hash" => %block.header.block_hash(),
@@ -570,13 +570,19 @@ impl NakamotoBlockBuilder {
             .block_limit()
             .expect("Failed to obtain block limit from miner's block connection");
 
+        let initial_txs: Vec<_> = [
+            tenure_info.tenure_change_tx.clone(),
+            tenure_info.coinbase_tx.clone(),
+        ]
+        .into_iter()
+        .filter_map(|x| x)
+        .collect();
         let (blocked, tx_events) = match StacksBlockBuilder::select_and_apply_transactions(
             &mut tenure_tx,
             &mut builder,
             mempool,
             parent_stacks_header.stacks_block_height,
-            tenure_info.tenure_change_tx(),
-            tenure_info.coinbase_tx(),
+            &initial_txs,
             settings,
             event_observer,
             ASTRules::PrecheckSize,

stackslib/src/chainstate/stacks/miner.rs

@@ -2139,8 +2139,7 @@ impl StacksBlockBuilder {
         builder: &mut B,
         mempool: &mut MemPoolDB,
         tip_height: u64,
-        tenure_change_tx: Option<&StacksTransaction>,
-        coinbase_tx: Option<&StacksTransaction>,
+        initial_txs: &[StacksTransaction],
         settings: BlockBuilderSettings,
         event_observer: Option<&dyn MemPoolEventDispatcher>,
         ast_rules: ASTRules,
@@ -2155,17 +2154,10 @@ impl StacksBlockBuilder {
 
         let mut tx_events = Vec::new();
 
-        if let Some(tenure_tx) = tenure_change_tx {
+        for initial_tx in initial_txs.iter() {
             tx_events.push(
                 builder
-                    .try_mine_tx(epoch_tx, tenure_tx, ast_rules.clone())?
-                    .convert_to_event(),
-            );
-        }
-        if let Some(coinbase_tx) = coinbase_tx {
-            tx_events.push(
-                builder
-                    .try_mine_tx(epoch_tx, coinbase_tx, ast_rules.clone())?
+                    .try_mine_tx(epoch_tx, initial_tx, ast_rules.clone())?
                     .convert_to_event(),
             );
         }
@@ -2442,8 +2434,7 @@ impl StacksBlockBuilder {
             &mut builder,
             mempool,
             parent_stacks_header.stacks_block_height,
-            None,
-            Some(coinbase_tx),
+            &[coinbase_tx.clone()],
             settings,
             event_observer,
             ast_rules,

stackslib/src/core/mod.rs

@@ -25,6 +25,8 @@ pub use stacks_common::types::StacksEpochId;
 use stacks_common::util::log;
 
 pub use self::mempool::MemPoolDB;
+use crate::burnchains::bitcoin::indexer::get_bitcoin_stacks_epochs;
+use crate::burnchains::bitcoin::BitcoinNetworkType;
 use crate::burnchains::{Burnchain, Error as burnchain_error};
 use crate::chainstate::burn::ConsensusHash;
 pub mod mempool;
@@ -604,9 +606,34 @@ pub trait StacksEpochExtension {
         epoch_2_1_block_height: u64,
     ) -> Vec<StacksEpoch>;
     fn validate_epochs(epochs: &[StacksEpoch]) -> Vec<StacksEpoch>;
+    /// This method gets the epoch vector.
+    ///
+    /// Choose according to:
+    /// 1) Use the custom epochs defined on the underlying `BitcoinIndexerConfig`, if they exist.
+    /// 2) Use hard-coded static values, otherwise.
+    ///
+    /// It is an error (panic) to set custom epochs if running on `Mainnet`.
+    ///
+    fn get_epochs(
+        bitcoin_network: BitcoinNetworkType,
+        configured_epochs: Option<&Vec<StacksEpoch>>,
+    ) -> Vec<StacksEpoch>;
 }
 
 impl StacksEpochExtension for StacksEpoch {
+    fn get_epochs(
+        bitcoin_network: BitcoinNetworkType,
+        configured_epochs: Option<&Vec<StacksEpoch>>,
+    ) -> Vec<StacksEpoch> {
+        match configured_epochs {
+            Some(epochs) => {
+                assert!(bitcoin_network != BitcoinNetworkType::Mainnet);
+                epochs.clone()
+            }
+            None => get_bitcoin_stacks_epochs(bitcoin_network),
+        }
+    }
+
     #[cfg(test)]
     fn unit_test_pre_2_05(first_burnchain_height: u64) -> Vec<StacksEpoch> {
         info!(

testnet/stacks-node/Cargo.toml

@@ -9,7 +9,6 @@ rust-version = "1.61"
 [dependencies]
 lazy_static = "1.4.0"
 pico-args = "0.3.1"
-rand = "0.7.3"
 serde = "1"
 serde_derive = "1"
 serde_json = { version = "1.0", features = ["arbitrary_precision", "raw_value"] }
@@ -29,7 +28,7 @@ chrono = "0.4.19"
 regex = "1"
 libsigner = { path = "../../libsigner" }
 wsts = { workspace = true }
-rand_core = "0.6"
+rand = { workspace = true }
 
 [dev-dependencies]
 ring = "0.16.19"

testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs

@@ -8,7 +8,6 @@ use async_h1::client;
 use async_std::io::ReadExt;
 use async_std::net::TcpStream;
 use base64::encode;
-use clarity::vm::types::PrincipalData;
 use http_types::{Method, Request, Url};
 use serde::Serialize;
 use serde_json::json;
@@ -50,7 +49,7 @@ use stacks_common::deps_common::bitcoin::network::encodable::ConsensusEncodable;
 use stacks_common::deps_common::bitcoin::network::serialize::deserialize as btc_deserialize;
 use stacks_common::deps_common::bitcoin::network::serialize::RawEncoder;
 use stacks_common::deps_common::bitcoin::util::hash::Sha256dHash;
-use stacks_common::types::chainstate::{BurnchainHeaderHash, StacksAddress};
+use stacks_common::types::chainstate::BurnchainHeaderHash;
 use stacks_common::util::hash::{hex_bytes, Hash160};
 use stacks_common::util::secp256k1::Secp256k1PublicKey;
 use stacks_common::util::sleep_ms;