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
Wladimir J. van der Laan
fdd0638161
Merge #8928 : Fix init segfault where InitLoadWallet() calls ATMP before genesis
...
37aefff Fix init segfault where InitLoadWallet() calls ATMP before genesis (Matt Corallo)
2018-01-09 17:23:39 +01:00
Alexander Block
610470c736
Remove bitcoin man pages and call gen-manpages.sh for Dash
2018-01-09 14:42:34 +01:00
Alexander Block
f9694badb9
Dashify gen-manpages.sh
2018-01-09 14:31:17 +01:00
Wladimir J. van der Laan
5691cee8dd
Merge #8608 : Install manpages via make install, also add some autogenerated manpages
...
d19583f improved gen-manpages.sh, includes bitcoin-tx and strips commit tag, now also runs binaries from build dir by default, added variables for more control (nomnombtc)
09546ca regenerated all manpages with commit tag stripped, also add bitcoin-tx (nomnombtc)
ae6e754 change help string --enable-man to --disable-man (nomnombtc)
a32c102 add conditional for --enable-man, default is yes (nomnombtc)
dc84b6f add doc/man to subdir if configure flag --enable-man is set (nomnombtc)
00dba72 add doc/man/Makefile.am to include manpages (nomnombtc)
eb5643b add autogenerated manpages by help2man (nomnombtc)
6edf2fd add gen-manpages.sh description to README.md (nomnombtc)
d2cd9c0 add script to generate manpages with help2man (nomnombtc)
2018-01-09 14:16:39 +01:00
MarcoFalke
85c0aabc11
Merge #8667 : Fix SIGHASH_SINGLE bug in test_framework SignatureHash
...
2f2548d Fix SIGHASH_SINGLE bug in test_framework SignatureHash (Johnson Lau)
2018-01-09 14:16:39 +01:00
Pieter Wuille
3baee7ba24
Merge #8681 : Performance Regression Fix: Pre-Allocate txChanged vector
...
ec81881 Performance Regression Fix: Pre-Allocate txChanged vector (Jeremy Rubin)
2018-01-09 14:16:39 +01:00
Wladimir J. van der Laan
0324fa0121
Merge #8677 : Do not shadow upper local variable 'send', prevent -Wshadow compiler warning.
...
125b946 Do not shadow upper local variable 'send', prevent -Wshadow compiler warning. (Pavel Janík)
2018-01-09 14:16:39 +01:00
Wladimir J. van der Laan
b90d7611ab
Merge #8563 : Add configure check for -latomic
...
878faac Add configure check for -latomic (Anthony Towns)
2018-01-09 14:16:39 +01:00
Wladimir J. van der Laan
c2a601f507
Merge #8680 : Address Travis spurious failures
...
d6a5dc4 add waitfornewblock/waitforblock/waitforblockheight rpcs and use them for tests (Cory Fields)
2018-01-09 14:16:39 +01:00
Wladimir J. van der Laan
6924212f09
Merge #8683 : fix incorrect file name bitcoin.qrc
...
df2d2e7 update name of file bitcoin.qrc (Gaurav Rana)
2018-01-09 14:16:39 +01:00
MarcoFalke
3d26438bec
Merge #8673 : Trivial: Fix obvious assignment/equality error in test
...
426e7bc Fix obvious assignment/equality error in test (Jeremy Rubin)
2018-01-09 14:16:39 +01:00
Pieter Wuille
f7e9bc613a
Merge #8606 : Fix some locks
...
144ed76 Fix some locks (Pieter Wuille)
2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
2189570911
Merge #8645 : Remove unused Qt 4.6 patch.
...
38acbf8 Remove unused Qt 4.6 patch. (Doug)
2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
75f920e897
Merge #8663 : trivial: remove unnecessary variable fDaemon
...
ff2ed7a trivial: remove unnecessary variable fDaemon (mruddy)
2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
313cfb09da
Merge #8466 : [Trivial] Do not shadow variables in networking code
...
b7c349d Do not shadow variables in networking code (Pavel Janík)
2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
414272af93
Merge #8629 : C++11: s/boost::scoped_ptr/std::unique_ptr/
...
cdd79eb C++11: s/boost::scoped_ptr/std::unique_ptr/ (Jorge Timón)
2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
4d0be42c6e
Merge #8272 : Make the dummy argument to getaddednodeinfo optional
...
854f1af Make the dummy argument to getaddednodeinfo optional (Pieter Wuille)
2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
bc91f34da6
Merge #8638 : rest.cpp: change HTTP_INTERNAL_SERVER_ERROR to HTTP_BAD_REQUEST
...
f012a85 rest.cpp: change HTTP_INTERNAL_SERVER_ERROR to HTTP_BAD_REQUEST (djpnewton)
2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
79d550d563
Merge #8557 : [contrib] Rework verifybinaries
...
faaed88 [contrib] verifybinaries: Mention mandatory preparation step (MarcoFalke)
fa917f6 [contrib] verifybinaries: Keep downloads by default (MarcoFalke)
fab1f92 [contrib] verifybinaries: Adjust parsing to new rc path (MarcoFalke)
2018-01-09 14:16:38 +01:00
MarcoFalke
ae0aca909e
[contrib] Remove reference to sf and add doc to verify.sh
2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
aed0b04133
contrib: remove hardcoded version from verify.sh
...
Closes #7595 as by removing the hardcoded version number from
`verify.sh`.
2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
a2d18b4758
Merge #8640 : [depends] Remove Qt46 package
...
3e7d2a2 [depends] Remove Qt46 package (Michael Ford)
2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
88fcf3fbd2
Merge #8191 : Do not shadow variables in src/wallet
...
b175cb7 Do not shadow variables. (Pavel Janík)
2018-01-09 14:16:37 +01:00
Wladimir J. van der Laan
5ce7ba6115
Merge #8291 : [util] CopyrightHolders: Check for untranslated substitution
...
33336e1 [util] CopyrightHolders: Check for untranslated substitution (MarcoFalke)
2018-01-09 14:16:37 +01:00
Wladimir J. van der Laan
9d061a2730
Merge #8163 : Do not shadow global RPC table variable (tableRPC)
...
de1bbe3 Do not shadow global RPC table variable (tableRPC) (Pavel Janík)
2018-01-09 14:16:37 +01:00
Wladimir J. van der Laan
75f65e9f19
Merge #8604 : build,doc: Update for 0.13.0+ and OpenBSD 5.9
...
6275123 doc: Update build-openbsd for 0.13.0+ and OpenBSD 5.9 (Wladimir J. van der Laan)
883175f build: Updates for OpenBSD (Wladimir J. van der Laan)
2018-01-09 14:16:37 +01:00
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