Commit Graph

10826 Commits

Author SHA1 Message Date
Jack Grigg d15cab21bc
Address Daira's further comments 2017-04-21 13:15:39 +12:00
zkbot 20d61ac0ea Auto merge of #2270 - bitcartel:2269_change_regtest_port, r=daira
Change regtest port to 18344.  Closes #2269.
2017-04-19 11:07:49 +00:00
Jack Grigg 0b431fbdb5
Address Daira's comments 2017-04-19 15:23:28 +12:00
Jack Grigg 2bf4f2781b
[manpage] Handle build numbers in versions 2017-04-19 14:21:45 +12:00
Jack Grigg a2e20e9ac6
Convert Zcash versions to Debian format 2017-04-19 13:45:55 +12:00
Jack Grigg 519713d32e
torcontrol: Add missing copyright header 2017-04-18 12:54:22 +12:00
Jack Grigg b93cedafe4
torcontrol: Handle escapes in Tor QuotedStrings
https://trac.torproject.org/projects/tor/ticket/14999 is tracking an encoding
bug with the Tor control protocol, where many of the QuotedString instances that
Tor outputs are in fact CStrings, but it is not documented which ones are which.

https://spec.torproject.org/control-spec section 2.1.1 provides a future-proofed
rule for handing QuotedStrings, which this commit implements.
2017-04-18 12:54:16 +12:00
cronicc 235d7a248b Update build scripts #69 fixes #70 (#72)
* #69 Update build-win.sh

* #69 update build-mac.sh

* update for rust exclusion
2017-04-17 12:24:09 -04:00
zkbot 8e96dc44dd Auto merge of #2205 - arcalinea:1804_zcash_addresses_in_help, r=daira
Change help text examples to use Zcash addresses

Closes #1804 and #2109

Ensures command line help text addresses are Zcash addresses.

Didn't change the text strings that say bitcoin or btc, leaving that for #2150 to close

Did I get all the addresses?
2017-04-17 15:49:37 +00:00
Simon 05844ba53b Change regtest port to 18344. Closes #2269. 2017-04-16 14:48:04 -07:00
zkbot ab3c2fe7b0 Auto merge of #2265 - daira:2263.fix-rpc-error-reporting, r=daira
Fix an error reporting bug due to BrokenPipeError and ConnectionResetError not existing in Python 2

refs #2263

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-04-16 16:56:16 +00:00
zkbot f7f764e0b2 Auto merge of #2189 - bitcartel:1.0.7_with_apache_qpid, r=bitcartel
Add AMQP 1.0 support via Apache Qpid Proton C++ API 0.17.0

Closes #2188
2017-04-16 15:09:19 +00:00
Simon 56f66372c5 Fix proton build issue with debian jessie, as used on CI servers.
Debian 8 stable ships with gcc 4.9.2 and cmake 3.0.2.  Previously
the depends package used CMAKE_CXX_STANDARD to tell cmake to use
C++11, but the option requires cmakes 3.1+.  To resolve the issue
we now update relevant CMakeLists.txt and set CMAKE_CXX_FLAGS.
2017-04-16 00:30:58 -07:00
Jay Graber 0a56135336 Poll on getblocktemplate result rather than use bare sleep to avoid race condition. 2017-04-14 17:31:35 -07:00
Daira Hopwood 80cbdbc749 Fix an error reporting bug due to BrokenPipeError and ConnectionResetError not existing in Python 2.
refs #2263

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-04-14 21:40:30 +01:00
Nathan Wilcox c5229b5603 [Direct master commit] Fix a release snafu in debian version string. 2017-04-13 20:24:28 -07:00
zkbot 67b47d212c Auto merge of #2260 - nathan-at-least:release-v1.0.8-1, r=nathan-at-least
Release v1.0.8 1
2017-04-14 01:12:14 +00:00
Nathan Wilcox c4bfb295a9 Fix the previous incorrect fix to the manpage. 2017-04-13 18:10:19 -07:00
Nathan Wilcox 9bfe6e8854 Undo a documentation error due to an automated tool. 2017-04-13 18:08:12 -07:00
Nathan Wilcox 1c360b2128 Fix a release-process.md bug; commit results changelog + debian updates. 2017-04-13 17:48:08 -07:00
Nathan Wilcox a4f764bb28 Commit the changes from gen-manpages.sh, except manually tweak the version strings. 2017-04-13 17:39:36 -07:00
Joshua Yabut c8d9ea1d4d Merge pull request #65 from aayanl/patch-2
Update docs for MultiOS
2017-04-13 20:18:07 -04:00
Joshua Yabut 58db0334b7 Merge pull request #66 from z-classic/v1.0.8-dev
v1.0.8-1 - SECURITY FIX
2017-04-13 20:12:49 -04:00
Nathan Wilcox 451047d14a Bump version numbers for v1.0.8-1. 2017-04-13 17:10:32 -07:00
joshuayabut c95dbd758e SECURITY FIX - Merge commit 'b0b5358b7efbc60876fc52d498896054762db2d8' into v1.0.8-dev 2017-04-13 19:01:35 -04:00
zkbot b0b5358b7e Auto merge of #2259 - nathan-at-least:simplify-joinsplit-priority2, r=ebfull
simplify joinsplit priority
2017-04-13 22:54:55 +00:00
joshuayabut dd4507ad39 Update text to Zclassic 2017-04-13 18:02:11 -04:00
Daira Hopwood 60b7410cce Add check for JoinSplit priority as calculated by CCoinsViewCache::GetPriority.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-04-13 22:40:37 +01:00
Daira Hopwood ec19e8e283 Simplify JoinSplit priority calculation. refs 1896
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-04-13 22:40:20 +01:00
joshuayabut a64c8bf338 Release 1.0.8.
-----BEGIN PGP SIGNATURE-----
 
 iF4EABYIAAYFAljZ1QgACgkQ/S21FcdQdRkuSQEAqQC0TrvzJbtyHvwwC+16YONr
 v2vdx5LhJDs92gtgBGMA/3NmfhhTTDlJB8ldSQWfnjEJCr3jjTSbO/7V/wK+JdIB
 =RkA7
 -----END PGP SIGNATURE-----

