aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge #8626: Berkeley DB v6 compatibility fixWladimir J. van der Laan2016-08-311-1/+1
|\ | | | | | | 323a5fe Berkeley DB v6 compatibility fix (Alexey Vesnin)
| * Berkeley DB v6 compatibility fixAlexey Vesnin2016-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes building error looking like this: CXX wallet/libbitcoin_wallet_a-db.o wallet/db.cpp: In member function ‘void CDBEnv::EnvShutdown()’: wallet/db.cpp:46:16: error: call of overloaded ‘DbEnv(int)’ is ambiguous DbEnv(0).remove(strPath.c_str(), 0); ^ wallet/db.cpp:46:16: note: candidates are: In file included from wallet/db.h:21:0, from wallet/db.cpp:6: /usr/include/db_cxx.h:916:2: note: DbEnv::DbEnv(const DbEnv&) DbEnv(const DbEnv &); ^ /usr/include/db_cxx.h:518:2: note: DbEnv::DbEnv(DB_ENV) DbEnv(DB_ENV *dbenv); ^ /usr/include/db_cxx.h:516:2: note: DbEnv::DbEnv(u_int32_t) DbEnv(u_int32_t flags); ^ Makefile:5780: recipe for target 'wallet/libbitcoin_wallet_a-db.o' failed make[2]: ** [wallet/libbitcoin_wallet_a-db.o] Error 1
* | Merge #8611: Reduce default number of blocks to check at startupWladimir J. van der Laan2016-08-301-1/+1
|\ \ | |/ |/| | | 203f212 Reduce default number of blocks to check at startup (Pieter Wuille)
| * Reduce default number of blocks to check at startupPieter Wuille2016-08-271-1/+1
| |
* | Merge #8564: [Wallet] remove unused code/conditions in ReadAtCursorPieter Wuille2016-08-293-11/+9
|\ \ | | | | | | | | | beef966 [Wallet] remove unused code/conditions in ReadAtCursor (Jonas Schnelli)
| * | [Wallet] remove unused code/conditions in ReadAtCursorJonas Schnelli2016-08-233-11/+9
| | |
* | | Merge #8607: [doc] Fix doxygen off-by-one comments, fix typosWladimir J. van der Laan2016-08-286-38/+38
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | | [doc] Fix typos in comments, doxygen: Fix comment syntaxMarcoFalke2016-08-225-37/+37
| | | |
| * | | init: Fix typo in help message for -whitelistforcerelayWladimir J. van der Laan2016-08-221-1/+1
| | | | | | | | | | | | | | | | Reported by pryds on Transifex in the Danish translation.
* | | | Merge #8573: Set jonasschnellis dns-seeder filter flagPieter Wuille2016-08-281-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | 40a95cf Set jonasschnellis dns-seeder filter flag (Jonas Schnelli)
| * | | Set jonasschnellis dns-seeder filter flagJonas Schnelli2016-08-241-1/+1
| | |/ | |/|
* | | Merge #8109: Do not shadow member variablesPieter Wuille2016-08-262-10/+10
|\ \ \ | | | | | | | | | | | | ff8d279 Do not shadow member variables (Pavel Janík)
| * | | Do not shadow member variablesPavel Janík2016-07-312-10/+10
| | | |
* | | | Merge #8590: Remove unused variablesWladimir J. van der Laan2016-08-264-6/+2
|\ \ \ \ | | | | | | | | | | | | | | | fa6dc9f Remove unused variables (MarcoFalke)
| * | | | Remove unused variablesMarcoFalke2016-08-254-6/+2
| | | | |
* | | | | Merge #8581: [wallet] rpc: Drop misleading optionWladimir J. van der Laan2016-08-261-6/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | fab5ecb [wallet] rpc: Drop misleading option (MarcoFalke)
| * | | | | [wallet] rpc: Drop misleading optionMarcoFalke2016-08-241-6/+1
| | | | | |
* | | | | | Merge #8583: Show XTHIN in GUIWladimir J. van der Laan2016-08-262-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 4c3e2cb Show XTHIN in GUI (R E Broadley)
| * | | | | | Show XTHIN in GUIR E Broadley2016-08-252-0/+6
| | |_|_|/ / | |/| | | |
* | | | | | Merge #8561: Show "end" instead of many zeros when getheaders request ↵Wladimir J. van der Laan2016-08-261-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | | | | | Show "end" instead of many zeros when getheaders request received with a ↵R E Broadley2016-08-231-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | hashStop of Null.
* | | | | | Merge #8462: Move AdvertiseLocal debug output to net categoryPieter Wuille2016-08-252-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | f13c1ba Move AdvertiseLocal debug output to net category (Michael Rotarius)
| * | | | | | Move AdvertiseLocal debug output to net categoryMichael Rotarius2016-08-052-3/+3
| | | | | | |
* | | | | | | Merge #7579: [Qt] show network/chain errors in the GUIJonas Schnelli2016-08-251-3/+5
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | 2f32c82 [Qt] show network/chain errors in the GUI (Jonas Schnelli)
| * | | | | | [Qt] show network/chain errors in the GUIJonas Schnelli2016-07-201-3/+5
| | | | | | |
* | | | | | | Merge #8487: Persist the datadir after option resetJonas Schnelli2016-08-252-1/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 57acb82 Load choose datadir dialog after options reset (Andrew Chow) 15df3c1 Persist the datadir after option reset (Andrew Chow)
| * | | | | | | Load choose datadir dialog after options resetAndrew Chow2016-08-242-1/+5
| | | | | | | |
| * | | | | | | Persist the datadir after option resetAndrew Chow2016-08-101-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a reset is performed, the datadir setting is saved and readded to the settings so that it is persisted across option resets.
* | | | | | | | Merge #8578: [test] Remove unused codeMarcoFalke2016-08-254-23/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | fa1cf9e [test] Remove unused code (MarcoFalke)
| * | | | | | | | [test] Remove unused codeMarcoFalke2016-08-244-23/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge #8282: net: Feeler connections to increase online addrs in the tried ↵Wladimir J. van der Laan2016-08-254-9/+83
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | table. dbb1f64 Added feeler connections increasing good addrs in the tried table. (Ethan Heilman)
| * | | | | | | Added feeler connections increasing good addrs in the tried table.Ethan Heilman2016-08-234-9/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests if addresses are online or offline by briefly connecting to them. These short lived connections are referred to as feeler connections. Feeler connections are designed to increase the number of fresh online addresses in tried by selecting and connecting to addresses in new. One feeler connection is attempted on average once every two minutes. This change was suggested as Countermeasure 4 in Eclipse Attacks on Bitcoin’s Peer-to-Peer Network, Ethan Heilman, Alison Kendler, Aviv Zohar, Sharon Goldberg. ePrint Archive Report 2015/263. March 2015.
* | | | | | | | Merge #8463: [qt] Remove Priority from coincontrol dialogJonas Schnelli2016-08-246-181/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | fa8dd78 [qt] Remove Priority from coincontrol dialog (MarcoFalke)
| * | | | | | | | [qt] Remove Priority from coincontrol dialogMarcoFalke2016-08-246-181/+27
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge #8450: [Test] Replace rpc_wallet_tests.cpp with python RPC unit testsWladimir J. van der Laan2016-08-242-231/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9578333 Remove rpc_wallet_tests.cpp (Patrick Strateman) 25400c4 Account wallet feature RPC tests. (Patrick Strateman)
| * | | | | | | | Remove rpc_wallet_tests.cppPatrick Strateman2016-08-072-231/+1
| | | | | | | | |
* | | | | | | | | Merge #8560: Trivial: Fix two VarInt examples in serialize.hPieter Wuille2016-08-241-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7bd5ff4 Trivial: Fix two VarInt examples in serialize.h (Christian Barcenas)
| * | | | | | | | | Trivial: Fix two VarInt examples in serialize.hChristian Barcenas2016-08-221-2/+2
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge #8445: Move CWallet::setKeyPool to private section of CWallet.Wladimir J. van der Laan2016-08-244-18/+26
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 8680d3a Move wallet initialization logic from AppInit2 to CWallet::InitLoadWallet (Patrick Strateman) e86eb71 Move CWallet::setKeyPool to private section of CWallet (Patrick Strateman)
| * | | | | | | | Move wallet initialization logic from AppInit2 to CWallet::InitLoadWalletPatrick Strateman2016-08-202-12/+10
| | | | | | | | |
| * | | | | | | | Move CWallet::setKeyPool to private section of CWalletPatrick Strateman2016-08-173-12/+22
| | | | | | | | |
* | | | | | | | | Merge #8539: CDB: fix debug outputWladimir J. van der Laan2016-08-221-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fab2e26 CDB: fix debug output (crowning-)
| * | | | | | | | | CDB: fix debug outputcrowning-2016-08-181-1/+1
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | It doesn't really help to clear a variable before printing it to the debug log.
* | | | | | | | | Merge #8554: trivial: remove unused variableWladimir J. van der Laan2016-08-221-1/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4207630 trivial: remove unused variable (Daniel Kraft)
| * | | | | | | | | trivial: remove unused variableDaniel Kraft2016-08-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the unused variable "blockTmp" in CMerkleTx::SetMerkleBranch. It was previously used to read the block from disk if not provided as argument, but is no longer needed.
* | | | | | | | | | Merge #8558: Add copyright header to wallet_text_fixture.cppWladimir J. van der Laan2016-08-221-0/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 653bb3d Add copyright header to wallet_text_fixture.cpp (Wladimir J. van der Laan)
| * | | | | | | | | | Add copyright header to wallet_text_fixture.cppWladimir J. van der Laan2016-08-221-0/+4
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I created the file but forgot to add this header.
* | | | | | | | | | Merge #8548: [wallet] Use __func__ to get function name for output printingWladimir J. van der Laan2016-08-224-21/+21
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | fa785d1 Use __func__ to get function name for output printing (MarcoFalke)
| * | | | | | | | | Use __func__ to get function name for output printingMarcoFalke2016-08-194-21/+21
| | | | | | | | | |
* | | | | | | | | | Merge #8517: [Qt] show wallet HD state in statusbarJonas Schnelli2016-08-1914-18/+103
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 914154f [Qt] add HD enabled/disabled icon to the status bar (Jonas Schnelli)