Pieter Wuille
f59e5e67f0
Merge #10500 : Avoid CWalletTx copies in GetAddressBalances and GetAddressGroupings
...
b9b814a38 Avoid CWalletTx copies in GetAddressBalances and GetAddressGroupings (Russell Yanofsky)
Tree-SHA512: 96a0612ca460ba1bfb3921f3aa348400fd3afa12c40f2ca1f3f04068b1574fe824d577e0123013d8898a4990084316dc1dfb541331849f0996ceff7f4eb25e6b
2019-06-26 12:44:45 -05:00
MarcoFalke
e353d271f0
Merge #10359 : [tests] functional tests should call BitcoinTestFramework start/stop node methods
...
53f6775 fixup: fix nits (John Newbery)
a433d8a [tests] Update start/stop node functions to be private module functions (John Newbery)
d8c218f [tests] Functional tests call self.start_node(s) and self.stop_node(s) (John Newbery)
Tree-SHA512: 9cc01584a5e57686b7e7cb1c4c5186ad8cc7eb650d6d4f27b06bdb5e249a10966705814bdfb22d9ff2d5d3326911e489bf3d22257d751a299c0b24b7f40bffb5
2019-06-26 12:44:45 -05:00
MarcoFalke
70cd81cc8a
Merge #10423 : [tests] skipped tests should clean up after themselves
...
930deb9 [tests] skipped tests should clean up after themselves (John Newbery)
Tree-SHA512: ed486c1cf144c223efa738a66e8bb407089a23002871ef5b15c43d4c08641038a20253fc286853b457d66f37a52c81c16f7988aef90635ac262df6ce7bab9b18
2019-06-26 12:43:19 -05:00
Wladimir J. van der Laan
c7aa3723c7
Merge #10323 : Update to latest libsecp256k1 master
...
e7c1b44 Squashed 'src/secp256k1/' changes from 8225239..84973d3 (Pieter Wuille)
Tree-SHA512: 3e1ba6e6ad9d68170a1a60bd963f2dbaa8b0ae592cc562e6cd23b2c7653f0b8016e4c682681ae2fb3714106a41f8b89708e16e8f52a42ff3db59fc28262eea0b
2019-06-26 12:43:19 -05:00
MarcoFalke
b6b486c274
Merge #10376 : [tests] fix disconnect_ban intermittency
...
3ba2c08 [tests] fix disconnect_ban intermittency (John Newbery)
Tree-SHA512: f4e1a88b4126ad5e1aa861a99f9b2589194a25610b5e18bcc196e7dccfa02491f0b9549fbb9f9a73776ed5ee2f6b8ade264b92ac378a25c1a92df4b0272487a7
2019-06-26 12:43:19 -05:00
UdjinM6
b9a738528c
Remove skipped denom from the list on tx commit ( #2997 )
...
* Remove skipped denom from the list on tx commit
Regardless of the tx type (PS or not).
* Update src/privatesend/privatesend-client.cpp
Co-Authored-By: Alexander Block <ablock84@gmail.com>
2019-06-26 14:39:36 +03:00
UdjinM6
1a88a3c7d9
Merge pull request #2992 from PastaPastaPasta/backports-0.15-pr16
...
Backports 0.15 pr16
2019-06-26 14:38:33 +03:00
Alexander Block
dff2c851d5
Update manpages for 0.14.0.2 ( #2999 )
2019-06-26 06:03:05 +02:00
Pasta
a8c2020819
remove unused import cont.
...
Signed-off-by: Pasta <pasta@dashboost.org>
2019-06-25 14:38:38 -05:00
Wladimir J. van der Laan
60475f1272
Merge #11831 : Always return true if AppInitMain got to the end
...
07c4838 Always return true if AppInitMain got to the end (Matt Corallo)
Pull request description:
This should fix a rare zapwallettxes failure on travis, but also
avoids having init operations (re-adding wallet transactions to
mempool) running after RPC is free'd.
I believe this was the failure at https://travis-ci.org/bitcoin/bitcoin/jobs/311747844 (from #11605 ).
Tree-SHA512: f0fea8c1b9265e2eeda57043d541380a3e58e4d9388fa24628a52fd56324257fcd7df0ca02e8f77f66fadd68d951893bab0f610ed9fd0a89b2ccd6bad1efa351
2019-06-25 06:09:33 -05:00
Pasta
a740a0cecd
remove extra argument from code review
...
Signed-off-by: Pasta <pasta@dashboost.org>
2019-06-24 17:41:02 -05:00
Pasta
5a760dd90e
remove duplicate code
...
Signed-off-by: Pasta <pasta@dashboost.org>
2019-06-24 12:07:26 -05:00
Pasta
dd99dd08c6
add gArgs for a couple things not caught by scripted diff
...
Signed-off-by: Pasta <pasta@dashboost.org>
2019-06-24 12:03:00 -05:00
Marko Bencun
5d5171f478
remove unused gArgs wrappers
...
(#10607 )
2019-06-24 12:03:20 -05:00
Pasta
6bfbe6053d
Scripted diff find src/ -name "*.cpp" ! -wholename "src/util.h" ! -wholename "src/util.cpp" | xargs perl -i -pe 's/(?<!\.)(ParseParameters|ReadConfigFile|IsArgSet|(Soft|Force)?(Get|Set)(|Bool|)Arg(s)?)\(/gArgs.\1(/g'
based on bb81e1735575e1c00e808326735168cc9810c174
...
(#10607 )
Signed-off-by: Pasta <pasta@dashboost.org>
2019-06-24 12:03:00 -05:00
Pasta
5bdb2c0ce1
Revert "Show BIP9 progress in getblockchaininfo ( #2435 )"
...
This reverts commit 3685c85e7f
.
2019-06-24 11:39:34 -05:00
Pasta
1bb4b9c085
fix gargs change regarding devnets
...
Signed-off-by: Pasta <pasta@dashboost.org>
2019-06-24 11:39:34 -05:00
Pasta
bb370afbfd
s/bitcoin/dash
...
Signed-off-by: Pasta <pasta@dashboost.org>
2019-06-24 11:39:34 -05:00
Pasta
b62db76180
Revert " Add real timestamp to log output when mock time is enabled ( #2604 )"
...
This reverts commit 968eb3fc5d
.
Signed-off-by: Pasta <pasta@dashboost.org>
# Conflicts:
# src/util.cpp
# src/utiltime.cpp
# src/utiltime.h
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
2ab30b846c
Merge #10475 : [RPC] getmempoolinfo mempoolminfee is a BTC/KB feerate
...
f128f78 getmempool mempoolminfee is a BTC/KB feerate (Gregory Sanders)
Tree-SHA512: 5b32ffc0d2ba7ca623d4ce450fb67855d17b4fa8c3ffb8570a63dc53b3d476d52b39ad6190ac4357dbf01f6b535fa187cd8c34175a16469e9b00097e3bf2e2bc
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
89e033085d
Merge #10447 : Make bitcoind invalid argument error message specific
...
cd5622d Make bitcoind invalid argument error message specific (Wladimir J. van der Laan)
Tree-SHA512: 78999b9359685c4090f9a112e1d02bdddac22173f5f04600773b042acb9481ebb54d0f73d9d6d74249f845f497927a58d59de69bf33e3dccf096c3c80c7ebf6b
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
785420b838
Merge #10467 : add SeedNodes to CConnman::Options
...
5d67526 add SeedNodes to CConnman::Options (Marko Bencun)
Tree-SHA512: d732ab08697419f896d9598fa3c30030ddbe3b82a99a398d813ebcd5e1fc610ad1043fe0f4c51a7ec5c4d70ce93a9ac5a5c7a91fcaae046ec4f1f7c41523a360
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
3ee7ffc7fd
Merge #10479 : [trivial] Fix comment for ForceSetArg()
...
42a83e5 [trivial] Fix comment for ForceSetArg() (John Newbery)
Tree-SHA512: 596db8b4bb01bca18908e254e5b364d3d4fcb0ea49d7d54314c65106e497efed65a877d80740bff88e090aeb772be1e46d4571ecca9b9263578f3f680f0bd0ce
2019-06-24 11:39:34 -05:00
Pieter Wuille
1c6630f72f
Merge #10464 : Introduce static DoWarning (simplify UpdateTip)
...
f28514576 Introduce static DoWarning (simplify UpdateTip) (Jorge Timón)
Tree-SHA512: 58b39f00bc921d47d199ef1cc15e9e36f918ec86e9182de46dc2f24fa9474853a92b18d330a274a3ea7c9b001681fdfa3d86aa2bbebb5c92ac8c5a6f7690dfc1
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
a8566404be
Merge #9208 : Improve DisconnectTip performance
...
c1235e3 Add RecursiveDynamicUsage overload for std::shared_ptr (Russell Yanofsky)
71f1903 Store disconnected block transactions outside mempool during reorg (Suhas Daftuar)
9decd64 [qa] Relax assumptions on mempool behavior during reorg (Suhas Daftuar)
Tree-SHA512: c160ad853a5cd060d0307af7606a0c77907497ed7033c9599b95e73d83f68fdfcd4214bd8a83db1c5b7a58022722b9de1ed2e6ea2e02f38a7b6c717f079dd0c6
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
1782b062cc
Merge #10460 : Broadcast address every day, not 9 hours
...
010d68e Broadcast address every day, not 9 hours (Pieter Wuille)
Tree-SHA512: 73a8b44b4b48784616e722b1e63561e35d669c2ee890dbc44e40191fdfd8fc1ef56710f4769ab6ea1f1a48fec0576f200c0b3812ca58fb143e7524006d1afed4
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
fbae76b21e
Merge #10011 : build: Fix typo s/HAVE_DONTWAIT/HAVE_MSG_DONTWAIT
...
5073100 build: Fix typo s/HAVE_DONTWAIT/HAVE_MSG_DONTWAIT (Wladimir J. van der Laan)
Tree-SHA512: 2305fd68afe940611da10bdebd4994a12612f610365e980313d7e75e13935252366efcaae6cb52da5f8d7e022a164399a3185b385151276ea3843fdcc231fdb1
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
11dbe39b48
Merge #10317 : Remove unused Python imports
...
0c60c63 Remove unused Python imports (practicalswift)
Tree-SHA512: c7ae6a8ae2c751b771804960498bf270ab022c80fa9e1b39118d5986d890c8cdfc27a3cc24bf28c080d8088ddc11facd1f2881ba2c209cdd819675fda4689d83
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
63db304064
Merge #10341 : rpc/wallet: Workaround older UniValue which returns a std::string temporary for get_str
...
a637734 rpc/wallet: Workaround older UniValue which returns a std::string temporary for get_str (Luke Dashjr)
Tree-SHA512: 8f03f1d301f714f700bf64e259a1c986136fd1ac532f091aa97198a39c131290c320094f4fc38c774c8db4469a75437596b1d933300e4f04037abc158a252bad
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
de9629553c
Merge #9614 : [wallet] [refactor] Simplify getbalance implementation
...
02d9f50 [wallet] Remove unneeded legacy getbalance code (Russell Yanofsky)
82b7dc3 [wallet] Add GetLegacyBalance method to simplify getbalance RPC (Russell Yanofsky)
Tree-SHA512: c3b890ff1f5a3df7e886309bad94bdf5cc3c12b72983bb79c72f8655ce16edf581bff0faaade2f18c2cb723f50d516e53f87792f81c3f8143b0c4377c0d80e87
2019-06-24 11:39:34 -05:00
Pasta
9ba69fd5cc
add serialize.h import
...
Signed-off-by: Pasta <pasta@dashboost.org>
2019-06-24 11:39:34 -05:00
Pieter Wuille
1522230ec1
Merge #10313 : [Consensus] Add constant for maximum stack size
...
cb184b3 Add constant for maximum stack size (Gregory Sanders)
Tree-SHA512: 0ec4a28552a6eee7fba8c69278f63c61f095e4ba06cb34456bd0162cd702370d10cca621ae1797a0d5e62fb39814cbb8245d3a7adc007ca39dab7a49cbc925dc
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
0477eb4b39
Merge #9539 : [net] Avoid initialization to a value that is never read
...
5844609 [net] Avoid initialization to a value that is never read (practicalswift)
Tree-SHA512: 068c3fba58034187f546688bc9b8b7317e0657e797850613fb6289a4efc28637e4d06a0fa5e57480538c6b8340ed6d6a6c6f9a96f130b698d5d60975490a03d8
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
324c588db8
Merge #9571 : RPC: getblockchaininfo returns BIP signaling statistics
...
557c9a6 RPC: getblockchaininfo: BIP9 stats (Matthew Zipkin)
Tree-SHA512: ecf0bf47f04f92becc77acc649fdfa270e768939acce42df39d30069398d40d9a30539862f7c307e08239f78d5c58c470ca5f6e717d2ab8e24db9be0dd7bec0c
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
3dae8f270c
Merge #10372 : Add perf counter data to GetStrongRandBytes state in scheduler
...
888cce5 Add perf counter data to GetStrongRandBytes state in scheduler (Matt Corallo)
399fb8f Add internal method to add new random data to our internal RNG state (Matt Corallo)
Tree-SHA512: 9732a3804d015eaf48d56b60c73880014845fd17a098f1ac2eff6bd50a4beb8b8be65956ac1f0d641e96e3a53c17daddd919401edbf2e3797c3fb687730fb913
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
ae864eb2ce
Merge #10390 : [wallet] remove minimum total fee option
...
091a9ae remove minimum total fee option (Gregory Sanders)
Tree-SHA512: 9be4df3dab0219f30917211408f47b242f7c96dd7663b06ab1cf3cc63027f14956dc680883be6c58673b6452d0f339cf893694e4f21d0d248e70760614d5a344
2019-06-24 11:39:34 -05:00
Pasta
9a40d488d4
change include
...
Signed-off-by: Pasta <pasta@dashboost.org>
2019-06-24 11:39:34 -05:00
MarcoFalke
ea3afb995f
Merge #10433 : [tests] improve tmpdir structure
...
b040243 [tests] improve tmpdir structure (John Newbery)
Tree-SHA512: b21ad555c3c23a43087b893ad18bd2398e1df91b82c0bf1804d07fdb582600a1c339e6f4aaca58074e52f146f459943a0e492abc045b2666d4a3a7e0e455d6dd
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
1f81ce12be
Merge #10429 : tests: fix spurious addrman test failure
...
6b51b0a tests: fix spurious addrman test failure (Cory Fields)
Tree-SHA512: 3d41723b1a31ff459d950331ffea7f383e4ef6187990be6a634978bead0c29d7c096f68e7edb6d4dc56069c1fe8a6f12a6daf573cb1e542b15d000eaa54ad288
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
e32bbf40be
Merge #10432 : [Trivial] Add BITCOIN_FS_H endif footer in fs.h
...
2300a5e [Trivial] Add BITCOIN_FS_H endif footer in fs.h (Ahmad Kazi)
Tree-SHA512: fd56c5c78c12db74baeef93186b59814ac626beeecfad5db852ab8eaad8e71f7f47d64590bcdd9052cc9e97f4531ba90c1f66f0f9e6517d2f956d622803111df
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
7ebe41b4b4
Merge #10408 : Net: Improvements to Tor control port parser
...
49a199b torcontrol: Handle escapes in Tor QuotedStrings (Jack Grigg)
0182a11 torcontrol: Log invalid parameters in Tor reply strings where meaningful (Jack Grigg)
0b6f40d torcontrol: Check for reading errors in ReadBinaryFile (Jack Grigg)
d63677b torcontrol: Fix ParseTorReplyMapping (Jack Grigg)
29f3c20 torcontrol: Add unit tests for Tor reply parsers (Jack Grigg)
d8e03c0 torcontrol: Improve comments (Jack Grigg)
Tree-SHA512: aa3ce8072d20299b38c4ba9471af7fab1f5df096c237bf40a96ee9274a357f7366f95ced0cc80f8da1f22f6455a1a8e68bad9a5ff71817eef3397b6aefcbc7ae
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
895c95cd90
Merge #9750 : Bloomfilter: parameter variables made constant
...
64aa36e param variables made const (ロハン ダル)
Tree-SHA512: 7c19f9e7dd574c8ce8a9468555f27196735b583efe349c1309c90e1e5d2949daf6891574b4bea7122d6c6aca0c7ee4a782fe3d24918d889f7bf89227084a51cd
2019-06-24 11:39:34 -05:00
Pieter Wuille
64d4113e01
Merge #10061 : [net] Added SetSocketNoDelay() utility function
...
ad415bc [net] Added SetSocketNoDelay() utility function (Thomas Snider)
Tree-SHA512: c19e3c9910b3fc2ef86f2434f3e91d343e9cd9e2116153941de9789e2a6fc0389bffe762d21b55cda4a4b1de993afee0564c6946e65d05cef9e866b58896f9af
2019-06-24 11:39:34 -05:00
Pieter Wuille
2e050ea744
Merge #10395 : Replace boost::function with std::function (C++11)
...
1b936f5 Replace boost::function with std::function (C++11) (practicalswift)
Tree-SHA512: c4faec8cf3f801842010976115681f68ffa08fbc97ba50b22e95c936840f47e1b3bd8d7fd2f5b4e094b5a46bf3d29fc90b69d975a99e77322c0d19f8a00d53d3
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
6b548bf37a
Merge #10388 : Output line to debug.log when IsInitialBlockDownload latches to false
...
65d484a Output line to debug.log when IsInitialBlockDownload latches to false (Alex Morcos)
Tree-SHA512: 8b9d1377167a78ea55afc4582c8b9305c8b0fe56063a25920e9d45ea9335470314e3cfdc92e78b803d304476fa4c19b228fea1758bbeadd20c719006d814b5f2
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
ad177ba666
Merge #10319 : Remove unused argument from MarkBlockAsInFlight(...)
...
6345f0b Remove unused argument from MarkBlockAsInFlight(...) (practicalswift)
Tree-SHA512: c07616aac1a2e00d269ffd62861bb0fe3addc60c7a601ec4f9c212727697cf82d41d237cce8e043df02b7733d553bd99d9c999ebb299d376dbc63483ce182219
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
d84660729e
Merge #7522 : Bugfix: Only use git for build info if the repository is actually the right one
...
ed1fcdc Bugfix: Detect genbuild.sh in repo correctly (Luke Dashjr)
e98e3dd Bugfix: Only use git for build info if the repository is actually the right one (Luke Dashjr)
Tree-SHA512: 510d7ec8cfeff4e8e0c7ac53631eb32c7acaada7017e7f8cc2e6f60d86afe1cd131870582e01022f961c85a783a130bcb8fef971f8b110070c9c02afda020726
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
23daebec7e
Merge #10405 : tests: Correct testcase in script_tests.json for large number OP_EQUAL
...
2f84cf6 tests: Correct testcase in script_tests.json for large number OP_EQUAL (Wladimir J. van der Laan)
Tree-SHA512: 3a4d33c7d65ea40f25e2f5f2dfab8b0262cac8a7c33698eef8332ca5ec4a6f88f73fc51441892b49ffa85660be5037644430585f2eab76e257d544f9c2271ab7
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
4dda381562
Merge #10374 : qa: Warn when specified test is not found
...
fac79e4 qa: Warn when specified test is not found (MarcoFalke)
Tree-SHA512: d11ecdde275309b12e23155f6cd8e26c99217436b5094a70dd51b95ae7688754227628dd9a801eb6a52ff3ebea4420938e2fc8e9dc9cd77a4dd5c28d2b822354
2019-06-24 11:39:34 -05:00
Wladimir J. van der Laan
c4bd31a4e4
Merge #10404 : doc: Add logging to FinalizeNode()
...
1530bfc Add logging to FinalizeNode() (Suhas Daftuar)
Tree-SHA512: 34bd950eb7830f378d069229c24122e97db68435b313f0de2c8772c2feefdc6db5f4d1f43eeade237ffe91cdef0f1cfe3232e1a37c561a65767f4527b2e2e370
2019-06-24 11:39:34 -05:00