DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
32,188 Commits 6 Branches 7 Tags
dev
Commit Graph
32188 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Homu e868f8247f Auto merge of #3463 - ebfull:revert-empty-root, r=ebfull 
Always write the empty root down as the best root, since we may roll back

In [`3577de83`](https://github.com/zcash/zcash/commit/3577de83aa126fec4db8bb022dbeecf9a77a3af8) we started not writing the Sapling empty root down as the "best" anchor because we had changed the encodings and didn't want users who compiled from master to have inconsistent coindb's in the future if the encoding changed again for some reason.

However, if we don't write the empty root down then during rollbacks to Sapling activation we leave the best anchor on disk different from what's in the cache, which will trigger an assertion.

This reverts the change from `3577de83` since we've settled on the encodings.
 2018-08-14 17:18:47 -07:00
Sean Bowe f791ce00eb Always write the empty root down as the best root, since we may roll back. 2018-08-14 15:17:30 -06:00
Homu b004f254d5 Auto merge of #3458 - str4d:temp-sapling-disable, r=ebfull 
Disable Sapling features on mainnet

Also places them behind an experimental features flag on testnet.
 2018-08-14 08:52:46 -07:00
jl777 1da742e71e Test 2018-08-14 04:48:07 -11:00
jl777 2b4374d705 nValue 2018-08-14 03:45:58 -11:00
jl777 db871af56f Fix dice finish 2018-08-14 03:44:36 -11:00
jl777 0e03d55920 Fix dice finish 2018-08-14 02:18:44 -11:00
jl777 99c3975dcb Set default KOMODO_MININGTHREADS <= -1 2018-08-13 23:00:06 -11:00
jl777 a488503266 Test 2018-08-13 21:37:46 -11:00
jl777 9b940331f9 Add segid to get block 2018-08-13 21:31:14 -11:00
jl777 6e78d3df43 KOMODO_MININGTHREADS to control staking vs PoW, delay start mining by 15 seconds 2018-08-13 21:06:49 -11:00
Asher Dawes e59d53dad7 Merge pull request #114 from VerusCoin/dev 
Dev
 2018-08-13 23:39:41 -07:00
Asher Dawes 2b72b2d16a Removing unnecessary parameters 2018-08-13 23:38:11 -07:00
miketout a671a00fd9 Use seed nodes even if DNS seeds had data 2018-08-13 22:29:45 -07:00
miketout 9bbb108297 Merge pull request #113 from VerusCoin/version-update 
Updating versions to v0.3.12a-beta
 2018-08-13 22:16:26 -07:00
Asher Dawes fffc2157ad Updating versions to v0.3.12a-beta 2018-08-13 21:46:19 -07:00
Asher Dawes 03a87ddbb9 Dev (#112) 
* removing genproclimit=0 parameter from verusd scripts

* removing gen parameter from verusd scripts
 2018-08-13 21:18:25 -07:00
jl777 cb2ee04b35 Fix dice finish 2018-08-13 05:46:11 -11:00
Jonathan "Duke" Leto 8d42405dda Merge remote-tracking branch 'origin/jl777' into cctests 2018-08-13 16:25:19 +02:00
jl777 a5a2c7cb3a Test 2018-08-13 03:16:59 -11:00
jl777 a4a96df9e5 Skip adding CC vin if CCchange is big enough 2018-08-13 03:15:16 -11:00
jl777 944aed48a8 Test 2018-08-13 03:12:15 -11:00
Jack Grigg 554e00e8f9 Disable Sapling features on mainnet 
Also places them behind an experimental features flag on testnet
 2018-08-13 14:18:18 +01:00
Jack Grigg dfcf33fe15 test: Use regtest in key_tests/zs_address_test 2018-08-13 14:17:17 +01:00
Jack Grigg e7ca4eb3c3 test: gtest for Sapling encoding and decoding 2018-08-13 13:20:07 +01:00
jl777 a85ad9d32b Prevent reporting locked funds as part of reward funds 2018-08-12 23:22:31 -11:00
jl777 8608399cb5 Numvouts 2018-08-12 23:16:48 -11:00
jl777 7300a1c117 Constrain dice vins to be for exact plan 2018-08-12 23:14:56 -11:00
jl777 79fc22cff4 Merge pull request #812 from jl777/jl777 
Jl777
 2018-08-12 23:09:08 -11:00
jl777 2156597439 Use tx not vents 2018-08-12 23:07:40 -11:00
jl777 c269ecf5d9 Get right total to unlock! 2018-08-12 23:05:56 -11:00
Asher Dawes 4474ce24c1 Skipping tests and non Windows builds. 
Finding and removing previous installations with installer
 2018-08-13 01:19:07 -07:00
Jonathan "Duke" Leto 66027c0219 Add rewards tests 2018-08-13 09:55:17 +02:00
Asher Dawes f73bf13713 modifying verus-cli source 2018-08-12 16:24:47 -07:00
Asher Dawes db428a6775 enabling tests 2018-08-12 13:35:40 -07:00
Asher Dawes a10c97a9f9 removing gen parameter from verusd scripts 2018-08-12 13:29:44 -07:00
Asher Dawes b4d0f8223e removing gen parameter from verusd scripts 2018-08-12 13:20:27 -07:00
Jonathan "Duke" Leto 84b40e08a2 Start adding tests for rewardsunlock 2018-08-12 20:31:45 +02:00
Asher Dawes 1bf80f9c69 removing genproclimit=0 parameter from verusd scripts 2018-08-12 01:24:05 -07:00
Asher Dawes 5d341191d6 removing genproclimit=0 parameter from verusd scripts and cleaning up GitLab CI config 2018-08-12 01:22:56 -07:00
Asher Dawes 752c828536 added missing deploy dependency 2018-08-12 00:16:28 -07:00
Asher Dawes 075ea9c41b added missing deploy dependency 2018-08-12 00:15:56 -07:00
Asher Dawes bf46fd72c2 Update .gitlab-ci.yml 2018-08-11 23:57:03 -07:00
Asher Dawes 68fcb19a70 Update .gitlab-ci.yml 2018-08-11 23:54:24 -07:00
Asher Dawes b08aa0d275 Update .gitlab-ci.yml 2018-08-11 23:12:33 -07:00
Asher Dawes 908aeba55b fixing filename 2018-08-11 22:35:28 -07:00
Asher Dawes bcfb6ac917 Merge branch 'dev' of https://github.com/VerusCoin/VerusCoin into Asher-Dev 
# Conflicts:
#	.gitlab-ci.yml
#	README.md
#	kmd/linux/verus-cli/README.txt
#	zcutil/VerusCoin.xml
 2018-08-11 22:32:25 -07:00
Asher Dawes aa454d30b1 clean up 2018-08-11 22:21:56 -07:00
Asher Dawes bf7b0f9e60 troubleshooting version read 2018-08-11 22:10:40 -07:00
Asher Dawes 7e3dd36664 troubleshooting version read 2018-08-11 21:57:35 -07:00