Commit Graph

354 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
Alexander Block
9b1d1c61b2 Move AutoBackup initialization into CWallet::InitAutoBackup 2018-01-11 18:39:50 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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