Bitcoin Core 0.12.0

[str4d]

This issue is for tracking the PRs from upstream that would result in feature-parity with Bitcoin Core 0.12.0. We may not merge all of these, but we should track those we have decided not to merge alongside those we already have, so we can spot anything we might have missed.

e9d0d252fc57119766f5d7b58715451dd42b1ce6 appears to be the most common ancestor between our branch (off 0.11.2) and Bitcoin master, so all PRs listed below are based off there.

Bitcoin PRs merged on our branch since then

Up to 0.11.2

• 6219 == 6218
• 6238 - same on master
• 6369 - same on master
• 6383 - 0.11-only
• 6397 - 0.11-only
• 6703 - bugfix backports
• 6750 == 6498
• 6785 == 6588
• 6707 - CLTV backport (6124, 6351, 6353, 6368)
• 6945 == 6917
• 6884 == 6566
• 6825 - more bugfix backports
• 6968 - 0.11.2 release notes
• 6975 - 0.11.2 7e278929df53e1fb4191bc5ba3176a177ce718bf

Bitcoin PRs merged on master since then

Before 0.12 branch made after 3cd836c1d855b92e7c73ab31979f471c4f8dad68

In reverse order (latest merged first)

• ~7158 GUI~
• [ ] 7157 Cleanup
• [ ] 7128 Moving
• [ ] 6216 Wallet
• [ ] 7147 Update UniValue
• [ ] 7146 Build
• [ ] 7118 RPC docs
• [ ] 7155 Tests cleanup
• [ ] 7144 Tests
• [ ] 6872 Block & txn
• [ ] 7040 Docs
• [ ] 6898 Block & txn
• [ ] 7137 Tests
• [ ] 7141 RPC
• ~7143 GUI~
• [x] 6915 Block & txn -> #2940
• [ ] 7022 RPC
• [ ] 7063 Tests
• [x] 7136 Docs cleanups -> #4268
• [x] 6914 Validation -> #3180
• [ ] 7096 Wallet
• [x] 7135 Test cleanup -> #4874
• [ ] 7105 Wallet
• [x] 7079 P2P & Net -> #1407
• [ ] 7072 RPC
• [x] 7044 RPC -> #2390
• [ ] 7094 Misc
• [ ] 7008 Block & txn
• [x] 7035 Config -> #2177
• [ ] 7112 Moving, GUI
• [ ] 7103 Wallet
• [x] 7027 Tests -> #4874
• [ ] 7126 Moving
• [ ] 7116 Bugfix for #7053
• [ ] 7127 Bugfix
• ~7025 GUI~
• [ ] 7129 P2P & Net
• [x] 7106 P2P & Net -> #1411
• [ ] 6508 Validation -> #5065
• [ ] 6961 Cleanups and bugfixes -> #2390
  • Still missing a small policy change
