Merge pull request #4743 from ASuciuX/feat/mock-mining-hot-swap

Feat/mock mining hot swap

Author: obycode

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

@@ -703,8 +703,8 @@ impl BitcoinRegtestController {
         utxos_to_exclude: Option<UTXOSet>,
         block_height: u64,
     ) -> Option<UTXOSet> {
-        // if mock mining, do not even both requesting UTXOs
-        if self.config.node.mock_mining {
+        // if mock mining, do not even bother requesting UTXOs
+        if self.config.get_node_config().mock_mining {
             return None;
         }
 

testnet/stacks-node/src/config.rs

@@ -558,6 +558,19 @@ impl Config {
         return config.miner;
     }
 
+    pub fn get_node_config(&self) -> NodeConfig {
+        let Some(path) = &self.config_path else {
+            return self.node.clone();
+        };
+        let Ok(config_file) = ConfigFile::from_path(path.as_str()) else {
+            return self.node.clone();
+        };
+        let Ok(config) = Config::from_config_file(config_file) else {
+            return self.node.clone();
+        };
+        return config.node;
+    }
+
     /// Apply any test settings to this burnchain config struct
     #[cfg_attr(test, mutants::skip)]
     fn apply_test_settings(&self, burnchain: &mut Burnchain) {

testnet/stacks-node/src/nakamoto_node.rs

@@ -167,7 +167,7 @@ impl StacksNode {
         let local_peer = p2p_net.local_peer.clone();
 
         // setup initial key registration
-        let leader_key_registration_state = if config.node.mock_mining {
+        let leader_key_registration_state = if config.get_node_config().mock_mining {
             // mock mining, pretend to have a registered key
             let (vrf_public_key, _) = keychain.make_vrf_keypair(VRF_MOCK_MINER_KEY);
             LeaderKeyRegistrationState::Active(RegisteredKey {

testnet/stacks-node/src/nakamoto_node/miner.rs

@@ -656,7 +656,7 @@ impl BlockMinerThread {
     fn make_vrf_proof(&mut self) -> Option<VRFProof> {
         // if we're a mock miner, then make sure that the keychain has a keypair for the mocked VRF
         // key
-        let vrf_proof = if self.config.node.mock_mining {
+        let vrf_proof = if self.config.get_node_config().mock_mining {
             self.keychain.generate_proof(
                 VRF_MOCK_MINER_KEY,
                 self.burn_block.sortition_hash.as_bytes(),

testnet/stacks-node/src/neon_node.rs

@@ -1712,7 +1712,7 @@ impl BlockMinerThread {
     fn make_vrf_proof(&mut self) -> Option<VRFProof> {
         // if we're a mock miner, then make sure that the keychain has a keypair for the mocked VRF
         // key
-        let vrf_proof = if self.config.node.mock_mining {
+        let vrf_proof = if self.config.get_node_config().mock_mining {
             self.keychain.generate_proof(
                 VRF_MOCK_MINER_KEY,
                 self.burn_block.sortition_hash.as_bytes(),
@@ -2535,7 +2535,7 @@ impl BlockMinerThread {
         let res = bitcoin_controller.submit_operation(target_epoch_id, op, &mut op_signer, attempt);
         if res.is_none() {
             self.failed_to_submit_last_attempt = true;
-            if !self.config.node.mock_mining {
+            if !self.config.get_node_config().mock_mining {
                 warn!("Relayer: Failed to submit Bitcoin transaction");
                 return None;
             }
@@ -3518,7 +3518,7 @@ impl RelayerThread {
             return false;
         }
 
-        if !self.config.node.mock_mining {
+        if !self.config.get_node_config().mock_mining {
             // mock miner can't mine microblocks yet, so don't stop it from trying multiple
             // anchored blocks
             if self.mined_stacks_block && self.config.node.mine_microblocks {
@@ -4777,7 +4777,7 @@ impl StacksNode {
         let local_peer = p2p_net.local_peer.clone();
 
         // setup initial key registration
-        let leader_key_registration_state = if config.node.mock_mining {
+        let leader_key_registration_state = if config.get_node_config().mock_mining {
             // mock mining, pretend to have a registered key
             let (vrf_public_key, _) = keychain.make_vrf_keypair(VRF_MOCK_MINER_KEY);
             LeaderKeyRegistrationState::Active(RegisteredKey {

testnet/stacks-node/src/run_loop/nakamoto.rs

@@ -195,7 +195,7 @@ impl RunLoop {
                     return true;
                 }
             }
-            if self.config.node.mock_mining {
+            if self.config.get_node_config().mock_mining {
                 info!("No UTXOs found, but configured to mock mine");
                 return true;
             } else {

testnet/stacks-node/src/run_loop/neon.rs

@@ -373,7 +373,7 @@ impl RunLoop {
                     return true;
                 }
             }
-            if self.config.node.mock_mining {
+            if self.config.get_node_config().mock_mining {
                 info!("No UTXOs found, but configured to mock mine");
                 return true;
             } else {