Backport missing PRs from Bitcoin 0.13 - Part 6 #1821
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
01a9904 [trivial] Ignore split-debug.sh (fanquake)
fa61756 [gitian] set correct PATH for wrappers (MarcoFalke)
0e209f9 [trivial] Sync ax_pthread with upstream draft (fanquake)
1c2a1ba Add address label to request payment QR Code (QT) (Francesco 'makevoid' Canessa)
…ry and website to the About Dialog fa58e5e [doc] Add website links to about dialog (MarcoFalke)
…sults bc0a895 Do not set extra flags for unfiltered DNS seed results (Pieter Wuille)
…t parsing 6fa950a [RPC] Fix createrawtx sequence number unsigned int parsing (Jonas Schnelli)
This was probably missed while backporting Bitcoin PR bitcoin#7892
…lent return facb6c0 [qa] mininode: fail on send_message instead of silent return (MarcoFalke)
faa91b1 [wallet] tests: Don't use floating point (MarcoFalke)
7734479 readme: Omit phrasing; 'new' (Will Binns)
9e3ec74 Clarify documentation for running a tor node (Nathaniel Mahieu)
2759597 Only pass -lQt5PlatformSupport if >=Qt5.6 (Jonas Schnelli) 59d063d Use runtime linking of QT libdbus, use custom/temp. SDK URL (Jonas Schnelli) 6194d9a Fix bitcoin_qt.m4 and fix-xcb-include-order.patch (Jonas Schnelli) f6eb4e2 [depends] OpenSSL 1.0.1k - update config_opts (fanquake) f25209a depends: bump OSX toolchain (Cory Fields)
…for each node fad1845 [qa] test_framework: Use different rpc_auth_pair for each node (MarcoFalke)
595b22e Stop treating importaddress'ed scripts as change (Pieter Wuille)
1e9aab0 Remove sipa's old revoked key from verify-commits (Peter Todd) 966151e Add README for verify-commits (Peter Todd) 11164ec Remove keys that are no longer used for merging (Peter Todd) 22421fa Remove pointless warning (Peter Todd) 9523e8a Make verify-commits path-independent (Matt Corallo) f7d4a25 Make verify-commits POSIX-compliant (Matt Corallo)
…accepted blocks. 54326a6 Increase maximum orphan size to 100,000 bytes. (Gregory Maxwell) 8c99d1b Treat orphans as implicit inv for parents, discard when parents rejected. (Gregory Maxwell) 11cc143 Adds an expiration time for orphan tx. (Gregory Maxwell) db0ffe8 This eliminates the primary leak that causes the orphan map to always grow to its maximum size. (Gregory Maxwell) 1b0bcc5 Track orphan by prev COutPoint rather than prev hash (Pieter Wuille)
Can be removed when we catch up with backporting. You'll notice it's time for this when you get conflicts while merging the affected backported PR.
ad0752e Stop trimming when mapTx is empty (Pieter Wuille)
e5a680d [Doc] Update OS X build notes for 10.11 SDK (fanquake)
3775ff9 Enable mempool consistency checks in unit tests (Pieter Wuille)
a1c92c2 trivial: capitalize BIP32 in option help (Wladimir J. van der Laan)
d241487 [doc] Add OS X ZMQ requirement to QA readme (fanquake)
d7828ab check that transactionView->selectionModel()->selectedRows(0) exists (fsb4000)
f70bcfc [trivial] Add aarch64 to depends .gitignore (fanquake)
409f833 RPC: Hide softfork if timeout is 0 (jl2012)
2129fce The bit field is shown only when status is "started" (Pavel Janík)
a7897c0 qt: Remove client name from debug window (Wladimir J. van der Laan)
36f1b9d Tests: Increase sync_blocks() timeouts in pruning.py (Suhas Daftuar)
20f3cd7 wallet: Revert input selection post-pruning (Wladimir J. van der Laan)
4f44cb6 qt: Network-specific example address (Wladimir J. van der Laan)
fa6ad56 [travis] Update SDK_URL (MarcoFalke)
cf2ef78 build: require boost for bench (Cory Fields)
ab0c35a [Doc] Update bips.md for CSV softfork. (fanquake)
099d4b0 gitian: use a wrapped gcc/g++ to avoid the need for a system change (Cory Fields)
1ba3db6 bash-completion: Adapt for 0.12 and 0.13 (Christian von Roques)
c1d61fb Add warning if -blockminsize is used. (Suhas Daftuar) 27362dd Remove -blockminsize option (Suhas Daftuar) d2e46e1 Remove addScoreTxs() (Suhas Daftuar) 6dd4bc2 Exclude witness transactions in addPackageTxs() pre-segwit activation (Suhas Daftuar) f15c2cd CreateNewBlock: add support for size-accounting to addPackageTxs (Suhas Daftuar)
…8295 Also remove nBlockMinSize check from addPackageTxs. Removed by SegWit related commits in Bitcoin.
d6dc1bc Fix 0.12 release notes on block relaying (Krzysztof Jurewicz)
This also overwrites/dashifies icons/bitcoin_testnet.ico which was introduced in Bitcoin bitcoin#8285. The icons were previously located in the drkblue theme directory while the path used in dash.qrc was poining to the non-theme icons directory. Also, the icons were never ported to the other themes. This commit moves them one level up until someone actually ports these to the other themes (if ever needed).
Dash allows free transactions by default, mixing up the expected ordering of transactions in TestPackageSelection
codablock
force-pushed
the
pr_backport_bitcoin_0.13-6
branch
from
aab9727 to
f61a754
Compare
UdjinM6
reviewed
Dec 28, 2017
UdjinM6
left a comment
UdjinM6
left a comment
There was a problem hiding this comment.
👍
Just a few small nits, otherwise looks good, will test.
doc/release-process.md
Outdated
| ==================== | ||
|
|
||
| * Update translations, see [translation_process.md](https://github.com/dashpay/dash/blob/master/doc/translation_process.md#syncing-with-transifex) | ||
| * Update translations (ping wumpus on IRC) see [translation_process.md](https://github.com/dashpay/dash/blob/master/doc/translation_process.md#synchronising-translations). |
There was a problem hiding this comment.
(ping wumpus on IRC) should not be added
contrib/debian/dashd.bash-completion
Outdated
| @@ -1 +1,2 @@ | |||
| contrib/dashd.bash-completion dashd | |||
| contrib/dash-cli.bash-completion dash-cli | |||
codablock
force-pushed
the
pr_backport_bitcoin_0.13-6
branch
from
3df3df0 to
9c2e970
Compare
Closed
9 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
Continuation of #1770
This is the final batch to get to Bitcoin 0.13. After that, I'll continue with Bitcoin 0.14 PRs.
This PR includes a temporary hack to fix a compilation error. This was needed because of the out-of-order backport of the main.cpp split, which in combination with backporting of Bitcoin PR bitcoin#8179 results in compilation errors. I don't remember exactly why I did not simply forward declare the needed stuff, but I remember that it resulted in more problems.
The hack is really just temporary and the fix for it is already in my local branch. When the time for it comes (all the other required PRs are backported), the hack will vanish.
This PR currently also includes #1819, which I'll remove after it is merged into develop.