Wladimir J. van der Laan
d16b2e5ecb
Merge #8621 : [contrib] python: Don't use shell=True
...
fa994a7 contrib: Don't use shell=True (MarcoFalke)
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
Wladimir J. van der Laan
f6658c07f3
Merge #8611 : Reduce default number of blocks to check at startup
...
203f212 Reduce default number of blocks to check at startup (Pieter Wuille)
2018-01-09 14:16:37 +01:00
Alexander Block
40202ef819
Dashify gitian-build.sh
2018-01-09 14:16:37 +01:00
Wladimir J. van der Laan
fc34ec4b3f
Merge #8566 : Easy to use gitian building script
...
3fe0b68 Set defaults to gitian defaults (Andrew Chow)
6ffd6b4 Create option to detach sign gitian builds and not commit the files in the script (Andrew Chow)
498d8da Check for OSX SDK (Andrew Chow)
eda4cfb Create an easy to use gitian building script (Andrew Chow)
2018-01-09 14:04:21 +01:00
MarcoFalke
e8e95994bb
Merge #8625 : [doc] - clarify statement about parallel jobs in rpc-tests.py
...
1467561 [doc] - clarify statement about parallel jobs in rpc-tests.py (isle2983)
2018-01-09 14:04:21 +01:00
Pieter Wuille
2da811becb
Merge #8624 : [doc] build: Mention curl
...
fae6bb8 [doc] build: Mention curl (MarcoFalke)
2018-01-09 14:04:21 +01:00
Pieter Wuille
e7da915844
Merge #8617 : Include instructions to extract Mac OS X SDK on Linux using 7zip and SleuthKit
...
b729fcd Include instructions to extract Mac OS X SDK on Linux using 7zip and SleuthKit (Luke Dashjr)
2018-01-09 14:04:21 +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
22604cbbcc
Merge #8607 : [doc] Fix doxygen off-by-one comments, fix typos
...
fafe7b3 contrib: Make fix-copyright-headers.py more portable (MarcoFalke)
fa27c0a [doc] Fix typos in comments, doxygen: Fix comment syntax (MarcoFalke)
fabfd5d [qa] pull-tester: Don't mute zmq ImportError (MarcoFalke)
67a5502 init: Fix typo in help message for -whitelistforcerelay (Wladimir J. van der Laan)
2018-01-09 14:04:21 +01:00
Pieter Wuille
f81e4f5fa9
Merge #8545 : [doc] Update git-subtree-check.sh README
...
fa3d974 [doc] Update git-subtree-check.sh README (MarcoFalke)
2018-01-09 14:04:20 +01:00
Pieter Wuille
30066a6004
Merge #8109 : Do not shadow member variables
...
ff8d279 Do not shadow member variables (Pavel Janík)
2018-01-09 14:04:20 +01:00
Wladimir J. van der Laan
87c81ba6f9
Merge #8602 : [trivial][doc] Mention ++i as preferred over i++ in dev notes
...
ab53207 [trivial][doc] Mention ++i as preferred to i++ in dev notes (fanquake)
2018-01-09 14:04:20 +01:00
Wladimir J. van der Laan
59f4df1d8b
Merge #8603 : [trivial][doc] Mention gpg --refresh-keys in release-process.md
...
c25083b [trivial][doc] Mention gpg --refresh-keys in release-process.md (fanquake)
2018-01-09 14:04:20 +01:00
Wladimir J. van der Laan
95c61637d5
Merge #8590 : Remove unused variables
...
fa6dc9f Remove unused variables (MarcoFalke)
2018-01-09 14:04:20 +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
b00f025dd8
Merge #8583 : Show XTHIN in GUI
...
4c3e2cb Show XTHIN in GUI (R E Broadley)
2018-01-09 14:04:20 +01:00
Wladimir J. van der Laan
df07a31743
Merge #8561 : Show "end" instead of many zeros when getheaders request received with a hashStop of Null
...
259ee09 Show "end" instead of many zeros when getheaders request received with a hashStop of Null. (R E Broadley)
2018-01-09 14:04:20 +01:00
Pieter Wuille
3a497a6b5c
Merge #8462 : Move AdvertiseLocal debug output to net category
...
f13c1ba Move AdvertiseLocal debug output to net category (Michael Rotarius)
2018-01-09 14:04:20 +01:00
Jonas Schnelli
3fca7e2044
Merge #7579 : [Qt] show network/chain errors in the GUI
...
2f32c82 [Qt] show network/chain errors in the GUI (Jonas Schnelli)
2018-01-09 14:04:20 +01:00
Pieter Wuille
909945d34d
Merge #8226 : contributing.md: Fix formatting (line lengths and smart quotes)
...
be1d451 contributing.md: Fix formatting (Will Binns)
2018-01-09 14:04:20 +01:00
MarcoFalke
249e720254
Merge #8578 : [test] Remove unused code
...
fa1cf9e [test] Remove unused code (MarcoFalke)
2018-01-09 14:04:19 +01:00
Wladimir J. van der Laan
7269e4a901
Merge #8567 : Add default port numbers to REST doc
...
c911035 Add default port numbers to REST doc (djpnewton)
2018-01-09 14:04:19 +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
Pieter Wuille
c9ebd95163
Merge #8560 : Trivial: Fix two VarInt examples in serialize.h
...
7bd5ff4 Trivial: Fix two VarInt examples in serialize.h (Christian Barcenas)
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
bb93f82351
doc: Add historical release notes for 0.12.1 0.13.0
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
UdjinM6
eecec4535c
Merge pull request #1824 from codablock/pr_backport_bitcoin_0.14-1
...
Backport missing PRs from Bitcoin 0.14 - Part 1
2018-01-09 14:22:25 +03:00
UdjinM6
9965d51bb6
Avoid reference leakage in CKeyHolderStorage::AddKey ( #1840 )
2018-01-09 14:11:43 +03:00
UdjinM6
c532be1c06
Protect CKeyHolderStorage via mutex ( #1834 )
2018-01-09 12:18:10 +03:00
UdjinM6
d69ad9d619
Skip existing masternode conections on mixing ( #1833 )
2018-01-09 12:17:54 +03:00
Alexander Block
e2a795fd84
Return EXIT_SUCCESS instead of 0 in main()
2018-01-08 18:41:25 +01:00
Alexander Block
e3da73ebf8
Update Dash related code to use new SyncTransaction notifications interface
2018-01-08 18:41:06 +01:00
Alexander Block
ebc466dbd5
Revert test_bitcoin.info to test_dash.info in Makefile.am
2018-01-08 18:40:04 +01:00
Alexander Block
f8ffc55af2
Partially cherry-pick tests refactorings found in Bitcoin SegWit PRs
...
These were mixed into SegWit related PRs and are still needed in Dash.
2018-01-08 18:04:55 +01:00
Alexander Block
8460a9b975
Dashify translation_process.md
2018-01-08 18:04:55 +01:00
MarcoFalke
5b62ad34a3
Merge #8551 : [qa] Remove unused code
...
faaec13 [qa] Remove unused code (MarcoFalke)
2018-01-08 18:04:55 +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
Alexander Block
ae90d0f09e
Align HD wallet status icon code with Bitcoin code
...
Rename labelEncryptionIcon to labelWalletEncryptionIcon
Reorder icons in Makefile.qt.include
Add missing entries in debian/copyright
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
5bf3dadcb6
Merge #8461 : document return value of networkhashps for getmininginfo RPC endpoint
...
65f4532 document return value of networkhashps for getmininginfo RPC endpoint (Jameson Lopp)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
80573f2bf4
Merge #8540 : qt: Fix random segfault when closing "Choose data directory" dialog
...
b4a9aa5 qt: Fix random segfault when closing "Choose data directory" dialog (Wladimir J. van der Laan)
2018-01-08 18:04:55 +01:00
Pieter Wuille
55ccc56a80
Merge #8453 : Bring secp256k1 subtree up to date with master
...
b213535 Squashed 'src/secp256k1/' changes from 6c527ec..7a49cac (Wladimir J. van der Laan)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
7231c66901
Revert "[qa] Adjust timeouts for micro-optimization of run time"
...
This reverts commit fa2d68f79c459b505652728c3d8da60679f98ae3.
Temporary revert - see discussion in #8532 .
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
6ac01da712
Merge #8531 : [qa] abandonconflict: Use assert_equal
...
fa64306 [qa] abandonconflict: Use assert_equal (MarcoFalke)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
e6dca369e6
Merge #8504 : test: Remove java comparison tool
...
eb0c52e travis: Remove hostname hack (Wladimir J. van der Laan)
3c5251d test: Remove java comparison tool (Wladimir J. van der Laan)
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
Wladimir J. van der Laan
6b8160ba20
Merge #8513 : Fix a type error that would not compile on OSX.
...
8194a6e Fix a type error that would not compile on Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn) (Jeremy Rubin)
2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
7bba7375d0
Merge #8482 : [qa] Use single cache dir for chains
...
fad8cf6 [qa] Use single cache dir for chains (MarcoFalke)
fa2d68f [qa] Adjust timeouts for micro-optimization of run time (MarcoFalke)
fae596f [qa] Sort scripts by time for pull_tester and don't overwrite setup_chain (MarcoFalke)
2018-01-08 18:04:55 +01:00