Skip to content
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.

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

fix: allow nakamoto-neon mode #4578

Merged
merged 3 commits into from
Mar 22, 2024
Merged

fix: allow nakamoto-neon mode #4578

merged 3 commits into from
Mar 22, 2024

Conversation

obycode
Copy link
Contributor

@obycode obycode commented Mar 22, 2024

PR #4577 removed nakamoto-neon mode, in order to make nakamoto the default, but did not remove nakamoto-neon everywhere. This change re-adds support for "nakamoto-neon" mode, but also leaves nakamoto mode as the default for xenon and mainnet modes.

Some integration tests failed in #4577, but the PR was merged anyway because it seems that the "Bitcoin Tests / Check Tests" check is not required. @wileyj can we make that check required now?

@obycode obycode requested review from kantai and hstove March 22, 2024 12:42
jferrant
jferrant previously approved these changes Mar 22, 2024
Copy link

codecov bot commented Mar 22, 2024

Codecov Report

Attention: Patch coverage is 94.11765% with 1 lines in your changes are missing coverage. Please review.

Project coverage is 83.17%. Comparing base (140385c) to head (14765e5).
Report is 124 commits behind head on next.

Additional details and impacted files
@@            Coverage Diff             @@
##             next    #4578      +/-   ##
==========================================
+ Coverage   83.14%   83.17%   +0.02%     
==========================================
  Files         456      471      +15     
  Lines      331024   337777    +6753     
  Branches      317      317              
==========================================
+ Hits       275240   280949    +5709     
- Misses      55776    56820    +1044     
  Partials        8        8              
Files Coverage Δ
stackslib/src/burnchains/mod.rs 82.73% <100.00%> (ø)
.../chainstate/burn/operations/leader_block_commit.rs 96.10% <100.00%> (+0.01%) ⬆️
stackslib/src/core/mod.rs 63.42% <ø> (ø)
testnet/stacks-node/src/main.rs 0.26% <0.00%> (-0.01%) ⬇️

... and 82 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 140385c...14765e5. Read the comment docs.

hstove
hstove previously approved these changes Mar 22, 2024
@wileyj
Copy link
Contributor

wileyj commented Mar 22, 2024

PR #4577 removed nakamoto-neon mode, in order to make nakamoto the default, but did not remove nakamoto-neon everywhere. This change re-adds support for "nakamoto-neon" mode, but also leaves nakamoto mode as the default for xenon and mainnet modes.

Some integration tests failed in #4577, but the PR was merged anyway because it seems that the "Bitcoin Tests / Check Tests" check is not required. @wileyj can we make that check required now?

that's the end goal, yes - but until we can resolve that failing test tests::neon_integrations::bitcoin_reorg_flap, requiring the check tests for PRs will mean all PR's will not have successful required checks

@obycode
Copy link
Contributor Author

obycode commented Mar 22, 2024

I removed that test from the yml file for now.

@wileyj
Copy link
Contributor

wileyj commented Mar 22, 2024

I removed that test from the yml file for now.

confirmed https://github.com/stacks-network/stacks-core/blob/next/.github/workflows/bitcoin-tests.yml#L90

in that case, yes we can take a look to ensure all tests taht should be passsing are passing, and then require that check tests workflow (which is the whole reason we added it!)

Prepare phase length must be >= 3 and epoch 3.0 start height must not be
in a prepare phase.
@obycode obycode dismissed stale reviews from hstove and jferrant via c3ea822 March 22, 2024 15:44
@obycode obycode requested review from jferrant and hstove March 22, 2024 15:57
kantai
kantai previously approved these changes Mar 22, 2024
@obycode obycode added this pull request to the merge queue Mar 22, 2024
Merged via the queue into next with commit 5f8a673 Mar 22, 2024
2 checks passed
ASuciuX added a commit to ASuciuX/archived-stacks-core that referenced this pull request Mar 27, 2024
ASuciuX added a commit to ASuciuX/archived-stacks-core that referenced this pull request Mar 27, 2024
@blockstack-devops
Copy link
Contributor

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.

@stacks-network stacks-network locked as resolved and limited conversation to collaborators Nov 3, 2024
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.

6 participants