Pieter Wuille
be3e042c20
Merge #10523 : Perform member initialization in initialization lists where possible
...
656dbd871
Perform member initialization in initialization lists where possible (practicalswift)
Tree-SHA512: 048380f4da23ab1eaaf471801a01dbd76f2235afb686c1489b30a6bac109195134afc83414b8378d3482a9042d537ec62d30136dadb9347cf06b07fb5c693208
2017-06-06 17:00:19 -07:00
MarcoFalke
2805d606bc
Merge #10522 : [wallet] Remove unused variables
...
a8c09af
Remove unused variables (practicalswift)
Tree-SHA512: 34807dc3a0471c83b086f430b66465602c8f6a3a158b54ace2ec8afb746f1f5907f7dfcde5a4bad4041df9721ec46b61681b2dbf89725c9c8c4c5ad0ca99f78f
2017-06-06 23:51:33 +02:00
Luke Dashjr
c237bd750e
wallet: Update formatting
2017-06-06 21:20:22 +00:00
Luke Dashjr
9cbe8c80ba
wallet: Forbid -salvagewallet, -zapwallettxes, and -upgradewallet with multiple wallets
2017-06-06 21:20:22 +00:00
Luke Dashjr
a2a5f3f0f0
wallet: Base backup filenames on original wallet filename
2017-06-06 21:20:22 +00:00
Luke Dashjr
b823a4c9f6
wallet: Include actual backup filename in recovery warning message
2017-06-06 21:17:09 +00:00
Luke Dashjr
84dcb45017
Bugfix: wallet: Fix warningStr, errorStr argument order
2017-06-06 21:17:09 +00:00
Luke Dashjr
008c360083
Wallet: Move multiwallet sanity checks to CWallet::Verify, and do other checks on all wallets
2017-06-06 21:17:09 +00:00
Luke Dashjr
0f08575be2
Wallet: Support loading multiple wallets if -wallet used more than once
2017-06-06 21:17:09 +00:00
Luke Dashjr
b124cf04ea
Wallet: Replace pwalletMain with a vector of wallet pointers
2017-06-06 21:17:09 +00:00
practicalswift
3fb81a8480
Use list initialization (C++11) for maps/vectors instead of boost::assign::map_list_of/list_of
2017-06-06 21:29:16 +02:00
Luke Dashjr
b005bf21a7
Introduce MAX_BIP125_RBF_SEQUENCE constant
2017-06-05 23:14:34 +00:00
Luke Dashjr
36bcab2356
RPC/Wallet: Add RBF support for fundrawtransaction
2017-06-05 23:12:29 +00:00
Luke Dashjr
891c5eeec2
Wallet: Refactor FundTransaction to accept parameters via CCoinControl
2017-06-05 23:12:03 +00:00
Luke Dashjr
19b3648bb5
CWalletDB: Store the update counter per wallet
2017-06-05 22:27:57 +00:00
Luke Dashjr
23fb9adaea
wallet: Move nAccountingEntryNumber from static/global to CWallet
2017-06-05 21:04:42 +00:00
Luke Dashjr
9d15d5548d
Bugfix: wallet: Increment "update counter" when modifying account stuff
2017-06-05 21:04:42 +00:00
Luke Dashjr
f28eb8020e
Bugfix: wallet: Increment "update counter" only after actually making the applicable db changes to avoid potential races
...
Also does all "update counter" access via IncrementUpdateCounter
2017-06-05 21:04:42 +00:00
Pieter Wuille
124d13a58c
Merge test_random.h into test_bitcoin.h
2017-06-05 12:44:44 -07:00
Jorge Timón
1238f13cf6
scripted-diff: Remove PAIRTYPE
...
-BEGIN VERIFY SCRIPT-
sed -i 's/PAIRTYPE(\([^,]*\), \([^\)]*\))/std::pair<\1, \2>/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
sed -i ':a;N;$!ba;s/#define std::pair<t1, t2> std::pair<t1, t2>\n//' ./src/utilstrencodings.h ;
-END VERIFY SCRIPT-
2017-06-05 20:14:53 +02:00
Jorge Timón
7c00c26726
scripted-diff: Fully remove BOOST_FOREACH
...
-BEGIN VERIFY SCRIPT-
sed -i 's/BOOST_FOREACH *(\(.*\),/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
-END VERIFY SCRIPT-
2017-06-05 20:10:50 +02:00
Wladimir J. van der Laan
9fec4da0be
Merge #9740 : Add friendly output to dumpwallet
...
164019d
Add dumpwallet output test (aideca)
9f82134
Add friendly output to dumpwallet refs #9564 (aideca)
Tree-SHA512: 913fcf18d42eebe34173f1f2519973494b1ad2d86d125ff4bf566d6c64aa501c02f8831e6f44812cd87a46916f61c6f510146af406865b31856d8336c173569f
2017-06-05 18:06:34 +02:00
Russell Yanofsky
9bb66ab660
Add RescanFromTime method and use from rpcdump
...
No change in behavior.
2017-06-05 09:59:58 -05:00
Russell Yanofsky
ccf84bb9c1
Move birthday optimization out of ScanForWalletTransactions
...
This change has no effect on wallet behavior.
On wallet startup, the transaction scan avoids reading any blocks with
timestamps older than the wallet birthday (less than nTimeFirstKey -
TIMESTAMP_WINDOW). This block skipping code currently resides in
CWallet::ScanForWalletTransactions but it doesn't really belong there because
it makes the implementation unnecessarily fragile and hard to understand, and
it never has any effect except at startup (because all other callers do their
rescans based on timestamps other than, but always greater or equal to,
nTimeFirstKey).
2017-06-05 09:59:58 -05:00
Wladimir J. van der Laan
08d0390a5f
Merge #10403 : Fix importmulti failure to return rescan errors
...
4d2d604
Fix importmulti failure to return rescan errors (Russell Yanofsky)
Tree-SHA512: e5e6d6c5a2bb7230e1bcac1903a4b766cd57bf781fade50c6c9cd5713cd3e768db0987cfda9699b57a53d3a0a60951b96dce5283b3d3ec1f954162c439bc932b
2017-06-05 16:41:02 +02:00
Wladimir J. van der Laan
0747d33498
Merge #10455 : Simplify feebumper minimum fee code slightly
...
88b8f0b
Simplify feebumper minimum fee code slightly (Russell Yanofsky)
Tree-SHA512: 4465daef63936860d016a7fd7fd31ce62878d87cb943a90f321b07a40accdc5e7970d99de46b2bc924eb0b422144d6f01649855949395518790ecd05d300ee52
2017-06-05 16:38:07 +02:00
practicalswift
90593ed92c
Limit variable scope
2017-06-05 00:52:36 +02:00
practicalswift
656dbd871a
Perform member initialization in initialization lists where possible
2017-06-04 01:09:48 +02:00
practicalswift
a8c09affce
Remove unused variables
2017-06-03 23:54:24 +02:00
Pieter Wuille
098b01dc58
Merge #10500 : Avoid CWalletTx copies in GetAddressBalances and GetAddressGroupings
...
b9b814a38
Avoid CWalletTx copies in GetAddressBalances and GetAddressGroupings (Russell Yanofsky)
Tree-SHA512: 96a0612ca460ba1bfb3921f3aa348400fd3afa12c40f2ca1f3f04068b1574fe824d577e0123013d8898a4990084316dc1dfb541331849f0996ceff7f4eb25e6b
2017-06-02 16:10:33 -07:00
Russell Yanofsky
b9b814a38e
Avoid CWalletTx copies in GetAddressBalances and GetAddressGroupings
2017-06-01 11:48:29 -04:00
Wladimir J. van der Laan
b6b150b016
Merge #10469 : Fixing typo in rpcdump.cpp
...
16d94d3
Fixing typo in rpcdump.cpp (James Evans)
Tree-SHA512: 84ef1b91c719131196ebed6b865e282b77bee7699614e15884ba59010239a3bbc1380dc8f856c83338f071e3eb3ca41c6b10f830816e6c794531cf6a965d63a9
2017-06-01 13:19:36 +02:00
Wladimir J. van der Laan
ef2d062c9f
Merge #10450 : Fix bumpfee rpc "errors" return value
...
1b6602f
Fix bumpfee rpc "errors" return value (Russell Yanofsky)
Tree-SHA512: a55d4dbe28c75f31fde3b7de60479265bb8f3777f432d1db321f1dd848d5274c353f757b09ed3cad9c69c08acbf3906679d27052267db943ab2b19629f79bd81
2017-06-01 10:48:19 +02:00
James Evans
16d94d3d03
Fixing typo in rpcdump.cpp
2017-05-27 16:44:10 +01:00
Pieter Wuille
b40ceed98a
Merge #10419 : [trivial] Fix three recently introduced typos
...
efc2e3302
[trivial] Fix three recently introduced typos (practicalswift)
Tree-SHA512: 99e97f3c1350299dfce9c0c35547d480f25c0b877da311d9120f113afd3089eda31b88b2378e2370f288b0c41bb69cee0fd3abca661cd93d5a56982f90709f91
2017-05-26 11:56:21 -07:00
Russell Yanofsky
88b8f0b682
Simplify feebumper minimum fee code slightly
...
No change in behavior. Get rid of specifiedConfirmTarget if/else block and
rename specifiedConfirmTarget and ignoreUserSetFee variables to
ignoreGlobalPayTxFee.
2017-05-25 10:13:28 -04:00
Russell Yanofsky
1b6602fbe6
Fix bumpfee rpc "errors" return value
2017-05-24 16:15:26 -04:00
Pieter Wuille
f2f7e97e8c
Merge #10347 : Use range-based for loops (C++11) when looping over vector elements
...
211adc0
Use range-based for loops (C++11) when looping over vector elements (practicalswift)
Tree-SHA512: 0e007f20dcef99d3c7a1036265e00f689d69f42e02fd82dd8389f45b52d31947e5f9388de2610d3d9bd9f554915ce0d35ebce561e5ae3a9013956d0ee4937145
2017-05-23 14:08:20 -07:00
Wladimir J. van der Laan
ce8176d038
Merge #10295 : [qt] Move some WalletModel functions into CWallet
...
108f04f
Add missing LOCK2 in CWallet::GetAvailableBalance (Russell Yanofsky)
429aa9e
[test] Move some tests from qt -> wallet (Russell Yanofsky)
d944bd7
[qt] Move some WalletModel functions into CWallet (Russell Yanofsky)
ef8ca17
[test] Add tests for some walletmodel functions (Russell Yanofsky)
Tree-SHA512: f6384d9f2ff3f7fb173d414588c3e7dc8c311b8ed2ce2b0979fb824a0ed83a7302890ccd3d83197f07f6fdcb6b1ca151584d90ea1961d88dfe8956c87087cde8
2017-05-23 19:32:52 +02:00
Wladimir J. van der Laan
e76a3927c3
Merge #10410 : Fix importwallet edge case rescan bug
...
2a8e35a
Fix importwallet edge case rescan bug (Russell Yanofsky)
Tree-SHA512: 59522c962290f9ef64436349d11183dd1fd829e515d1f5ec802b63dd813d04303e28d4f3ba38df77a6c151ee4c14f3ca5d3d82204c57456ac94054de62ae4bc7
2017-05-23 16:39:19 +02:00
practicalswift
efc2e3302d
[trivial] Fix three recently introduced typos
...
```
$ git blame src/policy/fees.cpp | grep becuase
3810e976
(2017-03-07 11:33:44 -0500 789) * checks for 2*target becuase we are taking the max over all time
$ git blame src/policy/fees.h | grep successfullly
2d2e1705
(2017-04-12 12:29:03 -0400 54) * representing that a tx was successfullly confirmed in less than or equal to
$ git blame src/wallet/feebumper.cpp | grep "hasen't"
a3878374
(2017-05-11 09:34:39 +0200 258) // make sure the transaction still has no descendants and hasen't been mined in the meantime
```
2017-05-23 13:22:40 +02:00
Wladimir J. van der Laan
e4775167cb
Merge #10390 : [wallet] remove minimum total fee option
...
091a9ae
remove minimum total fee option (Gregory Sanders)
Tree-SHA512: 9be4df3dab0219f30917211408f47b242f7c96dd7663b06ab1cf3cc63027f14956dc680883be6c58673b6452d0f339cf893694e4f21d0d248e70760614d5a344
2017-05-22 20:01:20 +02:00
practicalswift
211adc074a
Use range-based for loops (C++11) when looping over vector elements
2017-05-19 09:56:16 +02:00
Wladimir J. van der Laan
ea6fde3f1d
Merge #8329 : Consensus: MOVEONLY: Move functions for tx verification
...
618d07f
MOVEONLY: tx functions to consensus/tx_verify.o (Jorge Timón)
Tree-SHA512: 63fa2777c070a344dbfe61974526a770d962e049881c6f371b0034b1682c1e6e24f47454f01ee35ded20ade34488e023d4467a05369662906b99a73bb5de8497
2017-05-18 21:01:49 +02:00
Jonas Schnelli
962cd3f058
Merge #9697 : [Qt] simple fee bumper with user verification
...
a38783747
Make sure we re-check the conditions of a feebump during commit (Jonas Schnelli)
9b9ca538c
Only update the transactionrecord if the fee bump has been commited (Jonas Schnelli)
6ed4368f1
Make sure we use nTxConfirmTarget during Qt fee bumps (Jonas Schnelli)
be08fc39d
Make sure we always update the table row after a bumpfee call (Jonas Schnelli)
2678d3dc6
Show old-fee, increase a new-fee in Qt fee bumper confirmation dialog (Jonas Schnelli)
2ec911f60
Add cs_wallet lock assertion to SignTransaction() (Jonas Schnelli)
fbf385cc8
[Qt] simple fee bumper with user verification (Jonas Schnelli)
Tree-SHA512: a3ce626201abf64cee496dd1d83870de51ba633de40c48eb0219c3eba5085c038af34c284512130d2544de20c1bff9fea1b78f92e3574c21dd4e96c11b8e7d76
2017-05-18 11:18:23 +02:00
Russell Yanofsky
108f04f2d9
Add missing LOCK2 in CWallet::GetAvailableBalance
2017-05-17 05:18:25 -04:00
Russell Yanofsky
429aa9eb51
[test] Move some tests from qt -> wallet
...
After previous refactoring, the tests make more sense here.
2017-05-17 05:18:25 -04:00
Russell Yanofsky
d944bd7a27
[qt] Move some WalletModel functions into CWallet
...
Motivation for moving these is to make supporting IPC simpler (#10102 ), so
these lookups can be one-shot IPC requests, instead of back-and-forth
interactions over the IPC channel.
Also these functions are potentially useful outside of the bitcoin GUI (e.g.
for RPCs).
2017-05-17 05:18:25 -04:00
Wladimir J. van der Laan
08ac35a7e3
Merge #10413 : Fix docs (there's no rpc command setpaytxfee)
...
0f1b26a
Fix docs (there's no rpc command setpaytxfee) (Ryan Havar)
Tree-SHA512: 5b9e1f16e172e712452873f82faa35f3ac949cd1df6e2ee7e2282fc8fad4eaf4548ebf05407426547ad859360ae837172e6343d66f8d302c7f5b097f39bb3994
2017-05-17 10:46:24 +02:00
Pedro Branco
bc63d0ed3b
Add query options to listunspent rpc call
2017-05-17 08:37:34 +02:00