DragonX/hush3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
9,057 Commits 4 Branches 1 Tag
2dbabb11592163b6711efdb4a923c91b5a5b2197
Commit Graph

6166 Commits

Author SHA1 Message Date
Jack Grigg
2dbabb1159 Make Equihash solvers cancellable 
The miner only cancels the solver when chainActive.Tip() changes.

Closes #1055
 2016-07-20 19:17:02 +12:00
zkbot
e117ff7651 Auto merge of #1048 - str4d:collect-all-valid-equihash-solns, r=ebfull 
Collect all permutations of final solutions

This fixes a small bug where if there was a three-way (or more) collision in the final step, one or more valid solutions would be left out.
 2016-07-20 03:54:30 +00:00
zkbot
b83061544f Auto merge of #1116 - ebfull:performance-check-valid-pour-fix, r=ebfull 
Introduce `zcsamplejoinsplit` for creating a raw joinsplit description

We need this to generate joinsplits for use in the performance measurements. The current measurements for *memory usage* of verification are wrong now that we're computing the joinsplit before verifying: https://speed.z.cash/timeline/?exe=1&base=1%2B9&ben=memory+verifyjoinsplit&env=1&revs=50&equid=off&quarts=on&extr=on

This PR fixes that.
 2016-07-20 00:03:46 +00:00
zkbot
a1cded5b91 Auto merge of #1088 - ThisIsNotOfficialCodeItsJustForks:t1078-fix-sighash-bug-2, r=ebfull 
Fix SIGHASH_SINGLE bug by removing in-band signalling.

Competes with #1079. Closes #1078.

**I FORCE PUSHED**
 2016-07-19 23:39:06 +00:00
Taylor Hornby
838e3c753f Fix the tests that the SIGHASH_SINGLE bugfix breaks. 2016-07-19 16:36:37 -06:00
Taylor Hornby
67f0243533 Remove in-band error signalling from SignatureHash, fixing the SIGHASH_SINGLE bug. 2016-07-19 16:36:35 -06:00
Sean Bowe
1737627c4e Introduce zcsamplejoinsplit for creating a raw joinsplit description, and use it to construct the joinsplit for the performance tests that verify joinsplits. 2016-07-19 15:49:11 -06:00
Sean Bowe
1477fd3f40 Remove the constraint system from the alpha proving key. 2016-07-19 14:01:58 -06:00
Jack Grigg
c6365f4d80 Add test case that requires the fix 2016-07-19 23:33:28 +12:00
Jack Grigg
1bb40a42c2 Collect all permutations of final solutions 2016-07-19 23:11:49 +12:00
zkbot
d20d866d89 Auto merge of #1105 - bitcartel:zc.v0.11.2.z6_issue_424, r=ebfull 
New private/public key pairs for broadcasting alert messages

Implements #424

Fixes and integrates method of sending alerts as described by upstream here:
- https://gist.github.com/laanwj/0e689cfa37b52bcbbb44

To send an alert:
- Copy private keys into alertkeys.h.
- Modify alert parameters and message found in sendalert.cpp
- Build and run to send the alert e.g. ./zcashd -printtoconsole -sendalert

Tested and verified with local nodes on alpha 6 testnet.
 2016-07-18 21:09:46 +00:00
zkbot
4d459f93a4 Auto merge of #1090 - ebfull:rename-pour-and-serial, r=ebfull 
Rename things to match protocol specification

This is a pass through the code to eliminate usage of "pour" and "serial" and any other outdated terminology.

Closes #602
 2016-07-18 19:58:25 +00:00
zkbot
e613014526 Auto merge of #1104 - ebfull:libsnark-updates, r=ebfull 
Update libsnark

We have now forked libsnark's current master and applied the following patches:

