/bitcoin

Backports for 0.14.3 #10516

Merged
merged 41 commits into from Jul 6, 2017
+884 −264

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
Backport
Projects
None yet
Milestone
  0.14.3
@luke-jr
Member

luke-jr commented Jun 3, 2017 • edited

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

jonasschnelli and others added some commits Jan 6, 2017

@jonasschnelli jonasschnelli [Qt] Show more significant warning if we fall back to the default fee
This commit was signed with a verified signature.
@jonasschnelli jonasschnelli Jonas Schnelli
GPG key ID: 29D4BCB6416F53EC Learn about signing commits
c5adf8f
@JeremyRubin JeremyRubin Fix CCheckQueue IsIdle (potential) race condition and remove dangerou… 
…s constructors.
 e207342
@JeremyRubin JeremyRubin Add CheckQueue Tests
96c7f2c
@luke-jr @jonasschnelli luke-jr Qt/Send: Figure a decent warning colour from theme
This commit was signed with a verified signature.
@jonasschnelli jonasschnelli Jonas Schnelli
GPG key ID: 29D4BCB6416F53EC Learn about signing commits
3e4d7bf
@luke-jr @jonasschnelli luke-jr Qt/Send: Give fallback fee a reasonable indent
This commit was signed with a verified signature.
@jonasschnelli jonasschnelli Jonas Schnelli
GPG key ID: 29D4BCB6416F53EC Learn about signing commits
7abe7bb
@sdaftuar @luke-jr sdaftuar 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: 909306c
 d28d583
@sdaftuar @luke-jr sdaftuar [qa] Test prioritise_transaction / getblocktemplate interaction 
Github-Pull: #10196
Rebased-From: 6a61424
 71463a7
@luke-jr
Member

luke-jr commented Jun 3, 2017

Had to back out 965a124 and 513da90 due to incompatibilities.

practicalswift and others added some commits Mar 16, 2017

@practicalswift @luke-jr practicalswift [trivial] Fix a typo (introduced two days ago) in the default fee war… 
…ning

Github-Pull: #10008
Rebased-From: a3ca43b
 ef810c4
