Pieter Wuille
be3e042c20
Merge #10523 : Perform member initialization in initialization lists where possible
...
656dbd871
2017-06-06 17:00:19 -07:00
MarcoFalke
75e898c094
Merge #10331 : Share config between util and functional tests
...
8ad5bde95836c589fcd35e9265dfce58e93
2017-06-06 23:55:24 +02:00
MarcoFalke
2805d606bc
Merge #10522 : [wallet] Remove unused variables
...
a8c09af
2017-06-06 23:51:33 +02:00
MarcoFalke
32751807c9
Merge #10538 : [trivial] Fix typo: "occurrences" (misspelled as "occurrances")
...
b083db6
2017-06-06 23:48:10 +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
John Newbery
8ad5bdef78
Merge bctest.py into bitcoin-util-test.py
...
bctest.py is only used as an import by bitcoin-util-test.py. There's no
value in keeping it as a separate module, so let's merge them into a
single module to keep building and packaging simpler.
bitcoin-test-util is importable as a module, so if any future modules
really want to import the code from bctest.py, they can import
bitcoin-test-util and call the bctest functions by name.
2017-06-06 16:42:38 -04: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
Matt Corallo
40796e1a9d
Remove references to priority that snuck back in in 870824e9.
...
The "priority" field should be appropriately marked as a "dummy"
value and noted that it is deprecated and will likely be removed.
2017-06-06 15:13:37 -04:00
Wladimir J. van der Laan
1b708f2cf3
Merge #10201 : pass Consensus::Params& to functions in validation.cpp and make them static
...
24980a3
2017-06-06 17:54:09 +02:00
Mario Dian
24980a3e40
Make functions in validation.cpp static and pass chainparams
...
Fix bugs as per PR comment
Change bool static to static bool
2017-06-06 22:21:30 +08:00
Wladimir J. van der Laan
300f8e7a82
Merge #9909 : tests: Add FindEarliestAtLeast test for edge cases
...
cf66f04
2017-06-06 15:51:45 +02:00
Wladimir J. van der Laan
980deaf0b1
Merge #10252 : RPC/Mining: Restore API compatibility for prioritisetransaction
...
870824e
2017-06-06 15:49:38 +02:00
practicalswift
b083db617a
[trivial] Fix typo: "occurrences" (misspelled as "occurrances")
...
Typo introduced in 000391132600039113
2017-06-06 15:06:23 +02:00
MarcoFalke
30853e16d3
Merge #10535 : [qa] fundrawtx: Fix shutdown race
...
fa62dad
2017-06-06 12:28:59 +02:00
Wladimir J. van der Laan
67700b3924
Merge #10345 : [P2P] Timeout for headers sync
...
76f7481e265200
2017-06-06 12:23:56 +02:00
Wladimir J. van der Laan
16f6c98fa8
Merge #10426 : Replace bytes_serialized with bogosize
...
8b22af3
2017-06-06 11:46:31 +02:00
Wladimir J. van der Laan
323a46e034
Merge #10463 : Names: BIP9 vs versionbits
...
b463bc929c0719
2017-06-06 10:18:02 +02:00
Matt Corallo
ec1271f2be
Remove useless mapNextTx lookup in CTxMemPool::TrimToSize.
...
Prior to per-utxo CCoins, we checked that no other in-mempool tx
spent any of the given transaction's outputs, as we don't want to
uncache that entire tx in such a case. However, we now are checking
only that there exists no other mempool spends of the same output,
which should clearly be impossible after we removed the transaction
which was spending said output (barring massive mempool
inconsistency).
Thanks to @sdaftuar for the suggestion.
2017-06-05 21:46:14 -04:00
MarcoFalke
fa62dadabe
[qa] fundrawtx: Fix shutdown race
2017-06-06 01:23:01 +02:00
Luke Dashjr
9a5a1d7d45
RPC/rawtransaction: createrawtransaction: Check opt_into_rbf when provided with either value
2017-06-05 23:14:34 +00:00
Luke Dashjr
23b0fe34f5
bitcoin-tx: rbfoptin: Avoid touching nSequence if the value is already opting in
2017-06-05 23:14:34 +00:00
Luke Dashjr
b005bf21a7
Introduce MAX_BIP125_RBF_SEQUENCE constant
2017-06-05 23:14:34 +00:00
Jonas Schnelli
575cde4605
[bitcoin-tx] add rbfoptin command
2017-06-05 23:13:24 +00:00
Jonas Schnelli
5d26244148
[Tests] extend the replace-by-fee test to cover RPC rawtx features
2017-06-05 23:13:24 +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
578ec80d4f
RPC: rawtransaction: Add RBF support for createrawtransaction
2017-06-05 23:09:01 +00:00
Luke Dashjr
19b3648bb5
CWalletDB: Store the update counter per wallet
2017-06-05 22:27:57 +00:00
Luke Dashjr
74e8738961
Bugfix: ForceSetArg should replace entr(ies) in mapMultiArgs, not append
2017-06-05 21:04:42 +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
Suhas Daftuar
76f74811c4
Add timeout for headers sync
...
At startup, we choose one peer to serve us the headers chain, until
our best header is close to caught up. Disconnect this peer if more
than 15 minutes + 1ms/expected_header passes and our best header
is still more than 1 day away from current time.
2017-06-05 16:33:35 -04:00
Pieter Wuille
efee1db21a
scripted-diff: use insecure_rand256/randrange more
...
-BEGIN VERIFY SCRIPT-
sed -i "s/\<GetRandHash(/insecure_rand256(/" src/test/*_tests.cpp
sed -i "s/\<GetRand(/insecure_randrange(/" src/test/*_tests.cpp src/test/test_bitcoin.cpp
sed -i 's/\<insecure_rand() % \([0-9]\+\)/insecure_randrange(\1)/g' src/test/*_tests.cpp
-END VERIFY SCRIPT-
2017-06-05 12:45:44 -07:00
Pieter Wuille
1119927df0
Add various insecure_rand wrappers for tests
2017-06-05 12:44:44 -07:00
Pieter Wuille
124d13a58c
Merge test_random.h into test_bitcoin.h
2017-06-05 12:44:44 -07:00
Pieter Wuille
90620d66c9
scripted-diff: Rename cuckoo tests' local rand context
...
-BEGIN VERIFY SCRIPT-
sed -i 's/insecure_rand/local_rand_ctx/g' src/test/cuckoocache_tests.cpp
-END VERIFY SCRIPT-
2017-06-05 12:44:44 -07:00
Pieter Wuille
37e864eb9f
Add FastRandomContext::rand256() and ::randbytes()
...
FastRandomContext now provides all functionality that the real Rand* functions
provide.
2017-06-05 12:44:44 -07:00
Pieter Wuille
8b22af3ee5
Replace bytes_serialized with bogosize
2017-06-05 12:43:45 -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
18dc3c3962
scripted-diff: Remove Q_FOREACH
...
-BEGIN VERIFY SCRIPT-
sed -i 's/Q_FOREACH *(\(.*\),/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
-END VERIFY SCRIPT-
2017-06-05 20:11:01 +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
Jorge Timón
a5410ac5ec
Small preparations for Q_FOREACH, PAIRTYPE and #include <boost/foreach.hpp> removal
2017-06-05 20:02:30 +02:00