* [`9216072`: Remove code that we don't use.](9216072c3b) (unblocks #69)
* [`dcb78b2`: Modify makefile to stop compiling things we removed.](dcb78b24d9)
* [`a6b0ad0`: Use libsodium's PRNG](a6b0ad0c80) (closes #780)
* [`4036716`: Don't (de)serialize the constraint system in the proving key.](403671675a) (closes #491)
* [`a703148`: Taylor's compilation patch](a7031481fd) (@defuse can you submit this to upstream?)

This PR adopts those changes, and makes the requisite changes to Zcash to support them. I have decided to not bring libsnark in tree for the time being, though it should be incredibly easy to do later if we're *absolutely* sure we should.
 2016-07-18 18:04:56 +00:00
Sean Bowe
b78daf7de7 Change serial to nf in txdb. 2016-07-18 10:07:30 -06:00
Sean Bowe
22de160219 Fixes for indentation and local variable names. 2016-07-18 10:07:29 -06:00
Sean Bowe
28173cd0de Remove more usage of serial. 2016-07-18 10:06:18 -06:00
Sean Bowe
9e511dbbdd Rename CSerialsCacheEntry. 2016-07-18 10:06:18 -06:00
Sean Bowe
1d184d53e1 Rename cacheSerials to cacheNullifiers and fix tests. 2016-07-18 10:06:18 -06:00
Daira Hopwood
4bc00dc141 Bucket -> note. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2016-07-18 10:06:18 -06:00
Sean Bowe
cc01120a17 Rename more usage of serial. 2016-07-18 10:06:18 -06:00
Sean Bowe
b7e4abd6f7 Rename some usage of 'pour'. 2016-07-18 10:06:18 -06:00
Sean Bowe
bb64be52fe Rename mapSerials to mapNullifiers. 2016-07-18 10:06:18 -06:00
Sean Bowe
d889a287ae Rename CSerialsMap to CNullifiersMap. 2016-07-18 10:06:18 -06:00
Sean Bowe
d90e46ba8d Renaming SetSerial to SetNullifier. 2016-07-18 10:06:18 -06:00
Sean Bowe
616f8d05af Rename GetSerial to GetNullifier. 2016-07-18 10:06:18 -06:00
Sean Bowe
ee964faf3d Rename HavePourRequirements to HaveJoinSplitRequirements. 2016-07-18 10:06:18 -06:00
Sean Bowe
942bc46756 Rename GetPourValueIn to GetJoinSplitValueIn 2016-07-18 10:06:18 -06:00
Sean Bowe
8f95cd3c26 Test fixes. 2016-07-18 10:06:18 -06:00
Sean Bowe
bfeaf0049a Rename JSDescription's serials to nullifiers. 2016-07-18 10:06:18 -06:00
Sean Bowe
8675d94b63 Rename vpour to vjoinsplit. 2016-07-18 10:06:18 -06:00
Sean Bowe
a8c68ffe99 Rename CPourTx to JSDescription. 2016-07-18 10:06:18 -06:00
Simon
939aaeb620 New alert test data generated for new alert key pair. 
Added test fixture to create new test data.
Added instructions for developer.
 2016-07-17 12:36:26 -07:00
zkbot
f30580744f Auto merge of #1059 - bitcartel:zc.v0.11.2.z5_getblocksubsidy, r=ebfull 
Add getblocksubsidy RPC command to return block reward taking into account mining slow start

This PR adds a new RPC command to return the block reward as defined by function `GetBlockSubsidy`.

Usage:
`zcash-cli getblocksubsidy blockheight
`

The basis for this PR is that some users have been unaware of the mining slow start and they subsequently sought help to clarify if they were mining blocks correctly or if there was a bug in the reward schedule.
 2016-07-17 16:19:39 +00:00
Simon
9be2f85c22 Remove QT alert message box. 2016-07-16 13:18:42 -07:00
Simon
7af996b263 Update URL for zcash alert IDs. 2016-07-16 13:17:47 -07:00
Simon
656a5f0b6f Update alert protocol version comment. 2016-07-16 08:18:58 -07:00
Simon
2e6f1f8de9 Update alert ID start value and URL in comment. 2016-07-16 08:17:56 -07:00
Simon
8e77a067ef Update comments. 2016-07-16 08:12:19 -07:00
Simon
acefacf1b9 Disable QT alert message. 2016-07-16 08:03:36 -07:00
Simon
b39e1bdbca Fixes to integrate sendalert.cpp. 
Add sendalert.cpp to build process.
Add alertkeys.h as a placeholder for private keys.
 2016-07-15 19:57:55 -07:00
Simon
2513363e81 Add sendalert.cpp to repo. 2016-07-15 18:05:42 -07:00
Simon
174a68b3b7 Use new public/private key pairs for alert system. 2016-07-15 18:03:30 -07:00
Sean Bowe
bf76024eb7 Pass our constraint system to libsnark, so that it doesn't need to (de)serialize it in the proving key. 2016-07-15 10:45:59 -06:00
Sean Bowe
1fad6b87e5 Initialize libsodium in this routine, which is now necessary because libsnark uses its PRNG. 2016-07-15 10:45:22 -06:00
Simon
ea26d328fc Add founders reward to output. 2016-07-14 13:08:34 -07:00
zkbot
fc127fc2db Auto merge of #1051 - ThisIsNotOfficialCodeItsJustForks:t863-mock-coverage-of-checktransaction, r=ebfull 
Add mock test coverage of CheckTransaction

Closes #863.
 2016-07-14 18:43:07 +00:00
Taylor Hornby
a4944ffcb0 Fix bad_txns_oversize test for increased block size. 2016-07-14 12:17:01 -06:00
zkbot
4bcdd85583 Auto merge of #1047 - aniemerg:fix/get-difficulty-fix2, r=ebfull 
Update GetDifficulty() to use consensus.powLimit from consensus parameters.

Fixes #1032.
 2016-07-14 04:18:56 +00:00
zkbot
331cae91bc Auto merge of #1085 - zcash:daira-clang-cpp11, r=ebfull 
.clang-format: change standard to C++11

A nitpick for folks who want to test with clang.
 2016-07-14 03:08:55 +00:00
zkbot
2b75ad0bd4 Auto merge of #1089 - ThisIsNotOfficialCodeItsJustForks:t960-rename-zerocash-zcash, r=ebfull 
Rename zerocash to zcash in places

Closes #960.
 2016-07-13 01:51:22 +00:00