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

Merge branch 'develop' into btc-tx-more-info

Browse Source
This commit is contained in:
Jude Nelson
2023-02-02 17:13:29 +00:00
committed by GitHub
parent 998a7a4a67 d21b3f37fc
commit 8cdf09d17e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/net/rpc.rs
View File

@@ -423,6 +423,7 @@ impl RPCPoxInfoData {
net_error::ChainstateError("Burn block height overflowed i64".into())
})?;
let cur_block_pox_contract = pox_consts.active_pox_contract(burnchain_tip.block_height);
let cur_cycle_pox_contract =
pox_consts.active_pox_contract(burnchain.reward_cycle_to_block_height(reward_cycle_id));
let next_cycle_pox_contract = pox_consts
@@ -475,7 +476,7 @@ impl RPCPoxInfoData {
let cur_cycle_pox_active = sortdb.is_pox_active(burnchain, &burnchain_tip)?;
Ok(RPCPoxInfoData {
contract_id: boot_code_id(cur_cycle_pox_contract, chainstate.mainnet).to_string(),
contract_id: boot_code_id(cur_block_pox_contract, chainstate.mainnet).to_string(),
pox_activation_threshold_ustx,
first_burnchain_block_height,
current_burnchain_block_height: burnchain_tip.block_height,

2
testnet/stacks-node/src/tests/epoch_21.rs
View File

@@ -1639,7 +1639,7 @@ fn transition_removes_pox_sunset() {
assert_eq!(pox_info.current_cycle.is_pox_active, true);
assert_eq!(
&pox_info.contract_id,
&format!("ST000000000000000000002AMW42H.pox")
&format!("ST000000000000000000002AMW42H.pox-2")
);
// re-stack