neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
15,137 Commits 1 Branch 1 Tag 185 MiB
23f169c44a
Commit Graph

10836 Commits

Author SHA1 Message Date
Wladimir J. van der Laan
15a035b9c0 Merge #9798: Fix Issue #9775 (Check returned value of fopen) 
40f11f8 Fix for issue #9775. Added check for open() returning a NULL pointer. (kirit93)
 2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
8d2edc4698 Merge #9813: Read/write mempool.dat as a binary. 
171fc91 Read/write mempool.dat as a binary. (Pavel Janík)
 2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
199b07a892 Merge #9760: [wallet] Remove importmulti always-true check 
ec1267f [wallet] Remove importmulti always-true check (Russell Yanofsky)
 2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
3ab5fab7fb Merge #9786: boost: remove iostreams includes 
3301587 boost: remove iostreams includes (Cory Fields)
 2018-01-26 12:59:29 +01:00
Wladimir J. van der Laan
5e596423a4 Merge #9785: Avoid variable length arrays 
c801c82 Move BIP70_MAX_PAYMENTREQUEST_SIZE to header (Pieter Wuille)
914fad1 Make KEY_SIZE a compile-time constant (Pieter Wuille)
 2018-01-26 12:59:29 +01:00
UdjinM6
054abdbfa4
Merge pull request #1867 from codablock/pr_backport_bitcoin_0.14-10 
Backport missing PRs from Bitcoin 0.14 - Part 10
 2018-01-26 14:55:56 +03:00
UdjinM6
1ca270ed89
No need for msgMakerInitProto for sporks because we loop by fully connected nodes only now (#1877) 2018-01-26 04:11:30 +03:00
UdjinM6
b1817dd936
Introduce CDarksendAccept class (for DSACCEPT messages) (#1875) 2018-01-26 04:11:15 +03:00
UdjinM6
88646bd0d0
Rename fMasterNode to fMasternodeMode to clarify its meaning and to avoid confusion with CNode::fMasternode (#1874) 2018-01-26 04:11:01 +03:00
UdjinM6
f6d98422ca
Silence ratecheck_test (#1873) 2018-01-26 04:10:45 +03:00
UdjinM6
9cee4193b8 Separate .h generation from .json/.raw for different modules (#1870) 2018-01-24 16:29:24 +01:00
UdjinM6
83957f2d3b
Fix alertTests.raw.h (again) (#1869) 2018-01-24 14:27:08 +03:00
UdjinM6
c13afaad8b
Fix alertTests.raw.h generation (#1868) 2018-01-24 11:11:22 +03:00
Alexander Block
6c2fe3d055 Remove onlyMaybeDeadlock condition around printing of deadlock info 2018-01-23 12:27:28 +01:00
Wladimir J. van der Laan
0080fde36a Merge #9778: Add two hour buffer to manual pruning 
91fb506 Add two hour buffer to manual pruning (Alex Morcos)
 2018-01-23 09:24:29 +01:00
Wladimir J. van der Laan
86fd57b8cd Merge #9777: Handle unusual maxsigcachesize gracefully 
55c403b Ensure `-maxsigcachesize` is in valid range (John Newbery)
 2018-01-23 09:24:29 +01:00
Wladimir J. van der Laan
52819ca9b9 Merge #9763: [Trivial] Update comments referencing main.cpp 
00e623d [Trivial] Update comments referencing main.cpp (CryptAxe)
 2018-01-23 09:24:29 +01:00
Wladimir J. van der Laan
bb2c1624c9 Merge #9771: Add missing cs_wallet lock that triggers new lock held assertion 
07afcd6 Add missing cs_wallet lock that triggers new lock held assertion (Russell Yanofsky)
 2018-01-23 09:24:29 +01:00
Wladimir J. van der Laan
da8808fba0 Merge #9756: Return error when importmulti called with invalid address. 
9acf25c Return error when importmulti called with invalid address. (Russell Yanofsky)
 2018-01-23 09:24:29 +01:00
Wladimir J. van der Laan
136d8606c8 Merge #9758: Selectively suppress deprecation warnings 
4b6cccc Selectively suppress deprecation warnings (Jonas Schnelli)
 2018-01-23 09:24:29 +01:00
Wladimir J. van der Laan
f2b5560083 Merge #9553: Use z = std::max(x - y, 0) instead of z = x - y; if (z < 0) z = 0; 
a47da4b Use z = std::max(x - y, 0); instead of z = x - y; if (z < 0) z = 0; (practicalswift)
 2018-01-23 09:24:29 +01:00
Jonas Schnelli
132edbda8c Merge #9755: Bugfix: Qt/Options: Restore persistent "restart required" notice 
0b4f273 Bugfix: Qt/Options: Restore persistent "restart required" notice (Luke Dashjr)
 2018-01-23 09:24:28 +01:00
Wladimir J. van der Laan
fe0ef87cd3 Merge #9720: net: fix banning and disallow sending messages before 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)
 2018-01-23 09:24:28 +01:00
Wladimir J. van der Laan
588b8e5caf Merge #9715: Disconnect peers which we do not receive VERACKs 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)
 2018-01-23 09:24:28 +01:00
Pieter Wuille
b50b8196fa Merge #9708: Clean up all known races/platform-specific UB at 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)
 2018-01-23 09:24:28 +01:00
Wladimir J. van der Laan
3b543952d4 Merge #9698: net: fix socket close race 
9a0b784 net: add a lock around hSocket (Cory Fields)
45e2e08 net: rearrange so that socket accesses can be grouped together (Cory Fields)
 2018-01-23 09:24:28 +01:00
Wladimir J. van der Laan
f1f4e25d60 Merge #9718: Qt/Intro: Various fixes 
a9baa6d Bugfix: Qt/Intro: Pruned nodes never require *more* space (Luke Dashjr)
93ffba7 Bugfix: Qt/Intro: Chain state needs to be stored even with the full blockchain (Luke Dashjr)
c8cee26 Qt/Intro: Update block chain size (Luke Dashjr)
 2018-01-23 09:24:28 +01:00
Wladimir J. van der Laan
7d4e34029c Merge #9674: Always enforce strict lock ordering (try or not) 
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)
 2018-01-23 09:24:28 +01:00
MarcoFalke
f1cbc40b3e Merge #9712: bench: Fix initialization order in registration 
29c5328 bench: Fix initialization order in registration (Wladimir J. van der Laan)
 2018-01-23 09:24:27 +01:00
Wladimir J. van der Laan
767f5e436b Merge #9532: Remove unused variables 
90fd29b Remove unused int64_t nSinceLastSeen (practicalswift)
ac4a095 Remove unused Python variables (practicalswift)
 2018-01-23 09:24:27 +01:00
Wladimir J. van der Laan
eb4c5bac6d Merge #9227: Make nWalletDBUpdated atomic to avoid a potential race. 
d63ff62 Make nWalletDBUpdated atomic to avoid a potential race. (Patrick Strateman)
 2018-01-23 09:24:27 +01:00
Wladimir J. van der Laan
72a0d05d6b Merge #9378: [trivial] Add documentation for CWalletTx::fFromMe member. 
39c77b0 Add documentation for CWalletTx::fFromMe member. (Russell Yanofsky)
 2018-01-23 09:24:27 +01:00
Wladimir J. van der Laan
3f1929fb0d Merge #9659: Net: Turn some methods and params/variables const 
0729102 Net: pass interruptMsgProc as const where possible (Jorge Timón)
fc7f2ff Net: Make CNetMsgMaker more const (Jorge Timón)
d45955f Net: CConnman: Make some methods const (Jorge Timón)
 2018-01-23 09:24:27 +01:00
Wladimir J. van der Laan
81eeb0dee7 Merge #9651: Fix typos 
5f62e3e Fix typos (practicalswift)
 2018-01-23 09:24:27 +01:00
Pieter Wuille
ea414f3077 Merge #9578: Add missing mempool lock for CalculateMemPoolAncestors 
003cd60 Add missing mempool lock for CalculateMemPoolAncestors (Matt Corallo)
 2018-01-23 09:24:27 +01:00
Wladimir J. van der Laan
e86c52f690 Merge #9556: Remove redundant semicolons 
8fc6989 Remove redundant semicolons (practicalswift)
 2018-01-23 09:24:27 +01:00
Wladimir J. van der Laan
dcc251e2b7 Merge #9663: [RPC] clarify listunspent amount description 
3eba88d clarify listunspent amount description (Gregory Sanders)
 2018-01-23 09:24:27 +01:00
Wladimir J. van der Laan
d45a7ae731 Merge #9647: Skip RAII event tests if libevent is built without event_set_mem_functions 
95f97f4 Skip RAII event tests if libevent is built without event_set_mem_functions (Luke Dashjr)
 2018-01-23 09:24:26 +01:00
MarcoFalke
e24b8ae50e Merge #9649: [doc] Remove unused clang format dev script 
fa5137c [doc] Remove unused clang format dev script (MarcoFalke)
 2018-01-23 09:24:26 +01:00
Alexander Block
8ad57c31fd Remove "using namespace std" from wallet.cpp 2018-01-23 09:24:25 +01:00
MarcoFalke
25074aeb43 Merge #9644: [refactor] Remove using namespace <xxx> from src/ 
b7b48c8 Refactor: Remove using namespace <xxx> from src/*.cpp. (Karl-Johan Alm)
 2018-01-23 09:24:03 +01:00
Wladimir J. van der Laan
daa8582b18 Merge #9615: Wallet incremental fee 
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)
 2018-01-23 09:24:03 +01:00
Alexander Block
b84afb2512 Allow to filter for fully connected nodes when calling CopyNodeVector (#1864) 
And use this where needed. This avoids warnings about unset version fields
and is also generally a good thing (we really should only communicate with
nodes we know are good)
 2018-01-22 16:17:11 +03:00
Alexander Block
b97eecc058 Fix review nits 2018-01-22 08:05:44 +01:00
Alexander Block
ec81769605 Remove segwit related dash-tx tests 2018-01-21 22:50:55 +01:00
Alexander Block
4d651621ef Update mainnet chainparams to use correct heights for BIP34/BIP65/BIP66 2018-01-21 14:29:06 +01:00
Alexander Block
3824192e42 Update testnet chainparams to use correct heights for BIP34/BIP65/BIP66 2018-01-21 14:29:06 +01:00
Alexander Block
9bc404a8cc Add "setbip69enabled" RPC usable by tests only 
Needed by fundrawtransaction tests which rely on the ordering not being
changed.
 2018-01-21 14:14:34 +01:00
Russell Yanofsky
6bee150e8e Require timestamps for importmulti keys 
Additionally, accept a "now" timestamp, to allow avoiding rescans for keys
which are known never to have been used.

Note that the behavior when "now" is specified is slightly different than the
previous behavior when no timestamp was specified at all. Previously, when no
timestamp was specified, it would avoid rescanning during the importmulti call,
but set the key's nCreateTime value to 1, which would not prevent future block
reads in later ScanForWalletTransactions calls. With this change, passing a
"now" timestamp will set the key's nCreateTime to the current block time
instead of 1.

Fixes #9491
 2018-01-21 14:14:34 +01:00
Alexander Block
611cb6f275 Fix new dash-tx tests 2018-01-21 14:14:34 +01:00
Alexander Block
86753a890d Add spaces around + in updateGlobalFeeVariables 2018-01-21 14:14:34 +01:00
Alexander Block
771c56a79b Fix new bitcoin-util-tests 2018-01-21 14:14:33 +01:00
Alexander Block
9e13bb393d Fix transaction_tests.cpp 2018-01-21 14:14:33 +01:00
Alexander Block
cd0c910a88 Use new data structures for devnet checkpointData/chainTxData 2018-01-21 14:14:33 +01:00
Wladimir J. van der Laan
2cdafa0ca2 Merge #9671: Fix super-unlikely race introduced in 236618061a445d2cb11e72 
885cfdd Fix super-unlikely race introduced in 236618061a445d2cb11e72 (Matt Corallo)
 2018-01-21 14:14:33 +01:00
MarcoFalke
4f6de16976 Merge #9525: test: Include tx data in EXTRA_DIST 
fa29736 test: Include tx data in EXTRA_DIST (MarcoFalke)
 2018-01-21 14:14:33 +01:00
MarcoFalke
dd5ccf1cba Merge #9406: Re-enable a blank v1 Tx JSON test 
b371732 Re-enable a blank v1 Tx JSON test (Douglas Roark)
 2018-01-21 14:14:33 +01:00
MarcoFalke
660c027cd5 Merge #9510: [trivial] Fix typos in comments 
cc16d99 [trivial] Fix typos in comments (practicalswift)
 2018-01-21 12:48:34 +01:00
Wladimir J. van der Laan
007dc59762 Merge #9637: [Qt] fix transaction details output-index to reflect vout index 
04b8773 [Qt] fix transaction details output-index to reflect vout index (Jonas Schnelli)
 2018-01-21 12:48:34 +01:00
Wladimir J. van der Laan
6070cf111b Merge #9519: Exclude RBF replacement txs from fee estimation 
de1ae32 Exclude RBF txs from fee estimation (Alex Morcos)
 2018-01-21 12:48:34 +01:00
Jonas Schnelli
ccd81a00fc Merge #9624: [Trivial] fix logging typo in FlushStateToDisk() 
ac9a846 [Trivial] fix logging typo in FlushStateToDisk() (John Newbery)
 2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
dc523a1649 Merge #9371: Notify on removal 
094e4b3 Better document usage of SyncTransaction (Alex Morcos)
4afbde6 Introduce MemPoolConflictRemovalTracker (Alex Morcos)
ff25c32 mempool: add notification for added/removed entries (Wladimir J. van der Laan)
 2018-01-21 12:48:33 +01:00
Pieter Wuille
3b2a26c4e7 Merge #9596: [bugfix] save feeDelta instead of priorityDelta in DumpMempool 
bd92f24 [bugfix] save feeDelta instead of priorityDelta in DumpMempool (Alex Morcos)
 2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
119c3fe62f Merge #9516: Bug-fix: listsinceblock: use fork point as reference for blocks in reorg'd chains 
7ba0a00 Testing: listsinceblock should not use orphan block height. (Karl-Johan Alm)
ee5c1ce Bug-fix: listsinceblock: use closest common ancestor when a block hash was provided for a chain that was not the main chain. (Karl-Johan Alm)
 2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
9ba8a31d03 Merge #9583: Move wallet callbacks into cs_main (this effectively reverts #7946) 
9899893 Move wallet callbacks into cs_main (this effectively reverts #7946) (Matt Corallo)
 2018-01-21 12:48:33 +01:00
MarcoFalke
6bc16a66fb Merge #9610: [Trivial] Grammar and typo correction (laudaa) 
5c66d41 [Trivial] Grammar and typo correction (Lauda)
 2018-01-21 12:48:33 +01:00
MarcoFalke
cd04ccd2d9 Merge #9554: [test] Avoid potential NULL pointer dereference in addrman_tests.cpp 
afab9f4 [test] Avoid potential NULL pointer dereference in addrman_tests.cpp (practicalswift)
 2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
c431a7f07a trivial: squash missing field 'argNames' initializer warning in qt tests 
The additional initializer is for the named arguments, which are unused
in the test (and unfilled global fields will be initialized to 0
anyhow), so this is a no-op apart from the warning.
 2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
36109e0580 Merge #9377: fundrawtransaction: Keep change-output keys by default, make it optional 
c9f3062 Add fundrawtransactions new reserveChangeKey option to the release notes (Jonas Schnelli)
9eb325d [QA] Add test for fundrawtransactions new reserveChangeKey option (Jonas Schnelli)
9aa4e6a [Wallet] Add an option to keep the change address key, true by default (Jonas Schnelli)
 2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
f8b880f4d8 Merge #9535: Split CNode::cs_vSend: message processing and message sending 
376b3c2 Make the cs_sendProcessing a LOCK instead of a TRY_LOCK (Matt Corallo)
d7c58ad Split CNode::cs_vSend: message processing and message sending (Matt Corallo)
 2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
a84f8da136 Merge #9498: Basic CCheckQueue Benchmarks 
aad4cb5 Address ryanofsky feedback on CCheckQueue benchmarks. Eliminated magic numbers, fixed scoping of vectors (and memory movement component of benchmark). (Jeremy Rubin)
9f03110 Add Basic CheckQueue Benchmark (Jeremy Rubin)
 2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
197fbea84b Merge #9512: Fix various things -fsanitize complains about 
82e8baa Avoid boost dynamic_bitset in rest_getutxos (Pieter Wuille)
99f001e Fix memory leak in multiUserAuthorized (Pieter Wuille)
5a0b7e4 Fix memory leak in net_tests (Pieter Wuille)
6b03bfb Fix memory leak in wallet tests (Pieter Wuille)
f94f3e0 Avoid integer overflows in scriptnum tests (Pieter Wuille)
843c560 Avoid unaligned access in crypto i/o (Pieter Wuille)
 2018-01-21 12:48:33 +01:00
MarcoFalke
be63fb7953 Merge #9508: Remove unused Python imports 
95bab82 Remove unused Python imports (practicalswift)
 2018-01-21 12:48:33 +01:00
Pieter Wuille
3bd155bd5c Merge #9561: Wake message handling thread when we receive a new block 
241d893 Wake message handling thread when we receive a new block (Matt Corallo)
f13914a Make WakeMessageHandler public (Matt Corallo)
 2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
40dff103de Merge #9380: Separate different uses of minimum fees 
eb30d1a Introduce -dustrelayfee (Alex Morcos)
7b1add3 Introduce -incrementalrelayfee (Alex Morcos)
daec955 Introduce -blockmintxfee (Alex Morcos)
 2018-01-21 12:48:32 +01:00
Pieter Wuille
ad9b9251ac Merge #9490: Replace FindLatestBefore used by importmuti with FindEarliestAtLeast. 
4b06e41 Add unit test for FindEarliestAtLeast (Suhas Daftuar)
997a98a Replace FindLatestBefore used by importmuti with FindEarliestAtLeast. (Gregory Maxwell)
 2018-01-21 12:48:32 +01:00
Wladimir J. van der Laan
4408b2d147 Merge #9222: Add 'subtractFeeFromAmount' option to 'fundrawtransaction'. 
453bda6 Add 'subtractFeeFromOutputs' option to 'fundrawtransaction'. (Chris Moore)
 2018-01-21 12:48:32 +01:00
Wladimir J. van der Laan
74bfe0b223 Merge #9261: Add unstored orphans with rejected parents to recentRejects 
dfbe0d5 Add unstored orphans with rejected parents to recentRejects (Alex Morcos)
 2018-01-21 12:48:32 +01:00
Alexander Block
53820de3ef Remove SegWit related code in dash-tx 2018-01-21 12:48:32 +01:00
Wladimir J. van der Laan
a0d089eda1 Merge #8883: Add all standard TXO types to bitcoin-tx 
0c50909 testcases: explicitly specify transaction version 1 (John Newbery)
b7e144b Add test cases to test new bitcoin-tx functionality (jnewbery)
61a1534 Add all transaction output types to bitcoin-tx. (jnewbery)
1814b08 add p2sh and segwit options to bitcoin-tx outscript command (Stanislas Marion)
 2018-01-21 12:48:32 +01:00
Wladimir J. van der Laan
658479355e Merge #9472: Disentangle progress estimation from checkpoints and update it 
df36371 Update estimated transaction count data (Pieter Wuille)
e356d9a Shorten variable names and switch to tx/s (Pieter Wuille)
6dd8116 Remove SIGCHECK_VERIFICATION_FACTOR (Pieter Wuille)
3641141 Move tx estimation data out of CCheckPointData (Pieter Wuille)
a4bac66 [MOVEONLY] Move progress estimation out of checkpoints (Pieter Wuille)
 2018-01-21 12:48:32 +01:00
MarcoFalke
cee8cf1be6 Merge #9518: Return height of last block pruned by pruneblockchain RPC 
918d1fb Return height of last block pruned by pruneblockchain RPC (Russell Yanofsky)
 2018-01-21 12:48:32 +01:00
MarcoFalke
294b8f70e2 Merge #9520: Deprecate non-txindex getrawtransaction and better warning 
db904db Deprecate non-txindex getrawtransaction and better warning (Pieter Wuille)
 2018-01-21 12:48:32 +01:00
MarcoFalke
a0438d5347 Merge #9297: Various RPC help outputs updated 
54ee3fc RPC help updated (Michael Rotarius)
 2018-01-21 12:48:32 +01:00
Pieter Wuille
819ea7484e Merge #9507: Fix use-after-free in CTxMemPool::removeConflicts() 
fe7e593 Fix use-after-free in CTxMemPool::removeConflicts() (Suhas Daftuar)
 2018-01-21 12:48:32 +01:00
Wladimir J. van der Laan
88b9aa45de Merge #7871: Manual block file pruning. 
afffeea fixup! Add pruneblockchain RPC to enable manual block file pruning. (Russell Yanofsky)
1fc4ec7 Add pruneblockchain RPC to enable manual block file pruning. (mrbandrews)
 2018-01-21 12:48:32 +01:00
Alexander Block
6132bfbe23 Use version 2 blocks for miner_tests 
This is needed because Dashs chainparams start BIP34 on block 1 and
the removal of IsSuperMajority results in the checks to trigger
immediately in tests.

Also update miner_tests nonces
 2018-01-21 12:48:31 +01:00
Alexander Block
56ff71fcec Update devnet to activate BIP34/BIP65/BIP66 immediately 2018-01-21 12:48:31 +01:00
Wladimir J. van der Laan
7321bfdd6b Merge #8391: Consensus: Remove ISM 
122786d Consensus: Remove ISM (NicolasDorier)
 2018-01-20 09:22:40 +01:00
MarcoFalke
17d375e712 Merge #9436: test: Include tx data in EXTRA_DIST 
fa558be test: Include tx data in EXTRA_DIST (MarcoFalke)
 2018-01-20 09:22:39 +01:00
Wladimir J. van der Laan
b72f9249d9 Merge #9376: Remove unused test files and references 
9cb6624 Fix testfile reference (BtcDrak)
23208ac Remove unused test files and references (BtcDrak)
 2018-01-20 09:22:39 +01:00
Wladimir J. van der Laan
0fc37e8c56 Merge #7562: Bump transaction version default to 2 
c5c92c4 Update python tests for default tx version=2 (BtcDrak)
dab207e Preserve tx version=1 for certain tests (BtcDrak)
c5d746a tiny test fix for mempool_tests (Alex Morcos)
1f0ca1a Bump default transaction version to 2 (BtcDrak)
 2018-01-20 09:22:38 +01:00
Wladimir J. van der Laan
71e3e37d91 Merge #8837: allow bitcoin-tx to parse partial transactions 
7451cf5 Allow bitcoin-tx to parse partial transactions (jnewbery)
 2018-01-20 09:21:41 +01:00
Pieter Wuille
3235aad493 Implement SipHash in Python 2018-01-20 09:21:13 +01:00
Alexander Block
2e02b167ea Move wallet backup dir check to wallet.cpp 
Also remove caching in GetBackupsDir(). Not much is gained by this as we
don't call GetBackupsDir() that often.

Also add a is_directory check in AutoBackupWallet to handle cases where the
user deletes or moves the dir while Dash is running.
 2018-01-18 19:39:43 +01:00
Alexander Block
ec8a9e0a6d Add missing Dash specific parameters back in help strings 2018-01-18 19:39:43 +01:00
Alexander Block
b3ee3fc355 Dashify example config and help strings 2018-01-18 19:39:43 +01:00
Alexander Block
6ab9e6b906 Add missing colons to Result/Example help strings 2018-01-18 19:39:43 +01:00
Alexander Block
df31599863 Use OpenMasternodeConnection in ThreadMnbRequestConnections 2018-01-18 07:40:20 +01:00
Alexander Block
4f39a090bd Fix remaining direct uses of mapArgs 2018-01-18 07:38:58 +01:00
Wladimir J. van der Laan
e3e3267b4c Merge #9513: build: fix qt distdir builds (retry) 
67ca130 build: fix for out-of-tree/distdir qt builds (Cory Fields)
 2018-01-18 07:38:58 +01:00
Wladimir J. van der Laan
eb7a6b08f1 Merge #8811: rpc: Add support for JSON-RPC named arguments 
4e7e2e1 Update RPC argument names (John Newbery)
481f289 rpc: Named argument support for bitcoin-cli (Wladimir J. van der Laan)
9adb4e1 rpc: Argument name consistency (Wladimir J. van der Laan)
8d713f7 rpc: Named arguments for rawtransaction calls (Wladimir J. van der Laan)
37a166f rpc: Named arguments for wallet calls (Wladimir J. van der Laan)
78b684f rpc: Named arguments for mining calls (Wladimir J. van der Laan)
b8ebc59 rpc: Named arguments for net calls (Wladimir J. van der Laan)
2ca9dcd test: Add test for RPC named arguments (Wladimir J. van der Laan)
fba1a61 rpc: Named arguments for misc calls (Wladimir J. van der Laan)
286ec08 rpc: Add 'echo' call for testing (Wladimir J. van der Laan)
495eb44 rpc: Named arguments for blockchain calls (Wladimir J. van der Laan)
6f1c76a rpc: Support named arguments (Wladimir J. van der Laan)
5865d41 authproxy: Add support for RPC named arguments (Wladimir J. van der Laan)
 2018-01-18 07:38:57 +01:00
MarcoFalke
0dabb80ab5 Merge #9496: Rename lambda argument name to prevent shadowing 
7df5e38 Rename lambda argument name to prevent shadowing. (Pavel Janík)
 2018-01-18 07:38:23 +01:00
Pieter Wuille
7c5de865d8 Merge #9404: Smarter coordination of change and fee in CreateTransaction. 
20449ef Don't overpay fee if we have selected new coins that result in a smaller transaction. (Alex Morcos)
42f5ce4 Try to reduce change output to make needed fee in CreateTransaction (Alex Morcos)
 2018-01-18 07:38:23 +01:00
Pieter Wuille
17e51db71f Merge #9408: Allow shutdown during LoadMempool, dump only when necessary 
325e400 [Qt] Do proper shutdown (Jonas Schnelli)
9479f8d Allow shutdown during LoadMempool, dump only when necessary (Jonas Schnelli)
 2018-01-18 07:38:23 +01:00
Pieter Wuille
de21f92613 Merge #9319: Break addnode out from the outbound connection limits. 
032ba3f RPC help documentation for addnode peerinfo. (Gregory Maxwell)
90f13e1 Add release notes for addnode changes. (Gregory Maxwell)
50bd12c Break addnode out from the outbound connection limits. (Gregory Maxwell)
 2018-01-18 07:38:22 +01:00
Pieter Wuille
0bd9056899 Merge #9138: Improve fee estimation 
44b64b9 Fix edge case with stale fee estimates (Alex Morcos)
78ae62d Add clarifying comments to fee estimation (Alex Morcos)
5fe0f47 Add extra logging to processBlock in fee estimation. (Alex Morcos)
dc008c4 Add IsCurrentForFeeEstimatation (Alex Morcos)
ebafdca Pass pointers to existing CTxMemPoolEntries to fee estimation (Alex Morcos)
d825838 Always update fee estimates on new blocks. (Alex Morcos)
6f06b26 rename bool to validFeeEstimate (Alex Morcos)
84f7ab0 Remove member variable hadNoDependencies from CTxMemPoolEntry (Alex Morcos)
60ac00d Don't track transactions at all during IBD. (Alex Morcos)
4df4479 Remove extraneous LogPrint from fee estimation (Alex Morcos)
 2018-01-18 07:33:45 +01:00
Pieter Wuille
2dd62abe32 Merge #9465: [Wallet] Do not perform ECDSA signing in the fee calculation inner loop. 
b3d7b1c Wallet: Do not perform ECDSA in the fee calculation inner loop. (Gregory Maxwell)
 2018-01-18 07:33:44 +01:00
Jonas Schnelli
9e62719ccf Merge #9413: [CoinControl] Allow non-wallet owned change addresses 
54f8026 [CoinControl] Allow non-wallet owned change addresses (Jonas Schnelli)
 2018-01-18 07:33:44 +01:00
Wladimir J. van der Laan
5d3401c7e3 Merge #9312: Increase mempool expiry time to 2 weeks 
5f0e27f Increase mempool expiry time to 2 weeks (Alex Morcos)
 2018-01-18 07:33:44 +01:00
MarcoFalke
8c4c6063a4 Merge #9281: Refactor: Remove using namespace <xxx> from bench/ & test/ sources 
73f4119 Refactoring: Removed using namespace <xxx> from bench/ and test/ source files. (Karl-Johan Alm)
 2018-01-18 07:33:44 +01:00
Wladimir J. van der Laan
718e6223b2 Merge #9387: [Refactor] RAII of libevent stuff using unique ptrs with deleters 
05a55a6 Added EVENT_CFLAGS to test makefile to explicitly include libevent headers. (Karl-Johan Alm)
280a559 Added some simple tests for the RAII-style events. (Karl-Johan Alm)
7f7f102 Switched bitcoin-cli.cpp to use RAII unique pointers with deleters. (Karl-Johan Alm)
e5534d2 Added std::unique_ptr<> wrappers with deleters for libevent modules. (Karl-Johan Alm)
 2018-01-18 07:33:44 +01:00
Wladimir J. van der Laan
a1478e586a Merge #9417: Do not evaluate hidden LogPrint arguments 
407cdd6 Do not evaluate hidden LogPrint arguments (Pieter Wuille)
 2018-01-18 07:33:44 +01:00
Wladimir J. van der Laan
e48bc13a21 Merge #9474: Mark the minconf parameter to move as ignored 
ce370c1 Mark the minconf parameter to move as ignored (Pieter Wuille)
 2018-01-18 07:33:44 +01:00
Wladimir J. van der Laan
35f3f7aad9 Merge #9475: Let autoconf detect presence of EVP_MD_CTX_new 
0388afe Let autoconf detect presence of EVP_MD_CTX_new (Luke Dashjr)
 2018-01-18 07:33:44 +01:00
Wladimir J. van der Laan
e5873a5647 Merge #9457: [qt] Select more files for translation 
facf3e7 [qt] `make translate` (MarcoFalke)
fae26e8 [qt] Add more sources to translate (MarcoFalke)
 2018-01-18 07:33:43 +01:00
MarcoFalke
f89a5c78dc Merge #9470: qt: Set (count) placeholder in sendcoinsdialog to notranslate 
388ea19 qt: Set (count) placeholder in sendcoinsdialog to notranslate (Wladimir J. van der Laan)
 2018-01-18 07:33:43 +01:00
MarcoFalke
125adda41a Merge #9401: Make rpcauth help message clearer, add example in example .conf 
0513c70 Make rpcauth help message clearer, add example in example .conf (Gregory Sanders)
 2018-01-18 07:33:43 +01:00
Wladimir J. van der Laan
a81b2750fc Merge #9396: Updated listsinceblock rpc documentation 
3f67972 updated listsinceblock rpc docs (accraze)
 2018-01-18 07:33:43 +01:00
Wladimir J. van der Laan
bdd151f598 Merge #9288: Fix a bug if the min fee is 0 for FeeFilterRounder 
f8d43b8 Avoid rollingMinimumFeeRate never being able to decay below half (Alex Morcos)
eab8e1b fix a bug if the min fee is 0 for FeeFilterRounder (Alex Morcos)
 2018-01-18 07:33:43 +01:00
Wladimir J. van der Laan
8f423499dd Merge #9283: A few more CTransactionRef optimizations 
91335ba Remove unused MakeTransactionRef overloads (Pieter Wuille)
6713f0f Make FillBlock consume txn_available to avoid shared_ptr copies (Pieter Wuille)
62607d7 Convert COrphanTx to keep a CTransactionRef (Pieter Wuille)
c44e4c4 Make AcceptToMemoryPool take CTransactionRef (Pieter Wuille)
 2018-01-18 07:33:43 +01:00
Wladimir J. van der Laan
71a490e0f8 Merge #9462: [qt] Do not translate tilde character 
fab6c5f [qt] Do not translate `~` (MarcoFalke)
 2018-01-18 07:33:43 +01:00
Pieter Wuille
da209546df Merge #8776: Wallet refactoring leading up to multiwallet 
5394b39 Wallet: Split main logic from InitLoadWallet into CreateWalletFromFile (Luke Dashjr)
fb0c934 Wallet: Let the interval-flushing thread figure out the filename (Luke Dashjr)
 2018-01-18 07:33:42 +01:00
Jonas Schnelli
1d83352dad Merge #8877: Qt RPC console: history sensitive-data filter, and saving input line when browsing history 
8562792 GUI/RPCConsole: Include importmulti in history sensitive-command filter (Luke Dashjr)
ff77faf Qt/RPCConsole: Use RPCParseCommandLine to perform command filtering (Luke Dashjr)
a79598d Qt/Test: Make sure filtering sensitive data works correctly in nested commands (Luke Dashjr)
629cd42 Qt/RPCConsole: Teach RPCParseCommandLine how to filter out arguments to sensitive commands (Luke Dashjr)
e2d9213 Qt/RPCConsole: Make it possible to parse a command without executing it (Luke Dashjr)
1755c04 Qt/RPCConsole: Truncate filtered commands to just the command name, rather than skip it entirely in history (Luke Dashjr)
d80a006 Qt/RPCConsole: Add signmessagewithprivkey to list of commands filtered from history (Luke Dashjr)
afde12f Qt/RPCConsole: Refactor command_may_contain_sensitive_data function out of RPCConsole::on_lineEdit_returnPressed (Luke Dashjr)
de8980d Bugfix: Do not add sensitive information to history for real (Luke Dashjr)
9044908 Qt/RPCConsole: Don't store commands with potentially sensitive information in the history (Jonas Schnelli)
fc95daa Qt/RPCConsole: Save current command entry when browsing history (Jonas Schnelli)
 2018-01-18 07:33:42 +01:00
Jonas Schnelli
7b7ce8997a Merge #9446: SetMerkleBranch: remove unused code, remove cs_main lock requirement 
9e351c9 SetMerkleBranch: remove unused code, remove cs_main lock requirement (Jonas Schnelli)
 2018-01-18 07:33:42 +01:00
Pieter Wuille
cbbab00c56 Merge #9349: Make CScript (and prevector) c++11 movable. 
2ddfcfd Make CScript (and prevector) c++11 movable. (Pieter Wuille)
 2018-01-18 07:31:23 +01:00
Alexander Block
465ceff3ba Use ForceSetArg/ForceSetMultiArgs in debug rpc command 2018-01-18 07:31:23 +01:00
Pieter Wuille
aff4b6d2c5 Merge #9243: Clean up mapArgs and mapMultiArgs Usage 
c2f61be Add a ForceSetArg method for testing (Matt Corallo)
4e04814 Lock mapArgs/mapMultiArgs access in util (Matt Corallo)
4cd373a Un-expose mapArgs from utils.h (Matt Corallo)
71fde55 Get rid of mapArgs direct access in ZMQ construction (Matt Corallo)
0cf86a6 Introduce (and use) an IsArgSet accessor method (Matt Corallo)
2b5f085 Fix non-const mapMultiArgs[] access after init. (Matt Corallo)
c8042a4 Remove arguments to ParseConfigFile (Matt Corallo)
 2018-01-18 07:31:23 +01:00
MarcoFalke
b9b3583353 Merge #9435: Removed unused variable in test, fixing warning. 
35356b4 Remove unused variable in test, fixing warning. (Russell Yanofsky)
 2018-01-18 07:31:23 +01:00
MarcoFalke
7417a5b249 Merge #9407: [Trivial] Added missing colons in when running help command 
afe5b3f Added missing colons in when running help command (Anditto Heristyo)
 2018-01-18 07:31:23 +01:00
Wladimir J. van der Laan
d8b07b96ab Merge #9393: build: Include cuckoocache header in Makefile 
fa89581 build: Include cuckoocache header in Makefile (MarcoFalke)
 2018-01-18 07:31:23 +01:00
Wladimir J. van der Laan
dc1df137e3 Merge #9262: Prefer coins that have fewer ancestors, sanity check txn before ATMP 
cee1612 reduce number of lookups in TransactionWithinChainLimit (Gregory Sanders)
af9bedb Test for fix of txn chaining in wallet (Gregory Sanders)
5882c09 CreateTransaction: Don't return success with too-many-ancestor txn (Gregory Sanders)
0b2294a SelectCoinsMinConf: Prefer coins with fewer ancestors (Gregory Sanders)
 2018-01-18 07:31:22 +01:00
Wladimir J. van der Laan
851febd889 Merge #9316: [wallet] Disable free transactions when relay is disabled 
faf4ca8 [wallet] Disable free transactions when relay is disabled (MarcoFalke)
 2018-01-18 07:31:22 +01:00
Alexander Block
504fecfe63 Remove call to SetMiscWarning in util.cpp 
For some reason, this fails while linking dash-cli.
I tried to add LIBBITCOIN_COMMON to dash-cli, but with no luck.
Removing the call for now, has to be fixed later.
 2018-01-18 07:31:22 +01:00
Wladimir J. van der Laan
dcc9dffae9 Merge #9236: Fix races for strMiscWarning and fLargeWork*Found, make QT runawayException use GetWarnings 
749be01 Move GetWarnings() into its own file. (Gregory Maxwell)
e3ba0ef Eliminate data races for strMiscWarning and fLargeWork*Found. (Gregory Maxwell)
c63198f Make QT runawayException call GetWarnings instead of directly access strMiscWarning. (Gregory Maxwell)
 2018-01-18 07:31:22 +01:00
Wladimir J. van der Laan
b42c722b64 Merge #9311: Flush wallet after abandontransaction 
0632939 Flush wallet after abandontransaction (Alex Morcos)
 2018-01-18 07:31:22 +01:00
Wladimir J. van der Laan
6e11b14913 Merge #9329: [Qt] Console: allow empty arguments 
390bd14 [Qt] Console: don't allow empty arguments when using the comma-syntax (Jonas Schnelli)
6a32c0f Qt/Test: Check handling of empty arguments in RPC debug console (Luke Dashjr)
89c8d2c [Qt] Console: allow empty arguments (Jonas Schnelli)
 2018-01-18 07:31:22 +01:00
Wladimir J. van der Laan
8fa6680c5e Merge #9367: If we don't allow free txs, always send a fee filter (take 2) 
fa16b8f If we don't allow free txs, always send a fee filter (take 2) (MarcoFalke)
 2018-01-18 07:31:22 +01:00
Pieter Wuille
c1811e5661 Merge #8895: Better SigCache Implementation 
67dac4e Add unit tests for the CuckooCache (Jeremy Rubin)
c9e69fb Add CuckooCache implementation and replace the sigcache map_type with it (Jeremy Rubin)
 2018-01-18 07:31:22 +01:00
Wladimir J. van der Laan
e34afa1067 Merge #9273: Remove unused CDiskBlockPos* argument from ProcessNewBlock 
a13fa4c Remove unused CDiskBlockPos* argument from ProcessNewBlock (Matt Corallo)
 2018-01-18 07:31:22 +01:00
Pieter Wuille
e6d05d71dd Merge #9290: Make RelayWalletTransaction attempt to AcceptToMemoryPool. 
f692fce Make RelayWalletTransaction attempt to AcceptToMemoryPool. (Gregory Maxwell)
 2018-01-18 07:31:22 +01:00
Alexander Block
87e9b59881 Remove AddRef call in CNode constructor and do AddRef in AcceptConnection 
This was missed in #1857. ConnectNode is doing the initial AddRef for
outgoing connections. AcceptConnection also has to do an initial AddRef
call for incoming connections.
 2018-01-17 18:11:32 +01:00
Alexander Block
41ef1f98ea Remove comment about masternode connections 
This was related to the times we directly called ConnectNode from MN code
 2018-01-17 17:40:44 +01:00
Matt Corallo
4ee0657f85 Do not add to vNodes until fOneShot/fFeeler/fAddNode have been set 2018-01-17 17:38:32 +01:00
Alexander Block
ea73614994 Use EXIT_FAILURE when calling exit() 2018-01-17 17:31:13 +01:00
Wladimir J. van der Laan
5c860b3477 Merge #9330: [Qt] Console: add security warning 
ed6b377 [Qt] Console: add security warning (Jonas Schnelli)
 2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
91dc005154 Merge #9344: Do not run functions with necessary side-effects in assert() 
da9cdd2 Do not run functions with necessary side-effects in assert() (Gregory Maxwell)
 2018-01-17 17:31:12 +01:00
Alexander Block
11e27d7af5 Add missing null checks in wallet/crypto_tests.cpp 
Align code with Bitcoin
 2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
0982d6d3c8 Merge #9305: Refactor: Removed begin/end_ptr functions. 
8c1dbc5 Refactor: Removed begin/end_ptr functions. (Karl-Johan Alm)
 2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
3aee86d6fc Merge #9334: Update to latest libsecp256k1 
7b49f22 Squashed 'src/secp256k1/' changes from 7a49cac..8225239 (Pieter Wuille)
 2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
d0db70b01c Merge #9302: Return txid even if ATMP fails for new transaction 
b3a7410 Return txid even if ATMP fails for new transaction (Pieter Wuille)
 2018-01-17 17:31:12 +01:00
Pieter Wuille
04f6a7367d Merge #9240: Remove txConflicted 
a874ab5 remove internal tracking of mempool conflicts for reporting to wallet (Alex Morcos)
bf663f8 remove external usage of mempool conflict tracking (Alex Morcos)
 2018-01-17 17:31:12 +01:00
MarcoFalke
45727e7974 Merge #9303: Update comments in ctaes 
8501bed Squashed 'src/crypto/ctaes/' changes from cd3c3ac..003a4ac (Pieter Wuille)
 2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
b0c0046ef0 Merge #9291: Remove mapOrphanTransactionsByPrev from DoS_tests 
819ca3f Remove mapOrphanTransactionsByPrev from DoS_tests (Pieter Wuille)
 2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
470b526d95 Merge #9299: Remove no longer needed check for premature v2 txs 
b919179 remove no longer needed check for premature v2 txs (Alex Morcos)
 2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
63d610d13a Merge #9296: Fix missed change to WalletTx structure 
28f8ae8 Fix missed change to WalletTx structure (Alex Morcos)
 2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
7d887dafb1 Merge #9282: CMutableTransaction is defined as struct 
c4b6fa8 CMutableTransaction is defined as struct. (Pavel Janík)
 2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
386026e570 Merge #9165: SendMoney: use already-calculated balance 
ea83d00 SendMoney: use already-calculated balance (instagibbs)
 2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
9782c18312 Merge #9269: Align struct COrphan definition 
2efc438 Align struct COrphan definition (Pieter Wuille)
 2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
2feda90d5d Merge #8613: LevelDB 1.19 
634ad51 Squashed 'src/leveldb/' changes from 20ca81f..a31c8aa (Pieter Wuille)
 2018-01-17 17:31:11 +01:00
Wladimir J. van der Laan
b5389c09b3 Merge #9014: Fix block-connection performance regression 
dd0df81 Document ConnectBlock connectTrace postconditions (Matt Corallo)
2d6e561 Switch pblock in ProcessNewBlock to a shared_ptr (Matt Corallo)
2736c44 Make the optional pblock in ActivateBestChain a shared_ptr (Matt Corallo)
ae4db44 Create a shared_ptr for the block we're connecting in ActivateBCS (Matt Corallo)
fd9d890 Keep blocks as shared_ptrs, instead of copying txn in ConnectTip (Matt Corallo)
6fdd43b Add struct to track block-connect-time-generated info for callbacks (Matt Corallo)
 2018-01-17 17:31:11 +01:00
Alexander Block
45ea6ba4dc Fix invalid cast to CTransaction* in WalletModelTransaction 
CWalletTx/CMerkleTx does not derive from CTransaction anymore.
This code is different in Bitcoin as it was touched by SegWit code,
resulting in an upfront fix.
 2018-01-17 17:30:38 +01:00
Wladimir J. van der Laan
525c049316 Merge #8580: Make CTransaction actually immutable 
81e3228 Make CTransaction actually immutable (Pieter Wuille)
42fd8de Make DecodeHexTx return a CMutableTransaction (Pieter Wuille)
c3f5673 Make CWalletTx store a CTransactionRef instead of inheriting (Pieter Wuille)
a188353 Switch GetTransaction to returning a CTransactionRef (Pieter Wuille)
 2018-01-17 17:30:38 +01:00
Alexander Block
1e62969fa6 Preparations for upcoming backport of Bitcoin #8580 
Instead of deriving from CTransaction, we now have a CTransactionRef member
in CTxLockCandidate. This is needed for the next backported PR #8580,
which will make CTransaction immutable.

Also use CTransactionRef in CDarkSendEntry, CDarksendBroadcastTx and
CPrivateSendServer
 2018-01-17 17:30:38 +01:00
MarcoFalke
cb61441e2e Merge #9251: Improvement of documentation of command line parameter 'whitelist' 
8a70a9d Improvement of documentation of command line parameter 'whitelist' (wodry)
 2018-01-17 17:30:38 +01:00
MarcoFalke
b8a81d435f Merge #9223: unification of Bloom filter representation 
b7aa290 unification of Bloom filter representation (S. Matthew English)
 2018-01-17 17:30:38 +01:00
MarcoFalke
5a6131a86b Merge #9265: bitcoin-cli: Make error message less confusing 
fe37fbe bitcoin-cli: Make error message less confusing (Wladimir J. van der Laan)
 2018-01-17 17:30:38 +01:00
Wladimir J. van der Laan
a95622c0b0 Merge #9239: Disable fee estimates for 1 block target 
e878689 Make GUI incapable of setting tx confirm target of 1 (Alex Morcos)
d824ad0 Disable fee estimates for a confirm target of 1 block (Alex Morcos)
 2018-01-17 17:30:38 +01:00
Wladimir J. van der Laan
62ae4e6449 Merge #9229: Remove calls to getaddrinfo_a 
10ae7a7 Revert "Use async name resolving to improve net thread responsiveness" (Matt Corallo)
 2018-01-17 17:30:38 +01:00
Alexander Block
b2fb586dec Add missing comments to ProcessNewBlock and ProcessNewBlockHeaders 
Lost while backporting #9183
 2018-01-17 17:30:38 +01:00
Pieter Wuille
180e379e2d Merge #9253: Fix calculation of number of bound sockets to use 
9e1f468 Fix calculation of number of bound sockets to use (Matt Corallo)
 2018-01-17 17:30:38 +01:00
Wladimir J. van der Laan
3b2fd85b59 Merge #9230: Fix some benign races in timestamp logging 
8b22efb Make fStartedNewLine an std::atomic_bool (Matt Corallo)
507145d Fix race when accessing std::locale::classic() (Matt Corallo)
 2018-01-17 17:30:38 +01:00
Pieter Wuille
d54ef6d7e3 Merge #9226: Remove fNetworkNode and pnodeLocalHost. 
bdb922b Remove pnodeLocalHost. (Gregory Maxwell)
083f203 Remove fNetworkNode. (Gregory Maxwell)
 2018-01-17 17:30:36 +01:00
Pieter Wuille
a78e0e36c6 Merge #9244: Trivial refactor: Remove extern keyword from function declarations 
446a8f9 Trivial refactor: Remove extern keyword from function declarations, as they are extern by default. (Karl-Johan Alm)
 2018-01-17 17:27:25 +01:00
Pieter Wuille
b07393709e Merge #9010: Split up AppInit2 into multiple phases, daemonize after datadir lock errors 
deec83f init: Get rid of fServer flag (Wladimir J. van der Laan)
16ca0bf init: Try to aquire datadir lock before and after daemonization (Wladimir J. van der Laan)
0cc8b6b init: Split up AppInit2 into multiple phases (Wladimir J. van der Laan)
 2018-01-17 17:27:24 +01:00
Wladimir J. van der Laan
27fcec08f8 Merge #9202: bench: Add support for measuring CPU cycles 
3532818 bench: Add support for measuring CPU cycles (Wladimir J. van der Laan)
 2018-01-17 17:27:24 +01:00
Wladimir J. van der Laan
ab9bce2c3a Merge #9225: Fix some benign races 
dfed983 Fix unlocked access to vNodes.size() (Matt Corallo)
3033522 Remove double brackets in addrman (Matt Corallo)
dbfaade Fix AddrMan locking (Matt Corallo)
047ea10 Make fImporting an std::atomic (Matt Corallo)
42071ca Make fDisconnect an std::atomic (Matt Corallo)
 2018-01-17 17:27:24 +01:00
Wladimir J. van der Laan
b27c4b8e96 Merge #9224: Prevent FD_SETSIZE error building on OpenBSD 
498a1d7 Include select.h when WIN32 is not defined (Ivo van der Sangen)
 2018-01-17 17:27:24 +01:00
MarcoFalke
df24dfd4bc Merge #9233: Fix some typos 
15fa95d Fix some typos (fsb4000)
 2018-01-17 17:27:24 +01:00
Alexander Block
dadfc45b15 Add size() method to CVectorWriter 
Needed by CMasternodePing
 2018-01-17 17:27:24 +01:00
Pieter Wuille
5c0b55a7c0 Merge #9128: net: Decouple CConnman and message serialization 
c7be56d net: push only raw data into CConnman (Cory Fields)
2ec935d net: add CVectorWriter and CNetMsgMaker (Cory Fields)
b7695c2 net: No need to check individually for disconnection anymore (Cory Fields)
fedea8a net: don't send any messages before handshake or after requested disconnect (Cory Fields)
d74e352 net: Set feelers to disconnect at the end of the version message (Cory Fields)
 2018-01-17 17:27:22 +01:00
MarcoFalke
c87c151426 Merge #9220: Refactor: Stop using namespace std (bitcoin-cli/-tx). 
2f2625a Removed using namespace std from bitcoin-cli/-tx and added std:: in appropriate places. (Karl-Johan Alm)
 2018-01-17 17:25:36 +01:00
MarcoFalke
2c8fe46868 Merge #9100: tx_valid: re-order inputs to how they are encoded 
5262a15 tx_valid: re-order inputs to how they are encoded (Daniel Cousens)
 2018-01-17 17:25:36 +01:00
MarcoFalke
d5f2f07961 Merge #9216: Doc: Fix copypasted comment 
f26da35 Fix copypasted comment. (Pavel Janík)
 2018-01-17 17:25:36 +01:00
MarcoFalke
a71702e3e2 Merge #9144: [Trivial] Correct waitforblockheight example help text 
e3c4f7e Correct help output for waitfor RPC commands (fanquake)
 2018-01-17 17:25:36 +01:00
Pieter Wuille
3a48d2b832 Merge #8930: Move orphan processing to ActivateBestChain 
d2b88f9 Move orphan-conflict removal from main logic into a callback (Matt Corallo)
97e2802 Erase orphans per-transaction instead of per-block (Matt Corallo)
ec4525c Move orphan processing to ActivateBestChain (Matt Corallo)
 2018-01-17 17:25:36 +01:00
Alexander Block
532b9fa3db Use OpenNetworkConnection instead of calling ConnectNode directly in Dash code (#1857) 
ConnectNode is meant to be private and should not be leaked outside of
CConnman. This leaking resulted in multiple problems with AddRef/Release
behaviour. We use OpenNetworkConnectio/OpenMasternodeConnection from now on
and use appropriate ForNode calls to access the CNode* instance.

This commit also changes the behaviour for already connected nodes which
are afterwards requested for a masternode connection. We don't set
fMasternode=true anymore on such nodes, which means it won't be auto
disconnected anymore from ProcessMasternodeConnections.
 2018-01-17 18:09:08 +03:00
Alexander Block
86d33b2762 Remove double registration of "privatesend" RPC (#1853) 2018-01-16 16:14:28 +03:00
Alexander Block
b6ea01e071 Remove namespace alert_tests when including alert test data 2018-01-16 08:36:16 +01:00
Alexander Block
7939a23e3b Use std::move when calling MakeTransactionRef 2018-01-16 08:30:52 +01:00
Alexander Block
07cd44c0e2 Use MakeTransactionRef in CreateDevNetGenesisBlock 2018-01-15 07:03:20 +01:00
Alexander Block
e02f313471 Mogrify and optimize network_disabled.png and copy it to all themes 
Bitcoin #9145 made the icon 50% opaque, copy that to all themes.
 2018-01-15 06:51:53 +01:00
Wladimir J. van der Laan
898bd4395d Merge #9204: Clarify CreateTransaction error messages 
918b126 fix CreateTransaction error messages (instagibbs)
 2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
2d87a0fdd7 Merge #8690: Do not fully sort all nodes for addr relay 
a33b169 Do not fully sort all nodes for addr relay (Pieter Wuille)
 2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
d757c895b9 Merge #9141: Remove unnecessary calls to CheckFinalTx 
4512550 Remove unnecessary calls to CheckFinalTx (Jonas Schnelli)
 2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
4e1c1923b7 Merge #9142: Move -salvagewallet, -zap(wtx) to where they belong 
2e44893 Move -salvagewallet, -zap(wtx) to where they belong (Jonas Schnelli)
 2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
ce3f38d6ca Merge #9025: getrawtransaction should take a bool for verbose 
240189b add testcases for getrawtransaction (John Newbery)
ce2bb23 getrawtransaction should take a bool for verbose (jnewbery)
 2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
481bab7456 Merge #9200: bench: Fix subtle counting issue when rescaling iteration count 
e0a9cb2 bench: Fix subtle counting issue when rescaling iteration count (Wladimir J. van der Laan)
 2018-01-15 06:14:16 +01:00
Jonas Schnelli
507c4e5246 Merge #9185: [Qt] fix coincontrol sort issue 
4231032 [Qt] Clean up and fix coincontrol tree widget handling (Wladimir J. van der Laan)
76af4eb [Qt] fix coincontrol sort issue (Jonas Schnelli)
 2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
e5cc7d0eb4 Merge #8872: Remove block-request logic from INV message processing 
037159c Remove block-request logic from INV message processing (Matt Corallo)
3451203 [qa] Respond to getheaders and do not assume a getdata on inv (Matt Corallo)
d768f15 [qa] Make comptool push blocks instead of relying on inv-fetch (mrbandrews)
 2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
726dd1f8a3 Merge #9179: Set DEFAULT_LIMITFREERELAY = 0 kB/minute 
fa7cc5a Set DEFAULT_LIMITFREERELAY = 0 kB/minute (MarcoFalke)
 2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
afa99c41fc Merge #9117: net: don't send feefilter messages before the version handshake is complete 
4662553 net: don't send feefilter messages before the version handshake is complete (Cory Fields)
 2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
f12610c030 Merge #9125: Make CBlock a vector of shared_ptr of CTransactions 
b4e4ba4 Introduce convenience type CTransactionRef (Pieter Wuille)
1662b43 Make CBlock::vtx a vector of shared_ptr<CTransaction> (Pieter Wuille)
da60506 Add deserializing constructors to CTransaction and CMutableTransaction (Pieter Wuille)
0e85204 Add serialization for unique_ptr and shared_ptr (Pieter Wuille)
 2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
c937a0bfb1 Merge #9186: test: Fix use-after-free in scheduler tests 
12519bf test: Fix use-after-free in scheduler tests (Wladimir J. van der Laan)
 2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
9b9d3d1da8 Merge #9133: Unset fImporting for loading mempool 
79f755d Unset fImporting for loading mempool (Alex Morcos)
 2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
0932079ea6 Merge #9131: fNetworkActive is not protected by a lock, use an atomic 
079142b fNetworkActive is not protected by a lock, use an atomic (Jonas Schnelli)
 2018-01-15 06:14:16 +01:00
Pieter Wuille
dc4fdd9ffc Merge #9164: [trivial] credit values are CAmount 
20c3215 credit values are CAmount (Gregory Sanders)
 2018-01-15 06:14:16 +01:00
Alexander Block
c12eb7f312 Put namespace{} around alertTests.raw.h include 2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
a9c354472e Merge #9140: Bugfix: Correctly replace generated headers and fail cleanly 
b74ff5c Bugfix: Correctly replace generated headers and fail cleanly (Luke Dashjr)
 2018-01-15 06:14:16 +01:00
Jonas Schnelli
2b99a4b4e8 Merge #9145: [qt] Make network disabled icon 50% opaque 
fa42e4a [qt] Make network disabled icon 50% opaque (MarcoFalke)
 2018-01-15 06:14:15 +01:00
Wladimir J. van der Laan
db516cfb8e Merge #9124: Use better name for local variable to prevent -Wshadow compiler warning 
bf49f10 Use better name for local variable to prevent -Wshadow compiler warning (Pavel Janík)
 2018-01-15 06:14:15 +01:00
Wladimir J. van der Laan
a9aa477daf Merge #9049: Remove duplicatable duplicate-input check from CheckTransaction 
e2b3fb3 Optimize vInOutPoints insertion a bit (Matt Corallo)
eecffe5 Remove redundant duplicate-input check from CheckTransaction (Matt Corallo)
b2e178a Add deserialize + CheckBlock benchmarks, and a full block hex (Matt Corallo)
 2018-01-15 06:14:15 +01:00
MarcoFalke
ec08f5b750 Merge #9122: fix getnettotals RPC description about timemillis. 
a79f864 fix getnettotals RPC description about timemillis. (Masahiko Hyuga)
 2018-01-15 06:14:15 +01:00
Wladimir J. van der Laan
5f6908619e Merge #9121: Initialize variable to prevent compiler warning 
bdcba6d Initialize variable to prevent compiler warning (Pavel Janík)
 2018-01-15 06:14:15 +01:00
Wladimir J. van der Laan
161fa919c2 Merge #9111: Remove unused variable UNLIKELY_PCT from fees.h 
d8edf03 Remove unused var UNLIKELY_PCT from fees.h (fanquake)
 2018-01-15 06:14:15 +01:00
Alexander Block
7765c87e79 Remove nType and nVersion from Dash related serialization code 
Also remove bogus "nVersion = this->nVersion" assignments. These were
leftovers from old times.
 2018-01-15 06:14:15 +01:00
Wladimir J. van der Laan
19a2d668cf Merge #9039: Various serialization simplifcations and optimizations 
d59a518 Use fixed preallocation instead of costly GetSerializeSize (Pieter Wuille)
25a211a Add optimized CSizeComputer serializers (Pieter Wuille)
a2929a2 Make CSerAction's ForRead() constexpr (Pieter Wuille)
a603925 Avoid -Wshadow errors (Pieter Wuille)
5284721 Get rid of nType and nVersion (Pieter Wuille)
657e05a Make GetSerializeSize a wrapper on top of CSizeComputer (Pieter Wuille)
fad9b66 Make nType and nVersion private and sometimes const (Pieter Wuille)
c2c5d42 Make streams' read and write return void (Pieter Wuille)
50e8a9c Remove unused ReadVersion and WriteVersion (Pieter Wuille)
 2018-01-15 06:14:15 +01:00
Jonas Schnelli
705057f0d6 Merge #9095: test: Fix test_random includes 
fa8278e test: Fix test_random includes (MarcoFalke)
 2018-01-15 06:14:12 +01:00
Pieter Wuille
9b8cc0b1ce Merge #9045: Hash P2P messages as they are received instead of at process-time 
fe1dc62 Hash P2P messages as they are received instead of at process-time (Matt Corallo)
 2018-01-15 06:14:12 +01:00
Jonas Schnelli
2342b2ac00 Merge #9094: qt: Use correct conversion function for boost::path datadir 
e760b30 qt: Use correct conversion function for boost::path datadir (Wladimir J. van der Laan)
 2018-01-15 06:13:44 +01:00
Wladimir J. van der Laan
293333481e Merge #8981: Wshadow: Do not shadow argument with a local variable 
ff6639b Do not shadow local variable (Pavel Janík)
 2018-01-15 06:13:44 +01:00
Alexander Block
4a19af7bd1 Use correct version for fee estimates db 2018-01-14 14:13:39 +01:00
Alexander Block
fc95cbb49f Use nPowTargetSpacing in SendCoinsDialog::updateGlobalFeeVariables 2018-01-14 14:12:30 +01:00
Alexander Block
c5bfd21570 Fix version check in CBlockPolicyEstimator::Read 2018-01-14 14:06:46 +01:00
Alexander Block
d452018961 Dashify generatetoaddress help string 2018-01-13 18:34:53 +01:00
Wladimir J. van der Laan
6eaafa86b6 Merge #7730: Remove priority estimation 
0bd581a add release notes for removal of priority estimation (Alex Morcos)
b2322e0 Remove priority estimation (Alex Morcos)
 2018-01-13 13:44:40 +01:00
Wladimir J. van der Laan
9be592806d Merge #8709: Allow filterclear messages for enabling TX relay only. 
1f951c6 Allow filterclear messages for enabling TX relay only. (R E Broadley)
 2018-01-13 13:44:40 +01:00
Wladimir J. van der Laan
84559c0569 Merge #9052: Use RelevantServices instead of node_network in AttemptToEvict. 
d32036a Use RelevantServices instead of node_network in AttemptToEvict. (Gregory Maxwell)
 2018-01-13 13:44:40 +01:00
Alexander Block
29a59e518f Remove NodeEvictionCandidate constructor and revert to struct initializion 
Matches Bitcoins style and makes upcoming backports easier
 2018-01-13 13:44:40 +01:00
Wladimir J. van der Laan
9d661f4337 Merge #8675: Make copyright header lines uniform 
4b04e32 [copyright] copyright header style uniform (isle2983)
 2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
921730d97a Merge #9070: Lockedpool fixes 
b3ddc5e LockedPool: avoid quadratic-time allocation (Kaz Wesley)
0b59f80 LockedPool: fix explosion for illegal-sized alloc (Kaz Wesley)
21b8f3d LockedPool: test handling of invalid allocations (Kaz Wesley)
 2018-01-13 13:44:39 +01:00
Pieter Wuille
188a2d98f7 Merge #9085: Remove unused CTxOut::GetHash() 
190fd32 Remove unused CTxOut::GetHash() (Matt Corallo)
 2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
92f0f67c0c Merge #9069: Clean up bctest.py and bitcoin-util-test.py 
2b175d4 Clean up bctest.py and bitcoin-util-test.py (John Newbery)
 2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
5adb5b8e8a Merge #9073: Trivial: Add common failure cases for rpc server connection failure 
8f329f9 Add common failure cases for rpc server connection failure (instagibbs)
 2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
dd7669bc7c Merge #9050: net: make a few values immutable, and use deterministic randomness for the localnonce 
59ac5c5 net: Use deterministic randomness for CNode's nonce, and make it const (Cory Fields)
aff6584 net: constify a few CNode vars to indicate that they're threadsafe (Cory Fields)
 2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
6f8720b7f5 Merge #9071: Declare wallet.h functions inline 
2ca882a Declare wallet.h functions inline (Pieter Wuille)
 2018-01-13 13:44:39 +01:00
Pieter Wuille
cd7c5bd75c Merge #9036: wallet: Change default confirm target from 2 to 6 
0fdf810 wallet: Change default confirm target from 2 to 6 (Wladimir J. van der Laan)
 2018-01-13 13:44:39 +01:00
MarcoFalke
70c86db4ef Merge #9065: Merge doc/unit-tests.md into src/test/README.md 
eedc461 Merge `doc/unit-tests.md` into `src/test/README.md` (Wladimir J. van der Laan)
 2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
9b9f86a59b Merge #8977: [Wallet] Refactor wallet/init interaction (Reaccept wtx, flush thread) 
cab1da7 [Wallet] Refactor wallet/init interaction (Reaccept wtx, flush thread) (Jonas Schnelli)
 2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
2999d097f6 Merge #9013: Trivial: Explicitly pass const CChainParams& to LoadBlockIndexDB() 
d0b01f3 Explicitly pass const CChainParams& to LoadBlockIndexDB() (Geoffrey Tsui)
 2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
42fa46f859 Merge #9042: [rpc] ParseHash: Fail when length is not 64 
fa32619 [rpc] ParseHash: Fail when length is not 64 (MarcoFalke)
 2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
0a6bf096dc Merge #9066: tests: Remove variable unused after refactoring 
f91afe9 trivial: Remove variable unused after refactoring (Daniel Kraft)
 2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
07f406fd67 Merge #9023: Add logging to bitcoin-util-test.py 
32c0d6e Add logging to bitcoin-util-test.py (jnewbery)
 2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
b720415189 Merge #8828: Move CWalletDB::ReorderTransactions to CWallet 
86029e7 Move CWalletDB::ReorderTransactions to CWallet (Patrick Strateman)
 2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
85c5aea08b Merge #9063: Do not shadow variable, use deprecated MAP_ANON if MAP_ANONYMOUS is not defined 
4a9f3c5 Do not shadow variable, use deprecated MAP_ANON if MAP_ANONYMOUS is not defined. (Pavel Janík)
 2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
bc3b9294e8 Merge #8753: Locked memory manager 
444c673 bench: Add benchmark for lockedpool allocation/deallocation (Wladimir J. van der Laan)
6567999 rpc: Add `getmemoryinfo` call (Wladimir J. van der Laan)
4536148 support: Add LockedPool (Wladimir J. van der Laan)
f4d1fc2 wallet: Get rid of LockObject and UnlockObject calls in key.h (Wladimir J. van der Laan)
999e4c9 wallet: Change CCrypter to use vectors with secure allocator (Wladimir J. van der Laan)
 2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
88f9dc2f16 Merge #9032: test: Add format-dependent comparison to bctest 
6c5cd9d test: Add format-dependent comparison to bctest (Wladimir J. van der Laan)
 2018-01-13 13:44:39 +01:00
Wladimir J. van der Laan
0a0e60c1fb Merge #8448: Store mempool and prioritization data to disk 
582068a Add mempool.dat to doc/files.md (Pieter Wuille)
3f78562 Add DumpMempool and LoadMempool (Pieter Wuille)
ced7c94 Add AcceptToMemoryPoolWithTime function (Pieter Wuille)
c3efb58 Add feedelta to TxMempoolInfo (Pieter Wuille)
 2018-01-13 13:44:38 +01:00
Jonas Schnelli
b2229356b5 Merge #9043: [qt] Return useful error message on ATMP failure 
3333e5a [qt] Return useful error message on ATMP failure (MarcoFalke)
 2018-01-13 13:44:38 +01:00
MarcoFalke
ade67c91e7 Merge #9041: keypoololdest denote Unix epoch, not GMT 
7f61b49 Change all instance of 'GMT epoch' to 'Unix epoch' (matthias)
 2018-01-13 13:44:38 +01:00
Wladimir J. van der Laan
77b888a069 Merge #8989: [Qt] overhaul smart-fee slider, adjust default confirmation target 
cfe77ef [Qt] overhaul smart-fee slider, adjust default confirmation target (Jonas Schnelli)
6f02899 [Qt] Hide nTxConfirmTarget behind WalletModel (Jonas Schnelli)
004168d CoinControl: add option for custom confirmation target (Jonas Schnelli)
 2018-01-13 13:44:38 +01:00
Alexander Block
8d62e3f80e Throw exception in gobject prepare when CommitTransaction fails 2018-01-13 13:44:38 +01:00
Wladimir J. van der Laan
848f3389b4 Merge #9016: Return useful error message on ATMP failure 
169bdab Return useful error message on ATMP failure (instagibbs)
 2018-01-13 13:44:38 +01:00
Wladimir J. van der Laan
01389bc330 Merge #9029: instance of 'mem pool' to 'mempool' 
1c3ecc7 instance of 'mem pool' to 'mempool' (S. Matthew English)
 2018-01-13 13:44:38 +01:00
Wladimir J. van der Laan
d38c7f1d4c Merge #9020: rpc: Remove invalid explanation from wallet fee message 
04c1c15 rpc: Remove invalid explanation from wallet fee message (Wladimir J. van der Laan)
 2018-01-13 13:44:38 +01:00
Wladimir J. van der Laan
5bcd438b13 Merge #8515: A few mempool removal optimizations 
0334430 Add some missing includes (Pieter Wuille)
4100499 Return shared_ptr<CTransaction> from mempool removes (Pieter Wuille)
51f2783 Make removed and conflicted arguments optional to remove (Pieter Wuille)
f48211b Bypass removeRecursive in removeForReorg (Pieter Wuille)
 2018-01-13 13:44:38 +01:00
Wladimir J. van der Laan
00f4d887a2 Merge #9002: Make connect=0 disable automatic outbound connections. 
515e264 Make connect=0 disable automatic outbound connections. (Gregory Maxwell)
 2018-01-13 13:44:38 +01:00
Wladimir J. van der Laan
e9f250d681 Merge #8993: Trivial: Fix doxygen comment: the transaction is returned in txOut 
1d8e12b Fix doxygen comment: the transaction is returned in txOut (Pavel Janík)
 2018-01-13 13:44:38 +01:00
MarcoFalke
9be4217dff Merge #8982: Eliminating Inconsistencies in Textual Output 
3a286ab Eliminating Inconsistencies in Textual Output (S. Matthew English)
 2018-01-13 13:44:38 +01:00
Wladimir J. van der Laan
beef6e7841 Merge #8990: moveonly: move coincontrol to src/wallet 
1ae5839 moveonly: move `coincontrol` to `src/wallet` (Wladimir J. van der Laan)
 2018-01-13 13:44:37 +01:00
Wladimir J. van der Laan
6cacb79c03 Merge #8980: RPC: importmulti: Avoid using boost::variant::operator!=, which is only in newer boost versions 
7942d31 RPC: importmulti: Avoid using boost::variant::operator!=, which is only in newer boost versions (Luke Dashjr)
 2018-01-13 13:44:37 +01:00
Wladimir J. van der Laan
efded3ca9c Merge #7551: Add importmulti RPC call 
215caba Add consistency check to RPC call importmulti (Pedro Branco)
cb08fdb Add importmulti rpc call (Pedro Branco)
 2018-01-13 13:44:37 +01:00
Jonas Schnelli
bd8e9fbba3 Merge #8774: Qt refactors to better abstract wallet access 
178cd88 Qt/splash: Specifically keep track of which wallet(s) we are connected to for later disconnecting (Luke Dashjr)
1880aeb Qt: Get the private key for signing messages via WalletModel (Luke Dashjr)
 2018-01-13 13:44:37 +01:00
Wladimir J. van der Laan
dc9556a890 Merge #7948: RPC: augment getblockchaininfo bip9_softforks data 
fc14609 RPC: augment getblockchaininfo bip9_softforks data (mruddy)
 2018-01-13 13:44:37 +01:00
Alexander Block
3b084b25bd Remove unnecessary function prototypes 2018-01-13 13:44:37 +01:00
Wladimir J. van der Laan
dd6b9ad20f Merge #8788: [RPC] Give RPC commands more information about the RPC request 
e7156ad [RPC] pass HTTP basic authentication username to the JSONRequest object (Jonas Schnelli)
69d1c25 [RPC] Give RPC commands more information about the RPC request (Jonas Schnelli)
23c32a9 rpc: Change JSONRPCRequest to JSONRPCRequestObj (Wladimir J. van der Laan)
 2018-01-13 13:44:37 +01:00
Wladimir J. van der Laan
b5b7cd7b7b Merge #8951: RPC/Mining: getblocktemplate: Update and fix formatting of help 
59daa58 RPC/Mining: getblocktemplate: Update and fix formatting of help (Luke Dashjr)
 2018-01-13 12:21:54 +01:00
Alexander Block
8f13e25376 Remove doubled "./" from bitcoin-util-test.json 2018-01-12 16:38:33 +01:00
Alexander Block
6989f94d6e Get rid of InsecureRand and use equivalent FastRandomContext 
Also extend FastRandomContext to be compatible to existing uses, especially
with std::random_shuffle
 2018-01-12 16:37:39 +01:00
Alexander Block
5b8946cadd Add Dash Copyright to Makefiles modified by Dash developers 2018-01-12 16:12:54 +01:00
Wladimir J. van der Laan
89e959d306 Merge #8936: Report NodeId in misbehaving debug 
a1919ad Report NodeId in misbehaving debug (R E Broadley)
 2018-01-12 09:58:15 +01:00
Alexander Block
c8584293a5 Backport changes to ccoins_caching.cpp which were skipped 
...due to out-of-order backporting of per-UTXO.
 2018-01-12 09:58:15 +01:00
Wladimir J. van der Laan
2f8677391a Merge #8873: Add microbenchmarks to profile more code paths. 
18dacf9 Add microbenchmarks to profile more code paths. (Russell Yanofsky)
 2018-01-12 09:58:15 +01:00
Wladimir J. van der Laan
6e871c0c2e Merge #6996: Add preciousblock RPC 
5805ac8 Add preciousblock tests (Pieter Wuille)
5127c4f Add preciousblock RPC (Pieter Wuille)
 2018-01-12 09:58:15 +01:00
Wladimir J. van der Laan
85706a0ae5 Merge #8223: [c++11] Use std::unique_ptr for block creation. 
9fce062 [c++11] Use std::unique_ptr for block creation. (Daniel Kraft)
 2018-01-12 09:58:15 +01:00
Wladimir J. van der Laan
0dcca9b99b Merge #8287: [wallet] Set fLimitFree = true 
fa8b02d [rpc] rawtx: Prepare fLimitFree to make it an option (MarcoFalke)
fa28bfa [wallet] Set fLimitFree = true (MarcoFalke)
 2018-01-12 09:58:14 +01:00
Wladimir J. van der Laan
239ce534c2 Merge #8914: Kill insecure_random and associated global state 
5eaaa83 Kill insecure_random and associated global state (Wladimir J. van der Laan)
 2018-01-12 09:58:14 +01:00
Wladimir J. van der Laan
c4faa32181 Merge #8921: RPC: Chainparams: Remove Chainparams::fTestnetToBeDeprecatedFieldRPC 
b26a7b5 RPC: Chainparams: Remove Chainparams::fTestnetToBeDeprecatedFieldRPC (Jorge Timón)
 2018-01-12 09:58:14 +01:00
Wladimir J. van der Laan
ffc9673697 Merge #8932: Allow bitcoin-tx to create v2 transactions 
b0aea80 Sync bitcoin-tx with tx version policy (BtcDrak)
 2018-01-12 09:58:14 +01:00
Wladimir J. van der Laan
0f021e55f6 Merge #8880: protocol.h: Move MESSAGE_START_SIZE into CMessageHeader 
1df3111 protocol.h: Make enums in GetDataMsg concrete values (Wladimir J. van der Laan)
2c09a52 protocol.h: Move MESSAGE_START_SIZE into CMessageHeader (Wladimir J. van der Laan)
f9bd92d version.h: s/shord/short/ in comment (Wladimir J. van der Laan)
 2018-01-12 09:58:14 +01:00
Alexander Block
005ae79cf3 Refactor MSG_XXX enum values to align with Bitcoin core 
Needed as we skipped SegWit related backports
 2018-01-12 09:58:14 +01:00
Wladimir J. van der Laan
dcc63e6e9f Merge #8911: qt: Translate all files, even if wallet disabled 
8aed5f6 qt: Translate all files, even if wallet disabled (Wladimir J. van der Laan)
 2018-01-12 09:58:14 +01:00
MarcoFalke
76641e68a2 Merge #8881: Add some verbose logging to bitcoin-util-test.py 
621441a add verbose mode to bitcoin-util-test.py (jnewbery)
 2018-01-12 09:58:13 +01:00
Wladimir J. van der Laan
1c1554f7ca Merge #8884: Bugfix: Trivial: RPC: getblockchaininfo help: pruneheight is the lowest, not highest, block 
a78e542 Bugfix: Trivial: RPC: getblockchaininfo help: pruneheight is the lowest, not highest, block (Luke Dashjr)
 2018-01-12 09:57:56 +01:00
Wladimir J. van der Laan
fb8d46d44b Merge #8879: [doc] Rework docs 
eeeebdd [doc] Rework docs (MarcoFalke)
 2018-01-12 09:57:56 +01:00
Wladimir J. van der Laan
f45adb5619 Merge #8862: Fix a few cases where messages were sent after requested disconnect 
905bc68 net: fix a few cases where messages were sent rather than dropped upon disconnection (Cory Fields)
 2018-01-12 09:57:56 +01:00
Wladimir J. van der Laan
6e4dad98a6 Merge #8850: Implement (begin|end)_ptr in C++11 and add deprecation comment 
f00705a serialize: Deprecate `begin_ptr` / `end_ptr` (Wladimir J. van der Laan)
47314e6 prevector: add C++11-like data() method (Wladimir J. van der Laan)
 2018-01-12 09:57:56 +01:00
Wladimir J. van der Laan
14483e46f9 Merge #8856: Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs 
3450c18 Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs (Jorge Timón)
 2018-01-12 09:57:56 +01:00
Wladimir J. van der Laan
10127ae80b Merge #8863: univalue: Pull subtree 
2ca7faa Squashed 'src/univalue/' changes from daf1285..16a1f7f (MarcoFalke)
 2018-01-12 09:57:56 +01:00
Wladimir J. van der Laan
210242e5c0 Merge #8813: bitcoind: Daemonize using daemon(3) 
a92bf4a bitcoind: Daemonize using daemon(3) (Matthew King)
 2018-01-12 09:57:55 +01:00
Wladimir J. van der Laan
2f3abc62ee Merge #8830: [test] Add option to run bitcoin-util-test.py manually 
b82f493 Add option to run bitcoin-util-test.py manually (jnewbery)
 2018-01-12 09:57:55 +01:00
Wladimir J. van der Laan
972a44b707 Merge #8836: bitcoin-util-test.py should fail if the output file is empty 
da94697 bitcoin-util-test.py should fail if the output file is empty (jnewbery)
 2018-01-12 09:57:55 +01:00
MarcoFalke
963f6a6f3a Merge #8829: Add bitcoin-tx JSON tests 
54e5d7c Add bitcoin-tx JSON tests (jnewbery)
 2018-01-12 09:57:55 +01:00
Wladimir J. van der Laan
272fddce2c Merge #8826: Do not include env_win.cc on non-Windows systems 
7e5fd71 Do not include env_win.cc on non-Windows systems (Pavel Janík)
 2018-01-12 09:56:53 +01:00
Wladimir J. van der Laan
575f625f4d Merge #8658: Remove unused statements in serialization 
64d9507 [WIP] Remove unused statement in serialization (Pavel Janík)
 2018-01-12 09:56:53 +01:00
Wladimir J. van der Laan
79f6d3d304 Merge #8832: [rpc] throw JSONRPCError when utxo set can not be read 
fa05cfd [rpc] throw JSONRPCError when utxo set can not be read (MarcoFalke)
 2018-01-12 08:02:45 +01:00
Wladimir J. van der Laan
a26bad09b6 Merge #8784: Copyright headers for build scripts 
0c4e6ce Add MIT license to build-aux/m4 scripts (Luke Dashjr)
3f8a5d8 Trivial: build-aux/m4/l_atomic: Fix typo (Luke Dashjr)
3b4b6dc Add MIT license to autogen.sh and share/genbuild.sh (Luke Dashjr)
f4dffdd Add MIT license to Makefiles (Luke Dashjr)
 2018-01-12 08:02:45 +01:00
Wladimir J. van der Laan
8b8362ff15 Merge #8814: [wallet, policy] ParameterInteraction: Don't allow 0 fee 
fa4bfb4 [wallet, policy] ParameterInteraction: Don't allow 0 fee (MarcoFalke)
 2018-01-12 08:02:45 +01:00
Wladimir J. van der Laan
a75d6110ee Merge #8634: Add policy: null signature for failed CHECK(MULTI)SIG 
e41bd44 Add policy: null signature for failed CHECK(MULTI)SIG (Johnson Lau)
 2018-01-12 08:02:45 +01:00
Wladimir J. van der Laan
b224c02090 Merge #8357: [mempool] Fix relaypriority calculation error 
94a34a5 Fix relaypriority calculation error (maiiz)
 2018-01-12 08:02:45 +01:00
Alexander Block
9b1d1c61b2 Move AutoBackup initialization into CWallet::InitAutoBackup 2018-01-11 18:39:50 +01:00
Alexander Block
faf52c5908 Fix rpcnestedtests 
Use correct genesis transaction hash
 2018-01-11 14:24:14 +01:00
Wladimir J. van der Laan
ec9de93aee Merge #8655: Do not shadow variables (trivials) 
4731cab Do not shadow variables (Pavel Janík)
 2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
4a917b1b35 Merge #8796: [trivial] fix mempool comment (outdated by BIP125) 
c14ffd5 [trivial] fix mempool comment (outdated by BIP125) (jonnynewbs)
 2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
0028dbfbfd Merge #8780: [rpc] Deprecate getinfo 
fa6e71b [qa] Add getinfo smoke tests and rework versionbits test (MarcoFalke)
ddddaaf [rpc] Deprecate getinfo (MarcoFalke)
 2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
8e610c0ac3 Merge #8722: bitcoin-cli: More detailed error reporting 
381826d bitcoin-cli: More detailed error reporting (Wladimir J. van der Laan)
 2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
d87c156f19 Merge #8486: [wallet] Add high transaction fee warnings 
faef293 [wallet] Add high transaction fee warnings (MarcoFalke)
 2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
6262f79f00 Merge #8807: [univalue] Pull subtree from upstream 
3650668 Squashed 'src/univalue/' changes from f32df99..daf1285 (MarcoFalke)
 2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
18218aa3c2 Merge #8802: Fix future copyright year 
edeaf24 Fix future copyright year (Mitchell Cash)
 2018-01-11 13:22:22 +01:00
MarcoFalke
54703891e1 Merge #8790: [test] Remove redundant debug print in addrman_tests 
3333bd2 [test] Remove redundant print in addrman_tests (MarcoFalke)
 2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
39d2131142 Merge #8661: Do not set an addr time penalty when a peer advertises itself. 
6d0ced1 Do not set an addr time penalty when a peer advertises itself. (Gregory Maxwell)
 2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
c7a0b91d31 Merge #8793: Do not shadow in src/qt 
f839350 Do not shadow in src/qt (Pavel Janík)
 2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
17e110f47e Merge #8785: Comment on CNode::nLocalServices meaning 
b5ccded Comment on CConnman::nLocalServices meaning (instagibbs)
 2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
97b63420dd Merge #8656: Trivial: Do not shadow global variable fileout 
7c069a7 Do not shadow global variable (Pavel Janík)
 2018-01-11 13:22:21 +01:00
Wladimir J. van der Laan
bfa539a1dd Merge #8777: [qt] WalletModel: Expose disablewallet 
6666ca6 [qt] WalletModel: Expose disablewallet (MarcoFalke)
 2018-01-11 13:22:21 +01:00
Wladimir J. van der Laan
06f41f3586 Merge #8768: init: Get rid of fDisableWallet 
fa58edb [wallet] Introduce DEFAULT_DISABLE_WALLET (MarcoFalke)
fab9107 init: Get rid of fDisableWallet (MarcoFalke)
 2018-01-11 13:22:17 +01:00
Wladimir J. van der Laan
e02b48cad0 Merge #8765: [Wallet] remove "unused" ThreadFlushWalletDB from removeprunedfunds 
c6f5ca8 [Wallet] remove "unused" ThreadFlushWalletDB from removeprunedfunds (Jonas Schnelli)
 2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
387201712a Merge #7783: [Qt] RPC-Console: support nested commands and simple value queries 
1586044 [Qt] RPC-Console: support nested commands and simple value queries (Jonas Schnelli)
 2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
630c699f00 Merge #8696: [Wallet] Remove last external reference to CWalletDB 
2ca6b9d Remove last reference to CWalletDB from accounting_tests.cpp (Patrick Strateman)
02e2a81 Remove pwalletdb parameter from CWallet::AddAccountingEntry (Patrick Strateman)
d2e678d Add CWallet::ReorderTransactions and use in accounting_tests.cpp (Patrick Strateman)
59adc86 Add CWallet::ListAccountCreditDebit (Patrick Strateman)
 2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
fbbddf8107 Merge #8760: [init] Get rid of some ENABLE_WALLET 
faddd62 init: Get rid of some ENABLE_WALLET (MarcoFalke)
 2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
a5a9e46042 Merge #8700: [copyright] add MIT license headers to .sh scripts where missing 
0766d1c [copyright] add MIT license headers to .sh scripts where missing (isle2983)
 2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
b04e32c43d Merge #8688: Move static global randomizer seeds into CConnman 
d9ff591 Move static global randomizer seeds into CConnman (Pieter Wuille)
 2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
412f79083c Merge #8737: Trivial: UndoReadFromDisk works on undo files (rev), not on block files. 
b4fb512 UndoReadFromDisk works on undo files (rev), not on block files. (Pavel Janík)
 2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
af5d18ad5c Merge #8707: net: fix maxuploadtarget setting 
f3552da net: fix maxuploadtarget setting (Cory Fields)
 2018-01-11 13:19:32 +01:00
Wladimir J. van der Laan
2a13321ffc Merge #8742: Specify Protobuf version 2 in paymentrequest.proto 
c4084c2 Specify Protobuf version 2 in paymentrequest.proto (fanquake)
 2018-01-11 13:19:32 +01:00
Wladimir J. van der Laan
9432e1904f Merge #8494: [init, wallet] ParameterInteraction() iff wallet enabled 
fa5d276 [init] ParameterInteraction() iff wallet enabled (MarcoFalke)
 2018-01-11 13:19:32 +01:00
Jonas Schnelli
eae44bd3d7 Merge #8712: Remove maxuploadtargets recommended minimum 
1b6bcdd Remove maxuploadtargets recommended minimum (Jonas Schnelli)
 2018-01-11 13:19:32 +01:00
Wladimir J. van der Laan
85ce0ef287 Merge #8697: fix op order to append first alert 
1d635ae fix op order to append first alert (rodasmith)
 2018-01-11 13:19:32 +01:00
Alexander Block
3aad9d9085 Fix logging in PushInventory (#1847) 
Merge conflict resolution went wrong here. It showed filtered in case it
was pushed and nothing in case it was filtered.
 2018-01-11 04:59:25 +03:00
UdjinM6
94e891c020
Merge pull request #1842 from codablock/pr_backport_bitcoin_0.14-2 
Backport missing PRs from Bitcoin 0.14 - Part 2
 2018-01-11 04:58:52 +03:00
Alexander Block
c2de362b98 Actually honor fMiningRequiresPeers in getblocktemplate (#1844) 
MiningRequiresPeers() was not used at all. I checked the Bitcoin
code and even there it is set but then ignored. Updated getblocktemplate
to actually honor the value.

The check also removes the need for IsInitialBlockDownload() to be false.
As regtest nodes start with an empty chain they won't be able to use
getblocktemplate for mining otherwise.
 2018-01-10 15:22:00 +03:00
Alexander Block
81fb931fb8 Don't delay GETHEADERS when no blocks have arrived yet in devnet (#1807) 
When the first mined block arrives from another node on devnet, we have to
send GETHEADERS immediately as we otherwise will never leave the IBD mode.
 2018-01-10 15:20:08 +03:00
Wladimir J. van der Laan
fdd0638161 Merge #8928: Fix init segfault where InitLoadWallet() calls ATMP before genesis 
37aefff Fix init segfault where InitLoadWallet() calls ATMP before genesis (Matt Corallo)
 2018-01-09 17:23:39 +01:00
Pieter Wuille
3baee7ba24 Merge #8681: Performance Regression Fix: Pre-Allocate txChanged vector 
ec81881 Performance Regression Fix: Pre-Allocate txChanged vector (Jeremy Rubin)
 2018-01-09 14:16:39 +01:00
Wladimir J. van der Laan
0324fa0121 Merge #8677: Do not shadow upper local variable 'send', prevent -Wshadow compiler warning. 
125b946 Do not shadow upper local variable 'send', prevent -Wshadow compiler warning. (Pavel Janík)
 2018-01-09 14:16:39 +01:00
Wladimir J. van der Laan
c2a601f507 Merge #8680: Address Travis spurious failures 
d6a5dc4 add waitfornewblock/waitforblock/waitforblockheight rpcs and use them for tests (Cory Fields)
 2018-01-09 14:16:39 +01:00
MarcoFalke
3d26438bec Merge #8673: Trivial: Fix obvious assignment/equality error in test 
426e7bc Fix obvious assignment/equality error in test (Jeremy Rubin)
 2018-01-09 14:16:39 +01:00
Pieter Wuille
f7e9bc613a Merge #8606: Fix some locks 
144ed76 Fix some locks (Pieter Wuille)
 2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
75f920e897 Merge #8663: trivial: remove unnecessary variable fDaemon 
ff2ed7a trivial: remove unnecessary variable fDaemon (mruddy)
 2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
313cfb09da Merge #8466: [Trivial] Do not shadow variables in networking code 
b7c349d Do not shadow variables in networking code (Pavel Janík)
 2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
414272af93 Merge #8629: C++11: s/boost::scoped_ptr/std::unique_ptr/ 
cdd79eb C++11: s/boost::scoped_ptr/std::unique_ptr/ (Jorge Timón)
 2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
4d0be42c6e Merge #8272: Make the dummy argument to getaddednodeinfo optional 
854f1af Make the dummy argument to getaddednodeinfo optional (Pieter Wuille)
 2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
bc91f34da6 Merge #8638: rest.cpp: change HTTP_INTERNAL_SERVER_ERROR to HTTP_BAD_REQUEST 
f012a85 rest.cpp: change HTTP_INTERNAL_SERVER_ERROR to HTTP_BAD_REQUEST (djpnewton)
 2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
88fcf3fbd2 Merge #8191: Do not shadow variables in src/wallet 
b175cb7 Do not shadow variables. (Pavel Janík)
 2018-01-09 14:16:37 +01:00
Wladimir J. van der Laan
5ce7ba6115 Merge #8291: [util] CopyrightHolders: Check for untranslated substitution 
33336e1 [util] CopyrightHolders: Check for untranslated substitution (MarcoFalke)
 2018-01-09 14:16:37 +01:00
Wladimir J. van der Laan
9d061a2730 Merge #8163: Do not shadow global RPC table variable (tableRPC) 
de1bbe3 Do not shadow global RPC table variable (tableRPC) (Pavel Janík)
 2018-01-09 14:16:37 +01:00
Wladimir J. van der Laan
3b45caeeb7 Merge #8626: Berkeley DB v6 compatibility fix 
323a5fe Berkeley DB v6 compatibility fix (Alexey Vesnin)
 2018-01-09 14:16:37 +01:00
Wladimir J. van der Laan
f6658c07f3 Merge #8611: Reduce default number of blocks to check at startup 
203f212 Reduce default number of blocks to check at startup (Pieter Wuille)
 2018-01-09 14:16:37 +01:00
Pieter Wuille
707e2945a4 Merge #8564: [Wallet] remove unused code/conditions in ReadAtCursor 
beef966 [Wallet] remove unused code/conditions in ReadAtCursor (Jonas Schnelli)
 2018-01-09 14:04:21 +01:00
Wladimir J. van der Laan
22604cbbcc Merge #8607: [doc] Fix doxygen off-by-one comments, fix typos 
fafe7b3 contrib: Make fix-copyright-headers.py more portable (MarcoFalke)
fa27c0a [doc] Fix typos in comments, doxygen: Fix comment syntax (MarcoFalke)
fabfd5d [qa] pull-tester: Don't mute zmq ImportError (MarcoFalke)
67a5502 init: Fix typo in help message for -whitelistforcerelay (Wladimir J. van der Laan)
 2018-01-09 14:04:21 +01:00
Pieter Wuille
30066a6004 Merge #8109: Do not shadow member variables 
ff8d279 Do not shadow member variables (Pavel Janík)
 2018-01-09 14:04:20 +01:00
Wladimir J. van der Laan
95c61637d5 Merge #8590: Remove unused variables 
fa6dc9f Remove unused variables (MarcoFalke)
 2018-01-09 14:04:20 +01:00
Wladimir J. van der Laan
15b9e43abe Merge #8581: [wallet] rpc: Drop misleading option 
fab5ecb [wallet] rpc: Drop misleading option (MarcoFalke)
 2018-01-09 14:04:20 +01:00
Wladimir J. van der Laan
b00f025dd8 Merge #8583: Show XTHIN in GUI 
4c3e2cb Show XTHIN in GUI (R E Broadley)
 2018-01-09 14:04:20 +01:00
Wladimir J. van der Laan
df07a31743 Merge #8561: Show "end" instead of many zeros when getheaders request received with a hashStop of Null 
259ee09 Show "end" instead of many zeros when getheaders request received with a hashStop of Null. (R E Broadley)
 2018-01-09 14:04:20 +01:00
Pieter Wuille
3a497a6b5c Merge #8462: Move AdvertiseLocal debug output to net category 
f13c1ba Move AdvertiseLocal debug output to net category (Michael Rotarius)
 2018-01-09 14:04:20 +01:00
Jonas Schnelli
3fca7e2044 Merge #7579: [Qt] show network/chain errors in the GUI 
2f32c82 [Qt] show network/chain errors in the GUI (Jonas Schnelli)
 2018-01-09 14:04:20 +01:00
MarcoFalke
249e720254 Merge #8578: [test] Remove unused code 
fa1cf9e [test] Remove unused code (MarcoFalke)
 2018-01-09 14:04:19 +01:00
Wladimir J. van der Laan
e61556e20e Merge #8450: [Test] Replace rpc_wallet_tests.cpp with python RPC unit tests 
9578333 Remove rpc_wallet_tests.cpp (Patrick Strateman)
25400c4 Account wallet feature RPC tests. (Patrick Strateman)
 2018-01-09 14:04:19 +01:00
Pieter Wuille
c9ebd95163 Merge #8560: Trivial: Fix two VarInt examples in serialize.h 
7bd5ff4 Trivial: Fix two VarInt examples in serialize.h (Christian Barcenas)
 2018-01-09 14:04:19 +01:00
Wladimir J. van der Laan
d97fa0402f Merge #8445: Move CWallet::setKeyPool to private section of CWallet. 
8680d3a Move wallet initialization logic from AppInit2 to CWallet::InitLoadWallet (Patrick Strateman)
e86eb71 Move CWallet::setKeyPool to private section of CWallet (Patrick Strateman)
 2018-01-09 14:04:19 +01:00
Wladimir J. van der Laan
61a3d9aeb4 Merge #8554: trivial: remove unused variable 
4207630 trivial: remove unused variable (Daniel Kraft)
 2018-01-09 12:24:57 +01:00
Wladimir J. van der Laan
39909d3736 Merge #8558: Add copyright header to wallet_text_fixture.cpp 
653bb3d Add copyright header to wallet_text_fixture.cpp (Wladimir J. van der Laan)
 2018-01-09 12:24:57 +01:00
Kamil Woźniak
1cffb8a7ec Include p2pk into addressindex (#1839) 
* Add simple test for p2pk script

refs #1767

* Add p2pk transaction addresses indexing

Addresses from p2pk transaction are now indexed by transations pubkeys
hashes. Even if it isn't strict behavior and the p2pk are rare
and obsolete, it is transaction that should be able to be looked up.

fixes #1767

* Add p2pk script checking tests

refs #1767
 2018-01-09 14:23:46 +03:00
UdjinM6
eecec4535c
Merge pull request #1824 from codablock/pr_backport_bitcoin_0.14-1 
Backport missing PRs from Bitcoin 0.14 - Part 1
 2018-01-09 14:22:25 +03:00
UdjinM6
9965d51bb6
Avoid reference leakage in CKeyHolderStorage::AddKey (#1840) 2018-01-09 14:11:43 +03:00
UdjinM6
c532be1c06
Protect CKeyHolderStorage via mutex (#1834) 2018-01-09 12:18:10 +03:00
UdjinM6
d69ad9d619
Skip existing masternode conections on mixing (#1833) 2018-01-09 12:17:54 +03:00
Alexander Block
e2a795fd84 Return EXIT_SUCCESS instead of 0 in main() 2018-01-08 18:41:25 +01:00
Alexander Block
e3da73ebf8 Update Dash related code to use new SyncTransaction notifications interface 2018-01-08 18:41:06 +01:00
Alexander Block
f8ffc55af2 Partially cherry-pick tests refactorings found in Bitcoin SegWit PRs 
These were mixed into SegWit related PRs and are still needed in Dash.
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
b47cc13317 Merge #8548: [wallet] Use __func__ to get function name for output printing 
fa785d1 Use __func__ to get function name for output printing (MarcoFalke)
 2018-01-08 18:04:55 +01:00
Alexander Block
ae90d0f09e Align HD wallet status icon code with Bitcoin code 
Rename labelEncryptionIcon to labelWalletEncryptionIcon
Reorder icons in Makefile.qt.include
Add missing entries in debian/copyright
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
5bf3dadcb6 Merge #8461: document return value of networkhashps for getmininginfo RPC endpoint 
65f4532 document return value of networkhashps for getmininginfo RPC endpoint (Jameson Lopp)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
80573f2bf4 Merge #8540: qt: Fix random segfault when closing "Choose data directory" dialog 
b4a9aa5 qt: Fix random segfault when closing "Choose data directory" dialog (Wladimir J. van der Laan)
 2018-01-08 18:04:55 +01:00
Pieter Wuille
55ccc56a80 Merge #8453: Bring secp256k1 subtree up to date with master 
b213535 Squashed 'src/secp256k1/' changes from 6c527ec..7a49cac (Wladimir J. van der Laan)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
10aaf04b73 Merge #8505: Trivial: Fix typos in various files 
1aacfc2 various typos (leijurv)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
6b8160ba20 Merge #8513: Fix a type error that would not compile on OSX. 
8194a6e Fix a type error that would not compile on Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn) (Jeremy Rubin)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
5c928f0052 Merge #8512: Trivial: Corrected JSON typo on setban of net.cpp 
6ffd996 Corrected JSON typo on setban of net.cpp (Sev)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
599df51726 Merge #8516: [trivial] remove no-longer-used InitError logic 
edb6cf1 remove no-longer-used InitError logic (instagibbs)
 2018-01-08 18:04:55 +01:00
MarcoFalke
bc659c3e6e Merge #8270: Tests: Use portable #! in python scripts (/usr/bin/env) 
7b01ce2 Favour python over python2 as per PR #7723 (Matthew King)
873e81f Use portable #! in python scripts (/usr/bin/env) (Matthew King)
 2018-01-08 18:04:55 +01:00
Jonas Schnelli
a377499c10 Merge #8192: [trivial] Remove URLs from About dialog translations 
208d37f [trivial] Remove URLs from About dialog translations (fanquake)
 2018-01-08 18:04:55 +01:00
Alexander Block
f4af44676a Add SYNC_TRANSACTION_NOT_IN_BLOCK constant and fix callers of SyncTransaction 
Needed due to out-of-order backporting.
 2018-01-08 18:04:55 +01:00
Pieter Wuille
256b9b77a2 Merge #7946: Reduce cs_main locks during ConnectTip/SyncWithWallets 
b3b3c2a Reduce cs_main locks during ConnectTip/SyncWithWallets (Jonas Schnelli)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
6ba688b1c6 Merge #8353: Trivial: tiny c++11 refactors 
c784086 use std::map::emplace() instead of std::map::insert() (whythat)
5e187e7 use c++11 std::unique_ptr instead of boost::shared_ptr (whythat)
947913f use std::map::erase(const_iterator, const_iterator) to get non-constant iterator (whythat)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
d5b5aeefe3 Merge #8481: Qt: Fix minimize and close bugs 
05242e9 Fix minimize and close bugs (adlawren)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
5e54cf907d Merge #8392: Fix several node initialization issues 
9d4eb9a Do diskspace check before import thread is started (Pieter Wuille)
aa59f2e Add extra message to avoid a long 'Loading banlist' (Pieter Wuille)
0fd2a33 Use a signal to continue init after genesis activation (Pieter Wuille)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
2c3a218b34 Merge #8189: rename mapAddrCount to mapNetGroupNodes 
657fc19 rename mapAddrCount to mapNetGroupNodes (instagibbs)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
7c62457e6f Merge #8428: Update README.md inside of src/test/ 
b8db185 Update README.md (Chris Stewart)
 2018-01-08 18:04:55 +01:00
Pieter Wuille
e34e2bbcca Merge #8432: Make CWallet::fFileBacked private. 
29c2d99 Make CWallet::fFileBacked private. (Patrick Strateman)
 2018-01-08 18:04:55 +01:00
Pieter Wuille
9589e24485 Merge #8152: [Wallet] Remove CWalletDB* parameter from CWallet::AddToWallet 
5723bb4 Remove unused pwalletdb from CWallet::AddToWallet (Patrick Strateman)
867f842 Remove CWalletDB* parameter from CWallet::AddToWallet (Patrick Strateman)
00f09c9 Split CWallet::AddToWallet into AddToWallet and LoadToWallet. (Patrick Strateman)
 2018-01-08 18:04:55 +01:00
Pieter Wuille
aa6c37919b Merge #8413: Trivial: pass Consensus::Params& instead of CChainParams& in ContextualCheckBlock 
c8664ee Trivial: pass Consensus::Params& instead of CChainParams& in ContextualCheckBlock (Jorge Timón)
 2018-01-08 18:04:55 +01:00
Pieter Wuille
60668fb93d Merge #8346: Mempool: Use Consensus::CheckTxInputs direclty over main::CheckInputs 
a6cc299 Mempool: Use Consensus::CheckTxInputs direclty over main::CheckInputs (Jorge Timón)
 2018-01-08 18:04:55 +01:00
Pieter Wuille
7c1c9d0ea6 Merge #8427: net: Ignore notfound P2P messages 
5c9e49d net: Ignore `notfound` P2P messages (Wladimir J. van der Laan)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
13b4e659b6 Merge #8274: util: Update tinyformat 
a5072a7 util: Remove zero-argument versions of LogPrint and error (Wladimir J. van der Laan)
695041e util: Update tinyformat (Wladimir J. van der Laan)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
c03c42116b Merge #8421: httpserver: drop boost (#8023 dependency) 
7e87033 httpserver: replace boost threads with std (Cory Fields)
d3773ca httpserver: explicitly detach worker threads (Cory Fields)
755aa05 httpserver: use a future rather than relying on boost's try_join_for (Cory Fields)
 2018-01-08 18:04:55 +01:00
Pieter Wuille
2e4e12f4a9 Merge #8412: libconsensus: Expose a flag for BIP112 
d12b732 libconsensus: Expose a flag for BIP112 (Jorge Timón)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
b673b7bf65 Merge #8321: [trivial] Switched constants to sizeof() 
fbc6070 [trivial] Switched constants to sizeof() (Thomas Snider)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
e7da254c5e Merge #8407: [Qt] Add dbcache migration path 
893f379 [Qt] Add dbcache migration path (Jonas Schnelli)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
150d63f096 Merge #8414: prepend license statement to indirectmap.h 
d3af342 prepend license statement to indirectmap (Kaz Wesley)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
47c726e1d9 Merge #8396: remove outdated legacy code from key.h 
cc021ef remove outdated legacy code (lizhi)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
9a91ddb417 Merge #8347: Trivial: Make CBlockIndex param const in ContextualCheckBlockHeader and ContextualCheckBlock 
6f3d616 Trivial: Make CBlockIndex param const in ContextualCheckBlockHeader and ContextualCheckBlock (Jorge Timón)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
0bea37d7b8 Merge #8342: Consensus: Trivial transform BOOST_FOREACH into for loop 
a3e1984 Consensus: Trivial transform BOOST_FOREACH into for loop (NicolasDorier)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
8cfc25739a Merge #11847: Make boost::multi_index comparators const 
1ec0c0a Make boost::multi_index comparators const (Suhas Daftuar)

Pull request description:

  This fixes compatibility with boost 1.66.

  Fixes #11837

Tree-SHA512: 3181336fcc159aa7ee70c843d76f2a063e4a401f427c218d7f856a3548ca70eaf8eee9d20abb73be259a5656273d3a65aa748e946e09cf656de5f50e6d4eb880
 2018-01-07 02:30:15 +09:00
UdjinM6
38e505842a
Vote on IS only if it was accepted to mempool (#1826) 2018-01-06 13:06:43 +03:00
UdjinM6
287d367c3c
Fix -liquidityprovider option (#1829) 
revert to pre-1248 logic for liquidity providers
 2018-01-06 13:06:22 +03:00
thephez
e23861c0e4 [Trivial] RPC Typos / markdown formatting (#1830) 
* RPC typo cleanup

* Update protocol doc formatting for consistent doxygen parsing
 2018-01-06 13:05:55 +03:00
UdjinM6
1d620d1f9b
Fix calls to AcceptToMemoryPool in PS submodules (#1823) 2017-12-30 01:05:33 +03:00
UdjinM6
1448506570
Switch KeePassHttp integration to new AES lib, add tests and a note about KeePassHttp security (#1818) 
* Add a note about KeePassHttp security

* Use new AES lib instead of OpenSSL for KeePassHttp encryption/decryption

* Add tests to make sure new AES lib works corrctly for KeePassHttp encryption/decryption and produces the same results as OpenSSL did
 2017-12-29 01:10:34 +03:00
Alexander Block
f61a754020 Disable free transactions in TestPackageSelection 
Dash allows free transactions by default, mixing up the expected ordering
of transactions in TestPackageSelection
 2017-12-28 11:44:59 +01:00
Alexander Block
f8a7a2c88d Move bitcoin.ico/png and bitcoin_testnet.ico/png one dir up 
This also overwrites/dashifies icons/bitcoin_testnet.ico which was
introduced in 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).
 2017-12-28 11:44:59 +01:00
Alexander Block
6a993236be Remove SegWit related checks added by backporting of Bitcoin #8295 
Also remove nBlockMinSize check from addPackageTxs. Removed by SegWit
related commits in Bitcoin.
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
f9f3b8d938 Merge #8295: Mining-related fixups for 0.13.0 
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)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
bc257c1a08 Merge #8305: Improve handling of unconnecting headers 
e91cf4b Add test for handling of unconnecting headers (Suhas Daftuar)
96fa953 Improve handling of unconnecting headers (Suhas Daftuar)
 2017-12-28 11:44:59 +01:00
Jonas Schnelli
25627e31dd Merge #8288: qt: Network-specific example address 
4f44cb6 qt: Network-specific example address (Wladimir J. van der Laan)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
355f3724d2 Merge #8298: wallet: Revert input selection post-pruning 
20f3cd7 wallet: Revert input selection post-pruning (Wladimir J. van der Laan)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
dcf36df675 Merge #8285: windows: Add testnet link to installer 
975a41d windows: Add testnet icon for testnet link (Wladimir J. van der Laan)
0ce8e99 windows: Add testnet link to installer (Wladimir J. van der Laan)
 2017-12-28 11:44:59 +01:00
Jonas Schnelli
ba6b369781 Merge #8281: qt: Remove client name from debug window 
a7897c0 qt: Remove client name from debug window (Wladimir J. van der Laan)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
17aa23c884 Merge #8261: The bit field is shown only when status is "started" 
2129fce The bit field is shown only when status is "started" (Pavel Janík)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
7f5b8f1e1d Merge #8258: RPC: Hide softfork if timeout is 0 
409f833 RPC: Hide softfork if timeout is 0 (jl2012)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
3f7273d009 Merge #8256: BUG: bitcoin-qt crash 
d7828ab check that transactionView->selectionModel()->selectedRows(0) exists (fsb4000)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
b7b5d6ea7b Merge #8246: trivial: capitalize BIP32 in option help 
a1c92c2 trivial: capitalize BIP32 in option help (Wladimir J. van der Laan)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
e51f505449 Merge #8222: Enable mempool consistency checks in unit tests 
3775ff9 Enable mempool consistency checks in unit tests (Pieter Wuille)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
c2dabf8bd8 Merge #8220: Stop trimming when mapTx is empty 
ad0752e Stop trimming when mapTx is empty (Pieter Wuille)
 2017-12-28 11:44:59 +01:00
Alexander Block
36aa554584 Temporarily fix build error cased by out-of-order backporting 
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.
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
808936cc30 Merge #8179: Evict orphans which are included or precluded by 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)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
d2c3b7efef Merge #7687: Stop treating importaddress'ed scripts as change 
595b22e Stop treating importaddress'ed scripts as change (Pieter Wuille)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
68757db683 Merge #8210: [Qt] Bump to Qt5.6.1 
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)
 2017-12-28 11:44:59 +01:00
MarcoFalke
46473757ee Merge #8215: [wallet] tests: Don't use floating point 
faa91b1 [wallet] tests: Don't use floating point (MarcoFalke)
 2017-12-28 11:44:59 +01:00
Pieter Wuille
f362c610e4 Merge #7600: Mining: Select transactions using feerate-with-ancestors 
29fac19 Add unit tests for ancestor feerate mining (Suhas Daftuar)
c82a4e9 Use ancestor-feerate based transaction selection for mining (Suhas Daftuar)
 2017-12-28 11:44:59 +01:00
Alexander Block
79ad5f7682 Bump univalue version 
This was probably missed while backporting Bitcoin PR #7892
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
c783b39ce7 Merge #8171: [RPC] Fix createrawtx sequence number unsigned int parsing 
6fa950a [RPC] Fix createrawtx sequence number unsigned int parsing (Jonas Schnelli)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
402eb55732 Merge #8208: Do not set extra flags for unfiltered DNS seed results 
bc0a895 Do not set extra flags for unfiltered DNS seed results (Pieter Wuille)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
9875ab5353 Merge #8207: [trivial] Add a link to the Bitcoin-Core repository and website to the About Dialog 
fa58e5e [doc] Add website links to about dialog (MarcoFalke)
 2017-12-28 11:44:59 +01:00
Jonas Schnelli
96180a1896 Merge #7636: Add bitcoin address label to request payment QR code 
1c2a1ba Add address label to request payment QR Code (QT) (Francesco 'makevoid' Canessa)
 2017-12-28 11:44:59 +01:00
Alexander Block
fa25499868 Swap iterations and fUseInstantSend parameters in ApproximateBestSubset (#1819) 
#1695 introduced a fix for a instant send related edge case. Somehow the
parameters got mixed up and fUseInstantSend was passed as "iterations".
 2017-12-28 03:49:05 +03:00
Alexander Block
10786fe8e8 Use travis_wait for "wine test_dash.exe" call to fix timeouts (#1812) 
* Revert "Adjust tests to avoid Travis timeouts (#1745)"

This reverts commit 32f21698e8.

* Revert "Show test progress for tests running in wine to avoid Travis timeout (#1740)"

This reverts commit 31bc9d4ee8.

* Use travis_wait when calling "wine test_dash.exe"
 2017-12-27 20:41:24 +03:00
Alexander Block
4bce3bf8b2 Fix crash on exit when -createwalletbackups=0 (#1810) 2017-12-27 20:41:04 +03:00
Alexander Block
0c61226347 Also revert BLOCK_DOWNLOAD_TIMEOUT_PER_PEER to 500000 
Same reason as for reverting BLOCK_DOWNLOAD_TIMEOUT_BASE
 2017-12-27 14:07:52 +01:00
Alexander Block
c7937c202e Remove unnecessary call to AddInventoryKnown in INV message handling 
This should have been part of Bitcoin #7960 but was missed in merge
conflict resolution.
 2017-12-27 14:07:19 +01:00
Alexander Block
49f9d613b0 Revert to BLOCK_DOWNLOAD_TIMEOUT_BASE = 1000000 
This value is in "millionths of the block interval" and in Bitcoin it's set
to exactly 1000000, meaning one full block interval. It still has to be
1000000 for Dash, even though the block intervall is less.

This fixes test failures in p2p-fullblocktest.py when large reorgs are
tested. These take quite some time and did timeout.
 2017-12-22 19:35:34 +01:00
Alexander Block
05c8f2ee2c Dashify new tests in bitcoin-util-test.json 2017-12-22 19:35:34 +01:00
Wladimir J. van der Laan
e7e3a80712 Merge #8141: Continuing port of java comparison tool 
ff2dcf2 Tests: Edit bloated varint test and add option for 'barely expensive' tests (mrbandrews)
12c5a16 Catch exceptions from non-canonical encoding and print only to log (mrbandrews)
291f8aa Continuing port of java comptool (mrbandrews)
8c9e681 Tests: Rework blockstore to avoid re-serialization. (mrbandrews)
 2017-12-22 17:20:43 +01:00
Wladimir J. van der Laan
6a698300ab Merge #7598: Refactor CreateNewBlock to be a method of the BlockAssembler class 
c2dd5a3 FIX: correctly measure size of priority block (Alex Morcos)
a278764 FIX: Account for txs already added to block in addPriorityTxs (Alex Morcos)
4dc94d1 Refactor CreateNewBlock to be a method of the BlockAssembler class (Alex Morcos)
 2017-12-22 17:20:43 +01:00
Wladimir J. van der Laan
b95a338b30 Merge #8133: build: Finish up out-of-tree changes 
d1a3d57 bulid: fix "make translate" when out-of-tree (Cory Fields)
340012d build: add temporary fix for "bad magic number" error in out-of-tree builds (Cory Fields)
142ffc7 travis: use out-of-tree build (Cory Fields)
92e37a3 build: fix out-of-tree 'make deploy' for osx (Cory Fields)
ab95d5d build: a few ugly hacks to get the rpc tests working out-of-tree (Cory Fields)
fc4ad0c build: more out-of-tree fixups (Cory Fields)
0cb0f26 build: out-of-tree fixups (Cory Fields)
 2017-12-22 17:20:31 +01:00
Wladimir J. van der Laan
79db88bbb1 Merge #8181: build: Get rid of CLIENT_DATE 
d096d22 build: Get rid of `CLIENT_DATE` (Wladimir J. van der Laan)
 2017-12-22 17:20:31 +01:00
Pieter Wuille
b9a00f6294 Merge #7292: [RPC] Expose ancestor/descendant information over RPC 
176e19b Mention new RPC's in release notes (Suhas Daftuar)
7f6eda8 Add ancestor statistics to mempool entry RPC output (Suhas Daftuar)
a9b8390 Add test coverage for new RPC calls (Suhas Daftuar)
b09b813 Add getmempoolentry RPC call (Suhas Daftuar)
0dfd869 Add getmempooldescendants RPC call (Suhas Daftuar)
8f7b5dc Add getmempoolancestors RPC call (Suhas Daftuar)
5ec0cde Refactor logic for converting mempool entries to JSON (Suhas Daftuar)
 2017-12-22 17:20:31 +01:00
Wladimir J. van der Laan
2e3aacf43f Merge #8166: src/test: Do not shadow local variables 
c2715d3 Do not shadow local variables (Pavel Janík)
 2017-12-22 17:20:31 +01:00
Wladimir J. van der Laan
aa6cb48bfa Merge #8154: drop vAddrToSend after sending big addr message 
d3d02d5 drop vAddrToSend after sending big addr message (Kaz Wesley)
 2017-12-22 17:20:31 +01:00
Wladimir J. van der Laan
ca228f09ff Merge #8168: util: Add ParseUInt32 and ParseUInt64 
e012f3c util: Add ParseUInt32 and ParseUInt64 (Wladimir J. van der Laan)
 2017-12-22 17:20:31 +01:00
Wladimir J. van der Laan
cfc76bab9a Merge #8172: Fix two warnings for comparison between signed and unsigned 
77f63a4 Fix two warnings for comparison between signed and unsigned (Pieter Wuille)
 2017-12-22 17:20:31 +01:00
Alexander Block
80d02d8f5e Use nRelevantServices for requiredServiceBits 
Missed due to out of order backporting of network changes
 2017-12-22 16:33:56 +01:00
Pieter Wuille
b3e26cc757 Merge #8083: Add support for dnsseeds with option to filter by servicebits 
2d83013d Add support for dnsseeds with option to filter by servicebits (Jonas Schnelli)
 2017-12-22 16:33:56 +01:00
Pieter Wuille
361d26037b Merge #8173: Use SipHash for node eviction (cont'd) 
eebc232 test: Add more test vectors for siphash (Wladimir J. van der Laan)
8884830 Use C++11 thread-safe static initializers (Pieter Wuille)
c31b24f Use 64-bit SipHash of netgroups in eviction (Pieter Wuille)
9bf156b Support SipHash with arbitrary byte writes (Pieter Wuille)
053930f Avoid recalculating vchKeyedNetGroup in eviction logic. (Patrick Strateman)
 2017-12-22 16:33:56 +01:00
Wladimir J. van der Laan
05419aba3c Merge #8153: [rpc] fundrawtransaction feeRate: Use BTC/kB 
fa7f4f5 [rpc] fundrawtransaction feeRate: Use BTC/kB (MarcoFalke)
faf82e8 [rpc] fundrawtransaction: Fix help text and interface (MarcoFalke)
 2017-12-22 16:33:56 +01:00
Wladimir J. van der Laan
ca699cebaa Merge #8126: std::shared_ptr based CTransaction storage in mempool 
288d85d Get rid of CTxMempool::lookup() entirely (Pieter Wuille)
c2a4724 Optimization: use usec in expiration and reuse nNow (Pieter Wuille)
e9b4780 Optimization: don't check the mempool at all if no mempool req ever (Pieter Wuille)
dbfb426 Optimize the relay map to use shared_ptr's (Pieter Wuille)
8d39d7a Switch CTransaction storage in mempool to std::shared_ptr (Pieter Wuille)
1b9e6d3 Add support for unique_ptr and shared_ptr to memusage (Pieter Wuille)
 2017-12-22 16:33:56 +01:00
Pieter Wuille
51fa05ac33 Merge #8082: Defer inserting into maprelay until just before relaying. 
4d8993b Defer inserting into maprelay until just before relaying. (Gregory Maxwell)
 2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
881d8329ca Merge #7703: tor: Change auth order to only use password auth if -torpassword 
2e49448 tor: Change auth order to only use HASHEDPASSWORD if -torpassword (Wladimir J. van der Laan)
 2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
00c84ca53e Merge #8065: Addrman offline attempts 
6182d10 Do not increment nAttempts by more than one for every Good connection. (Gregory Maxwell)
c769c4a Avoid counting failed connect attempts when probably offline. (Gregory Maxwell)
 2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
2ee817fb0d Merge #8078: Disable the mempool P2P command when bloom filters disabled 
3d3602f Add RPC test for the p2p mempool command in conjunction with disabled bloomfilters (Jonas Schnelli)
beceac9 Disable the mempool P2P command when bloom filters disabled (Peter Todd)
 2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
0b8169d498 Merge #8164: [Bitcoin-Tx] fix missing test fixtures, fix 32bit atoi issue 
86efa30 [Bitcoin-Tx] fix missing test fixtures, fix 32bit atoi issue (Jonas Schnelli)
 2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
9af87c8269 Merge #7957: [RPC][Bitcoin-TX] Add support for sequence number 
ae357d5 [Bitcoin-Tx] Add tests for sequence number support (Jonas Schnelli)
e59336f [bitcoin-tx] allow to set nSequence number over the in= command (Jonas Schnelli)
a946bb6 [RPC] createrawtransaction: add option to set the sequence number per input (Jonas Schnelli)
 2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
d5d25564cf Merge #8136: Log/report in 10% steps during VerifyDB 
8b78486 Log/report in 10% steps during VerifyDB (Jonas Schnelli)
 2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
7f0213ac3e Merge #8118: Reduce unnecessary hashing in signrawtransaction 
bd0f413 Reduce unnecessary hashing in signrawtransaction (Jonas Nick)
 2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
49c2e9702b Merge #8151: [init] Make feefilter option debug option 
fa51a1d [init] Make feefilter option debug option (MarcoFalke)
 2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
b2bd69a7a9 Merge #8142: Improve CWallet API with new GetAccountPubkey function. 
152ab23 Improve CWallet API  with new GetAccountPubkey function. (Patrick Strateman)
 2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
463a68d4a5 Merge #8007: Minor locking improvements 
f0fdda0 IsInitialBlockDownload: usually avoid locking (Kaz Wesley)
 2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
d7d5d577f4 Merge #8137: Improve CWallet API with new AccountMove function. 
9dfaa1c Improve CWallet API with new AccountMove function. (Patrick Strateman)
 2017-12-22 16:33:55 +01:00
Jonas Schnelli
7538795b1f Merge #8143: comment nit: miners don't vote 
e39dc69 comment nit: miners don't vote (instagibbs)
 2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
c69df9b82c Merge #7967: [RPC] add feerate option to fundrawtransaction 
04eaa90 Add more clear interface for CoinControl.h regarding individual feerate (Jonas Schnelli)
3b35e48 [RPC] add feerate option to fundrawtransaction (Jonas Schnelli)
 2017-12-22 16:33:55 +01:00
Pieter Wuille
fb88e9b607 Merge #7997: replace mapNextTx with slimmer setSpends 
9805f4a mapNextTx: use pointer as key, simplify value (Kaz Wesley)
 2017-12-22 16:33:55 +01:00
Pieter Wuille
df14a7f009 Merge #7825: Prevent multiple calls to ExtractDestination 
0bf6f30 Prevent multiple calls to ExtractDestination (Pedro Branco)
 2017-12-22 16:33:52 +01:00
Pieter Wuille
fefd0ace3e Merge #8077: Consensus: Decouple from chainparams.o and timedata.o 
ee9f4a5 Consensus: Decouple from chainparams.o and timedata.o (Jorge Timón)
 2017-12-22 16:33:04 +01:00
Pieter Wuille
bf069fb1bd Merge #8123: Use std::atomic for fRequestShutdown and fReopenDebugLog 
a886dbf Use std::atomic for fRequestShutdown and fReopenDebugLog (Pieter Wuille)
16cf85f Revert "Include signal.h for sig_atomic_t in WIN32" (Pieter Wuille)
 2017-12-22 16:33:04 +01:00
Pieter Wuille
09eda9783a Merge #8112: Include signal.h for sig_atomic_t in WIN32 
88f14b9 Include signal.h for sig_atomic_t in WIN32 (Pieter Wuille)
 2017-12-22 16:33:04 +01:00
Pieter Wuille
bad08eadf8 Merge #7960: Only use AddInventoryKnown for transactions 
383fc10 Only use AddInventoryKnown for transactions (Suhas Daftuar)
 2017-12-22 16:33:04 +01:00
Alexander Block
433a026a15 Fix OpenSSL build error 2017-12-22 16:33:04 +01:00
Pieter Wuille
91752ab7ed Merge #7689: Replace OpenSSL AES with ctaes-based version 
723779c build: Enumerate ctaes rather than globbing (Cory Fields)
34ed64a crypter: add tests for crypter (Cory Fields)
0a36b9a crypter: shuffle Makefile so that crypto can be used by the wallet (Cory Fields)
976f9ec crypter: add a BytesToKey clone to replace the use of openssl (Cory Fields)
9049cde crypter: hook up the new aes cbc classes (Cory Fields)
fb96831 crypter: constify encrypt/decrypt (Cory Fields)
1c391a5 crypter: fix the stored initialization vector size (Cory Fields)
daa3841 crypto: add aes cbc tests (Cory Fields)
27a212d crypto: add AES 128/256 CBC classes (Cory Fields)
6bec172 Add ctaes-based constant time AES implementation (Pieter Wuille)
a545127 Squashed 'src/crypto/ctaes/' content from commit cd3c3ac (Pieter Wuille)
 2017-12-22 16:33:04 +01:00
Alexander Block
83dc1dc99c Directly push messages instead of using CDataStream first 2017-12-22 16:33:04 +01:00
Wladimir J. van der Laan
dfa0bd2341 Merge #8080: Do not use mempool for GETDATA for tx accepted after the last mempool req. 
7e908c7 Do not use mempool for GETDATA for tx accepted after the last mempool req. (Gregory Maxwell)
 2017-12-22 16:33:03 +01:00
Alexander Block
b2a27c0624 Only serve normal transactions from mapRelay 
Bitcoin #7877 changed mapRelay to be indexed by hash instead of inv. This
means that we may end up with a false-positive match here and send out an
instant transaction as normal transaction.
 2017-12-22 16:33:03 +01:00
Wladimir J. van der Laan
bef036125f Merge #7877: Change mapRelay to store CTransactions 
38c3102 Change mapRelay to store CTransactions (Pieter Wuille)
 2017-12-22 16:33:03 +01:00
Alexander Block
2dc71e8e08 Revert deadlock fix in ProcessGetData 
Fix was introdeced in:
https://github.com/dashpay/dash/pull/1169
A fix was later applied to fix a race condition:
https://github.com/dashpay/dash/pull/1178

This has to be reverted to be able to backport multiple changes from Bitcoin.
Later backported PRs from Bitcoin will remove cs_mapRelay and thus also
remove the deadlock that was initially fixed with the above PRs.
 2017-12-22 16:33:03 +01:00
Wladimir J. van der Laan
d8c5a59005 Merge #8090: Adding P2SH(p2pkh) script test case 
b682960 Adding P2SH(p2pkh) script test case (Chris Stewart)
 2017-12-22 16:33:03 +01:00
UdjinM6
af1233cb48
Merge pull request #1804 from codablock/pr_backport_bitcoin_0.13-4 
Backport missing PRs from Bitcoin 0.13 - Part 4
 2017-12-22 17:21:33 +03:00
Alexander Block
5496e468a6 Dashify a few docs and the use of an address 2017-12-22 06:09:04 +01:00
Alexander Block
5ba21d4e33 Revert "ReprocessBlocks"->"ResetBlockFailureFlags" in debug message 2017-12-22 06:08:29 +01:00
Alexander Block
b1df5e9e87 Align sorting in OverviewPage::SetupTransactionList with transaction view 2017-12-22 06:03:27 +01:00
Alexander Block
abe84cb9ec Use GetStrongRandBytes in CMnemonic::Generate 2017-12-22 06:00:51 +01:00
Wladimir J. van der Laan
a3c63033d1 Merge #8115: Avoid integer division in the benchmark inner-most loop. 
63ff57d Avoid integer division in the benchmark inner-most loop. (Gregory Maxwell)
 2017-12-21 18:50:14 +01:00
Pieter Wuille
43cbeb7fa5 Merge #7891: Always require OS randomness when generating secret keys 
628cf14 Don't use assert for catching randomness failures (Pieter Wuille)
fa2637a Always require OS randomness when generating secret keys (Pieter Wuille)
 2017-12-21 18:50:14 +01:00
Wladimir J. van der Laan
cee571bda4 Merge #8107: bench: Added base58 encoding/decoding benchmarks 
5fac1f3 bench: Added base58 encoding/decoding benchmarks (Yuri Zhykin)
 2017-12-21 18:50:14 +01:00
Wladimir J. van der Laan
a39b1f7b8d Merge #7896: fix typo in help text 
fc95f6e fix typo in help text (Chris Moore)
 2017-12-21 18:50:14 +01:00
Wladimir J. van der Laan
6c962f5e69 Merge #8111: Benchmark SipHash 
619d569 Benchmark SipHash (Pieter Wuille)
 2017-12-21 18:50:14 +01:00
MarcoFalke
8d47ecb232 Merge #8108: Trivial: Remove unused local variable shadowing upper local 
13c4558 Remove unused local variable shadowing upper local (Pavel Janík)
 2017-12-21 18:50:14 +01:00
Wladimir J. van der Laan
b71ee087ad Merge #8015: CCoinsViewErrorCatcher raison-d-etre 
a4d5855 CCoinsViewErrorCatcher raison-d-etre (21E14)
 2017-12-21 18:50:14 +01:00
Pieter Wuille
640bee1814 Merge #7795: UpdateTip: log only one line at most per block 
f20d42e UpdateTip: log only one line at most per block (Wladimir J. van der Laan)
 2017-12-21 18:50:14 +01:00
Alexander Block
51d17dcde3 Move AutoBackupWallet into wallet.cpp 2017-12-21 18:50:14 +01:00
Pieter Wuille
8723f99569 Merge #8061: [Wallet] Improve Wallet encapsulation 
380498a Move BackupWallet to CWallet::BackupWallet (Patrick Strateman)
ecb9741 Move GetAccountBalance from rpcwallet.cpp into CWallet::GetAccountBalance (Patrick Strateman)
 2017-12-21 18:50:14 +01:00
Pieter Wuille
c571a94906 Merge #8076: VerifyDB: don't check blocks that have been pruned 
bd477f4 VerifyDB: don't check blocks that have been pruned (Suhas Daftuar)
 2017-12-21 18:50:14 +01:00