DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity
18,894 Commits 7 Branches 3 Tags
71fc062672b1e6d1e419fc35652a89c6dfd2f1a1
Commit Graph

18894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
jl777
e9e7e410ef Test 2017-04-17 17:33:52 +03:00
jl777
bfb634f223 Increment number of note witness cache 2017-04-17 17:24:00 +03:00
jl777
7020df9139 New mesh 2017-04-17 10:18:22 +03:00
ca333
d1f9f6070a Merge pull request #9 from jl777/beta 
beta update
 2017-04-17 01:47:41 +02: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
jl777
a74c52b02a Merge pull request #416 from jl777/dPoW 
DPoW
 2017-04-16 08:33:46 +03:00
jl777
147379d2eb Merge pull request #415 from jl777/beta 
Beta
 2017-04-16 08:31:41 +03:00
ca333
01fefc2784 Merge pull request #8 from jl777/master 
master update
 2017-04-16 03:32:02 +02: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
jl777
854af15e28 Merge pull request #412 from jl777/dev 
https://github.com/zcash/zcash/pull/2259/commits
 2017-04-14 08:37:02 +03:00
jl777
4d4a7cd55d https://github.com/zcash/zcash/pull/2259/commits 
https://github.com/zcash/zcash/pull/2259/commits
 2017-04-14 08:33:04 +03: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
Nathan Wilcox
451047d14a Bump version numbers for v1.0.8-1. 2017-04-13 17:10:32 -07: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
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
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
jl777
21afe18407 Merge pull request #411 from jl777/dev 
Test
 2017-04-10 17:36:49 +03:00
jl777
56403c7e15 Test 2017-04-10 17:35:51 +03:00
jl777
3c4d6ebc6e Merge pull request #410 from jl777/dev 
Dev
 2017-04-10 15:47:06 +03:00
jl777
41ebe9c6a8 Test 2017-04-10 15:41:40 +03:00
jl777
20b4fe1d43 Test 2017-04-10 15:35:21 +03:00
jl777
f11e832013 Test 2017-04-10 10:17:07 +03:00
jl777
4206dee514 Test 2017-04-10 10:12:40 +03:00
jl777
967c5efdff Test 2017-04-10 10:08:08 +03:00
jl777
c5ab46041e Test 2017-04-10 10:06:42 +03:00
jl777
32f8faad5d Test 2017-04-10 09:58:57 +03:00
jl777
8094795afc Test 2017-04-10 09:57:54 +03:00
jl777
4415b53eed Test 2017-04-10 09:48:38 +03: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
jl777
953cec090a Merge pull request #409 from jl777/dev 
Dev
 2017-04-08 16:45:05 +03:00
jl777
7afa0b34e0 Merge pull request #408 from jl777/1.0.8 
1.0.8
 2017-04-08 16:43:47 +03:00
jl777
02d067d7db 1.0.8 2017-04-08 16:42:29 +03: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
jl777
6e9f40ca49 Test 2017-03-30 05:42:52 +03:00
jl777
4e5be25928 Test 2017-03-30 05:40:36 +03:00
jl777
d5f3353d30 Test 2017-03-30 05:34:26 +03:00