@TheBlueMatt @luke-jr TheBlueMatt 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 70899d7 (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: 9970219
 c94e262
@TheBlueMatt @luke-jr TheBlueMatt Bump minimum boost version in contrib/debian 
Github-Pull: #10328
Rebased-From: a8e9286
 2ea0358
@TheBlueMatt @luke-jr TheBlueMatt Build with QT5 on Debian-based systems using contrib/debian 
Github-Pull: #10328
Rebased-From: c5071e1
 e9a0d89
@TheBlueMatt @luke-jr TheBlueMatt Re-enable upnp support in contrib/debian 
Github-Pull: #10328
Rebased-From: 91700aa
 6ad45b8

fanquake added this to the 0.14.2 milestone Jun 4, 2017

fanquake added the Backport label Jun 4, 2017

@laanwj
Owner

laanwj commented Jun 5, 2017

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.

jnewbery and others added some commits Feb 7, 2017

@jnewbery @luke-jr jnewbery 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: a012087
 4943d7a
@jnewbery @luke-jr jnewbery 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: 6d07c62
 3ad00b4
@jnewbery @luke-jr jnewbery 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: dab804c
 f5efe82
@jnewbery @luke-jr jnewbery 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: 960bc7f
 18c109d
@jnewbery @luke-jr jnewbery 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: c119096
 fe51c89
@jnewbery @luke-jr jnewbery Update release notes to include RPC error code changes. 
Github-Pull: #9853
Rebased-From: adaa281
 c25d0a8
@jnewbery @luke-jr jnewbery [tests] fix nodehandling.py flake8 warnings 
Github-Pull: #10143
Rebased-From: d6564a2
 5bc75bb
@jnewbery @luke-jr jnewbery [tests] disconnectban test - only use two nodes 
Github-Pull: #10143
Rebased-From: 395561b
 bfd1cf6
@luke-jr luke-jr Merge #10196 via branch 'prioritisetx_gbtcache-0.14' into 0.14.2_fixes 74653a4
@luke-jr luke-jr Merge #9853 via branch 'fixerrorcodes-0.14' into 0.14.2_fixes 99e5dbd
@luke-jr
Member

luke-jr commented Jun 5, 2017

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

jnewbery and others added some commits Apr 19, 2017

@jnewbery @luke-jr jnewbery [tests] disconnect_ban: use wait_until instead of sleep 
Github-Pull: #10143
Rebased-From: 12de2f2
 98bd0c3
@jnewbery @luke-jr jnewbery [tests] disconnect_ban: remove dependency on urllib 
Github-Pull: #10143
Rebased-From: 5cc3ee2
 0422693
@jnewbery @luke-jr jnewbery [net] listbanned RPC and QT should show correct banned subnets 
Github-Pull: #10234
Rebased-From: 77c54b2
 d289b56
@jnewbery @luke-jr jnewbery [tests] update disconnect_ban.py test case to work with listbanned 
Github-Pull: #10234
Rebased-From: d6732d8
 ee1a60d
@luke-jr luke-jr Merge #10234, #10143 (fixes only), and #9853 via branch 'disconnect_b… 
…an_fixes-0.14' into 0.14.2_fixes
 e05799a
@luke-jr luke-jr Merge #9481 via remote-tracking branch 'jonas/2017/01/fee_warning' in… 
…to 0.14.2_fixes
 aca4b6d
@luke-jr luke-jr Merge #10008 via branch 'fee_warning-0.14' into 0.14.2_fixes 77de9bb
@luke-jr luke-jr Merge #9497 via remote-tracking branch 'origin-pull/9497/head' into 0… 
….14.2_fixes
 1b864c9
@luke-jr luke-jr Merge #10328 via branch 'debianppa-0.14' into 0.14.2_fixes a40d69e
@sipa @luke-jr sipa 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: f478d98
 e23cef0
@tjps @luke-jr tjps [wallet] Securely erase potentially sensitive keys/values 
Github-Pull: #10308
Rebased-From: 6c914ac
 28b8b8b
@kallewoof @luke-jr kallewoof [wallet] Make sure pindex is non-null before possibly referencing in … 
…LogPrintf call.

Github-Pull: #10265
Rebased-From: c36ea69
 ff13f59
@sipa @luke-jr sipa Fix: make CCoinsViewDbCursor::Seek work for missing keys 
Thanks to Suhas Daftuar for figuring this out.

Github-Pull: #10445
Rebased-From: 822755a
 87a21d5
@Mikerah @luke-jr Mikerah Fixed typo in documentation for merkleblock.h 
Github-Pull: #10258
Rebased-From: dd07068
 d2ec969
@fanquake @luke-jr fanquake [doc] Minor corrections to osx dependencies 
Github-Pull: #10260
Rebased-From: 661caf8
 692dbb0
@CryptAxe @luke-jr CryptAxe Trivial: remove extra character from comment 
Github-Pull: #10309
Rebased-From: 3503716
 12adedf
@kallewoof @luke-jr kallewoof [doc] Add hint about getmempoolentry to getrawmempool help. 
Github-Pull: #10310
Rebased-From: 3a0a5bc
ff274d3
@luke-jr luke-jr 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: afc693d
 3612219
@laanwj @luke-jr laanwj 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: ac9cd95
 76f9cf9

@fanquake fanquake modified the milestone: 0.14.3, 0.14.2 Jun 6, 2017

@fanquake
Contributor

fanquake commented Jun 6, 2017

Moved to 0.14.3 milestone.

luke-jr changed the title from Backports for 0.14.2 to Backports for 0.14.3 Jun 6, 2017

@fanquake
Contributor

fanquake commented Jun 28, 2017

Does anything new need to be added here?
@luke-jr
Member

luke-jr commented Jun 28, 2017

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

laanwj commented Jun 28, 2017

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
Contributor

fanquake commented Jul 5, 2017

utACK 76f9cf9
@laanwj
Owner

laanwj commented Jul 6, 2017

utACK ff274d3

@laanwj laanwj merged commit ff274d3 into bitcoin:0.14 Jul 6, 2017
1 check passed

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@laanwj laanwj added a commit that referenced this pull request Jul 6, 2017

@laanwj laanwj Merge #10516: Backports for 0.14.3 
ff274d3 [doc] Add hint about getmempoolentry to getrawmempool help. (Karl-Johan Alm)
76f9cf9 contrib: Update location of seeds.txt (Wladimir J. van der Laan)
12adedf Trivial: remove extra character from comment (CryptAxe)
d2ec969 Fixed typo in documentation for merkleblock.h (Mikerah)
3612219 contrib/init/bitcoind.openrcconf: Don't disable wallet by default (Luke Dashjr)
692dbb0 [doc] Minor corrections to osx dependencies (fanquake)
87a21d5 Fix: make CCoinsViewDbCursor::Seek work for missing keys (Pieter Wuille)
28b8b8b [wallet] Securely erase potentially sensitive keys/values (Thomas Snider)
ff13f59 [wallet] Make sure pindex is non-null before possibly referencing in LogPrintf call. (Karl-Johan Alm)
e23cef0 Fix some empty vector references (Pieter Wuille)
6ad45b8 Re-enable upnp support in contrib/debian (Matt Corallo)
e9a0d89 Build with QT5 on Debian-based systems using contrib/debian (Matt Corallo)
2ea0358 Bump minimum boost version in contrib/debian (Matt Corallo)
c94e262 Update contrib/debian to latest Ubuntu PPA upload. (Matt Corallo)
96c7f2c Add CheckQueue Tests (Jeremy Rubin)
e207342 Fix CCheckQueue IsIdle (potential) race condition and remove dangerous constructors. (Jeremy Rubin)
ef810c4 [trivial] Fix a typo (introduced two days ago) in the default fee warning (practicalswift)
7abe7bb Qt/Send: Give fallback fee a reasonable indent (Luke Dashjr)
3e4d7bf Qt/Send: Figure a decent warning colour from theme (Luke Dashjr)
c5adf8f [Qt] Show more significant warning if we fall back to the default fee (Jonas Schnelli)
ee1a60d [tests] update disconnect_ban.py test case to work with listbanned (John Newbery)
d289b56 [net] listbanned RPC and QT should show correct banned subnets (John Newbery)
0422693 [tests] disconnect_ban: remove dependency on urllib (John Newbery)
98bd0c3 [tests] disconnect_ban: use wait_until instead of sleep (John Newbery)
bfd1cf6 [tests] disconnectban test - only use two nodes (John Newbery)
5bc75bb [tests] fix nodehandling.py flake8 warnings (John Newbery)
c25d0a8 Update release notes to include RPC error code changes. (John Newbery)
f5efe82 Return correct error codes in fundrawtransaction(). (John Newbery)
4943d7a Return correct error codes in setban(). (John Newbery)
18c109d Return correct error codes in removeprunedfunds(). (John Newbery)
fe51c89 Return correct error codes in blockchain.cpp. (John Newbery)
3ad00b4 Return correct error codes in bumpfee(). (John Newbery)
71463a7 [qa] Test prioritise_transaction / getblocktemplate interaction (Suhas Daftuar)
d28d583 Bugfix: PrioritiseTransaction updates the mempool tx counter (Suhas Daftuar)

Tree-SHA512: fa3628527c8e176e438de992b9c5815cc2f3c296dbe5d81b592d17a907554e9c6af7eb595e96a2c345de399ba5326c07b4791a91b7b07f89dce0787c85891206
This commit was signed with a verified signature.
@laanwj laanwj Wladimir J. van der Laan
GPG key ID: 1E4AED62986CD25D Learn about signing commits
91be5e3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment