neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
14,600 Commits 1 Branch 1 Tag 185 MiB
720325f23c
Commit Graph

10407 Commits

Author SHA1 Message Date
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
Pieter Wuille
42a3e0d2d7 Merge #8063: Acquire lock to check for genesis block. 
46b0c3b Acquire lock to check for genesis block. (Patrick Strateman)
 2017-12-21 18:50:14 +01:00
Jonas Schnelli
3f5be563f4 Merge #8014: Qt: Sort transactions by date 
2d5603c Qt: Sort transactions by date (Tyler Hardin)
 2017-12-21 18:50:13 +01:00
Ethan Heilman
8eeaa4f212 Fix typo adddrman to addrman as requested in #8070 2017-12-21 18:50:13 +01:00
Wladimir J. van der Laan
1897ccc646 Merge #8033: Fix Socks5() connect failures to be less noisy and less unnecessarily scary 
bf9266e Use Socks5ErrorString() to decode error responses from socks proxy. (Warren Togami)
94fd1d8 Make Socks5() InterruptibleRecv() timeout/failures informative. (Warren Togami)
0d9af79 SOCKS5 connecting and connected messages with -debug=net. (Warren Togami)
00678bd Make failures to connect via Socks5() more informative and less unnecessarily scary. (Warren Togami)
 2017-12-21 18:50:13 +01:00
Wladimir J. van der Laan
0450dfdeb8 Merge #7932: CAddrMan::Deserialize handle corrupt serializations better. 
fb26bf0 CAddrMan::Deserialize handle corrupt serializations better. (Patrick Strateman)
 2017-12-21 18:50:13 +01:00
Wladimir J. van der Laan
8b28f5f995 Merge #8020: Use SipHash-2-4 for various non-cryptographic hashes 
a68ec21 Use SipHash-2-4 for address relay selection (Pieter Wuille)
8cc9cfe Switch CTxMempool::mapTx to use a hash index for txids (Pieter Wuille)
382c871 Use SipHash-2-4 for CCoinsCache index (Pieter Wuille)
0b1295b Add SipHash-2-4 primitives to hash (Pieter Wuille)
 2017-12-21 18:50:13 +01:00
MarcoFalke
a0afc3ee01 Merge #8038: [qa, doc] Various minor fixes 
fa83a5d [qa] wallet: Temporarily disable salvagewallet test (MarcoFalke)
fadd048 [doc] Link to clang-format in the developer notes (MarcoFalke)
fa72f7d [doc] Remove outdated line from listunspent RPC help, fix typo (MarcoFalke)
ac40ed7 Increase timeout waiting for pruned blk00000.dat (error10)
 2017-12-21 18:50:13 +01:00
Pieter Wuille
7b25879463 Merge #8059: Remove unneeded feerate param from RelayTransaction/AcceptToMemoryPool. 
d87b198 Remove unneeded feerate param from RelayTransaction/AcceptToMemoryPool. (Gregory Maxwell)
 2017-12-21 18:50:13 +01:00
Wladimir J. van der Laan
26f07f835c Merge #8004: signal handling: fReopenDebugLog and fRequestShutdown should be type sig_atomic_t 
3262316 fReopenDebugLog and fRequestShutdown should be type sig_atomic_t (Chirag Davé)
 2017-12-21 18:50:13 +01:00
Pieter Wuille
4ee3858426 Merge #8039: bench: Add crypto hash benchmarks 
32114dd bench: Add crypto hash benchmarks (Wladimir J. van der Laan)
 2017-12-21 18:50:13 +01:00
Wladimir J. van der Laan
76b72a7f2b Merge #8028: Fix insanity of CWalletDB::WriteTx and CWalletTx::WriteToDisk 
0fd5997 Fix insanity of CWalletDB::WriteTx and CWalletTx::WriteToDisk (Patrick Strateman)
 2017-12-21 18:50:13 +01:00
Wladimir J. van der Laan
4750be1afb Merge #8036: init: Move berkeleydb version reporting to wallet 
3e2c946 init: Move berkeleydb version reporting to wallet (Wladimir J. van der Laan)
 2017-12-21 18:50:13 +01:00
Wladimir J. van der Laan
3dbae2d321 Merge #8019: Remove state arg from ReconsiderBlock, rename to ResetBlockFailureFlags 
657e07e Rename ReconsiderBlock func to reflect real behavior (instagibbs)
addb9d2 Remove state arg from ReconsiderBlock (instagibbs)
 2017-12-21 18:50:13 +01:00
