DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
17,214 Commits 6 Branches 2 Tags
055ee43334352f0647371fd6b7cc3e75da1dc512
Commit Graph

17214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jl777
7283f803e9 Merge pull request #202 from jl777/dev 
Remove interests[] log
 2017-02-21 08:10:55 +02:00
jl777
4f0f864d3b Remove interests[] log 2017-02-21 08:09:56 +02:00
jl777
0f98f3fa6b Merge pull request #201 from jl777/dPoW 
DPoW
 2017-02-21 08:02:55 +02:00
jl777
fcd55e6055 Merge pull request #200 from jl777/beta 
Beta
 2017-02-21 08:02:08 +02:00
jl777
50c887a644 Merge pull request #199 from jl777/dev 
Test
 2017-02-21 07:59:53 +02:00
jl777
2e79a560e0 Test 2017-02-21 07:58:27 +02:00
zkbot
4e338b0c36 Auto merge of #2093 - bitcartel:sent_network_alerts, r=daira 
Closes #2092. Maintain record of alerts sent onto mainnet.
 2017-02-20 17:28:40 +00:00
Simon
4340ec9705 Update founders reward addresses for testnet 2017-02-20 09:23:06 -08:00
Simon
2911b35712 Fix bug where test was generating but not saving keys to wallet on disk. 2017-02-20 09:23:06 -08:00
zkbot
e96c8725af Auto merge of #2089 - elopio:patch-1, r=str4d 
Fix the path to the example configuration
 2017-02-20 15:18:53 +00:00
zkbot
73779d8c6d Auto merge of #1888 - mvrilo:busybox-sha256sum, r=daira 
Fix sha256sum on busybox

Busybox's version of `sha256sum` doesn't support `--check` parameter

```
/usr/bin/sha256sum: unrecognized option: check
BusyBox v1.24.2 (2016-08-12 14:38:34 GMT) multi-call binary.

Usage: sha256sum [-c[sw]] [FILE]...

Print or check SHA256 checksums

	-c	Check sums against list in FILEs
	-s	Don't output anything, status code shows success
	-w	Warn about improperly formatted checksum lines
The command '/bin/sh -c ./zcutil/fetch-params.sh' returned a non-zero code: 1```
 2017-02-20 14:08:51 +00:00
jl777
d74b39f80c Merge pull request #197 from jl777/dPoW 
225000 update
 2017-02-19 10:40:12 +02:00
jl777
8104754bfd Merge pull request #196 from jl777/beta 
225000 update
 2017-02-19 10:39:36 +02:00
jl777
ac64c9a962 Merge pull request #195 from jl777/dev 
225000 update
 2017-02-19 10:37:15 +02:00
jl777
ddf53ca2fa 225000 update 2017-02-19 10:35:57 +02:00
jl777
451cc49cce Merge pull request #193 from jl777/dPoW 
225000 update
 2017-02-19 10:32:03 +02:00
jl777
d3bd1762c6 Merge pull request #192 from jl777/beta 
225000 update
 2017-02-19 10:31:26 +02:00
ca333
4fbf4c38fc Merge pull request #3 from jl777/dev 
dev merge
 2017-02-19 09:31:08 +01:00
jl777
e5c4439dbb Merge pull request #191 from jl777/dev 
Dev
 2017-02-19 10:30:38 +02:00
jl777
86ad1cb1a0 Scheduled update 225000 2017-02-19 10:29:32 +02:00
jl777
20ce141789 Merge pull request #190 from jl777/dPoW 
Scheduled update at 225000
 2017-02-19 09:30:41 +02:00
jl777
bafd1a2aaa Merge pull request #189 from jl777/beta 
Scheduled update at 225000
 2017-02-19 09:29:56 +02:00
jl777
755c2b0044 test 2017-02-19 09:26:18 +02:00
jl777
c911b6d331 Merge pull request #188 from jl777/dev 
scheduled update at 225000
 2017-02-19 09:25:46 +02:00
