Commit Graph

9439 Commits

Author SHA1 Message Date
zkbot fa632c1c91 Auto merge of #1468 - str4d:1138-change-versioning-scheme, r=str4d
Change versioning scheme

Closes #1138
2016-10-02 19:29:38 -04:00
str4d 6c92100607 Merge pull request #4 from daira/1138-change-versioning-scheme
Repair FormatSubVersion tests. refs #1138
2016-10-02 16:28:36 -07:00
Daira Hopwood 0fafbd5d0a Repair FormatSubVersion tests. refs #1138
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-10-02 16:44:56 +01:00
zkbot 0df0ce05f0 Auto merge of #1467 - ageis:wget-cert-verify, r=str4d
Verify TLS certificates w/ wget in fetch-params.sh

Per NCC-2016-017, wget was being run with `--no-check-certificate`, which means that the connection can be man-in-the-middled, even if we are verifying the integrity of the parameters later via hash sums.
The rationale cited in the Bash comments does not stand up to scrutiny. There's really no persuasive reason not to verify certificates.

Fixes #1346.
2016-10-02 03:01:14 -04:00
Jack Grigg 5428c6ca34 Formatting fix 2016-10-02 19:15:01 +13:00
zkbot d9da9d69ff Auto merge of #1398 - bitcartel:master_fr48, r=bitcartel
Add multiple founders' reward addresses

./zcash-gtest --gtest_filter="founders_reward_test.*"

Closes #1405.
2016-10-01 17:12:33 -04:00
Simon 4d11e5d2b9 Update mainnet addresses used for testing to have the correct number 2016-10-01 07:19:24 -07:00
Jack Grigg 1fa852f7a0 Update release process with version schema 2016-10-02 00:27:50 +13:00
Jack Grigg 899d8cf5f3 Use CLIENT_VERSION_BUILD to represent -beta and -rc in client version 2016-10-02 00:20:02 +13:00
Simon 2d6e97ecc5 Add field fMinerTestModeForFoundersRewardScript to chainparams 2016-09-30 18:31:51 -07:00
Simon 02acbfc262 Add mainnet 2-of-3 multisig addresses for testing. 2016-09-30 18:29:10 -07:00
Simon 6c54e9fc0b Update testnet founders reward addresses 2016-09-30 14:42:47 -07:00
Simon 88fd810150 Update founders reward test to output path of temporary wallet.dat file which contains keys which can be used for testing founders reward addresses. 2016-09-30 14:42:47 -07:00
Simon b7d072069e Update comment per review 2016-09-30 14:42:47 -07:00
Simon 22dadb35ec Refactor and fix per review 2016-09-30 14:42:47 -07:00
Simon 1a21a25e62 Refactor to add test to verify number of rewards each mainnet address will receive 2016-09-30 14:42:47 -07:00
Simon 241867b115 Founders reward: Refactor test and formatting per review. 2016-09-30 14:42:47 -07:00
Simon 3b30d8361a Founders reward: changed index computation, added new test and some refactoring. 2016-09-30 14:42:47 -07:00
Simon db0f931570 Add founders reward to ChainParams.
Fix bug where subsidy slow shift was ignored.
2016-09-30 14:42:47 -07:00
zkbot d90ed0df93 Auto merge of #1433 - str4d:gtest-expected-failures, r=str4d
Add a make command for checking expected failures

With this merged, we can add gtests prefixed with `DISABLED_`, and then configure Buildbot to run those tests but not require they pass in order to merge.
2016-09-30 17:12:26 -04:00
Kevin Gallagher e70213103c Verify TLS certificates w/ wget in fetch-params.sh
Per NCC-2016-017, wget was run with --no-check-certificate,
which means that the connection can be man-in-the-middled,
even if we are verifying the integrity of the params later via hash sums.
The rationale cited in the Bash comments does not stand up to scrutiny.
There's really no persuasive reason not to verify certificates.

Fixes #1346.
2016-09-30 12:08:15 -07:00
zkbot d5dce9342b Auto merge of #1444 - str4d:1394-reindex-clear-witness-caches, r=str4d
Clear note witness caches on reindexing

This PR also fixes a test that was passing arguments in the wrong order.

Closes #1394
2016-09-30 02:30:01 -04:00
Simon 82bd9ee81b Fix comment and formatting per review 2016-09-29 22:07:38 -07:00
Simon 2aa9c0253a Update to use new API in CCryptoKeyStore and store a viewing key in walletdb. 2016-09-29 20:17:30 -07:00
Simon 73699ceaf6 Add support for spending keys to the encrypted wallet. 2016-09-29 20:17:30 -07:00
Jack Grigg 40600f5089 Simplify ClearNoteWitnessCache() 2016-09-30 15:00:16 +13:00
zkbot 71b2b66e26 Auto merge of #1370 - ageis:improve-fetch-params, r=daira
Improvements to fetch-params.sh

Two instances of the fetch-params.sh script running at once will result in corruption of the proving key and an error when the hashes are computed. This implements a lock to stop such a scenario from occurring.

We also terminate and don't create the symlinks if the downloaded parameters fail the checksum command.