Jonas Schnelli
262e857db9 Merge #8012: Qt: Delay user confirmation of send 
3902a29 Qt: Delay user confirmation of send (Tyler Hardin)
 2017-12-21 18:50:13 +01:00
Alexander Block
3d665aa485 Use fThread = true default argument in CAlert::Notify 
Instead of fully backporting Bitcoin #7958, we make true the default value
for fThread. Otherwise the AlertNotify test case will fail as it expects
the alerts to be processed synchronously.
 2017-12-21 18:50:08 +01:00
UdjinM6
3110f7ebdd
Fix issues introduced in 1770 (#1803) 2017-12-21 19:58:38 +03:00
Wladimir J. van der Laan
5222e9377d Merge #7976: Remove obsolete reference to CValidationState from UpdateCoins. 
c8b9248 Remove obsolete reference to CValidationState from UpdateCoins. (21E14)
 2017-12-21 17:31:57 +01:00
Wladimir J. van der Laan
93be53e34e Merge #7934: Improve rolling bloom filter performance and benchmark 
1953c40 More efficient bitsliced rolling Bloom filter (Pieter Wuille)
aa62b68 Benchmark rolling bloom filter (Pieter Wuille)
 2017-12-21 17:31:57 +01:00
Wladimir J. van der Laan
c66fcf47e0 Merge #8011: don't run ThreadMessageHandler at lowered priority 
e53e7c5 don't run ThreadMessageHandler at lowered priority (Kaz Wesley)
 2017-12-21 17:30:51 +01:00
Alexander Block
d4b8abf4ff Send non-tx/non-block inventory items 
Bitcoin #7840 has split the INVs to send into block and TX and completely
ignores non-tx/non-block items in PushInventory. This is fine for Bitcoin,
as they only use it for blocks and TXs, but we also have a lot of MN related
messages which also need to be relayed.
 2017-12-21 17:30:51 +01:00
Wladimir J. van der Laan
5d8e94a26f Merge #7840: Several performance and privacy improvements to inv/mempool handling 
b559914 Move bloom and feerate filtering to just prior to tx sending. (Gregory Maxwell)
4578215 Return mempool queries in dependency order (Pieter Wuille)
ed70683 Handle mempool requests in send loop, subject to trickle (Pieter Wuille)
dc13dcd Split up and optimize transaction and block inv queues (Pieter Wuille)
f2d3ba7 Eliminate TX trickle bypass, sort TX invs for privacy and priority. (Gregory Maxwell)
 2017-12-21 17:30:51 +01:00
Wladimir J. van der Laan
33233409a9 Merge #7966: http: Do a pending c++11 simplification handling work items 
f0188f9 http: use std::move to move HTTPRequest into HTTPWorkItem (Wladimir J. van der Laan)
37b2137 http: Change boost::scoped_ptr to std::unique_ptr in HTTPRequest (Wladimir J. van der Laan)
f97b410 http: Add log message when work queue is full (Wladimir J. van der Laan)
091d6e0 http: Do a pending c++11 simplification (Wladimir J. van der Laan)
 2017-12-21 17:30:51 +01:00
Wladimir J. van der Laan
90b00cfc66 Merge #7953: Create signmessagewithprivkey rpc 
7db0ecb Test for signing messages (Andrew Chow)
f90efbf Create signmessagewithprivkey rpc (Andrew)
 2017-12-21 17:30:51 +01:00
UdjinM6
0c5302e815
Merge pull request #1795 from codablock/pr_backport_bitcoin_0.13-3 
Backport missing PRs from Bitcoin 0.13 - Part 3
 2017-12-21 17:32:41 +03:00
UdjinM6
ebbd26a054
Drop IsInputAssociatedWithPubkey and optimize CheckOutpoint (#1783) 
* Drop IsInputAssociatedWithPubkey and optimize CheckOutpoint

* typo
 2017-12-21 16:03:02 +03:00
Alexander Block
b78bd5cc76 Dashify help text of fundrawtransaction 2017-12-21 07:12:35 +01:00
Alexander Block
da2de07718 Put ps_rounds to the bottom of the result of listunspent 
Avoids future conflicts in upcoming backports
 2017-12-21 07:02:24 +01:00
Alexander Block
15fc7f2133 De-bump fees in miner_tests.cpp 
Bumped unnecessarily 10x when backporting PRs
 2017-12-21 06:57:45 +01:00
Alexander Block
2c63839f23 Dashify fundrawtransaction exception 
Fixes test failure
 2017-12-20 17:32:14 +01:00