Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
ba1ceac
Remove handle_affirmation_reorg, check_pox_anchor_affirmation
jferrant Jul 23, 2025
c695609
Remove check_chainstate_against_burnchain_affirmations
jferrant Jul 23, 2025
da251cf
Remove undo_stacks_block_orphaning
jferrant Jul 23, 2025
fac38a7
Remove affirmation_maps_active
jferrant Jul 23, 2025
4c7abfc
Remove find_invalid_and_revalidated_sortitions, get_snapshots_and_aff…
jferrant Jul 23, 2025
32aa1a6
Remove check for compatible_stacks_blocks in handle_new_epoch2_burnch…
jferrant Jul 23, 2025
2d57bce
Remove find_highest_stacks_block_with_compatible_affirmation_map
jferrant Jul 24, 2025
4f43f7f
Remove consolidate_affirmation_maps, *_get_*_affirmation_map, is_bloc…
jferrant Jul 24, 2025
d1fdb69
Fix failing test_inv_sync_start_reward_cycle
jferrant Jul 24, 2025
36c427b
Remove AffirmationMaps from getinfo endpoint
jferrant Jul 24, 2025
ff7b3b4
Merge branch 'develop' of https://github.com/stacks-network/stacks-co…
jferrant Jul 24, 2025
70b773a
Remove require_affirmed_anchor_blocks config options
jferrant Jul 28, 2025
86d281c
Remove always_use_affirmation_maps config option
jferrant Jul 28, 2025
e40e0cf
Remove assume_present_anchor_blocks config option
jferrant Jul 28, 2025
b72a6ab
check_missing_anchor_block should stall if missing anchor block regar…
jferrant Jul 29, 2025
6c36933
Fix test_pox_no_anchor_selected
jferrant Jul 29, 2025
ea15d55
Fix test_pox_no_anchor_selected
jferrant Jul 29, 2025
33fbe18
Fix test_simple_setup
jferrant Jul 29, 2025
cd1b4cc
Remove affirmation_overrides config
jferrant Jul 29, 2025
b74cf10
Fix test_generate_markdown_with_real_fixture_data
jferrant Jul 30, 2025
e114345
Fix test_get_block_availability
jferrant Jul 30, 2025
acc9678
Merge branch 'develop' of https://github.com/stacks-network/stacks-co…
jferrant Aug 7, 2025
53bf9ea
Remove TODO comment
jferrant Aug 7, 2025
9cad386
Make test_nakamoto_inv_sync_across_epoch_change panic instead of timi…
jferrant Aug 7, 2025
c4fad7f
Merge branch 'develop' of https://github.com/stacks-network/stacks-co…
jferrant Aug 22, 2025
3bf47dd
Remove drive_chain_livenes which was meant to address potential bug i…
jferrant Aug 22, 2025
5ed4860
CRC: should include prior reward cycle for get_block_scan_start
jferrant Aug 25, 2025
ae41678
WIP: remove process_affirmation_maps and always call get_chosen_pox_a…
jferrant Aug 25, 2025
8d22715
WIP: remove insert_block_commit_affirmation_map and update_block_comm…
jferrant Aug 25, 2025
782e167
chore: fix epoch2x inv sync to use a given node's last-seen reward cy…
jcnelson Aug 26, 2025
e5f5413
Merge pull request #2 from jcnelson/fix/fix-epoch2x-inv-sync
jferrant Aug 27, 2025
f0af8d4
Cleanup
jferrant Aug 27, 2025
6bc5d43
Merge branch 'develop' of https://github.com/stacks-network/stacks-co…
jferrant Aug 28, 2025
bb4423a
Remove affirmation_weight from block_headers in chainstate db
jferrant Sep 3, 2025
166234d
Remove affirmation_id from block_commit_metadata and drop it and affi…
jferrant Sep 3, 2025
838d309
Remove remaining references to affirmation maps throughout code base …
jferrant Sep 3, 2025
82d87e9
Fix supports_epoch
jferrant Sep 3, 2025
a9aa74e
Remove pox flapping/missing anchor block tests that no longer are rel…
jferrant Sep 4, 2025
c028f83
Merge branch 'develop' of https://github.com/stacks-network/stacks-co…
jferrant Sep 4, 2025
7cfff95
CRC: clean up CHAINSTATE_SCHEMA_5 to simply drop affirmation_weight c…
jferrant Sep 4, 2025
f210934
CRC: cleanup get_schema_version
jferrant Sep 5, 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
6 changes: 0 additions & 6 deletions .github/workflows/bitcoin-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,6 @@ jobs:
- test-name: tests::epoch_205::test_dynamic_db_method_costs
- test-name: tests::epoch_205::test_exact_block_costs
- test-name: tests::epoch_205::transition_empty_blocks
- test-name: tests::epoch_21::test_pox_missing_five_anchor_blocks
- test-name: tests::epoch_21::test_pox_reorg_flap_duel
- test-name: tests::epoch_21::test_pox_reorg_flap_reward_cycles
- test-name: tests::epoch_21::test_pox_reorg_one_flap
- test-name: tests::epoch_21::test_pox_reorgs_three_flaps
- test-name: tests::epoch_21::test_sortition_divergence_pre_21
- test-name: tests::epoch_21::test_v1_unlock_height_with_current_stackers
- test-name: tests::epoch_21::test_v1_unlock_height_with_delay_and_current_stackers
Expand All @@ -99,7 +94,6 @@ jobs:
- test-name: tests::epoch_21::transition_removes_pox_sunset
- test-name: tests::epoch_22::disable_pox
- test-name: tests::epoch_22::pox_2_unlock_all
- test-name: tests::epoch_22::test_pox_reorg_one_flap
- test-name: tests::epoch_23::trait_invocation_behavior
- test-name: tests::epoch_24::fix_to_pox_contract
- test-name: tests::epoch_24::verify_auto_unlock_behavior
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE

