Wladimir J. van der Laan
a0d089eda1
Merge #8883 : Add all standard TXO types to bitcoin-tx
...
0c50909 testcases: explicitly specify transaction version 1 (John Newbery)
b7e144b Add test cases to test new bitcoin-tx functionality (jnewbery)
61a1534 Add all transaction output types to bitcoin-tx. (jnewbery)
1814b08 add p2sh and segwit options to bitcoin-tx outscript command (Stanislas Marion)
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
cee8cf1be6
Merge #9518 : Return height of last block pruned by pruneblockchain RPC
...
918d1fb Return height of last block pruned by pruneblockchain RPC (Russell Yanofsky)
2018-01-21 12:48:32 +01:00
MarcoFalke
294b8f70e2
Merge #9520 : Deprecate non-txindex getrawtransaction and better warning
...
db904db Deprecate non-txindex getrawtransaction and better warning (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
Pieter Wuille
819ea7484e
Merge #9507 : Fix use-after-free in CTxMemPool::removeConflicts()
...
fe7e593 Fix use-after-free in CTxMemPool::removeConflicts() (Suhas Daftuar)
2018-01-21 12:48:32 +01:00
Wladimir J. van der Laan
88b9aa45de
Merge #7871 : Manual block file pruning.
...
afffeea fixup! Add pruneblockchain RPC to enable manual block file pruning. (Russell Yanofsky)
1fc4ec7 Add pruneblockchain RPC to enable manual block file pruning. (mrbandrews)
2018-01-21 12:48:32 +01:00
Alexander Block
6132bfbe23
Use version 2 blocks for miner_tests
...
This is needed because Dashs chainparams start BIP34 on block 1 and
the removal of IsSuperMajority results in the checks to trigger
immediately in tests.
Also update miner_tests nonces
2018-01-21 12:48:31 +01:00
Alexander Block
56ff71fcec
Update devnet to activate BIP34/BIP65/BIP66 immediately
2018-01-21 12:48:31 +01:00
Wladimir J. van der Laan
7321bfdd6b
Merge #8391 : Consensus: Remove ISM
...
122786d Consensus: Remove ISM (NicolasDorier)
2018-01-20 09:22:40 +01:00
MarcoFalke
17d375e712
Merge #9436 : test: Include tx data in EXTRA_DIST
...
fa558be test: Include tx data in EXTRA_DIST (MarcoFalke)
2018-01-20 09:22:39 +01:00
Wladimir J. van der Laan
b72f9249d9
Merge #9376 : Remove unused test files and references
...
9cb6624 Fix testfile reference (BtcDrak)
23208ac Remove unused test files and references (BtcDrak)
2018-01-20 09:22:39 +01:00
Wladimir J. van der Laan
0fc37e8c56
Merge #7562 : Bump transaction version default to 2
...
c5c92c4 Update python tests for default tx version=2 (BtcDrak)
dab207e Preserve tx version=1 for certain tests (BtcDrak)
c5d746a tiny test fix for mempool_tests (Alex Morcos)
1f0ca1a Bump default transaction version to 2 (BtcDrak)
2018-01-20 09:22:38 +01:00
Wladimir J. van der Laan
71e3e37d91
Merge #8837 : allow bitcoin-tx to parse partial transactions
...
7451cf5 Allow bitcoin-tx to parse partial transactions (jnewbery)
2018-01-20 09:21:41 +01:00
Pieter Wuille
3235aad493
Implement SipHash in Python
2018-01-20 09:21:13 +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
Alexander Block
df31599863
Use OpenMasternodeConnection in ThreadMnbRequestConnections
2018-01-18 07:40:20 +01:00
Alexander Block
4f39a090bd
Fix remaining direct uses of mapArgs
2018-01-18 07:38:58 +01:00
Wladimir J. van der Laan
e3e3267b4c
Merge #9513 : build: fix qt distdir builds (retry)
...
67ca130 build: fix for out-of-tree/distdir qt builds (Cory Fields)
2018-01-18 07:38:58 +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
MarcoFalke
0dabb80ab5
Merge #9496 : Rename lambda argument name to prevent shadowing
...
7df5e38 Rename lambda argument name to prevent shadowing. (Pavel Janík)
2018-01-18 07:38:23 +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
17e51db71f
Merge #9408 : Allow shutdown during LoadMempool, dump only when necessary
...
325e400 [Qt] Do proper shutdown (Jonas Schnelli)
9479f8d Allow shutdown during LoadMempool, dump only when necessary (Jonas Schnelli)
2018-01-18 07:38:23 +01:00
Pieter Wuille
de21f92613
Merge #9319 : Break addnode out from the outbound connection limits.
...
032ba3f RPC help documentation for addnode peerinfo. (Gregory Maxwell)
90f13e1 Add release notes for addnode changes. (Gregory Maxwell)
50bd12c Break addnode out from the outbound connection limits. (Gregory Maxwell)
2018-01-18 07:38:22 +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
Jonas Schnelli
9e62719ccf
Merge #9413 : [CoinControl] Allow non-wallet owned change addresses
...
54f8026 [CoinControl] Allow non-wallet owned change addresses (Jonas Schnelli)
2018-01-18 07:33:44 +01:00
Wladimir J. van der Laan
5d3401c7e3
Merge #9312 : Increase mempool expiry time to 2 weeks
...
5f0e27f Increase mempool expiry time to 2 weeks (Alex Morcos)
2018-01-18 07:33:44 +01:00
MarcoFalke
8c4c6063a4
Merge #9281 : Refactor: Remove using namespace <xxx> from bench/ & test/ sources
...
73f4119 Refactoring: Removed using namespace <xxx> from bench/ and test/ source files. (Karl-Johan Alm)
2018-01-18 07:33:44 +01:00
Wladimir J. van der Laan
718e6223b2
Merge #9387 : [Refactor] RAII of libevent stuff using unique ptrs with deleters
...
05a55a6 Added EVENT_CFLAGS to test makefile to explicitly include libevent headers. (Karl-Johan Alm)
280a559 Added some simple tests for the RAII-style events. (Karl-Johan Alm)
7f7f102 Switched bitcoin-cli.cpp to use RAII unique pointers with deleters. (Karl-Johan Alm)
e5534d2 Added std::unique_ptr<> wrappers with deleters for libevent modules. (Karl-Johan Alm)
2018-01-18 07:33:44 +01:00
Wladimir J. van der Laan
a1478e586a
Merge #9417 : Do not evaluate hidden LogPrint arguments
...
407cdd6 Do not evaluate hidden LogPrint arguments (Pieter Wuille)
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
35f3f7aad9
Merge #9475 : Let autoconf detect presence of EVP_MD_CTX_new
...
0388afe Let autoconf detect presence of EVP_MD_CTX_new (Luke Dashjr)
2018-01-18 07:33:44 +01:00
Wladimir J. van der Laan
e5873a5647
Merge #9457 : [qt] Select more files for translation
...
facf3e7 [qt] `make translate` (MarcoFalke)
fae26e8 [qt] Add more sources to translate (MarcoFalke)
2018-01-18 07:33:43 +01:00
MarcoFalke
f89a5c78dc
Merge #9470 : qt: Set (count) placeholder in sendcoinsdialog to notranslate
...
388ea19 qt: Set (count) placeholder in sendcoinsdialog to notranslate (Wladimir J. van der Laan)
2018-01-18 07:33:43 +01:00
MarcoFalke
125adda41a
Merge #9401 : Make rpcauth help message clearer, add example in example .conf
...
0513c70 Make rpcauth help message clearer, add example in example .conf (Gregory Sanders)
2018-01-18 07:33:43 +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
bdd151f598
Merge #9288 : Fix a bug if the min fee is 0 for FeeFilterRounder
...
f8d43b8 Avoid rollingMinimumFeeRate never being able to decay below half (Alex Morcos)
eab8e1b fix a bug if the min fee is 0 for FeeFilterRounder (Alex Morcos)
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
Wladimir J. van der Laan
71a490e0f8
Merge #9462 : [qt] Do not translate tilde character
...
fab6c5f [qt] Do not translate `~` (MarcoFalke)
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
1d83352dad
Merge #8877 : Qt RPC console: history sensitive-data filter, and saving input line when browsing history
...
8562792 GUI/RPCConsole: Include importmulti in history sensitive-command filter (Luke Dashjr)
ff77faf Qt/RPCConsole: Use RPCParseCommandLine to perform command filtering (Luke Dashjr)
a79598d Qt/Test: Make sure filtering sensitive data works correctly in nested commands (Luke Dashjr)
629cd42 Qt/RPCConsole: Teach RPCParseCommandLine how to filter out arguments to sensitive commands (Luke Dashjr)
e2d9213 Qt/RPCConsole: Make it possible to parse a command without executing it (Luke Dashjr)
1755c04 Qt/RPCConsole: Truncate filtered commands to just the command name, rather than skip it entirely in history (Luke Dashjr)
d80a006 Qt/RPCConsole: Add signmessagewithprivkey to list of commands filtered from history (Luke Dashjr)
afde12f Qt/RPCConsole: Refactor command_may_contain_sensitive_data function out of RPCConsole::on_lineEdit_returnPressed (Luke Dashjr)
de8980d Bugfix: Do not add sensitive information to history for real (Luke Dashjr)
9044908 Qt/RPCConsole: Don't store commands with potentially sensitive information in the history (Jonas Schnelli)
fc95daa Qt/RPCConsole: Save current command entry when browsing history (Jonas Schnelli)
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
cbbab00c56
Merge #9349 : Make CScript (and prevector) c++11 movable.
...
2ddfcfd Make CScript (and prevector) c++11 movable. (Pieter Wuille)
2018-01-18 07:31:23 +01:00
Alexander Block
465ceff3ba
Use ForceSetArg/ForceSetMultiArgs in debug rpc command
2018-01-18 07:31:23 +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
MarcoFalke
b9b3583353
Merge #9435 : Removed unused variable in test, fixing warning.
...
35356b4 Remove unused variable in test, fixing warning. (Russell Yanofsky)
2018-01-18 07:31:23 +01:00
MarcoFalke
7417a5b249
Merge #9407 : [Trivial] Added missing colons in when running help command
...
afe5b3f Added missing colons in when running help command (Anditto Heristyo)
2018-01-18 07:31:23 +01:00
Wladimir J. van der Laan
d8b07b96ab
Merge #9393 : build: Include cuckoocache header in Makefile
...
fa89581 build: Include cuckoocache header in Makefile (MarcoFalke)
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
Alexander Block
504fecfe63
Remove call to SetMiscWarning in util.cpp
...
For some reason, this fails while linking dash-cli.
I tried to add LIBBITCOIN_COMMON to dash-cli, but with no luck.
Removing the call for now, has to be fixed later.
2018-01-18 07:31:22 +01:00
Wladimir J. van der Laan
dcc9dffae9
Merge #9236 : Fix races for strMiscWarning and fLargeWork*Found, make QT runawayException use GetWarnings
...
749be01 Move GetWarnings() into its own file. (Gregory Maxwell)
e3ba0ef Eliminate data races for strMiscWarning and fLargeWork*Found. (Gregory Maxwell)
c63198f Make QT runawayException call GetWarnings instead of directly access strMiscWarning. (Gregory Maxwell)
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
Wladimir J. van der Laan
6e11b14913
Merge #9329 : [Qt] Console: allow empty arguments
...
390bd14 [Qt] Console: don't allow empty arguments when using the comma-syntax (Jonas Schnelli)
6a32c0f Qt/Test: Check handling of empty arguments in RPC debug console (Luke Dashjr)
89c8d2c [Qt] Console: allow empty arguments (Jonas Schnelli)
2018-01-18 07:31:22 +01:00
Wladimir J. van der Laan
8fa6680c5e
Merge #9367 : If we don't allow free txs, always send a fee filter (take 2)
...
fa16b8f If we don't allow free txs, always send a fee filter (take 2) (MarcoFalke)
2018-01-18 07:31:22 +01:00
Pieter Wuille
c1811e5661
Merge #8895 : Better SigCache Implementation
...
67dac4e Add unit tests for the CuckooCache (Jeremy Rubin)
c9e69fb Add CuckooCache implementation and replace the sigcache map_type with it (Jeremy Rubin)
2018-01-18 07:31:22 +01:00
Wladimir J. van der Laan
e34afa1067
Merge #9273 : Remove unused CDiskBlockPos* argument from ProcessNewBlock
...
a13fa4c Remove unused CDiskBlockPos* argument from ProcessNewBlock (Matt Corallo)
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
87e9b59881
Remove AddRef call in CNode constructor and do AddRef in AcceptConnection
...
This was missed in #1857 . ConnectNode is doing the initial AddRef for
outgoing connections. AcceptConnection also has to do an initial AddRef
call for incoming connections.
2018-01-17 18:11:32 +01:00
Alexander Block
41ef1f98ea
Remove comment about masternode connections
...
This was related to the times we directly called ConnectNode from MN code
2018-01-17 17:40:44 +01:00
Matt Corallo
4ee0657f85
Do not add to vNodes until fOneShot/fFeeler/fAddNode have been set
2018-01-17 17:38:32 +01:00
Alexander Block
ea73614994
Use EXIT_FAILURE when calling exit()
2018-01-17 17:31:13 +01:00
Wladimir J. van der Laan
5c860b3477
Merge #9330 : [Qt] Console: add security warning
...
ed6b377 [Qt] Console: add security warning (Jonas Schnelli)
2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
91dc005154
Merge #9344 : Do not run functions with necessary side-effects in assert()
...
da9cdd2 Do not run functions with necessary side-effects in assert() (Gregory Maxwell)
2018-01-17 17:31:12 +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
0982d6d3c8
Merge #9305 : Refactor: Removed begin/end_ptr functions.
...
8c1dbc5 Refactor: Removed begin/end_ptr functions. (Karl-Johan Alm)
2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
3aee86d6fc
Merge #9334 : Update to latest libsecp256k1
...
7b49f22 Squashed 'src/secp256k1/' changes from 7a49cac..8225239 (Pieter Wuille)
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
Pieter Wuille
04f6a7367d
Merge #9240 : Remove txConflicted
...
a874ab5 remove internal tracking of mempool conflicts for reporting to wallet (Alex Morcos)
bf663f8 remove external usage of mempool conflict tracking (Alex Morcos)
2018-01-17 17:31:12 +01:00
MarcoFalke
45727e7974
Merge #9303 : Update comments in ctaes
...
8501bed Squashed 'src/crypto/ctaes/' changes from cd3c3ac..003a4ac (Pieter Wuille)
2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
b0c0046ef0
Merge #9291 : Remove mapOrphanTransactionsByPrev from DoS_tests
...
819ca3f Remove mapOrphanTransactionsByPrev from DoS_tests (Pieter Wuille)
2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
470b526d95
Merge #9299 : Remove no longer needed check for premature v2 txs
...
b919179 remove no longer needed check for premature v2 txs (Alex Morcos)
2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
63d610d13a
Merge #9296 : Fix missed change to WalletTx structure
...
28f8ae8 Fix missed change to WalletTx structure (Alex Morcos)
2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
7d887dafb1
Merge #9282 : CMutableTransaction is defined as struct
...
c4b6fa8 CMutableTransaction is defined as struct. (Pavel Janík)
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
9782c18312
Merge #9269 : Align struct COrphan definition
...
2efc438 Align struct COrphan definition (Pieter Wuille)
2018-01-17 17:31:12 +01:00
Wladimir J. van der Laan
2feda90d5d
Merge #8613 : LevelDB 1.19
...
634ad51 Squashed 'src/leveldb/' changes from 20ca81f..a31c8aa (Pieter Wuille)
2018-01-17 17:31:11 +01:00
Wladimir J. van der Laan
b5389c09b3
Merge #9014 : Fix block-connection performance regression
...
dd0df81 Document ConnectBlock connectTrace postconditions (Matt Corallo)
2d6e561 Switch pblock in ProcessNewBlock to a shared_ptr (Matt Corallo)
2736c44 Make the optional pblock in ActivateBestChain a shared_ptr (Matt Corallo)
ae4db44 Create a shared_ptr for the block we're connecting in ActivateBCS (Matt Corallo)
fd9d890 Keep blocks as shared_ptrs, instead of copying txn in ConnectTip (Matt Corallo)
6fdd43b Add struct to track block-connect-time-generated info for callbacks (Matt Corallo)
2018-01-17 17:31:11 +01:00
Alexander Block
45ea6ba4dc
Fix invalid cast to CTransaction* in WalletModelTransaction
...
CWalletTx/CMerkleTx does not derive from CTransaction anymore.
This code is different in Bitcoin as it was touched by SegWit code,
resulting in an upfront fix.
2018-01-17 17:30:38 +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
1e62969fa6
Preparations for upcoming backport of Bitcoin #8580
...
Instead of deriving from CTransaction, we now have a CTransactionRef member
in CTxLockCandidate. This is needed for the next backported PR #8580 ,
which will make CTransaction immutable.
Also use CTransactionRef in CDarkSendEntry, CDarksendBroadcastTx and
CPrivateSendServer
2018-01-17 17:30:38 +01:00
MarcoFalke
cb61441e2e
Merge #9251 : Improvement of documentation of command line parameter 'whitelist'
...
8a70a9d Improvement of documentation of command line parameter 'whitelist' (wodry)
2018-01-17 17:30:38 +01:00
MarcoFalke
b8a81d435f
Merge #9223 : unification of Bloom filter representation
...
b7aa290 unification of Bloom filter representation (S. Matthew English)
2018-01-17 17:30:38 +01:00
MarcoFalke
5a6131a86b
Merge #9265 : bitcoin-cli: Make error message less confusing
...
fe37fbe bitcoin-cli: Make error message less confusing (Wladimir J. van der Laan)
2018-01-17 17:30:38 +01:00
Wladimir J. van der Laan
a95622c0b0
Merge #9239 : Disable fee estimates for 1 block target
...
e878689 Make GUI incapable of setting tx confirm target of 1 (Alex Morcos)
d824ad0 Disable fee estimates for a confirm target of 1 block (Alex Morcos)
2018-01-17 17:30:38 +01:00
Wladimir J. van der Laan
62ae4e6449
Merge #9229 : Remove calls to getaddrinfo_a
...
10ae7a7 Revert "Use async name resolving to improve net thread responsiveness" (Matt Corallo)
2018-01-17 17:30:38 +01:00
Alexander Block
b2fb586dec
Add missing comments to ProcessNewBlock and ProcessNewBlockHeaders
...
Lost while backporting #9183
2018-01-17 17:30:38 +01:00
Pieter Wuille
180e379e2d
Merge #9253 : Fix calculation of number of bound sockets to use
...
9e1f468 Fix calculation of number of bound sockets to use (Matt Corallo)
2018-01-17 17:30:38 +01:00
Wladimir J. van der Laan
3b2fd85b59
Merge #9230 : Fix some benign races in timestamp logging
...
8b22efb Make fStartedNewLine an std::atomic_bool (Matt Corallo)
507145d Fix race when accessing std::locale::classic() (Matt Corallo)
2018-01-17 17:30:38 +01:00
Pieter Wuille
d54ef6d7e3
Merge #9226 : Remove fNetworkNode and pnodeLocalHost.
...
bdb922b Remove pnodeLocalHost. (Gregory Maxwell)
083f203 Remove fNetworkNode. (Gregory Maxwell)
2018-01-17 17:30:36 +01:00
Pieter Wuille
a78e0e36c6
Merge #9244 : Trivial refactor: Remove extern keyword from function declarations
...
446a8f9 Trivial refactor: Remove extern keyword from function declarations, as they are extern by default. (Karl-Johan Alm)
2018-01-17 17:27:25 +01:00
Pieter Wuille
b07393709e
Merge #9010 : Split up AppInit2 into multiple phases, daemonize after datadir lock errors
...
deec83f init: Get rid of fServer flag (Wladimir J. van der Laan)
16ca0bf init: Try to aquire datadir lock before and after daemonization (Wladimir J. van der Laan)
0cc8b6b init: Split up AppInit2 into multiple phases (Wladimir J. van der Laan)
2018-01-17 17:27:24 +01:00
Wladimir J. van der Laan
27fcec08f8
Merge #9202 : bench: Add support for measuring CPU cycles
...
3532818 bench: Add support for measuring CPU cycles (Wladimir J. van der Laan)
2018-01-17 17:27:24 +01:00
Wladimir J. van der Laan
ab9bce2c3a
Merge #9225 : Fix some benign races
...
dfed983 Fix unlocked access to vNodes.size() (Matt Corallo)
3033522 Remove double brackets in addrman (Matt Corallo)
dbfaade Fix AddrMan locking (Matt Corallo)
047ea10 Make fImporting an std::atomic (Matt Corallo)
42071ca Make fDisconnect an std::atomic (Matt Corallo)
2018-01-17 17:27:24 +01:00
Wladimir J. van der Laan
b27c4b8e96
Merge #9224 : Prevent FD_SETSIZE error building on OpenBSD
...
498a1d7 Include select.h when WIN32 is not defined (Ivo van der Sangen)
2018-01-17 17:27:24 +01:00
MarcoFalke
df24dfd4bc
Merge #9233 : Fix some typos
...
15fa95d Fix some typos (fsb4000)
2018-01-17 17:27:24 +01:00
Alexander Block
dadfc45b15
Add size() method to CVectorWriter
...
Needed by CMasternodePing
2018-01-17 17:27:24 +01:00
Pieter Wuille
5c0b55a7c0
Merge #9128 : net: Decouple CConnman and message serialization
...
c7be56d net: push only raw data into CConnman (Cory Fields)
2ec935d net: add CVectorWriter and CNetMsgMaker (Cory Fields)
b7695c2 net: No need to check individually for disconnection anymore (Cory Fields)
fedea8a net: don't send any messages before handshake or after requested disconnect (Cory Fields)
d74e352 net: Set feelers to disconnect at the end of the version message (Cory Fields)
2018-01-17 17:27:22 +01:00
MarcoFalke
c87c151426
Merge #9220 : Refactor: Stop using namespace std (bitcoin-cli/-tx).
...
2f2625a Removed using namespace std from bitcoin-cli/-tx and added std:: in appropriate places. (Karl-Johan Alm)
2018-01-17 17:25:36 +01:00
MarcoFalke
2c8fe46868
Merge #9100 : tx_valid: re-order inputs to how they are encoded
...
5262a15 tx_valid: re-order inputs to how they are encoded (Daniel Cousens)
2018-01-17 17:25:36 +01:00
MarcoFalke
d5f2f07961
Merge #9216 : Doc: Fix copypasted comment
...
f26da35 Fix copypasted comment. (Pavel Janík)
2018-01-17 17:25:36 +01:00
MarcoFalke
a71702e3e2
Merge #9144 : [Trivial] Correct waitforblockheight example help text
...
e3c4f7e Correct help output for waitfor RPC commands (fanquake)
2018-01-17 17:25:36 +01:00
Pieter Wuille
3a48d2b832
Merge #8930 : Move orphan processing to ActivateBestChain
...
d2b88f9 Move orphan-conflict removal from main logic into a callback (Matt Corallo)
97e2802 Erase orphans per-transaction instead of per-block (Matt Corallo)
ec4525c Move orphan processing to ActivateBestChain (Matt Corallo)
2018-01-17 17:25:36 +01:00
Alexander Block
532b9fa3db
Use OpenNetworkConnection instead of calling ConnectNode directly in Dash code ( #1857 )
...
ConnectNode is meant to be private and should not be leaked outside of
CConnman. This leaking resulted in multiple problems with AddRef/Release
behaviour. We use OpenNetworkConnectio/OpenMasternodeConnection from now on
and use appropriate ForNode calls to access the CNode* instance.
This commit also changes the behaviour for already connected nodes which
are afterwards requested for a masternode connection. We don't set
fMasternode=true anymore on such nodes, which means it won't be auto
disconnected anymore from ProcessMasternodeConnections.
2018-01-17 18:09:08 +03:00
Alexander Block
86d33b2762
Remove double registration of "privatesend" RPC ( #1853 )
2018-01-16 16:14:28 +03:00
Alexander Block
b6ea01e071
Remove namespace alert_tests when including alert test data
2018-01-16 08:36:16 +01:00
Alexander Block
7939a23e3b
Use std::move when calling MakeTransactionRef
2018-01-16 08:30:52 +01:00
Alexander Block
07cd44c0e2
Use MakeTransactionRef in CreateDevNetGenesisBlock
2018-01-15 07:03:20 +01:00
Alexander Block
e02f313471
Mogrify and optimize network_disabled.png and copy it to all themes
...
Bitcoin #9145 made the icon 50% opaque, copy that to all themes.
2018-01-15 06:51:53 +01: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
2d87a0fdd7
Merge #8690 : Do not fully sort all nodes for addr relay
...
a33b169 Do not fully sort all nodes for addr relay (Pieter Wuille)
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
ce3f38d6ca
Merge #9025 : getrawtransaction should take a bool for verbose
...
240189b add testcases for getrawtransaction (John Newbery)
ce2bb23 getrawtransaction should take a bool for verbose (jnewbery)
2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
481bab7456
Merge #9200 : bench: Fix subtle counting issue when rescaling iteration count
...
e0a9cb2 bench: Fix subtle counting issue when rescaling iteration count (Wladimir J. van der Laan)
2018-01-15 06:14:16 +01:00
Jonas Schnelli
507c4e5246
Merge #9185 : [Qt] fix coincontrol sort issue
...
4231032 [Qt] Clean up and fix coincontrol tree widget handling (Wladimir J. van der Laan)
76af4eb [Qt] fix coincontrol sort issue (Jonas Schnelli)
2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
e5cc7d0eb4
Merge #8872 : Remove block-request logic from INV message processing
...
037159c Remove block-request logic from INV message processing (Matt Corallo)
3451203 [qa] Respond to getheaders and do not assume a getdata on inv (Matt Corallo)
d768f15 [qa] Make comptool push blocks instead of relying on inv-fetch (mrbandrews)
2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
726dd1f8a3
Merge #9179 : Set DEFAULT_LIMITFREERELAY = 0 kB/minute
...
fa7cc5a Set DEFAULT_LIMITFREERELAY = 0 kB/minute (MarcoFalke)
2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
afa99c41fc
Merge #9117 : net: don't send feefilter messages before the version handshake is complete
...
4662553 net: don't send feefilter messages before the version handshake is complete (Cory Fields)
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
Wladimir J. van der Laan
c937a0bfb1
Merge #9186 : test: Fix use-after-free in scheduler tests
...
12519bf test: Fix use-after-free in scheduler tests (Wladimir J. van der Laan)
2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
9b9d3d1da8
Merge #9133 : Unset fImporting for loading mempool
...
79f755d Unset fImporting for loading mempool (Alex Morcos)
2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
0932079ea6
Merge #9131 : fNetworkActive is not protected by a lock, use an atomic
...
079142b fNetworkActive is not protected by a lock, use an atomic (Jonas Schnelli)
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
Alexander Block
c12eb7f312
Put namespace{} around alertTests.raw.h include
2018-01-15 06:14:16 +01:00
Wladimir J. van der Laan
a9c354472e
Merge #9140 : Bugfix: Correctly replace generated headers and fail cleanly
...
b74ff5c Bugfix: Correctly replace generated headers and fail cleanly (Luke Dashjr)
2018-01-15 06:14:16 +01:00
Jonas Schnelli
2b99a4b4e8
Merge #9145 : [qt] Make network disabled icon 50% opaque
...
fa42e4a [qt] Make network disabled icon 50% opaque (MarcoFalke)
2018-01-15 06:14:15 +01:00
Wladimir J. van der Laan
db516cfb8e
Merge #9124 : Use better name for local variable to prevent -Wshadow compiler warning
...
bf49f10 Use better name for local variable to prevent -Wshadow compiler warning (Pavel Janík)
2018-01-15 06:14:15 +01:00
Wladimir J. van der Laan
a9aa477daf
Merge #9049 : Remove duplicatable duplicate-input check from CheckTransaction
...
e2b3fb3 Optimize vInOutPoints insertion a bit (Matt Corallo)
eecffe5 Remove redundant duplicate-input check from CheckTransaction (Matt Corallo)
b2e178a Add deserialize + CheckBlock benchmarks, and a full block hex (Matt Corallo)
2018-01-15 06:14:15 +01:00
MarcoFalke
ec08f5b750
Merge #9122 : fix getnettotals RPC description about timemillis.
...
a79f864 fix getnettotals RPC description about timemillis. (Masahiko Hyuga)
2018-01-15 06:14:15 +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
161fa919c2
Merge #9111 : Remove unused variable UNLIKELY_PCT from fees.h
...
d8edf03 Remove unused var UNLIKELY_PCT from fees.h (fanquake)
2018-01-15 06:14:15 +01:00
Alexander Block
7765c87e79
Remove nType and nVersion from Dash related serialization code
...
Also remove bogus "nVersion = this->nVersion" assignments. These were
leftovers from old times.
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
Jonas Schnelli
705057f0d6
Merge #9095 : test: Fix test_random includes
...
fa8278e test: Fix test_random includes (MarcoFalke)
2018-01-15 06:14:12 +01:00
Pieter Wuille
9b8cc0b1ce
Merge #9045 : Hash P2P messages as they are received instead of at process-time
...
fe1dc62 Hash P2P messages as they are received instead of at process-time (Matt Corallo)
2018-01-15 06:14:12 +01:00
Jonas Schnelli
2342b2ac00
Merge #9094 : qt: Use correct conversion function for boost::path datadir
...
e760b30 qt: Use correct conversion function for boost::path datadir (Wladimir J. van der Laan)
2018-01-15 06:13:44 +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
Alexander Block
4a19af7bd1
Use correct version for fee estimates db
2018-01-14 14:13:39 +01:00
Alexander Block
fc95cbb49f
Use nPowTargetSpacing in SendCoinsDialog::updateGlobalFeeVariables
2018-01-14 14:12:30 +01:00
Alexander Block
c5bfd21570
Fix version check in CBlockPolicyEstimator::Read
2018-01-14 14:06:46 +01:00
Alexander Block
d452018961
Dashify generatetoaddress help string
2018-01-13 18:34:53 +01:00
Wladimir J. van der Laan
6eaafa86b6
Merge #7730 : Remove priority estimation
...
0bd581a add release notes for removal of priority estimation (Alex Morcos)
b2322e0 Remove priority estimation (Alex Morcos)
2018-01-13 13:44:40 +01:00
Wladimir J. van der Laan
9be592806d
Merge #8709 : Allow filterclear messages for enabling TX relay only.
...
1f951c6 Allow filterclear messages for enabling TX relay only. (R E Broadley)
2018-01-13 13:44:40 +01:00
Wladimir J. van der Laan
84559c0569
Merge #9052 : Use RelevantServices instead of node_network in AttemptToEvict.
...
d32036a Use RelevantServices instead of node_network in AttemptToEvict. (Gregory Maxwell)
2018-01-13 13:44:40 +01:00
Alexander Block
29a59e518f
Remove NodeEvictionCandidate constructor and revert to struct initializion
...
Matches Bitcoins style and makes upcoming backports easier
2018-01-13 13:44:40 +01:00