merge bitcoin#15928...#16984: backports #4570
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
PastaPastaPasta
previously approved these changes
Nov 6, 2021
Member
PastaPastaPasta
left a comment
PastaPastaPasta
left a comment
There was a problem hiding this comment.
LGTM
utACK for merging via merge commit (assuming CI is happy)
Member
|
build fails |
|
This pull request has conflicts, please rebase. |
kwvg
force-pushed
the
miscports_again_again
branch
from
d56d62e to
01c5201
Compare
kwvg
force-pushed
the
miscports_again_again
branch
from
01c5201 to
dc209f1
Compare
kwvg
changed the title
kwvg
force-pushed
the
miscports_again_again
branch
from
dc209f1 to
8102fca
Compare
UdjinM6
requested changes
Dec 12, 2021
kwvg
force-pushed
the
miscports_again_again
branch
from
8102fca to
fc487f8
Compare
…own softforks' warning
kwvg
force-pushed
the
miscports_again_again
branch
from
fc487f8 to
6718789
Compare
src/chainparams.cpp
Outdated
| consensus.DIP0003EnforcementHeight = 2; // DIP0003 activated immediately on devnet | ||
| consensus.DIP0003EnforcementHash = uint256(); | ||
| consensus.DIP0008Height = 2; // DIP0008 activated immediately on devnet | ||
| consensus.MinBIP9WarningHeight = consensus.DIP0008Height + consensus.nMinerConfirmationWindow; |
Member
There was a problem hiding this comment.
why should this be dip0008? Also, should be this be bumped periodically / with each new hf hardening?
PastaPastaPasta
approved these changes
Dec 12, 2021
Member
PastaPastaPasta
left a comment
PastaPastaPasta
left a comment
There was a problem hiding this comment.
utACK for merging via merge commit
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
No description provided.