- Clarity errors pertaining to syntax binding errors have been made more
expressive (#6337)

- Removed affirmation maps logic throughout, upgrading chainstate DB schema to 11 and burnchain DB schema to 3 (#6314)

## [3.2.0.0.1]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
},
{
"name": "miner",
"description": "Flag indicating whether this node should activate its mining logic and attempt to\nproduce Stacks blocks. Setting this to `true` typically requires providing\nnecessary private keys (either [`NodeConfig::seed`] or [`MinerConfig::mining_key`]).\nIt also influences default behavior for settings like\n[`NodeConfig::require_affirmed_anchor_blocks`].",
"description": "Flag indicating whether this node should activate its mining logic and attempt to\nproduce Stacks blocks. Setting this to `true` typically requires providing\nnecessary private keys (either [`NodeConfig::seed`] or [`MinerConfig::mining_key`]).",
"default_value": "`false`",
"notes": null,
"deprecated": null,
Expand All @@ -74,7 +74,6 @@
"referenced_constants": {
"MinerConfig::mining_key": null,
"NodeConfig::miner": null,
"NodeConfig::mine_microblocks": null,
"NodeConfig::require_affirmed_anchor_blocks": null
"NodeConfig::mine_microblocks": null
}
}
6 changes: 0 additions & 6 deletions docs/rpc/components/examples/node-info.example.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@
"is_fully_synced": false,
"node_public_key": "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01",
"node_public_key_hash": "1328af7c4f96eee8fdbb1e023e48ba11e255d1c8",
"affirmations": {
"heaviest": "",
"stacks_tip": "",
"sortition_tip": "",
"tentative_best": ""
},
"last_pox_anchor": {
"anchor_block_hash": "47c20352492e1647127d6f6275fa5abfe90157f6a64e6a175ff45ed0c1fb3f4e",
"anchor_block_txid": "5b5d678c658525122fa73a8699b5810325ce9412bf0dc3762fb7518699be3d4d"
Expand Down
15 changes: 0 additions & 15 deletions docs/rpc/components/schemas/node-info.schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,21 +88,6 @@ properties:
node_public_key_hash:
type: [string, "null"]
description: The HASH160 of the node's public key.
affirmations:
type: [object, "null"]
properties:
heaviest:
type: string
description: Encoded affirmation map string.
stacks_tip:
type: string
description: Encoded affirmation map string.
sortition_tip:
type: string
description: Encoded affirmation map string.
tentative_best:
type: string
description: Encoded affirmation map string.
last_pox_anchor:
type: [object, "null"]
properties:
Expand Down
1 change: 0 additions & 1 deletion stacks-node/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ fn cli_get_miner_spend(
&mut sortdb,
&burnchain,
&OnChainRewardSetProvider(no_dispatcher),
config.node.always_use_affirmation_maps,
)
.unwrap();

Expand Down
1 change: 0 additions & 1 deletion stacks-node/src/neon_node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2109,7 +2109,6 @@ impl BlockMinerThread {
burn_db,
&self.burnchain,
&OnChainRewardSetProvider::new(),
self.config.node.always_use_affirmation_maps,
) {
Ok(x) => x,
Err(e) => {
Expand Down
13 changes: 2 additions & 11 deletions stacks-node/src/node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -840,22 +840,13 @@ impl Node {
parent_consensus_hash
};

let burnchain = self.config.get_burnchain();
let burnchain_db =
BurnchainDB::connect(&burnchain.get_burnchaindb_path(), &burnchain, true)
.expect("FATAL: failed to connect to burnchain DB");

let atlas_config = Self::make_atlas_config();
let mut processed_blocks = vec![];
loop {
let mut process_blocks_at_tip = {
let tx = db.tx_begin_at_tip();
self.chain_state.process_blocks(
burnchain_db.conn(),
tx,
1,
Some(&self.event_dispatcher),
)
self.chain_state
.process_blocks(tx, 1, Some(&self.event_dispatcher))
};
match process_blocks_at_tip {
Err(e) => panic!("Error while processing block - {e:?}"),
Expand Down
5 changes: 0 additions & 5 deletions stacks-node/src/run_loop/nakamoto.rs
Original file line number Diff line number Diff line change
Expand Up @@ -323,11 +323,6 @@ impl RunLoop {
let mut fee_estimator = moved_config.make_fee_estimator();

let coord_config = ChainsCoordinatorConfig {
assume_present_anchor_blocks: moved_config.node.assume_present_anchor_blocks,
always_use_affirmation_maps: moved_config.node.always_use_affirmation_maps,
require_affirmed_anchor_blocks: moved_config
.node
.require_affirmed_anchor_blocks,
txindex: moved_config.node.txindex,
};
ChainsCoordinator::run(
Expand Down
Loading
Loading