Fixes #1306. This is the same as #1310 but now targeting master.
2016-09-29 20:22:07 -04:00
zkbot 07e425ac1c Auto merge of #1372 - str4d:1199-spending-key-wallet-encryption, r=str4d
Encrypt spending keys in the wallet

This is a continuation of #1210.
2016-09-29 19:42:30 -04:00
zkbot 2b83ac82ab Auto merge of #1451 - zcash:daira-update-CoC-email, r=str4d
Update my email address in the Code of Conduct.
2016-09-29 06:12:21 -04:00
zkbot 42941c9fd4 Auto merge of #1445 - bitcartel:master_fix_filtered_notes, r=str4d
Fix casting error in GetFilteredNotes

Use int for minDepth like upstream instead of size_t which can lead to casting problems if a wallet tx has a depth of -1.
Also don't use FindMyNotes as mapNoteData has already been set on wallet tx.

@str4d As dicussed. This should be merged before other PRs related to wallet.
2016-09-29 05:33:11 -04:00
Daira Hopwood 90ff0c749e Update my email address in the Code of Conduct. 2016-09-29 01:33:11 +01:00
Jack Grigg ef3a6a97ae Use correct lock for spending keys 2016-09-29 11:35:18 +13:00
Jack Grigg ad041fceec Cache note decryptors in encrypted keystore 2016-09-29 11:34:59 +13:00
Simon eaccc007c9 Update test to filter and find notes. 2016-09-27 22:43:13 -07:00
zkbot 587f848482 Auto merge of #1384 - str4d:1378-atomic-witness-storage, r=ebfull
Write note witness cache atomically to disk to avoid corruption

Closes #1378
2016-09-27 21:27:11 -04:00
Jack Grigg 6bffc46a87 Implement CSecureDataStream for streaming CKeyingMaterial 2016-09-28 13:44:53 +13:00
Jack Grigg 3bbf2c1422 Test that invalid keys fail to unlock the keystore 2016-09-28 12:52:53 +13:00
Jack Grigg 56fb1bb8e4 Write note witness cache atomically to disk to avoid corruption
Closes #1378
2016-09-28 11:51:42 +13:00
Simon dec49d1f82 Fix GetFilteredNotes to use int for minDepth like upstream and avoid casting problems. Don't use FindMyNotes as mapNoteData has already been set on wallet tx. 2016-09-27 11:14:49 -07:00
Jack Grigg 1683b1f58b Clear note witness caches on reindex 2016-09-27 15:21:18 +13:00
Jack Grigg 76b226586e Add wallet method to clear the note witness cache 2016-09-27 14:55:05 +13:00
Jack Grigg e81c2de753 Fix test 2016-09-27 14:55:05 +13:00
Kevin Gallagher 9fc324a139 Updates dns.testnet.z.cash -> dnsseed.testnet.z.cash
People seem to agree that dnsseed.* is a more intuitive address.
The original address was committed to beta1 as a result of a misunderstanding.
The DNS seeder service will be updated to coincide with at beta2 release.
2016-09-26 14:34:26 -07:00
zkbot c470cdf70b Auto merge of #1376 - str4d:1191-improve-multithreaded-benchmark, r=daira
Measure multithreaded solveequihash time per-thread

Continuation of #1213
Closes #1191
2016-09-23 15:01:04 -04:00
Jack Grigg e9006272c2 Add a make command for checking expected failures 2016-09-23 12:32:59 +12:00
Kevin Gallagher 2e113f6b9d Lock to prevent parallel execution of fetch-params.sh
Two instances of the fetch-params.sh script running at once will
result in corruption of the proving key and an error when the
hashes are computed. This implements a lock to stop such a
scenario from occurring.

We also terminate and don't create the symlinks if the downloaded
parameters fail the checksum command.
2016-09-22 03:08:42 -07:00
zkbot 976479f824 Auto merge of #1411 - bitcartel:master_bitcoin_7106, r=daira
Upstream patch: Fix and improve relay from whitelisted peers

https://github.com/bitcoin/bitcoin/pull/7106
a9f3d3db5c0c8d1697998ed9b3e192ddbf9a31f4

An extra commit modifies the log message string, otherwise there are are a number of commits that need be to backported to add methods e.g. GetDebugMessage.  These commits modify the interface in consensus/validation.h so there are conflicts to be resolved. e.g.
9003c7c
a9ac95c
5f12263
fbf44e6
2016-09-20 19:41:00 -04:00
zkbot 5ef7fecf14 Auto merge of #1407 - bitcartel:master_bitcoin_7079, r=daira
Upstream patch: Prevent peer flooding inv request queue

https://github.com/bitcoin/bitcoin/pull/7079
5029698186445bf3cd69d0e720f019c472661bff
ebb25f4c23adbcb55796c402bafd6064a136f16f
2016-09-20 19:11:28 -04:00
Daira Hopwood 65b502aa98 Benchmark 50 iterations of solveequihash
Since the parameters changed in z8, the benchmark on speed.z.cash is showing misleading results due to variability. (The quartile and extrema bars will still show the variability with 50 runs, they just won't jump around as much between benchmark data points.)
2016-09-19 19:08:24 +01:00
Simon e63d14fd4d Replace %i format specifier with more commonly used %d. 2016-09-19 09:36:26 -07:00