Skip to content

Commit 2833cfb

Browse files
authored
Merge pull request #5498 from stacks-network/feat/no-miner-key-select-node-seed
If miner has no mining key set, automatically set it to node seed
2 parents 3ee6a22 + b839d5d commit 2833cfb

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

testnet/stacks-node/src/config.rs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ use stacks::net::connection::ConnectionOptions;
5353
use stacks::net::{Neighbor, NeighborKey};
5454
use stacks::types::chainstate::BurnchainHeaderHash;
5555
use stacks::types::EpochList;
56+
use stacks::util::hash::to_hex;
5657
use stacks::util_lib::boot::boot_code_id;
5758
use stacks::util_lib::db::Error as DBError;
5859
use stacks_common::consts::SIGNER_SLOTS_PER_USER;
@@ -833,7 +834,12 @@ impl Config {
833834
}
834835

835836
let miner = match config_file.miner {
836-
Some(miner) => miner.into_config_default(miner_default_config)?,
837+
Some(mut miner) => {
838+
if miner.mining_key.is_none() && !node.seed.is_empty() {
839+
miner.mining_key = Some(to_hex(&node.seed));
840+
}
841+
miner.into_config_default(miner_default_config)?
842+
}
837843
None => miner_default_config,
838844
};
839845

@@ -2546,6 +2552,13 @@ pub struct MinerConfigFile {
25462552

25472553
impl MinerConfigFile {
25482554
fn into_config_default(self, miner_default_config: MinerConfig) -> Result<MinerConfig, String> {
2555+
match &self.mining_key {
2556+
Some(_) => {}
2557+
None => {
2558+
panic!("mining key not set");
2559+
}
2560+
}
2561+
25492562
let mining_key = self
25502563
.mining_key
25512564
.as_ref()

0 commit comments

Comments
 (0)