diff options
author | MarcoFalke <falke.marco@gmail.com> | 2019-09-27 15:25:47 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2019-09-27 15:25:53 -0400 |
commit | 6b2210f1016c9ed96ce470e588e4cb12fa36a900 (patch) | |
tree | 5447d11910bee85a34c7c6300f4b9fd5f4e2d9f4 /src/Makefile.qt.include | |
parent | a6c8aed1f140bef942b32af8aea78f0d5458cd17 (diff) | |
parent | fdb3e8f8b27e3b0b2f88c32915975c6e4c299b1e (diff) | |
download | bitcoin-6b2210f1016c9ed96ce470e588e4cb12fa36a900.tar.xz |
Merge #16713: Ignore old versionbit activations to avoid 'unknown softforks' warning
fdb3e8f8b27e3b0b2f88c32915975c6e4c299b1e Ignore old versionbit activations (Anthony Towns)
Pull request description:
PR 16060 removed the CSV and Segwit BIP9 softfork definitions and hard-coded ('buried') the activation heights. The versionbits code will warn users if an undefined softfork has been signalled in block header versions, and removing the CSV/Segwit definitions caused those warnings to be triggered.
Change the BIP 9 warning code to only check for unknown softforks after the segwit activation height.
ACKs for top commit:
MarcoFalke:
ACK fdb3e8f8b2
ajtowns:
ACK fdb3e8f8b27e3b0b2f88c32915975c6e4c299b1e for what it's worth
achow101:
ACK fdb3e8f8b27e3b0b2f88c32915975c6e4c299b1e
Sjors:
ACK fdb3e8f8b27e3b0b2f88c32915975c6e4c299b1e. It makes the bit 0 warning go away in mainnet and testnet QT when a new block arrives. I think the code is clear enough.
jonatack:
ACK fdb3e8f8b27e3b0b2f88c32915975c6e4c299b1e
Tree-SHA512: e6fd34e8902f8c7affb28e8951803e47d542710d5f1229000746656a37ee59d754439fc33e36b7eef87544262e5aac374645db91b74cb507e73514003ca7a67f
Diffstat (limited to 'src/Makefile.qt.include')
0 files changed, 0 insertions, 0 deletions