Skip to content

Conversation

@brice-stacks
Copy link
Contributor

Resolves merge conflicts merging 3.3.0.0.1 into develop.

Heads up that if you were running develop on a live node, the chainstate schema will need some manual surgery since both the 3.3.0.0.1 release and develop were using schema version 12, so I had to bump develop's change to 13.

This replaces #6667

@brice-stacks brice-stacks requested review from a team as code owners November 11, 2025 15:33
@CLAassistant
Copy link

CLAassistant commented Nov 11, 2025

CLA assistant check
All committers have signed the CLA.

@brice-stacks brice-stacks changed the base branch from master to develop November 11, 2025 15:35
wileyj
wileyj previously approved these changes Nov 11, 2025
jacinta-stacks
jacinta-stacks previously approved these changes Nov 11, 2025
@brice-stacks
Copy link
Contributor Author

Ugh, a new conflict. Fixing now...

jcnelson
jcnelson previously approved these changes Nov 11, 2025
@jcnelson
Copy link
Member

Seems this broke a bunch of things

@jcnelson jcnelson self-requested a review November 11, 2025 18:03
@brice-stacks
Copy link
Contributor Author

I see. I missed updating here:

pub const CHAINSTATE_VERSION: &str = "13";
pub const CHAINSTATE_VERSION_NUMBER: u32 = 13

Copy link

@francesco-stacks francesco-stacks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

@brice-stacks brice-stacks added this pull request to the merge queue Nov 12, 2025
Merged via the queue into stacks-network:develop with commit dc555b4 Nov 12, 2025
3 of 4 checks passed
@brice-stacks brice-stacks deleted the 3.3.0.0.1-to-develop branch November 12, 2025 14:33
@codecov
Copy link

codecov bot commented Nov 12, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 79.72%. Comparing base (17a221c) to head (99a809e).
⚠️ Report is 21 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #6673      +/-   ##
===========================================
+ Coverage    70.52%   79.72%   +9.20%     
===========================================
  Files          575      575              
  Lines       355819   355827       +8     
===========================================
+ Hits        250935   283684   +32749     
+ Misses      104884    72143   -32741     
Files with missing lines Coverage Δ
stackslib/src/chainstate/nakamoto/mod.rs 82.87% <ø> (+1.85%) ⬆️
stackslib/src/chainstate/stacks/db/mod.rs 84.80% <100.00%> (+5.26%) ⬆️
stackslib/src/chainstate/stacks/db/transactions.rs 96.84% <100.00%> (+16.27%) ⬆️

... and 314 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 17a221c...99a809e. Read the comment docs.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@github-actions
Copy link

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 20, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants