Skip to content

aac: update epoch list configuration from epoch20 #6611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

aac: update epoch list configuration from epoch20 #6611

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39a7d30
test: aac update epoch list configuration from epoch20, #6567
federico-stacks Oct 17, 2025
d932a22
merge: address conflicts with develop, #6567
federico-stacks Oct 17, 2025
a5ae88e
chore: restore some changes after merge conflicts, #6567
federico-stacks Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 68 additions & 53 deletions stackslib/src/chainstate/tests/consensus.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ use crate::chainstate::tests::TestChainstate;
use crate::core::test_util::{
make_contract_call, make_contract_publish_versioned, make_stacks_transfer_tx, to_addr,
};
use crate::core::{EpochList, BLOCK_LIMIT_MAINNET_21};
use crate::core::{
EpochList, BLOCK_LIMIT_MAINNET_20, BLOCK_LIMIT_MAINNET_205, BLOCK_LIMIT_MAINNET_21,
};
use crate::net::tests::NakamotoBootPlan;

/// The epochs to test for consensus are the current and upcoming epochs.
Expand Down Expand Up @@ -549,8 +551,19 @@ impl TestTxFactory {
}
}

fn epoch_3_0_onwards(first_burnchain_height: u64) -> EpochList {
info!("StacksEpoch unit_test first_burn_height = {first_burnchain_height}");
// Configure an [`EpochList`] starting from Epoch 2.0
fn epoch_2_0_onwards(pox_constants: &PoxConstants) -> EpochList {
let epoch2_first_burn_height = 1;

// pox4 activated in epoch 2.5, so we can start producing naka blocks after the end of that epoch.
let epoch3_first_burn_height =
(pox_constants.pox_4_activation_height + pox_constants.reward_cycle_length + 1) as u64;

info!("EpochList creation";
"pox constants" => ?pox_constants,
"epoch 2.X first bbh:" => epoch2_first_burn_height,
"epoch 3.X first bbh:" => epoch3_first_burn_height,
);

EpochList::new(&[
StacksEpoch {
Expand All @@ -563,78 +576,78 @@ fn epoch_3_0_onwards(first_burnchain_height: u64) -> EpochList {
StacksEpoch {
epoch_id: StacksEpochId::Epoch20,
start_height: 0,
end_height: 0,
block_limit: ExecutionCost::max_value(),
end_height: epoch2_first_burn_height,
block_limit: BLOCK_LIMIT_MAINNET_20,
network_epoch: PEER_VERSION_EPOCH_2_0,
},
StacksEpoch {
epoch_id: StacksEpochId::Epoch2_05,
start_height: 0,
end_height: 0,
block_limit: ExecutionCost::max_value(),
start_height: epoch2_first_burn_height,
end_height: epoch2_first_burn_height + 1,
block_limit: BLOCK_LIMIT_MAINNET_205,
network_epoch: PEER_VERSION_EPOCH_2_05,
},
StacksEpoch {
epoch_id: StacksEpochId::Epoch21,
start_height: 0,
end_height: 0,
block_limit: ExecutionCost::max_value(),
start_height: epoch2_first_burn_height + 1,
end_height: epoch2_first_burn_height + 2,
block_limit: BLOCK_LIMIT_MAINNET_21,
network_epoch: PEER_VERSION_EPOCH_2_1,
},
StacksEpoch {
epoch_id: StacksEpochId::Epoch22,
start_height: 0,
end_height: 0,
block_limit: ExecutionCost::max_value(),
start_height: epoch2_first_burn_height + 2,
end_height: epoch2_first_burn_height + 3,
block_limit: BLOCK_LIMIT_MAINNET_21,
network_epoch: PEER_VERSION_EPOCH_2_2,
},
StacksEpoch {
epoch_id: StacksEpochId::Epoch23,
start_height: 0,
end_height: 0,
block_limit: ExecutionCost::max_value(),
start_height: epoch2_first_burn_height + 3,
end_height: epoch2_first_burn_height + 4,
block_limit: BLOCK_LIMIT_MAINNET_21,
network_epoch: PEER_VERSION_EPOCH_2_3,
},
StacksEpoch {
epoch_id: StacksEpochId::Epoch24,
start_height: 0,
end_height: 0,
block_limit: ExecutionCost::max_value(),
start_height: epoch2_first_burn_height + 4,
end_height: epoch2_first_burn_height + 5,
block_limit: BLOCK_LIMIT_MAINNET_21,
network_epoch: PEER_VERSION_EPOCH_2_4,
},
StacksEpoch {
epoch_id: StacksEpochId::Epoch25,
start_height: 0,
end_height: first_burnchain_height,
block_limit: BLOCK_LIMIT_MAINNET_21.clone(),
start_height: epoch2_first_burn_height + 5,
end_height: epoch3_first_burn_height,
block_limit: BLOCK_LIMIT_MAINNET_21,
network_epoch: PEER_VERSION_EPOCH_2_5,
},
StacksEpoch {
epoch_id: StacksEpochId::Epoch30,
start_height: first_burnchain_height,
end_height: first_burnchain_height + 1,
block_limit: BLOCK_LIMIT_MAINNET_21.clone(),
start_height: epoch3_first_burn_height,
end_height: epoch3_first_burn_height + 1,
block_limit: BLOCK_LIMIT_MAINNET_21,
network_epoch: PEER_VERSION_EPOCH_3_0,
},
StacksEpoch {
epoch_id: StacksEpochId::Epoch31,
start_height: first_burnchain_height + 1,
end_height: first_burnchain_height + 2,
block_limit: BLOCK_LIMIT_MAINNET_21.clone(),
start_height: epoch3_first_burn_height + 1,
end_height: epoch3_first_burn_height + 2,
block_limit: BLOCK_LIMIT_MAINNET_21,
network_epoch: PEER_VERSION_EPOCH_3_1,
},
StacksEpoch {
epoch_id: StacksEpochId::Epoch32,
start_height: first_burnchain_height + 2,
end_height: first_burnchain_height + 3,
block_limit: BLOCK_LIMIT_MAINNET_21.clone(),
start_height: epoch3_first_burn_height + 2,
end_height: epoch3_first_burn_height + 3,
block_limit: BLOCK_LIMIT_MAINNET_21,
network_epoch: PEER_VERSION_EPOCH_3_2,
},
StacksEpoch {
epoch_id: StacksEpochId::Epoch33,
start_height: first_burnchain_height + 3,
start_height: epoch3_first_burn_height + 3,
end_height: STACKS_EPOCH_MAX,
block_limit: BLOCK_LIMIT_MAINNET_21.clone(),
block_limit: BLOCK_LIMIT_MAINNET_21,
network_epoch: PEER_VERSION_EPOCH_3_3,
},
])
Expand Down Expand Up @@ -783,12 +796,9 @@ impl ConsensusTest<'_> {
.with_pox_constants(100, 3)
.with_initial_balances(initial_balances)
.with_private_key(FAUCET_PRIV_KEY.clone());
let epochs = epoch_3_0_onwards(
(boot_plan.pox_constants.pox_4_activation_height
+ boot_plan.pox_constants.reward_cycle_length
+ 1) as u64,
);
let epochs = epoch_2_0_onwards(&boot_plan.pox_constants);
boot_plan = boot_plan.with_epochs(epochs);

let chain = boot_plan.boot_nakamoto_chainstate(None);

Self { chain }
Expand Down Expand Up @@ -854,7 +864,6 @@ impl ConsensusTest<'_> {
NakamotoChainState::get_canonical_block_header(stacks_node.chainstate.db(), &sortdb)
.unwrap()
.unwrap();
let pox_constants = PoxConstants::test_default();
let sig_hash = nakamoto_block.header.signer_signature_hash();
debug!(
"--------- Processing block {sig_hash} ---------";
Expand Down Expand Up @@ -901,20 +910,26 @@ impl ConsensusTest<'_> {
) -> Vec<ExpectedResult> {
// Validate blocks
for (epoch_id, blocks) in epoch_blocks.iter() {
assert!(
!matches!(
*epoch_id,
StacksEpochId::Epoch10
| StacksEpochId::Epoch20
| StacksEpochId::Epoch2_05
| StacksEpochId::Epoch21
| StacksEpochId::Epoch22
| StacksEpochId::Epoch23
| StacksEpochId::Epoch24
| StacksEpochId::Epoch25
),
"Pre-Nakamoto Tenures are not Supported"
assert_ne!(
*epoch_id,
StacksEpochId::Epoch10,
"Epoch10 is not supported!"
);

let is_epoch2X = matches!(
*epoch_id,
StacksEpochId::Epoch20
| StacksEpochId::Epoch2_05
| StacksEpochId::Epoch21
| StacksEpochId::Epoch22
| StacksEpochId::Epoch23
| StacksEpochId::Epoch24
| StacksEpochId::Epoch25
);
if is_epoch2X {
panic!("TODO: need chainstate update to work with pre-naka");
}

assert!(
!blocks.is_empty(),
"Each epoch must have at least one block"
Expand Down