jl777
bc17ac4928
Merge remote-tracking branch 'zcash/master' into rebase
...
# Conflicts:
# README.md
# src/Makefile.gtest.include
# src/chainparams.cpp
# src/init.cpp
# src/miner.cpp
# src/wallet/wallet.cpp
2016-12-12 12:19:13 +02:00
jl777
96298cfff3
test
2016-11-27 14:26:53 -03:00
jl777
f4fd242689
dns seeds
2016-11-27 06:43:50 -03:00
Simon
2f1238bc51
Add checkpoint at block height 15000
2016-11-23 15:17:51 -08:00
jl777
0f0d8331c4
test
2016-11-07 08:30:47 -03:00
zkbot
11c9be9eff
Auto merge of #1735 - str4d:metrics-screen-improvements, r=str4d
...
Metrics screen improvements
Closes #1656 , #1685 , #1688 and #1716
2016-11-03 14:55:04 +00:00
Sean Bowe
73363c3d9a
Add checkpoint at block 2500.
2016-11-01 09:16:51 -06:00
Jack Grigg
d793f94b8a
Track mined blocks to detect and report orphans and mining revenue
...
Part of #1713
Closes #1716
2016-10-30 16:37:44 -07:00
jl777
00aec80e2f
test
2016-10-29 12:58:19 -03:00
jl777
1b45f3e180
test
2016-10-29 12:55:01 -03:00
jl777
cad9f4c85a
test
2016-10-29 11:42:27 -03:00
jl777
7a4c01c9c1
test
2016-10-29 11:15:24 -03:00
jl777
f71f89bb8b
test
2016-10-29 10:23:50 -03:00
jl777
6711677d7a
test
2016-10-29 09:26:44 -03:00
jl777
8da17c39be
test
2016-10-29 09:22:52 -03:00
jl777
9ce73740f7
test
2016-10-29 09:20:10 -03:00
jl777
052583500a
test
2016-10-29 09:16:48 -03:00
jl777
ce0d45422b
test
2016-10-29 08:58:03 -03:00
jl777
f4a5902e31
test
2016-10-29 08:55:08 -03:00
jl777
9c05b959a0
test
2016-10-29 08:45:31 -03:00
jl777
f8b26b3e28
test
2016-10-29 08:41:55 -03:00
jl777
080f5fe661
test
2016-10-29 08:40:47 -03:00
jl777
1efd6f2be4
test
2016-10-29 08:17:52 -03:00
jl777
ae381ffda4
test
2016-10-28 15:06:07 -03:00
jl777
a9b54b9dd4
test
2016-10-28 14:57:43 -03:00
jl777
69fae9323e
test
2016-10-28 14:55:47 -03:00
jl777
4b0a8bbd70
revert genesis changes
2016-10-28 14:54:59 -03:00
jl777
30853e4ab9
Merge remote-tracking branch 'zcash/master' into dPoW
2016-10-28 13:50:21 -03:00
jl777
78dece340d
test
2016-10-28 13:38:22 -03:00
Zcash Company
1feaefac51
Update network magics for 1.0.0 ⓩ❤
2016-10-28 14:32:25 +00:00
Jack Grigg
30ed379109
Add the Zcash genesis blocks
...
Closes #1554
2016-10-28 02:55:43 -07:00
Daira Hopwood
c5eba1812b
Update pchMessageStart for mainnet and testnet.
...
Signed-off-by: Daira Hopwood <daira@jacaranda.org >
2016-10-27 13:47:53 +01:00
Jack Grigg
2360dd6449
Regenerate mainnet and testnet genesis blocks for nMaxTipAge change
...
The regtest genesis block is unchanged because the RPC test framework has an
unspecified dependency on its specific value of nTime.
2016-10-27 02:43:16 -07:00
Jack Grigg
2f5d62fe32
Remove Founders' Reward override from #1398
2016-10-26 21:05:17 -07:00
Jack Grigg
9f15b823ac
Integrate production Founders' Reward keys
...
Closes #870
2016-10-26 21:05:17 -07:00
Daira Hopwood
5551db8822
Remove the override of nMaxTipAge that effectively disables it on testnet.
...
This is relevant to #1609 because it hid the bug, but does not fix that
issue; the fix is to regenerate the genesis blocks.
Signed-off-by: Daira Hopwood <daira@jacaranda.org >
2016-10-26 23:52:25 +01:00
Daira Hopwood
3483696bed
Update dnsseeds for mainnet. closes #1369
...
Signed-off-by: Daira Hopwood <daira@jacaranda.org >
2016-10-26 23:08:30 +01:00
Daira Hopwood
5c5f70f0fc
Update pchMessageStart strings for rc2.
...
Signed-off-by: Daira Hopwood <daira@jacaranda.org >
2016-10-23 02:22:08 +01:00
zkbot
30d3d2dfd4
Auto merge of #1603 - str4d:1556-reject-old-block-versions, r=daira
...
Reject block versions lower than 4
Includes parts of #1554
Closes #1556
2016-10-22 14:32:40 -04:00
Jack Grigg
77175766f4
Enforce standard transaction rules on testnet
...
Closes #1582
2016-10-22 09:03:09 -05:00
Daira Hopwood
789914e7b0
Update comments in chainparams.cpp.
...
Signed-off-by: Daira Hopwood <daira@jacaranda.org >
2016-10-22 13:46:22 +01:00
Jack Grigg
6be6762237
Regenerate genesis blocks with nVersion = 4
...
Includes parts of #1554
2016-10-22 00:52:45 -05:00
jl777
1d095ca0f7
test
2016-10-17 17:01:17 -03:00
jl777
6fc7179140
test
2016-10-17 16:27:56 -03:00
jl777
1cf07d4396
test
2016-10-17 16:26:06 -03:00
jl777
49365ac5d2
test
2016-10-17 16:24:37 -03:00
jl777
883df96939
test
2016-10-17 16:23:48 -03:00
jl777
b801c3b706
test
2016-10-17 16:19:05 -03:00
jl777
5b7ce70855
test
2016-10-17 16:02:34 -03:00
jl777
3a672e7b11
Merge remote-tracking branch 'zcash/master' into dPoW
2016-10-17 15:28:00 -03:00
