Alexander Block
8ad57c31fd
Remove "using namespace std" from wallet.cpp
2018-01-23 09:24:25 +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
b97eecc058
Fix review nits
2018-01-22 08:05:44 +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
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
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
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
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
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
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
a0438d5347
Merge #9297 : Various RPC help outputs updated
...
54ee3fc RPC help updated (Michael Rotarius)
2018-01-21 12:48:32 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
86d33b2762
Remove double registration of "privatesend" RPC ( #1853 )
2018-01-16 16:14:28 +03: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
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
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
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
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
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
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
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
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
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
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
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
df14a7f009
Merge #7825 : Prevent multiple calls to ExtractDestination
...
0bf6f30 Prevent multiple calls to ExtractDestination (Pedro Branco)
2017-12-22 16:33:52 +01:00