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

use EpochID check for disabling, add (missing) test file

Browse Source
This commit is contained in:
Aaron Blankstein
2023-04-21 13:40:43 -05:00
parent 730028e3f6
commit 37cce8b53c
2 changed files with 1091 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/chainstate/coordinator/mod.rs
View File

@@ -265,7 +265,10 @@ impl RewardSetProvider for OnChainRewardSetProvider {
sortdb: &SortitionDB,
block_id: &StacksBlockId,
) -> Result<RewardSet, Error> {
if current_burn_height > burnchain.pox_constants.v2_unlock_height as u64 {
let cur_epoch = SortitionDB::get_stacks_epoch(sortdb.conn(), current_burn_height)?.expect(
&format!("FATAL: no epoch for burn height {}", current_burn_height),
);
if cur_epoch.epoch_id >= StacksEpochId::Epoch22 {
info!("PoX reward cycle defaulting to burn in Epoch 2.2");
return Ok(RewardSet::empty());
}
@@ -300,10 +303,6 @@ impl RewardSetProvider for OnChainRewardSetProvider {
"registered_addrs" => registered_addrs.len());
}
let cur_epoch = SortitionDB::get_stacks_epoch(sortdb.conn(), current_burn_height)?.expect(
&format!("FATAL: no epoch for burn height {}", current_burn_height),
);
Ok(StacksChainState::make_reward_set(
threshold,
registered_addrs,

1087
testnet/stacks-node/src/tests/epoch_22.rs Normal file
View File

File diff suppressed because it is too large Load Diff