• [ ] 6942 Docs bugfix
• [ ] 7003 Docs
• [ ] 7117 Bugfix
• [ ] 7078 Misc
• [ ] 7114 Misc
• [x] 7090 P2P & Net -> #2177
• [ ] 7095 Tests
• [ ] 7083 Bugfix - OpenSSL 1.1.0
• [ ] 6780 GUI -> #2390
• [ ] 7053 Globals
• [ ] 6871 Block & txn
• [ ] 6134 Wallet - fee estimation
• [ ] 5967 Block & txn
• [x] 7058 ZMQ -> #2050
• [ ] 7069 Bugfix
• [ ] 7087 RPC
• [ ] 7088 Update libsecp256k1
• [ ] 7092 Build system
• ~7006 GUI~
• [ ] 7075 Logging -> #4994
• [ ] 7066 Docs
• [ ] 7045 Tests
• [ ] 7042 Docs
• [ ] 7052 QA cleanup/build(?)
• [ ] 7065 RPC
• [x] 7028 QA docs -> #4874
• [x] 7029 Cleanup -> #4874
• [ ] 7046 P2P & Net
• [ ] 7011 RPC
• [ ] 6851 Wallet
• ~6979 GUI~
• [ ] 7019 CI
• [x] 7059 Build -> #2786
• [x] 6900 Gitian determinism -> #1541
• ~7051 GUI~
• [ ] 7048 Docs
• [ ] 7041 Docs
• [x] 6932 Block & txn -> #3262
• ~6951 GUI~
• [ ] 7030 Contrib cleanup
• [ ] 7050 Bugfix
• [x] 7020 Cleanup -> #2940
• [ ] 7026 Cleanup
• [ ] 6986 Correctness
• [x] 6999 RPC -> #2816
• [ ] 7023 Bugfix
• [x] 6954 Validation -> #2335
• [x] 7016 Build -> #2176
• [ ] 6991 Docs
• ~7000 GUI~
• [ ] 6993 Config
• [x] 6984 P2P & Net -> #2816
• ~7004 Gitian~
• [ ] 7013 RPC
• [ ] 7010 Wallet
• [x] 6990 RPC -> #2555
• [ ] 7007 Test bugfix
• [x] 6983 Update libsecp256k1 -> #2335
• [x] 6958 Cleanup & docs -> #2816
• [ ] 6998 Docs
• [ ] 6771 Policy
• [x] 6639 P2P & Net -> #2177
• [x] 6918 Block & txn -> #3262
• [ ] 6931 Validation
• [x] 6804 Tests -> #4874
• [ ] 6969 Docs
• [ ] 6974 P2P & Net -> Tabled #2152 -> #4994
• [x] 6987 Docs -> #2816
• [ ] 6988 Docs
• [x] 6978 Build -> #2786
• [ ] 6982 Globals correctness
• [ ] 6985 Gitian
• [ ] 6965 Block & txn
• ~6940 GUI~
• [x] 6822 Tests -> #4268
• [ ] 5574 RPC
• [ ] 6163 Globals
• ~6967 Gitian?~
• ~6908 GUI cleanup - BIP70~
• [x] 6962 Translations -> #4268
• [x] 6970 RPC -> #2100
• [ ] 6955 Cleanup & docs
• [x] 6948 Chainstate -> 0.11.X
• [ ] 6934 Block & txn
• [x] 6887 GUI & wallet -> #4268
• [ ] 6944 Update LevelDB
• ~6938 Build system~ (QT)
• ~6864 GUI~
• [x] 6669 Wallet & docs -> #4268
• [x] 6927 ZMQ -> #2050
• [ ] 6933 Build docs
• [x] 6905 Bugfix -> #2390
• [x] 6930 Build -> #4874
• [ ] 6928 Revert #6566
• [x] 6926 Tests -> #3669
• ~6883~
• [ ] 6906 Wallet
• [ ] 6896 Config
• [ ] 6863 Tests
• [x] 6899 Correctness -> #2176
• [ ] 6870 Cleanup & docs
• [ ] 6894 Tests
• [ ] 6891 Correctness
• [ ] 6892 Cleanup
• [x] 6776 Config -> #2940
• ~6895 Gitian?~
• [ ] 6875 CI or Gitian
• [ ] 6865 Block & txn
• [ ] 6464 Block & txn
• [ ] 6889 Block & txn
• [ ] 6881 Config
• [x] 6622 Config -> #2816
• [ ] 6621 OSX
• [ ] 6888 Tests
• [x] 6566 Block & txn -> 0.11.X
• [ ] 6877 RPC
• [ ] 6813 Tests
• [ ] 6878 Docs
• [ ] 6879 Docs - BIP65
• [ ] 6873 Cleanup
• [x] 6856 Bugfix -> 0.11.X
• [x] 6351 Soft-fork - BIP65 -> #6707
• [x] 5936 RPC -> #3086
• [ ] 6818 Script
• [ ] 6790 Misc
• [x] 6867 P2P -> 0.11.X
• [ ] 6848 Tests
• [x] 6846 Config -> 6825
• [x] 6854 Misc -> #1541
• [ ] 6859 RPC
• [ ] 6722 Block & txn
• [x] 6796 Cleanup -> 6825
• [x] 6235 Cleanup -> #2390
• [x] 6841 Tests -> 0.11.X
• [ ] 6801 Build system
• [x] 6827 Tests -> #4874
• [ ] 6853 Tests
• [ ] 6829 Docs -> #4994
• [x] 6852 Correctness - OpenSSL -> 0.11.X
• [ ] 6837 Temp comment out rpcbind.py
• [x] 6843 Typo -> 6825
• [ ] 6849 Docs
• [ ] 6820 UniValue subdir fixes
• [ ] 6817 Docs cleanup
• [ ] 6823 Cleanup
• [x] 6830 -> 0.11.X (via #6832)
• [x] 6810 ZMQ -> #2050
• [ ] 6777 Block & txn
• [ ] 6791 Cleanup -> #4874
• [x] 6798 Test docs -> 6825
• [x] 6812 Gitian? -> 6825
• [x] 6788 UniValue upgrade -> #1990, #4874
• ~6807 Gitian?~
• ~6805 Gitian?~
• [x] 6793 Dust threshold -> 0.11.X
• [x] 6795 Disable UPnP by default -> 0.11.X
• [x] 6789 Deps -> 0.11.X
• [x] 6779 ZMQ -> #2050
• [x] 6783 Typo -> 6825
• [ ] 6770 Cleanup
• [x] 6720 Tests -> #929
• [x] 6769 Bugfix cleanup, consensus hardening -> 0.11.X
• [ ] 6650 Block & txn
• [ ] 6733 Misc
• [ ] 6762 Tests cleanup
• [x] 6743 ZMQ -> #2050
• [ ] 6760 Cleanup
• ~6763 Docs~
• ~6751 Docs~
• [x] 6768 ZMQ -> #2050
• [ ] 6742 Config
• [x] 6744 Build -> 6825
• [ ] 6748 Config docs -> #4222
• [ ] 6759 Cleanup
• [x] 6616 Tests - rpc-tests.sh to rpc-tests.py -> #4874
• [x] 6739 ZMQ -> #2050
• [x] 6424 Script -> #4227
• [ ] 6732 revert LibreSSL
• [x] 6637 UniValue upgrade -> #1990
• [x] 6686 ZMQ -> #2050
• [x] 5987 Misc -> 6825
• [ ] 6731 Build docs
• [x] 6588 P2P & Net -> 0.11.X
• [ ] 5924 Wallet
• [ ] 6741 Docs (maybe we want?)
• [x] 6680 Block & txn -> #2050
• [ ] 6740 Docs or CI?
• [x] 6736 ZMQ -> #2050
• [ ] 6713 Misc
• [ ] 6661 Gitian docs
• [x] 6730 Tests -> 6825
• [ ] 6728 Misc -> #4994
• [x] 6719 RPC -> #2555
• [ ] 6724 Bugfix - Debian
• [ ] 6718 CONTRIBUTING.md
• [x] 5264 RPC -> #3180
• ~6619 Build system~
• [ ] 6721 Docs
• [x] 6664 Cleanup & bugfix -> 6825 (partial), #4268
• [x] 6600 Build system -> 6825
• [ ] 6715 Block & txn
• [ ] 6550 Wallet -> #5065
• ~6653 GUI~ -> 6825 (partial)
• [ ] 6645 Wallet
• [x] 6688 Wallet -> 6825
• [x] 6148 P2P & Net -> #2815
• [ ] 6646 Cleanup
• [x] 6315 GUI & net -> #2812
• [ ] 6652 Docs
• [ ] 6647 Config
• [x] 6694 GUI -> 0.11.X
• [x] 6709 Typo -> 6825
• [ ] 6667 Docs
• ~6668 Cleanup (GUI?)~
• [ ] 6671 Gitian?
• [x] 6695 RPC -> #2176
• [ ] 6654 Block & txn -> #2940
• [ ] 6692 Misc
• [ ] 6422 Docs
• [x] 6685 Tests bugfix -> #2050
• [x] 6684 ZMQ -> #2050
• ~6317 GUI~
• [x] 6103 ZMQ -> #2050
• [ ] 6663 Docs typo
• ~5665 GUI~
• [ ] 6635 Docs
• [ ] 6579 P2P & Net
• ~6594 GUI~
• [x] 6640 Docs typo -> #2176
• [ ] 6644 Config docs
• [x] 6643 Docs -> #2177
• [ ] 6648 RPC
• [x] 6636 P2P & Net -> #1258
• [ ] 6626 Gitian
• [ ] 6633 RPC
• [x] 5677 RPC -> #2176
• [x] 6631 RPC docs -> #4268
• [x] 6630 Misc -> 6703
• [x] 6374 P2P & Net -> #1258
• [ ] 6611 Docs
• [ ] 6627 Docs
• [ ] 6620 CI
• [x] 6617 CI -> 6703
• [ ] 6548 Tests - Windows
• [x] 6583 P2P & Net -> 6703
• [ ] 6599 Misc
• [x] 6530 P2P & Net -> #929 (merged with bitcoin/bitcoin#7212)
• [x] 6590 Tests -> 6703
• [ ] 6576 RPC
• [x] 6523 Tests -> #4874
• [ ] 6541 Docs
• [x] 6242 Cleanup -> #2217
• [x] 6545 Misc -> 0.11.X
• [x] 6556 P2P & Net -> 6703
• [x] 6571 Consensus - OpenSSL -> 0.11.X
• [ ] 6544 Bugfix
• [ ] 6539 Bugfix -> 6703 (partial)
• [x] 6565 Misc -> 6703
• [ ] 6561 Misc -> #4994
• [x] 6567 Wallet -> #4874
• [x] 6553 Cleanup -> 6703
• [x] 6551 Block & txn -> 6703
• [x] 6509 Tests -> 6703
• [x] 6013 RPC -> #2175
• [x] 6415 Wallet -> #4226
• [ ] 6519 Validation
• [ ] 6532 Docs
• [ ] 6346 RPC
• [ ] 6512 Docs
• [ ] 6534 Tests
• [ ] 6538 Correctness
• ~6529 GUI~
• ~4587 GUI~
• [ ] 6505 GUI - Maybe want?
• [x] 6377 Block & txn -> 6703
• [x] 6527 Misc -> 6703
• [ ] 6177 Block & txn
• ~6521~
• [ ] 5913 Block & txn
• [ ] 6462 Config
• [x] 6489 Config -> #2390
• [ ] 6507 Misc
• [x] 6503 Cleanup - net -> #2177
• [x] 6504 Misc -> #2564
• [x] 6498 P2P & Net -> 0.11.X
• [x6] 6284 Config -> #2390
• [x] 6356 Wallet -> 6703
• [x] 6497 Misc -> 6703
• [x] 6501 Build system -> 6703 (partial), other commit is for QT
• [x ] 6473 Cleanup -> #2217
• ~6487 GUI~
• [x] 6224 Net, cleanup -> 0.11.X
• [x] 6488 Misc -> 6703
• ~6484 GUI~
• [x] 6077 Tx Validation Caching & Tests -> #2390
• [ ] 5697 Cleanup
• [x] 6380 RPC -> #2100
• [x] 6468 Bugfix -> #2099
• [x] 6471 GUI - Qt -> 0.11.X
• [x] 6456 RPC -> #2082, #2100
• [x] 6465 Tests -> #2101
• [x] 6287 Tests -> 6703, #2101
• [x] 5515 Tests -> #2101
• [x] 6149 Misc -> #2099
• [x] 6381 Cleanup -> #2217
• [ ] 6400 Docs
• [x] 6444 Block & txn -> #2100
• ~6408 GUI~
• [x] 6453 Misc -> #2175
• [x] 6412 P2P & Net -> 0.11.X
• [x] 6447 Cleanup -> #2099
• [ ] 6457 RPC
• [x] 6372 Misc -> #2099
• [x] 6439 Docs cleanup -> 0.11.X
• ~6442~
• [x] 6434 Build system -> #2099
• [ ] 6430 libbitcoinconsensus docs
• [x] 6438 Bugfix - OpenSSL -> 0.11.X
• [x] 6440 Cleanup -> 6703
• ~6373 Update dependencies~
• [x] 6413 Docs - bdb4.8 -> 0.11.X
• [x] 6433 GUI -> 0.11.X
• [x] 6388 RPC -> #1999
• [x] 6428 Tests -> 6703
• [x] 6418 Build system -> 6703
• [x] 6398 Tests -> #1950, #2100
• [x] 6417 Tests -> #2100
• [x] 6410 Block & txn -> #2175
• [ ] 6414 Tests
• [x] 6370 Cleanup - remove DefaultMinerThreads -> #2227
• [x] 6379 RPC -> #1990
• [x] 5486 RPC -> #2100
• ~5288 Config~ Removed in 6374 -> #1258, #4994
• [x] 6384 GUI - TLS -> 0.11.X
• [x] 6401 Misc -> #2099
• [x] 6368 Tests -> 6707
• ~6378 GUI~
• [x] 6387 Misc -> #2099
• [x] 6390 Tests -> #2101
• [ ] 6365 Moving
• [x] 6335 Moving -> #4227
• [ ] 6329 Block & txn
• [x] 6369 -> 0.11.X
• [x] 6310 P2P & Net -> #2812
• [x] 6362 RPC -> #2100
• [x] 6361 Validation -> #2227
• [ ] 5881 Tests
• [x] 6133 Bugfix - warnings -> #2099
• [x] 6247 RPC -> #2100
• [x] 6350 Tests -> #2100
• [x] 6353 RPC -> 6707
• [x] 5994 Misc -> #3762
• [x] 6354 Gitian -> 0.11.X
• [x] 6337 Tests -> #2101
• [ ] 6299 Validation -> #2100 (partial)
• [x] 6124 Block & txn -> 6707
• [x] 6333 Seeds -> 0.11.X
• [x] 6233 Block & txn -> 0.11.X
• [x] 6339 RPC -> #2100
• [x] 6088 Wallet -> #2100
• [x] 6303 Gitian -> 0.11.X
• [x] 6319 Docs - ML addr -> 0.11.X
• ~6318 Tests~ comparison tool removed by us
• [x] 6316 Cleanup - Boost -> #2099
• [x] 6262 RPC -> #2100
• [x] 6290 RPC -> #2100
• [x] 6307 RPC -> #2100
• ~6301 Gitian~
• ~6305 Tests~ comparison tool removed by us
• [x] 6272 P2P & Net -> #2099
• [x] 6158 RPC -> #2100
• [x] 6282 Bugfix -> 0.11.X
• [x] 6280 Bugfix - Boost 1.55 -> 0.11.X
• [x] 6286 Cleanup - bdb4 -> 0.11.X
• [x] 6271 RPC -> #2100
• [x] 6283 P2P & Net -> #929, #2099
• [x] 6285 Bugfix - Boost -> 0.11.X
• [x] 6274 Config - opt out of alerts -> 0.11.X
• [x] 6269 Build system -> 0.11.X
• [x] 6257 RPC -> #2100
• [x] 6276 RPC -> 0.11.X
• ~6209 GUI~
• [x] 6256 P2P & Net -> 0.11.X
• [x] 6266 RPC -> #2100
• [x] 6221 Block & txn -> 0.11.X
• [x] 6264 Docs - remove translation from -help-debug -> 0.11.X
• [x] 6061 Misc -> #2099
• [ ] 5975 Misc
• [x] 6057 Wallet -> #4226
• [x] 5985 Block & txn -> 0.11.X
• [x] 6213 Misc -> #2099
• [x] 5927 Validation -> #2099
• [x] 6222 Block & txn -> #2217
• [x] 6244 LibreSSL -> 0.11.X
• [x] 6239 RPC -> #1990
• [x] 6246 Cleanup - endian.h header -> 0.11.X
• ~6217 GUI~
• ~6249 Gitian~
• ~6250 Gitian~
• [x] 6241 Bugfix - clang warnings -> #1990
• ~6232 Gitian~
• ~6152 Cleanup - remove unused wallet & validation interface code~ Will be useful for #754.
• [x] 6238 Bugfix -> 0.11.X
• [x] 6206 Correctness - const references -> #2099
• [x] 6234 RPC -> #1990
• [x] 6121 RPC - UniValue -> #1990
• ~6220~
• [x] 5875 P2P & Net -> 0.11.X
• [x] 6218 Build system -> 0.11.X
• [x] 6226 -> 0.11.X
• [x] 6214 Build system -> 0.11.X
• [x] 6203 Block & txn - Remove P2SH coinbase flag -> 0.11.X
• [x] 6210 Build system - gmp in libsecp -> 0.11.X
• [x] 6172 P2P & Net - Ignore getheaders reqs when not synced -> 0.11.X
• [x] 6183 Wallet - nLockTime off-by-one -> 0.11.X
• [x] 6164 Config - -debug=1, Docs, cli help -> #1900
• [x] 6198 Docs - MAX_MONEY -> #2099

After 0.12 branch

Taken from the 0.12.0 release notes; these should be replaced with a list of PRs from the 0.12.X branch.

RPC

• [ ] 7469
• [x] 7472 -> #2529
• [ ] 7222
• [ ] 7312

Config

• [ ] 7440
• [ ] 7290
• [ ] 7386
• [ ] 7323

Block & txn

• [ ] 7387
• [ ] 7217
• [ ] 7276
• [ ] 7062

P2P & Net

• [ ] 7482
• [ ] 7439
• [x] 7438 -> #2177
• [ ] 7415
• [x] 7125 -> #5265.
• [ ] 7181
• [ ] 7179
• [ ] 7174
• [ ] 7133
• [ ] 7166 -> #4994

Validation

• [ ] 7500
• [ ] 6351?

Build system

• [x] 7424 -> #1541
• [ ] 6980 -> #2050

Wallet

• [ ] 7502
• [ ] 7491
• [ ] 7381
• [ ] 7306
• [ ] 7293
• [ ] 7296
• [ ] 7200
• [ ] 4906

GUI

• 7384
• 7364
• 7327
• 7318
• 7319
• 7282
• 7206
• 7112

Tests

• [ ] 7468
• [ ] 7308
• [ ] 7229
• [x] 7170 -> #2177
• [ ] 7153
• [ ] 7226
• [x] 7209 -> #4874
• [ ] 7216

[bitcartel]

How was this list (auto)-generated?

[str4d]

• git log --merges e9d0d252.. on both Zcash and Bitcoin codebases, using grep / awk to extract #XXXX from Merge pull request #XXXX.
• I went through the Bitcoin 0.12.0 release notes by hand copying their categorisation into this list.
• I went through the entire Bitcoin git history between the initial and final branch points by hand to fill in the categorisation gaps.
• I went through most of the Zcash git history between the initial branch point and the 0.11.2 Bitcoin release (where we started from) to fill out the details about PRs that were backported to 0.11.X.

[nathan-at-least]

I just filed #2357 which is probably covered by this umbrella ticket. However, I want to pull out #2357 explicitly in order to prioritize separately from this general umbrella ticket work.