Backport missing PRs from Bitcoin 0.14 - Part 10 #1867
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
4b189c1 Change bumpfee result value from 'oldfee' to 'origfee'. (Alex Morcos) 0c0c63f Introduce WALLET_INCREMENTAL_RELAY_FEE (Alex Morcos) e8021ec Use CWallet::GetMinimumFee in bumpfee (Alex Morcos) ae9719a Refactor GetMinimumFee to give option of providing targetFee (Alex Morcos) fe8e8ef [rpc] Add incremental relay fee to getnetworkinfo (Alex Morcos) 6b331e6 Fix to have miner test aware of new separate block min tx fee (Alex Morcos) de6400d Fix missing use of dustRelayFee (Alex Morcos) 5b15870 Use incrementalRelayFee for BIP 125 replacement (Alex Morcos)
b7b48c8 Refactor: Remove using namespace <xxx> from src/*.cpp. (Karl-Johan Alm)
fa5137c [doc] Remove unused clang format dev script (MarcoFalke)
…t event_set_mem_functions 95f97f4 Skip RAII event tests if libevent is built without event_set_mem_functions (Luke Dashjr)
3eba88d clarify listunspent amount description (Gregory Sanders)
b9d95bd Fix various minor linearization script issues (Douglas Roark)
8fc6989 Remove redundant semicolons (practicalswift)
…stors 003cd60 Add missing mempool lock for CalculateMemPoolAncestors (Matt Corallo)
5f62e3e Fix typos (practicalswift)
…e member. 39c77b0 Add documentation for CWalletTx::fFromMe member. (Russell Yanofsky)
… race. d63ff62 Make nWalletDBUpdated atomic to avoid a potential race. (Patrick Strateman)
29c5328 bench: Fix initialization order in registration (Wladimir J. van der Laan)
618ee92 Further-enforce lockordering by enforcing directly after TRY_LOCKs (Matt Corallo) 2a962d4 Fixup style a bit by moving { to the same line as if statements (Matt Corallo) 8465631 Always enforce lock strict lock ordering (try or not) (Matt Corallo) fd13eca Lock cs_vSend and cs_inventory in a consistent order even in TRY (Matt Corallo)
9db8eec Fix RPC failure testing (John Newbery)
…the time PR was opened db2dc7a Move CNode::addrLocal access behind locked accessors (Matt Corallo) 036073b Move CNode::addrName accesses behind locked accessors (Matt Corallo) d8f2b8a Make nTimeBestReceived atomic (Matt Corallo) 22b4966 Move [clean|str]SubVer writes/copyStats into a lock (Matt Corallo) 0f31872 Make nServices atomic (Matt Corallo) 96f42d8 Make nStartingHeight atomic (Matt Corallo) 512731b Access fRelayTxes with cs_filter lock in copyStats (Matt Corallo) ae683c1 Avoid copying CNodeStats to make helgrind OK with buggy std::string (Matt Corallo) 644f123 Make nTimeConnected const in CNode (Matt Corallo) 321d0fc net: fix a few races. Credit @TheBlueMatt (Cory Fields)
…from within 60 sec 66f861a Add a test for P2P inactivity timeouts (Matt Corallo) b436f92 qa: Expose on-connection to mininode listeners (Matt Corallo) 8aaba7a qa: mininode learns when a socket connects, not its first action (Matt Corallo) 2cbd119 Disconnect peers which we do not receive VERACKs from within 60 sec (Matt Corallo)
…fore receiving verack d943491 qa: add a test to detect leaky p2p messages (Cory Fields) 8650bbb qa: Expose on-connection to mininode listeners (Matt Corallo) 5b5e4f8 qa: mininode learns when a socket connects, not its first action (Matt Corallo) cbfc5a6 net: require a verack before responding to anything else (Cory Fields) 8502e7a net: parse reject earlier (Cory Fields) c45b9fb net: correctly ban before the handshake is complete (Cory Fields)
…equired" notice 0b4f273 Bugfix: Qt/Options: Restore persistent "restart required" notice (Luke Dashjr)
…if (z < 0) z = 0; a47da4b Use z = std::max(x - y, 0); instead of z = x - y; if (z < 0) z = 0; (practicalswift)
4b6cccc Selectively suppress deprecation warnings (Jonas Schnelli)
… address. 9acf25c Return error when importmulti called with invalid address. (Russell Yanofsky)
… held assertion 07afcd6 Add missing cs_wallet lock that triggers new lock held assertion (Russell Yanofsky)
00e623d [Trivial] Update comments referencing main.cpp (CryptAxe)
…NG.md 36164fa Fix typo and spelling inconsistency in CONTRIBUTING.md (Koki Takahashi)
55c403b Ensure `-maxsigcachesize` is in valid range (John Newbery)
91fb506 Add two hour buffer to manual pruning (Alex Morcos)
… of doc/man b194872 Remove old manpages from contrib/debian (fanquake)
Also remove references to unused communication channels (Freenode, mailing lists)
UdjinM6
requested changes
Jan 23, 2018
contrib/debian/bitcoin-qt.manpages
Outdated
| @@ -0,0 +1 @@ | |||
| doc/man/bitcoin-qt.1 | |||
contrib/debian/bitcoin-tx.manpages
Outdated
| @@ -0,0 +1 @@ | |||
| doc/man/bitcoin-tx.1 | |||
|
@schinzelh pls review 1c8b7b4 |
UdjinM6
approved these changes
Jan 23, 2018
There was a problem hiding this comment.
Tested and yep, dsa/mnv/getdata (for mnbrecovery) is broken - MNs will reject these messages. But this is smth that we have/agreed to fix anyway so ACK :)
PS. Waiting for @schinzelh 's review requested above
schinzelh
approved these changes
Jan 26, 2018
|
🎉 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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
With this PR we get to the point where the Bitcoin 0.14 branch was created.
After this one I'll go through all the code again (do a full tree diff) and find PRs I skipped which can/should also be backported. I'll also include PRs which were backported into the 0.14 branch to create 0.14.x releases (this will mostly be bug fixes).
After that, we should discuss how to proceed with Bitcoin 0.15. Continue as we did with 0.13/0.14 or do this later so we can fully concentrate on Evo for some time.
We should probably also think about some extensive testing on testnet to see if everything is still working and fix everything that comes up before we continue with 0.15 backports.