Backports for 0.14.3 #10516

luke-jr commented at 5:06 AM on June 3, 2017: member

Sorry this is late. It should have backports of everything from PRs 10234..10495, except for #10318, 965a12442746e99247e5ce0f43fba8e3e149cae4, and 513da90cdd8463964e8c430b25f4326defc0bc96 which seem too complex for a trivial backport.

[Qt] Show more significant warning if we fall back to the default fee c5adf8f267

Fix CCheckQueue IsIdle (potential) race condition and remove dangerous constructors. e2073424fd

Add CheckQueue Tests 96c7f2c345

Qt/Send: Figure a decent warning colour from theme 3e4d7bfcb7

Qt/Send: Give fallback fee a reasonable indent 7abe7bbf61

Bugfix: PrioritiseTransaction updates the mempool tx counter

The mempool's nTransactionsUpdated is used by getblocktemplate
to trigger new invocations of CreateNewBlock().

Github-Pull: #10196
Rebased-From: 909306cde3770ed7019e7b635e24cedbd9de66ce

d28d583820

[qa] Test prioritise_transaction / getblocktemplate interaction

Github-Pull: #10196
Rebased-From: 6a61424c9eed072ae8d79d68aac71f525c1608b5

71463a7d18

luke-jr force-pushed on Jun 3, 2017

luke-jr commented at 5:39 AM on June 3, 2017: member

Had to back out 965a12442746e99247e5ce0f43fba8e3e149cae4 and 513da90cdd8463964e8c430b25f4326defc0bc96 due to incompatibilities.

[trivial] Fix a typo (introduced two days ago) in the default fee warning

Github-Pull: #10008
Rebased-From: a3ca43bb32520fdc049bc2112a29a554188126cc

ef810c4cd4

luke-jr force-pushed on Jun 3, 2017

Update contrib/debian to latest Ubuntu PPA upload.

This:
 * Partially reverts 9f68ed6 (which fixed spelling in a changelog,
   though generally changelogs should be append-only).
 * Disables UPnP support (PPA has not had it for a while, and I
   still don't trust miniupnpc, plus it seems uneccessary - its
   been a while since we needed to care about Bitcoin-Qt home users
   getting their inbound ports auto-mapped).
 * Enables ZMQ.
 * Forces GUI to Qt4 to fix various issues people have been seeing
   on Ubuntu and elsewhere with Qt5.
 * Reverts 70899d70b (Bitcoin does not enable "instant payments",
   not is transaction management "carried out collectively by the
   network", for whatever "transaction management" means, finally
   Bitcoin Core is not the only way to use the Bitcoin currency,
   as seemingly implied in the description).

Github-Pull: #10328
Rebased-From: 997021986e02f8e59024ffca6437857d9d17f396

c94e262d4b

Bump minimum boost version in contrib/debian

Github-Pull: #10328
Rebased-From: a8e928699a6ab612459e836ba24af143eae37b0f

2ea035832f

Build with QT5 on Debian-based systems using contrib/debian

Github-Pull: #10328
Rebased-From: c5071e1f03085b4025f2a33fb2c3079d823d660c

e9a0d89bf7

Re-enable upnp support in contrib/debian

Github-Pull: #10328
Rebased-From: 91700aa1df57c1a9209284e743224119396604d5

6ad45b8f8b

luke-jr force-pushed on Jun 3, 2017

fanquake added this to the milestone 0.14.2 on Jun 4, 2017

fanquake added the label Backport on Jun 4, 2017

laanwj commented at 10:53 AM on June 5, 2017: member

Maybe leave this for 0.14.3? We're already in the 0.14.2 rc cycle, which I think is too late to add so much.

Return correct error codes in bumpfee().

The bumpfee() RPC was returning misleading or incorrect error codes
(for example RPC_INVALID_ADDRESS_OR_KEY when the transaction was not
BIP125 replacable). This commit fixes those error codes:

- RPC_INVALID_ADDRESS_OR_KEY if an invalid address was provided:
    - Invalid change address given
- RPC_INVALID_PARAMETER if a single (non-address/key) parameter is incorrect
    - confTarget and totalFee options should not both be set.
    - Invalid confTarget
    - Insufficient totalFee (cannot be less than required fee)
- RPC_WALLET_ERROR for any other error
    - Transaction has descendants in the wallet
    - Transaction has descendants in the mempool
    - Transaction has been mined, or is conflicted with a mined transaction
    - Transaction is not BIP 125 replaceable
    - Transaction has already been bumped
    - Transaction contains inputs that don't belong to the wallet
    - Transaction has multiple change outputs
    - Transaction does not have a change output
    - Fee is higher than maxTxFee
    - New fee rate is less than the minimum fee rate
    - Change output is too small.

This commit also updates the test cases to explicitly test the error code.

Github-Pull: #9853
Rebased-From: 6d07c62322f60eb2702c6654e994fc353bcfcf8c

3ad00b4b32

Return correct error codes in blockchain.cpp.

RPCs in blockchain.cpp were returning misleading or incorrect error
codes (for example getblock() returning RPC_INTERNAL_ERROR when the
block had been pruned). This commit fixes those error codes:

- RPC_INTERNAL_ERROR should not be returned for application-level
  errors, only for genuine internal errors such as corrupted data.
- RPC_METHOD_NOT_FOUND should not be returned in response to a
  JSON request for an existing method.

Those error codes have been replaced with RPC_MISC_ERROR or
RPC_INVALID_PARAMETER as appropriate.

Github-Pull: #9853
Rebased-From: c1190963b388590dc0a346bf625c7e84f69cee8d

fe51c8924e

Return correct error codes in removeprunedfunds().

The removeprunedfunds() RPC was returning misleading or incorrect error
codes (for example RPC_INTERNAL_ERROR when the transaction was
not found in the wallet). This commit fixes those error codes:

- RPC_INTERNAL_ERROR should not be returned for application-level
errors, only for genuine internal errors such as corrupted data.

This error code has been replaced with RPC_WALLET_ERROR.

This commit also updates the test cases to explicitly test the error code.

Github-Pull: #9853
Rebased-From: 960bc7f778d8dd618e65f1e37ec734e2d4734051

18c109ddb1

Return correct error codes in setban().

The setban() RPC was returning misleading or incorrect error
codes (for example RPC_CLIENT_NODE_ALREADY_ADDED when an invalid IP
address was entered). This commit fixes those error codes:

- RPC_CLIENT_INVALID_IP_OR_SUBNET should be returned if the client
  enters an invalid IP address or subnet.

This commit also updates the test cases to explicitly test the error code.

This commit also adds a testcase for trying to setban on an invalid subnet.

Github-Pull: #9853
Rebased-From: a012087667edb35a36f25ae06b42b1644d80e649

4943d7a9fe

Return correct error codes in fundrawtransaction().

The fundrawtransaction() RPC was returning misleading or incorrect error
codes (for example RPC_INTERNAL_ERROR when funding the transaction
failed). This commit fixes those error codes:

- RPC_INTERNAL_ERROR should not be returned for application-level
errors, only for genuine internal errors such as corrupted data.

That error code has been replaced with RPC_WALLET_ERROR.

This commit also updates the test cases to explicitly test the error code.

Github-Pull: #9853
Rebased-From: dab804c18a427901684ebe936b2069a97e04a268

f5efe82a83

Update release notes to include RPC error code changes.

Github-Pull: #9853
Rebased-From: adaa281da12bcc697779f97973cea6b103eec4ab

c25d0a8739

luke-jr force-pushed on Jun 5, 2017

[tests] fix nodehandling.py flake8 warnings

Github-Pull: #10143
Rebased-From: d6564a26f4afc28d7d1a24b94946916387c9bf24

5bc75bb8ee

[tests] disconnectban test - only use two nodes

Github-Pull: #10143
Rebased-From: 395561becfa612fedec74fd841cb4f28afdc23d7

bfd1cf6713

luke-jr force-pushed on Jun 5, 2017

Merge #10196 via branch 'prioritisetx_gbtcache-0.14' into 0.14.2_fixes 74653a41fe

Merge #9853 via branch 'fixerrorcodes-0.14' into 0.14.2_fixes 99e5dbd0aa

luke-jr force-pushed on Jun 5, 2017

luke-jr commented at 7:38 PM on June 5, 2017: member

I don't see anything too critical here, so fine with me if it waits for 0.14.3.

[tests] disconnect_ban: use wait_until instead of sleep

Github-Pull: #10143
Rebased-From: 12de2f252c8f48e05c579cb679866a68af8c660e

98bd0c338b

[tests] disconnect_ban: remove dependency on urllib

Github-Pull: #10143
Rebased-From: 5cc3ee24d29397737f2746d78b19a2509c0dedbb

04226938a3

[net] listbanned RPC and QT should show correct banned subnets

Github-Pull: #10234
Rebased-From: 77c54b270dd3b469d662c8f69e06f7b00fc4136d

d289b564e3

[tests] update disconnect_ban.py test case to work with listbanned

Github-Pull: #10234
Rebased-From: d6732d832aa901e733e63799260d409821a2c37a

ee1a60d156

Merge #10234, #10143 (fixes only), and #9853 via branch 'disconnect_ban_fixes-0.14' into 0.14.2_fixes e05799a381

Merge #9481 via remote-tracking branch 'jonas/2017/01/fee_warning' into 0.14.2_fixes aca4b6dbcb

Merge #10008 via branch 'fee_warning-0.14' into 0.14.2_fixes 77de9bbc57

Merge #9497 via remote-tracking branch 'origin-pull/9497/head' into 0.14.2_fixes 1b864c9820

Merge #10328 via branch 'debianppa-0.14' into 0.14.2_fixes a40d69e0b8

Fix some empty vector references

streams.h has some methods that can be tricked into dereferencing
null pointers or end() iterators. Fix this.

Github-Pull: #10250
Rebased-From: f478d98fe49d3c0c0f2c79b3f8d9dbfc1aafd407

e23cef0c94

[wallet] Make sure pindex is non-null before possibly referencing in LogPrintf call.

Github-Pull: #10265
Rebased-From: c36ea693ee16611e0337aec682d1ce80b90e1bd3

ff13f592c5

[wallet] Securely erase potentially sensitive keys/values

Github-Pull: #10308
Rebased-From: 6c914ac176624468c66febdb1ad0e24ff2118a5f

28b8b8b603

Fix: make CCoinsViewDbCursor::Seek work for missing keys

Thanks to Suhas Daftuar for figuring this out.

Github-Pull: #10445
Rebased-From: 822755a424d0abfa408dc34313f4aca4b816f54f

87a21d5922

[doc] Minor corrections to osx dependencies

Github-Pull: #10260
Rebased-From: 661caf83b3dcae6376e59b6cae07f0a2a4d37fe9

692dbb0288

contrib/init/bitcoind.openrcconf: Don't disable wallet by default

It's harmless if it goes unused, and confused when a wallet is desired

Github-Pull: #10451
Rebased-From: afc693dea695b75721db55d0decee3b11dcb3625

3612219f9a

Fixed typo in documentation for merkleblock.h

Github-Pull: #10258
Rebased-From: dd07068d6b11e738bc954c998800b5660d160959

d2ec96909a

Trivial: remove extra character from comment

Github-Pull: #10309
Rebased-From: 3503716f1e37a0cc3ab13c8f4e774061ff4ae2f8

12adedff0b

contrib: Update location of seeds.txt

Update the steps for updating the hardcoded seed nodes to point to the
new filename on @sipa's server, and add command to decompress it.

Ref: #10163

Github-Pull: #10495
Rebased-From: ac9cd953d91e2448d24851b2f4973c7be8f4c3cd

76f9cf9ac9

[doc] Add hint about getmempoolentry to getrawmempool help.

Github-Pull: #10310
Rebased-From: 3a0a5bc2341ea6a453306f6fe1c065b937294cfb

ff274d3b00

luke-jr force-pushed on Jun 5, 2017

fanquake added this to the milestone 0.14.3 on Jun 6, 2017

fanquake removed this from the milestone 0.14.2 on Jun 6, 2017

fanquake commented at 1:30 AM on June 6, 2017: member

Moved to 0.14.3 milestone.

luke-jr renamed this:
~~Backports for 0.14.2~~
Backports for 0.14.3
on Jun 6, 2017

fanquake commented at 12:49 AM on June 28, 2017: member

Does anything new need to be added here?

luke-jr commented at 3:49 AM on June 28, 2017: member

I haven't reviewed anything since nearly a month ago. Newer stuff can get another PR?

laanwj commented at 3:38 PM on June 28, 2017: member

Yes, if people agree with the list of PRs backported here (didn't find anything objectionable in a quick scan, at least) and they're backported properly this should be merged.

fanquake commented at 4:30 AM on July 5, 2017: member

utACK 76f9cf9

laanwj commented at 4:56 PM on July 6, 2017: member

utACK ff274d3

laanwj merged this on Jul 6, 2017

laanwj closed this on Jul 6, 2017

laanwj referenced this in commit 91be5e3c1e on Jul 6, 2017

DrahtBot locked this on Sep 8, 2021