Sean Bowe
28173cd0de
Remove more usage of `serial`.
2016-07-18 10:06:18 -06:00
Sean Bowe
fd933ed05e
Fix tests
2016-07-18 10:06:18 -06:00
Sean Bowe
6e33353ea2
Rename pour RPC tests
2016-07-18 10:06:18 -06:00
Sean Bowe
ffcfe76d4f
Change encryptedbucket1 to encryptednote1.
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
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
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
42825a9f6a
Auto merge of #979 - nathan-at-least:nathan.cleanup-nonofficial-tags, r=ebfull
...
A script to remove "unofficial" tags from a remote, such as github.
Officialness is determined by a regular expression. ;-)
This is handy because we often want upstream Bitcoin tags for local
diffs, but sometimes we accidentally upload them to github which then
claims they are our releases, which is confusing and misleading.
2016-07-13 02:23:14 +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
Simon
933bff472d
Narrow scope of lock.
2016-07-11 22:01:15 -07:00
Simon
1db13d5063
Replace index with height in help message for getblocksubsidy RPC call.
2016-07-11 21:53:09 -07:00
zkbot
46187fbe7a
Auto merge of #1082 - ebfull:reorder-logs, r=ebfull
...
Reorder initialization routines to ensure verifying key log messages appear in debug.log.
Closes #721
2016-07-12 04:41:10 +00:00
Taylor Hornby
4e117b63c6
Rename zerocash_packages to zcash_packages in packages.mk
2016-07-11 19:30:18 -06:00
Taylor Hornby
3bde967f53
Rename qa/zerocash to qa/zcash in Makefile.am
2016-07-11 19:29:41 -06:00
Taylor Hornby
76b3a92652
Remove references to libzerocash in .gitignore
2016-07-11 19:29:11 -06:00
Taylor Hornby
c9c4611d9a
Rename zerocash to zcash in some places.
2016-07-11 19:27:52 -06:00
zkbot
04932a64e8
Auto merge of #1080 - ebfull:performance-check-valid-pour, r=ebfull
...
Always check valid joinsplits during performance tests
This will generate a valid joinsplit instead of using one from an environment variable.
2016-07-11 22:38:25 +00:00
Sean Bowe
35f82c35fe
Rename samplepour to samplejoinsplit
2016-07-11 11:33:14 -06:00
zkbot
6caacc892e
Auto merge of #1058 - ebfull:coin-cache, r=ebfull
...
Flush to disk more consistently by accounting memory usage of serials/anchors in cache.
Closes #626 .
It's important that this at least *approximates* the memory usage, so that we flush the cache to disk as expected. It's okay that we overestimate. The serials are stored in keys in the `boost::unordered_map`, so we can simply use that map's `DynamicMemoryUsage`. The anchors are another story.
2016-07-11 17:23:19 +00:00
zkbot
ecef582339
Auto merge of #1061 - ebfull:remove-libzerocash-completely, r=ebfull
...
Remove the rest of libzerocash.
Closes #510 .
2016-07-11 16:17:35 +00:00
Sean Bowe
92b73b0dbb
Remove zerocash tests from full-test-suite.
2016-07-11 10:05:55 -06:00
Daira Hopwood
b097171ef9
.clang-format: change standard to C++11
2016-07-11 13:22:20 +01:00
Sean Bowe
f4091941f5
Reorder initialization routines to ensure verifying key log messages appear in debug.log.
2016-07-10 21:10:02 -06:00
Sean Bowe
ffcd1c57cc
Update tests with cache usage computations
2016-07-10 20:53:33 -06:00
Sean Bowe
2668a1bc13
Remove the rest of libzerocash.
2016-07-10 20:25:02 -06:00
Sean Bowe
2fbbde597c
Always check valid joinsplits during performance tests, and avoid recomputing them every time we change the circuit.
2016-07-09 14:31:43 -06:00
zkbot
3c72ec710e
Auto merge of #1044 - bitcartel:zc.v0.11.2.z5_issue_932, r=ebfull
...
Disable USE_ASM when building libsnark
For #932 .
2016-07-09 17:36:19 +00:00
Daira Hopwood
a71fb9ff6d
z6 release notes and version update.
...
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-07-08 22:57:37 +01:00
Sean Bowe
000383c193
Increase block size to 2MB and update performance test.
2016-07-07 16:53:16 -06:00
zkbot
89a9e46cc9
Auto merge of #1049 - str4d:equihash-faster-sort-comparison, r=bitcartel
...
Only compare the first n/(k+1) bits when sorting
We only need to sort based on the bits we are colliding. In earlier solver rounds, this speeds up the comparison considerably (calling `memcmp()` on 3 bytes instead of 12 in the first round for the current parameters).
2016-07-07 20:43:42 +00:00
Sean Bowe
9c45b501ad
Make `validatelargetx` test more accurate, reduce block size limit to 1MB for now.
2016-07-06 12:07:50 -06:00
Sean Bowe
2ba9641767
Fix performance test for block verification.
2016-07-05 07:55:35 -06:00