[0.21] Speedy trial activation for Taproot #21701
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The intent here is to allow checking ComputeBlockVersion behaviour with each deployment, rather than only testdummy on mainnet. This commit does the trivial refactoring component of that change. Github-Pull: bitcoin#21377 Rebased-From: 63879f0
This generalises the ComputeBlockVersion test so that it can apply to any activation parameters we might set, and checks all the parameters set for each deployment on each chain, to simultaneously ensure that the deployments we have configured work sensibly, and that the test code does not suffer bitrot in the event that all interesting deployments are buried. Github-Pull: bitcoin#21377 Rebased-From: 5932744
Simplify the versionbits unit test slightly to make the next set of changes a little easier to follow. Github-Pull: bitcoin#21377 Rebased-From: 9e6b65f
Github-Pull: bitcoin#21377 Rebased-From: 73d4a70
maflcko
reviewed
Apr 15, 2021
37c255c to
724e494
Compare
|
I verified as follows: Git diff only shows a difference in the trailing I had manually resolve a conflict for dd07e6d. I also managed to spin up the node and see the softfork as "defined" in I'm unable to reproduce the CI failure on macOS 11.2.3 with homebrew Boost 1.75.0. It doesn't happen for me with depends either. |
|
I don't know why CI is having a hard time building this. I am able to do a gitian build of this branch, so it should be working. |
This was referenced Apr 16, 2021
fanquake
reviewed
Apr 16, 2021
Github-Pull: bitcoin#21377 Rebased-From: dd85d54
Github-Pull: bitcoin#21377 Rebased-From: dd07e6d
Previously we used deployments that would timeout prior to Bitcoin's invention, which allowed the deployment to still be activated in unit tests. This switches those deployments to be truly never active. Github-Pull: bitcoin#21377 Rebased-From: 55ac5f5
This removes the DEFINED->FAILED transition and changes the STARTED->FAILED transition to only occur if signalling didn't pass the threshold. This ensures that it is always possible for activation to occur, no matter what settings are chosen, or the speed at which blocks are found. Github-Pull: bitcoin#21377 Rebased-From: f054f6b
Github-Pull: bitcoin#21377 Rebased-From: ffe33df
Github-Pull: bitcoin#21686 Rebased-From: f979b32
724e494 to
cbd64c3
Compare
|
cherry-pick ACK cbd64c3 |
|
ACK cbd64c3 Repeated the rebase/cherry-pick myself and the only differences were the unsigned/signed fixups here: #21701 (review). |
|
tACK cbd64c3 |
|
cherry-pick-only ACK cbd64c3 🌾 Show signature and timestampSignature: Timestamp of file with hash |
|
Post-merge ACK cbd64c3 -- checked fuzzer compiles at each step, visually compared new patches with originals, checked original patches are in master |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of #21377 and #21686