Wladimir J. van der Laan
8edc2a78cb
Merge #8249 : Enable (and check for) 64-bit ASLR on Windows
...
62c2915 build: supply `-Wl,--high-entropy-va` (Wladimir J. van der Laan)
9a75d29 devtools: Check for high-entropy ASLR in 64-bit PE executables (Wladimir J. van der Laan)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
6262f79f00
Merge #8807 : [univalue] Pull subtree from upstream
...
3650668 Squashed 'src/univalue/' changes from f32df99..daf1285 (MarcoFalke)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
18218aa3c2
Merge #8802 : Fix future copyright year
...
edeaf24 Fix future copyright year (Mitchell Cash)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
fdc87cecc6
Merge #8771 : CONTRIBUTING: Mention not to open several pulls
...
faa91bc CONTRIBUTING: Mention not to open several pulls (MarcoFalke)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
24c4116b58
Merge #8787 : [Doc] Add missing autogen to example builds
...
3f58a28 [Doc] Add missing autogen to example builds (Amir Abrams)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
ce73b8300a
Merge #8786 : Mandatory copyright agreement
...
4b67402 Mandatory copyright agreement (Andrew Chow)
2018-01-11 13:22:22 +01:00
MarcoFalke
54703891e1
Merge #8790 : [test] Remove redundant debug print in addrman_tests
...
3333bd2 [test] Remove redundant print in addrman_tests (MarcoFalke)
2018-01-11 13:22:22 +01:00
MarcoFalke
7f4439fa63
Merge #8789 : [qa] pull-tester: Only print output when failed
...
fa427ce [qa] pull-tester: Only print output when failed (MarcoFalke)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
39d2131142
Merge #8661 : Do not set an addr time penalty when a peer advertises itself.
...
6d0ced1 Do not set an addr time penalty when a peer advertises itself. (Gregory Maxwell)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
c7a0b91d31
Merge #8793 : Do not shadow in src/qt
...
f839350 Do not shadow in src/qt (Pavel Janík)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
17e110f47e
Merge #8785 : Comment on CNode::nLocalServices meaning
...
b5ccded Comment on CConnman::nLocalServices meaning (instagibbs)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
9ad1f3ffb9
Merge #8779 : [contrib] Delete spendfrom
...
fa81d09 [contrib] Delete spendfrom (MarcoFalke)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
801c9e259d
Merge #8423 : [depends] expat 2.2.0, ccache 3.3.1, fontconfig 2.12.1
...
86d410d [depends] fontconfig 2.12.1 (fanquake)
9616ac8 [depends] ccache 3.3.1 (fanquake)
6b6cbdd [depends] expat 2.2.0 (fanquake)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
0dfb934509
Merge #8783 : [share] remove qt/protobuf.pri
...
fa13c5c [share] remove qt/protobuf.pri (MarcoFalke)
2018-01-11 13:22:21 +01:00
Wladimir J. van der Laan
24c69691c2
Merge #8781 : [contrib] delete qt_translations.py
...
faf87af [contrib] delete qt_translations.py (MarcoFalke)
2018-01-11 13:22:21 +01:00
Wladimir J. van der Laan
97b63420dd
Merge #8656 : Trivial: Do not shadow global variable fileout
...
7c069a7 Do not shadow global variable (Pavel Janík)
2018-01-11 13:22:21 +01:00
Wladimir J. van der Laan
bfa539a1dd
Merge #8777 : [qt] WalletModel: Expose disablewallet
...
6666ca6 [qt] WalletModel: Expose disablewallet (MarcoFalke)
2018-01-11 13:22:21 +01:00
MarcoFalke
bd9449c00f
Merge #8773 : Trivial Bugfix: doc/gitian-building.md: Link to release-process needs to be updated
...
6f933c6 Trivial Bugfix: doc/gitian-building.md: Link to release-process needs to be updated (Luke Dashjr)
2018-01-11 13:22:21 +01:00
Wladimir J. van der Laan
06f41f3586
Merge #8768 : init: Get rid of fDisableWallet
...
fa58edb [wallet] Introduce DEFAULT_DISABLE_WALLET (MarcoFalke)
fab9107 init: Get rid of fDisableWallet (MarcoFalke)
2018-01-11 13:22:17 +01:00
Wladimir J. van der Laan
ac3fdd3d27
Merge #8769 : Trivial: Fix ISO URL, capitalization
...
04d91f4 Trivial: Fix ISO URL, capitalization (unsystemizer)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
e02b48cad0
Merge #8765 : [Wallet] remove "unused" ThreadFlushWalletDB from removeprunedfunds
...
c6f5ca8 [Wallet] remove "unused" ThreadFlushWalletDB from removeprunedfunds (Jonas Schnelli)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
36fcd5c414
Merge #8762 : Trivial: Fix typo
...
12a721b Trivial: Fix typo (Marty Jones)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
387201712a
Merge #7783 : [Qt] RPC-Console: support nested commands and simple value queries
...
1586044 [Qt] RPC-Console: support nested commands and simple value queries (Jonas Schnelli)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
630c699f00
Merge #8696 : [Wallet] Remove last external reference to CWalletDB
...
2ca6b9d Remove last reference to CWalletDB from accounting_tests.cpp (Patrick Strateman)
02e2a81 Remove pwalletdb parameter from CWallet::AddAccountingEntry (Patrick Strateman)
d2e678d Add CWallet::ReorderTransactions and use in accounting_tests.cpp (Patrick Strateman)
59adc86 Add CWallet::ListAccountCreditDebit (Patrick Strateman)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
fbbddf8107
Merge #8760 : [init] Get rid of some ENABLE_WALLET
...
faddd62 init: Get rid of some ENABLE_WALLET (MarcoFalke)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
a5a9e46042
Merge #8700 : [copyright] add MIT license headers to .sh scripts where missing
...
0766d1c [copyright] add MIT license headers to .sh scripts where missing (isle2983)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
d95a9728be
Merge #8676 : Add missing copyright headers
...
783e930 [copyright] Add missing copyright headers (isle2983)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
b04e32c43d
Merge #8688 : Move static global randomizer seeds into CConnman
...
d9ff591 Move static global randomizer seeds into CConnman (Pieter Wuille)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
473ffa0641
Merge #8702 : [copyright] add MIT License copyright header to remaining Python files
...
4677b19 [copyright] add MIT License copyright header to remaining Python files (isle2983)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
45fe44ed27
Merge #8701 : [copyright] add MIT License copyright header to zmq_sub.py
...
37a7fe9 [copyright] add MIT License copyright header to zmq_sub.py (isle2983)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
412f79083c
Merge #8737 : Trivial: UndoReadFromDisk works on undo files (rev), not on block files.
...
b4fb512 UndoReadFromDisk works on undo files (rev), not on block files. (Pavel Janík)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
af5d18ad5c
Merge #8707 : net: fix maxuploadtarget setting
...
f3552da net: fix maxuploadtarget setting (Cory Fields)
2018-01-11 13:19:32 +01:00
Wladimir J. van der Laan
699db99321
Merge #8716 : [qa] wallet: Check legacy wallet as well
...
fa644d0 [qa] wallet: Check legacy wallet as well (MarcoFalke)
2018-01-11 13:19:32 +01:00
Wladimir J. van der Laan
2a13321ffc
Merge #8742 : Specify Protobuf version 2 in paymentrequest.proto
...
c4084c2 Specify Protobuf version 2 in paymentrequest.proto (fanquake)
2018-01-11 13:19:32 +01:00
Wladimir J. van der Laan
e031570c46
Merge #8720 : Minor change in section name
...
dad932c Minor change in section name (Anders Øyvind Urke-Sætre)
2018-01-11 13:19:32 +01:00
Wladimir J. van der Laan
81a8e05d11
Merge #8754 : [Doc] Target protobuf 2.6 in OS X build notes.
...
b16a7f6 [Doc] Target protobuf 2.6 in OS X build notes. (Michael Ford)
2018-01-11 13:19:32 +01:00
Wladimir J. van der Laan
9432e1904f
Merge #8494 : [init, wallet] ParameterInteraction() iff wallet enabled
...
fa5d276 [init] ParameterInteraction() iff wallet enabled (MarcoFalke)
2018-01-11 13:19:32 +01:00
MarcoFalke
9e0976ee0a
Merge #8724 : [qa] walletbackup: Sync blocks inside the loop
...
fad41f3 [qa] walletbackup: Sync blocks inside the loop (MarcoFalke)
2018-01-11 13:19:32 +01:00
MarcoFalke
9d86487352
Merge #8713 : [qa] create_cache: Delete temp dir when done
...
fa27d99 [qa] create_cache: Delete temp dir when done (MarcoFalke)
2018-01-11 13:19:32 +01:00
MarcoFalke
c46c480577
Merge #8714 : [qa] gitignore: Remove unused lines
...
1111ddb gitignore: Remove unused lines (MarcoFalke)
2018-01-11 13:19:32 +01:00
Jonas Schnelli
eae44bd3d7
Merge #8712 : Remove maxuploadtargets recommended minimum
...
1b6bcdd Remove maxuploadtargets recommended minimum (Jonas Schnelli)
2018-01-11 13:19:32 +01:00
MarcoFalke
93e857ed9c
Merge #8652 : [qa]: remove root test directory for RPC tests
...
c62cc4e fix path for bak file (whythat)
438e94d remove root test directory for RPC tests (whythat)
2018-01-11 13:19:32 +01:00
Wladimir J. van der Laan
85ce0ef287
Merge #8697 : fix op order to append first alert
...
1d635ae fix op order to append first alert (rodasmith)
2018-01-11 13:19:32 +01:00
Alexander Block
3aad9d9085
Fix logging in PushInventory ( #1847 )
...
Merge conflict resolution went wrong here. It showed filtered in case it
was pushed and nothing in case it was filtered.
2018-01-11 04:59:25 +03:00
UdjinM6
94e891c020
Merge pull request #1842 from codablock/pr_backport_bitcoin_0.14-2
...
Backport missing PRs from Bitcoin 0.14 - Part 2
2018-01-11 04:58:52 +03:00
Alexander Block
c2de362b98
Actually honor fMiningRequiresPeers in getblocktemplate ( #1844 )
...
MiningRequiresPeers() was not used at all. I checked the Bitcoin
code and even there it is set but then ignored. Updated getblocktemplate
to actually honor the value.
The check also removes the need for IsInitialBlockDownload() to be false.
As regtest nodes start with an empty chain they won't be able to use
getblocktemplate for mining otherwise.
2018-01-10 15:22:00 +03:00
Alexander Block
81fb931fb8
Don't delay GETHEADERS when no blocks have arrived yet in devnet ( #1807 )
...
When the first mined block arrives from another node on devnet, we have to
send GETHEADERS immediately as we otherwise will never leave the IBD mode.
2018-01-10 15:20:08 +03:00
Alexander Block
a46bf120bc
Don't directly call "wine test_dash.exe" and let "make check" handle it ( #1841 )
...
Turned out "make check" will use wine if needed and for some reason does
not suffer from the same performance issues when called manually.
2018-01-10 12:18:52 +03:00
Alexander Block
e805f790e3
Automatically build and push docker image to docker.io/dashpay/dashd-develop ( #1809 )
...
* Automatically build and push docker image to dashpay/dashd-develop
* Remove DOCKER_REPO env var from .travis.yml and add new-line to .gitignore
This should not have been there and results in errournous pushes to
"dashpay/dashd/dashpay/dashd-develop".
Also add missing new-line in .gitignore
* Fix Travis build failures happening due to large writes to stdout
Travis issue: https://github.com/travis-ci/travis-ci/issues/4704
Build failure happened since the introduction of secrets in .travis.yml
* Fix BUILD_DIR
Due to changes in develop the build dir has changed to be just "build".
* Remove bogus upload example from .travis.yml
* Switch to pushing on "develop" branch
Used "pr_docker" before for testing purposes.
* Only push docker image when TRAVIS_PULL_REQUEST = false
2018-01-10 12:17:43 +03:00
Alexander Block
8efec7b068
Fix wallet-accounts.py tests
2018-01-09 17:45:28 +01:00