kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-04-28 19:55:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Get the last block of the parent tenure when the new tenure is empty

Browse Source 
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
This commit is contained in:
Jacinta Ferrant
2024-04-11 11:20:23 -07:00
committed by jferrant
parent 64dca26168
commit 9ecfc9f3d6
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
testnet/stacks-node/src/nakamoto_node/miner.rs
View File

@@ -669,12 +669,10 @@ impl BlockMinerThread {
} else {
self.parent_tenure_id
};
let Some(stacks_tip_header) =
let Some(mut stacks_tip_header) =
NakamotoChainState::get_block_header(chain_state.db(), &stacks_block_id)
.expect("FATAL: could not query chain tip")
.expect("FATAL: could not query prior stacks block id")
else {
debug!("No Stacks chain tip known, will return a genesis block");
let burnchain_params = burnchain_params_from_config(&self.config.burnchain);
let chain_tip = ChainTip::genesis(
@@ -693,6 +691,19 @@ impl BlockMinerThread {
});
};
if self.mined_blocks.is_empty() {
// We could call this even if self.mined_blocks was not empty, but would return the same value, so save the effort and only do it when necessary.
// If we are starting a new tenure, then make sure we are building off of the last block of our parent tenure
if let Some(last_tenure_finish_block_id) =
NakamotoChainState::get_nakamoto_tenure_finish_block_header(
chain_state.db(),
&stacks_tip_header.consensus_hash,
)
.expect("FATAL: could not query parent tenure finish block")
{
stacks_tip_header = last_tenure_finish_block_id;
}
}
let miner_address = self
.keychain
.origin_address(self.config.is_mainnet())

1
testnet/stacks-node/src/tests/nakamoto_integrations.rs
View File

@@ -1272,6 +1272,7 @@ fn mine_multiple_per_tenure_integration() {
// Mine `tenure_count` nakamoto tenures
for tenure_ix in 0..tenure_count {
debug!("Mining tenure {}", tenure_ix);
let commits_before = commits_submitted.load(Ordering::SeqCst);
next_block_and_process_new_stacks_block(&mut btc_regtest_controller, 60, &coord_channel)
.unwrap();