Merge v1.0.8
2017-04-13 17:40:02 -04:00
str4d c83c5932e4 Add unit test for security issue 2017-04-11.a 2017-04-13 17:59:36 +01:00
str4d e40180aa0f Update tests to check actual infinity as well as INF_FEERATE 2017-04-13 17:59:36 +01:00
Daira Hopwood 0090c64534 Don't rely on a finite upper bound on fee rate or priority.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-04-13 17:59:36 +01:00
Daira Hopwood 5a49c929dd Delete old protocol version constants and simplify code that used them.
fixes #2244

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-04-09 13:19:48 +01:00
Procrastinator d30125a03d Update README.md 2017-04-07 20:07:34 -04:00
Procrastinator 84414046f5 Update security-warnings.md 2017-04-07 19:49:29 -04:00
zkbot c752b8aa9b Auto merge of #2241 - str4d:2238-benchmark-timeouts, r=ageis
Use a larger -rpcclienttimeout for slow performance measurements

Closes #2238.
2017-04-07 09:06:41 +00:00
Jack Grigg 338ff45787
Use a larger -rpcclienttimeout for slow performance measurements
Closes #2238.
2017-04-07 15:03:25 +12:00
Joshua Yabut b729c4c409 Merge pull request #60 from z-classic/v1.0.6-dev
V1.0.6
2017-04-05 17:39:20 -04:00
Jack Grigg 0d0265fd11
Use AtomicTimer for metrics screen thread count 2017-03-29 18:25:09 +13:00
Wladimir J. van der Laan 2854c4e366
Remove ChainParams::DefaultMinerThreads
No longer relevant after #5957. This hack existed because of another
hack where the numthreads parameter, on regtest, doubled as how many
blocks to generate.
2017-03-29 16:06:02 +13:00
Wladimir J. van der Laan da1357e6cc
Use real number of cores for default -par, ignore virtual cores
To determine the default for `-par`, the number of script verification
threads, use [boost:🧵:physical_concurrency()](http://www.boost.org/doc/libs/1_58_0/doc/html/thread/thread_management.html#thread.thread_management.thread.physical_concurrency)
which counts only physical cores, not virtual cores.

Virtual cores are roughly a set of cached registers to avoid context
switches while threading, they cannot actually perform work, so spawning
a verification thread for them could even reduce efficiency and will put
undue load on the system.

Should fix issue #6358, as well as some other reported system overload
issues, especially on Intel processors.

The function was only introduced in boost 1.56, so provide a utility
function `GetNumCores` to fall back for older Boost versions.
2017-03-29 16:06:00 +13:00
zkbot f630519d86 Auto merge of #2213 - daira:2211.release-1.0.8, r=daira
2211.release-1.0.8

Release 1.0.8. refs #2211
2017-03-28 01:22:21 +00:00
Daira Hopwood 27fb36c50b Update authors, release notes, and Debian package metadata.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-03-27 21:32:16 +01:00
Daira Hopwood b58208fb8d Generate man pages.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-03-27 21:27:10 +01:00
Daira Hopwood 26722e47c6 Improvement to release process doc.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-03-27 21:05:10 +01:00
Daira Hopwood 83aac13083 Update version numbers.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-03-27 21:01:18 +01:00
zkbot 45faa928ec Auto merge of #2177 - str4d:2061-tor-ephemeral-hs, r=daira
Tor ephemeral hidden services

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6503 (included to reduce merge conflicts)
- bitcoin/bitcoin#6639
- bitcoin/bitcoin#6643
- bitcoin/bitcoin#7090
- bitcoin/bitcoin#7035
- bitcoin/bitcoin#7170
- bitcoin/bitcoin#7218 (non-QT part)
- bitcoin/bitcoin#7313
- bitcoin/bitcoin#7438
- bitcoin/bitcoin#7553
- bitcoin/bitcoin#7637
- bitcoin/bitcoin#7683
- bitcoin/bitcoin#7813
- bitcoin/bitcoin#7703
- bitcoin/bitcoin#8203
- bitcoin/bitcoin#9004
- bitcoin/bitcoin#9234
- bitcoin/bitcoin#9911 (partial)

Closes #2061.
2017-03-26 02:44:06 +00:00
zkbot f7fcad709b Auto merge of #2203 - arcalinea:2142_security_log_message, r=daira
Add message directing users to security guide

Addresses #2142, which was blocking on updates to zcash/support/security.html. That page has now been added, so this message directing users to the site can be included.

It displays in the zcash-cli --help and --version message text, and on the zcashd metrics screen.
2017-03-26 01:36:24 +00:00
Jack Grigg 87b7f4d878
torcontrol: Log invalid parameters in Tor reply strings where meaningful 2017-03-26 14:35:13 +13:00