jl777
96e6053c04 225000 scheduled update 2017-02-19 08:54:09 +02:00
jl777
dae6126c5d Scheduled upgrade at 225000 2017-02-19 08:38:03 +02:00
jl777
8c072c2d19 Test 2017-02-19 08:19:22 +02:00
jl777
edcf9a39c3 Test 2017-02-19 08:14:49 +02:00
jl777
9661ca22bb Test 2017-02-19 07:07:58 +02:00
jl777
899e372886 Coinbasevalue 2017-02-18 20:18:53 +02:00
Simon
f47269cda9 Add assert to check alert message length is valid 2017-02-17 11:55:41 -08:00
Jay Graber
cc64e2ccc8 Add rpc test for prioritisetransaction 2017-02-12 11:01:45 -08:00
Leo Arias
82c754f628 Fix the path to the example configuration 2017-02-11 13:52:15 -06:00
zkbot
be5ac31607 Auto merge of #2087 - bitcartel:1.0.6_release_process_add_missing_file, r=bitcartel 
1.0.6 release process

Add release notes generated by script (accidentally excluded from last PR).
 2017-02-11 00:07:56 +00:00
Simon
312863fbee Add release notes generated by script as part of release process 2017-02-10 16:02:16 -08:00
zkbot
ac8e575205 Auto merge of #2085 - bitcartel:1.0.6_release_process, r=bitcartel 
1.0.6 release process
 2017-02-10 22:52:47 +00:00
Simon
8da1ab7792 Fix debian manpage manually as part of release process 2017-02-10 14:12:10 -08:00
Simon
5b9eb25e67 Fix manpage as part of release process. 2017-02-10 12:54:09 -08:00
Simon
804523da8e Update authors.md using fixed release-notes.py, as part of release process. 2017-02-10 12:51:08 -08:00
Simon
a8d201026e Fix bug in release process tool: bad regex in zcutil/release-notes.py. 2017-02-10 12:50:01 -08:00
Simon
027ab14b29 Update debian changelog as part of release process 2017-02-10 10:29:10 -08:00
Simon
f3211ddd48 Update release notes as part of release process 2017-02-10 10:22:19 -08:00
Simon
31a4f0d5c9 Debian man pages updated as part of release process 2017-02-10 10:20:21 -08:00
Simon
2ddec8f0e4 Bump version to 1.0.6 as part of release process 2017-02-10 09:55:49 -08:00
zkbot
93baaeee3e Auto merge of #2081 - daira:1955-single-address-mining, r=bitcartel 
Address @str4d's comment on #1965 about the case where -gen is not set

https://github.com/zcash/zcash/pull/1965#discussion_r100414069

Note that the case of calling the ``setgenerate true`` RPC with the wallet disabled was already handled correctly.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2017-02-10 08:58:19 +00:00
zkbot
eaaa5f625f Auto merge of #2082 - str4d:univalue-subtree, r=bitcartel 
Add UniValue as subtree

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6637
- bitcoin/bitcoin#6239
- bitcoin/bitcoin#6379
- bitcoin/bitcoin#6456
- bitcoin/bitcoin#6788
 2017-02-10 07:46:58 +00:00
Simon
238fec642d Update test to check for updated error messages in AmountFromValue(). 2017-02-09 23:32:15 -08:00
zkbot
e51bd1b556 Auto merge of #1990 - str4d:1985-replace-json-spirit-with-univalue, r=str4d 
Convert entire source tree from json_spirit to UniValue

This PR cherry-picks bitcoin/bitcoin#6121 and then migrates the Zcash-specific code to UniValue.

Also cherry-picks:
- bitcoin/bitcoin#6241
- bitcoin/bitcoin#6234

Closes #1985.
 2017-02-10 05:15:53 +00:00
zkbot
44788f9990 Auto merge of #2080 - ebfull:libsnark-update, r=bitcartel 
Update libsnark.

This updates libsnark to adopt https://github.com/zcash/libsnark/pull/11. Do not merge this until https://github.com/zcash/libsnark/pull/11 is merged.

Closes #2043
 2017-02-10 03:51:13 +00:00
Jack Grigg
f54db399f2 Get rid of fPlus argument to FormatMoney in Zcash-specific code 2017-02-10 02:19:14 +00:00