Commit Graph
100 Commits
Author SHA1 Message Date
zkbot 2787ea686c Auto merge of #1673 - str4d:fix-libsnark-indeterminism, r=str4d
Build libsnark with -march=x86-64 instead of -march=native

Fixes the remaining libsnark indeterminacy.

Thanks to @tromer for the fix!

Closes #1645
2016-10-28 03:32:13 +00:00
zkbot ab5c175744 Auto merge of #1661 - ageis:deb-pkg-enhancements, r=arcalinea
Debian packaging fixes

* Updates maintainer scripts from latest version of `dh_make`
* Includes `rules` file
* Use `fakeroot` to build the package.
We use currently `dpkg-deb --build` instead of `debuild` or `dpkg-buildpackage`, so I don't know if the package is well-formatted for the latter. (one difference, the former works with uppercase `DEBIAN`, the latter lowercase `debian` -- that's why the directory was renamed)
2016-10-27 19:13:35 +00:00
zkbot 278439fbe3 Auto merge of #1623 - ebfull:sprout-params, r=str4d
Zcash zk-SNARK public parameters for 1.0 "Sprout".

Created in the ceremony this weekend! 🎉

We're writing a blog post about this, I'm going to publish the code shortly too.

Closes #1553
2016-10-27 03:08:10 +00:00
zkbot 8f30c50751 Auto merge of #1660 - daira:1641.release-rc3, r=str4d
1641.release rc3

Release 1.0.0-rc3. This also includes the DNS seed updates for mainnet, and removing the testnet override of nMaxTipAge. closes #1369
2016-10-26 23:17:34 +00:00
zkbot dcea8593c8 Auto merge of #1655 - ebfull:fix-bitcoin-strings, r=daira
Change some Bitcoin strings to Zcash strings.

This addresses most of the user-facing ones (in help messages for example), thread names, but avoids things like tests and datastructure names.

**I slopped this together in a rush. Review it carefully!**
2016-10-26 17:50:17 -04:00
zkbot 3fedcfedcb Auto merge of #1647 - snyff:patch-1, r=daira
Fix typo in README.md

s/sophisticiated/sophisticated/
2016-10-26 13:01:31 -04:00
zkbot 0fabe19495 Auto merge of #1646 - ebfull:manpages, r=daira
Add manpages for zcashd and zcash-cli binaries for debian.

See #1524.
2016-10-25 23:00:30 -04:00
zkbot 8d04ff72ca Auto merge of #1643 - ioptio:example-config, r=daira
add zcash.conf

port examples/bitcoin.conf to examples/zcash.conf
2016-10-25 22:21:16 -04:00
zkbot ea4c08d43d Auto merge of #1644 - str4d:826-reference-in-security-warnings, r=daira
Link to #826 in doc/security-warnings.md, link to new Security website page

Closes #826
2016-10-25 19:47:14 -04:00
zkbot 07c967aca7 Auto merge of #1637 - daira:upgrade-bdb-again, r=daira
Fix licensing docs, and upgrade bdb again to 6.2.23

Upgrading BDB is necessary due to the security bugs listed at https://www.cvedetails.com/vulnerability-list/vendor_id-93/product_id-32070/Oracle-Berkeley-Db.html . The resulting dependency on the Affero GPL is unfortunate, but see #1469.
2016-10-25 19:07:59 -04:00
zkbot 6bad499c2a Auto merge of #1640 - daira:upstream-update-tinyformat, r=daira
util: Update tinyformat

Updates `tinyformat.h` to commit
https://github.com/c42f/tinyformat/commit/3a33bbf65442432277eee079e83d3e8fac51730c upstream.

Makes sure that our local changes are kept:

- bitcoin/bitcoin#3767 1b8fd35aad Make tinyformat errors raise an exception instead of assert()ing
- bitcoin/bitcoin#4735 9b6d4c5cdc Move strprintf define to tinyformat.h
- bitcoin/bitcoin#4748 6e5fd003e0 include stdexcept (for std::exception)
- bitcoin/bitcoin#8000 9eaa0afa6ec5d3dd01e4d01121314ef51f2bc305 force USE_VARIADIC_TEMPLATES
- Add `std::string format(const std::string &fmt...` added this
  at the time, as we want to be able to do `strprintf(_(...), ...)`

Inspired by bitcoin/bitcoin#8264.

For Zcash: ref #1349
2016-10-25 18:29:45 -04:00
zkbot 489f1d38ee Auto merge of #1629 - bitcartel:1616_wallet_disallow_coinbase_change, r=daira
Add z_sendmany rule that when coinbase utxos must be spent in their entirety, with no change

See #1616 - coinbase utxos must be consumed entirely, without any change, since there
is currently no way to specify a change address in z_sendmany.
2016-10-25 15:40:36 -04:00
zkbot a1f81867f0 Auto merge of #1620 - bitcartel:1616_z_sendmany_need_0_message_bug, r=bitcartel
Fix incorrect error message in z_sendmany

Fixes one of the problems in #1616.
2016-10-25 15:02:29 -04:00
zkbot 511c5ec1d0 Auto merge of #1615 - arithmetric:1612.fix-floating-point-exception, r=daira
Fixing floating point exception in non-TTY environments

As reported in #1612, a floating point exception occurs when zcashd is started with `showmetrics` enabled in environments without a TTY, such as when started as a service or piped to a file.

The root cause is that the metrics code attempts to get the screen width and uses this as a divisor in calculations. For non-TTY environments, this value is 0, leading to a division by zero error.

This PR adds a default screen width of 80 and uses the actual screen width only if the width can be fetched (and in a TTY environment).
2016-10-25 11:43:28 -04:00
zkbot 11ce636a9d Auto merge of #1634 - bitcartel:upstream_8123_race_condition_std_atomic, r=daira
Upstream 8123 race condition

This backports a fix from upstream, with commits applied in sequence:
https://github.com/bitcoin/bitcoin/pull/8004
https://github.com/bitcoin/bitcoin/pull/8112
https://github.com/bitcoin/bitcoin/pull/8123
2016-10-25 08:30:59 -04:00
zkbot ede2ebff4e Auto merge of #1617 - str4d:fix-performance-measurements, r=daira
Disable metrics screen in performance-measurements.sh
2016-10-24 22:05:30 -04:00
zkbot 6c26e7c618 Auto merge of #1613 - ageis:fix-1610, r=daira
Adds libgomp1 to Debian package depends

Fixes #1610.
2016-10-24 21:27:55 -04:00
zkbot a294b26db7 Auto merge of #1375 - str4d:1331-node-metrics, r=daira
Add node metrics screen

Continuation of #1336
Closes #1331
2016-10-22 20:21:11 -04:00
zkbot 026c3f784f Auto merge of #1602 - str4d:1424-minimal-getblocktemplate, r=daira
Minimal modifications to getblocktemplate

A simpler alternative to #1435 that ensures Zcash GBT will remain compatible with BIP 22.

Closes #1424
2016-10-22 16:40:59 -04:00
zkbot f39d176ebf Auto merge of #1607 - daira:1530.update-unit-tests-doc, r=daira
Update unit-tests documentation. closes #1530

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-10-22 15:57:44 -04: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
zkbot f82273829a Auto merge of #1600 - str4d:1557-consensus-rule-disallow-v0-txns, r=daira
Disallow v0 transactions as a consensus rule

Closes #1557
2016-10-22 13:50:52 -04:00
zkbot e3c8e88e9b Auto merge of #1588 - bitcartel:upstream_8427_dos_logging, r=daira
Upstream: Prevent possible DoS in logging

bitcoin/bitcoin#8427
2016-10-22 13:08:26 -04:00
zkbot 0b3809464c Auto merge of #1601 - str4d:1459-revert-reversion, r=daira
Revert "Revert "Avoid boost::posix_time functions that have potential out-of-bounds read bugs. ref #1459""

This reverts commit f19cb7b7ee.

Closes #1459.
2016-10-22 07:06:40 -04:00
zkbot a12eaa2bf2 Auto merge of #1581 - bitcartel:1464_ncc_2016_008, r=str4d
Fixes for NCC-2016-008

To close #1464 NCC-2016-088

- This PR
- https://github.com/zcash/libsnark/pull/8

Of the 101 issues in NCC-2016-088, 62 are in dependencies, and many of the remainder are duplicates of the CIDs fixed in this PR.

Commit log message is: CID Type (Type is from scan.coverity Type column)
2016-10-22 00:56:08 -04:00
zkbot 48888b67c9 Auto merge of #1599 - daira:1597.fix-other-potential-race-conditions, r=daira
Fix other potential race conditions similar to ref #1597 in RPC tests.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-10-22 00:15:32 -04:00
zkbot 7ccbcca62c Auto merge of #1591 - bitcartel:upstream_7933_fix_out_of_memory_deserializing_utxo, r=daira
Upstream: fix out of memory problem when deserializing utxo

bitcoin/bitcoin#7933
2016-10-21 23:32:51 -04:00
zkbot f808be7546 Auto merge of #1589 - bitcartel:upstream_7856_one_getaddr_per_connection, r=daira
Upstream: Only send one GetAddr response per connection.

bitcoin/bitcoin#8427
2016-10-21 22:53:19 -04:00
zkbot 71043784dd Auto merge of #1586 - bitcartel:z_sendmany_amount_too_strict, r=daira
Fix issue where z_sendmany amount parameter is too strict

Upstream treats an amount parameter of `1` the same as `1.0`.  Third-party would like this fixed.
2016-10-21 22:10:41 -04:00
zkbot fd7ef7b632 Auto merge of #1584 - bitcartel:1504_zca_011_logging, r=daira
More granular control over logging of z_* calls

Closes #1504
2016-10-21 21:32:46 -04:00
zkbot 10ad093bbb Auto merge of #1567 - str4d:rename-binaries, r=daira
Rename binaries

This ensures that our installs don't clash with existing Bitcoin binaries and libraries.

Closes #1563 and #1565
2016-10-21 20:48:11 -04:00
zkbot dc21a8a39f Auto merge of #1578 - daira:1570.tromp-equihash-with-libsodium-blake.2, r=daira
1570.tromp equihash with libsodium blake.2

Remove BLAKE2b implementation from Tromp Equihash solver, and address almost all of @str4d's review comments on #1570. Supercedes #1576.

Signed-off-by: Daira Hopwood daira@jacaranda.org
2016-10-21 19:07:26 -04:00
zkbot cd8e856df7 Auto merge of #1585 - bitcartel:1583_stop_test_writing_to_testnet3, r=daira
Closes #1583 by setting up the datadir for the wallet gtest.

Stops test writing to ~/.zcash/testnet3.
Also related to #1506
2016-10-21 03:15:00 -04:00
zkbot c99a1c7e4f Auto merge of #1566 - daira:1557.make-v2-txns-standard, r=ageis
1557.make v2 txns standard

Make v2 transactions standard. This also corrects a rule about admitting large orphan transactions into the mempool, to account for v2-specific fields. ref #1557
2016-10-21 01:10:37 -04:00
zkbot 323b8214c2 Auto merge of #1580 - str4d:1378-repair-witness-cache, r=daira
Clear witness cache when re-witnessing notes

Closes #1378
2016-10-21 00:24:39 -04:00
zkbot 78293a9989 Auto merge of #1575 - arcalinea:document-rpc-security, r=daira
Document RPC security assumptions

Document RPC security assumptions in security-warnings.md #965
2016-10-20 19:50:47 -04:00
zkbot 90031e1d61 Auto merge of #1577 - radix42:v1.0.0-rc1-gitian, r=daira
V1.0.0 rc1 gitian

Removes indeterminism from gitian builds: underlying processor instruction set variant of x86_64 was being detected by the libgmp autoconf process, which caused differences in libgmp and libsnark
2016-10-20 17:40:27 -04:00
zkbot f90526579b Auto merge of #1569 - str4d:1552-disable-wallet-encryption, r=daira
Disable wallet encryption

Closes #1552
2016-10-20 17:01:51 -04:00
zkbot bb891cb4a2 Auto merge of #1571 - daira:1459.avoid-boost-posix-time, r=daira
Avoid boost::posix_time functions that have potential out-of-bounds read bugs

ref #1459

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-10-20 15:42:23 -04:00
zkbot b492ef3232 Auto merge of #1568 - str4d:1548-remove-block-index-tag, r=daira
Remove the RC 1 block index error message

Reverts 85457ddec1

Closes #1548
2016-10-20 13:57:23 -04:00
zkbot 0dfe612ff9 Auto merge of #1561 - str4d:778-randomise-note-order, r=daira
Randomize JoinSplit input and output orders

Closes #778.
2016-10-20 03:55:33 -04:00
zkbot 3277cf28b6 Auto merge of #1560 - zcash:daira-link-readme-to-protocol-spec, r=daira
Add link to protocol specification.
2016-10-20 03:15:58 -04:00
zkbot 4dc45bad95 Auto merge of #1532 - arcalinea:cleanup-documentation, r=daira
Cleanup documentation

Added zcash developer public keys to /contrib/gitian-downloader, incorporated some of @daira's suggestions for files in the /doc directory
2016-10-20 02:34:25 -04:00
zkbot fd23341f1e Auto merge of #1547 - daira:1378-witness-cache-assertion-failure.1, r=bitcartel
Add more precise assertions in IncrementNoteWitnesses

Part of #1378
2016-10-17 03:00:19 -04:00
zkbot 98224d76f5 Auto merge of #1521 - zcash:gitian, r=bitcartel
Update Linux Gitian descriptor for building Zcash

Changes required to use the Gitian builder at https://github.com/zcash/zcash-gitian

Closes #540.
2016-10-17 01:55:03 -04:00
zkbot 4ee9d712b5 Auto merge of #1541 - str4d:upstream-gitian-updates, r=bitcartel
Upstream gitian updates

This PR pulls in all gitian-related PRs that have been merged upstream since 0.11.2. The only ones I left out were documentation-only PRs, because we removed `doc/gitian-building.md` at some point. Here are the commits applied here, in the order shown in `git log` (ie. last to first):

- bitcoin/bitcoin#7283
  - fa42a67
  - fa58c76
- bitcoin/bitcoin#8175
  - 74c1347
- bitcoin/bitcoin#8167
  - 7e7eb27
  - ad38204
  - b676f38
- bitcoin/bitcoin#7776
  - f063863
- bitcoin/bitcoin#7424
  - a81c87f ~ we already partly applied
  - a8ce872
  - f3d3eaf ~ we already partly applied
  - 475813b
  - ~~cd27bf5~~ X we already applied
- bitcoin/bitcoin#7060
  - 3b468a0 ~ we removed doc/gitian-building.md
  - ~~99fda26~~ X we removed doc/gitian-building.md
- bitcoin/bitcoin#7251
  - fa09562
- bitcoin/bitcoin#6900
  - ~~2cecb24~~ X we removed doc/gitian-building.md
  - 957c0fd
  - 2e31d74
  - ~~0b416c6~~ X we removed QT
  - 9f251b7
- bitcoin/bitcoin#6854
  - 579b863 ~ we already partly applied

Part of #540
2016-10-17 01:17:01 -04:00
zkbot e8d28a0acc Auto merge of #1448 - ageis:debian-package, r=bitcartel
Initial packaging for Debian

This adds some source files, a script and skeleton for building a Debian package that installs the zcash daemon and CLI tool.

To test it:

Check out my branch.
Build Zcash binaries: `./zcutil/build.sh`
Build the package: `./zcutil/build-debian-package.sh`
You now have a .deb in the source root folder, so install it: `sudo dpkg -i zcash-1.0.0-rc1-amd64.deb`
Now you can run `zcashd`, `zcash-cli`, and `zcash-fetch-params` from `$PATH`.

This pull request will need further refinement and review, so let's leave it open for a while.
2016-10-17 00:22:50 -04:00
zkbot ec8dc3a88a Auto merge of #1431 - bitcartel:master_1373_taddr_coinbase_error, r=bitcartel
Return a more informative error message when trying to spend coinbase; select non-coinbase inputs when sending to a transparent output if needed

For #1373 and #1519

Code change:
- Extra parameter added to AvailableCoins to include or exclude Coinbase coins.  Default value of parameter is 'true' as current behaviour is to include Coinbase coins.
- SelectCoins, used for sending taddr->taddr, will now exclude Coinbase coins.

Unit test:
Tried to write a test to focus on the extra parameter added to AvailableCoins but could not.

Empirical testing on Testnet:
Current behaviour is that upstream RPC commands sendfrom and sendtoaddress try to spend coinbase coins returned by AvailableCoins.  So the user will see:

```
./zcash-cli sendtoaddress mrEGRmGJhmwAa4MQjzGd86ry63vrvovu9b 1000.0
error: {"code":-6,"message":"Insufficient funds"}

./zcash-cli sendtoaddress mrEGRmGJhmwAa4MQjzGd86ry63vrvovu9b 0.00003000
error: {"code":-4,"message":"Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."}

./zcash-cli sendfrom "" mrEGRmGJhmwAa4MQjzGd86ry63vrvovu9b 0.00003000
error: {"code":-4,"message":"Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."}
```

After fix is applied:

```
./zcash-cli sendtoaddress mrEGRmGJhmwAa4MQjzGd86ry63vrvovu9b 1000.0
error: {"code":-6,"message":"Insufficient funds"}

./zcash-cli sendtoaddress mrEGRmGJhmwAa4MQjzGd86ry63vrvovu9b 0.00003000
error: {"code":-4,"message":"Coinbase funds can only be sent to a zaddr"}
```

When non-coinbase UTXOs exist, they will now be selected and used:

```
./zcash-cli z_sendmany tnPJZHeVxegCg91utaquBRPEDBGjozfz9iLDHt7zvphFbZdspNgkTVLCGjDcadQBKNyUwKs8pNjDXuEZKrE1aNLpFwHgz4t '[{"address":"mx5fTRhLZwbYE7ZqhAPueZgQGSnwTbdvKU", "amount":0.01}]'

./zcash-cli sendtoaddress mrEGRmGJhmwAa4MQjzGd86ry63vrvovu9b 1000.0
error: {"code":-6,"message":"Insufficient funds"}

./zcash-cli sendtoaddress mrEGRmGJhmwAa4MQjzGd86ry63vrvovu9b 0.00003000
9818e543ac2f689d4ce8b52087607d73fecd771d45d316a1d9db092f0485aff2

./zcash-cli sendfrom "" mrEGRmGJhmwAa4MQjzGd86ry63vrvovu9b 0.00003000
899f2894823f51f15fc73b5e0871ac943edbe0ff88e1635f86906087b72caf30
```
2016-10-16 22:08:07 -04:00
zkbot 67ec04e6f4 Auto merge of #1520 - str4d:1502-cache-nullifiers-on-wallet-unlock, r=str4d
Cache nullifiers on wallet unlock

Closes #1502
2016-10-16 17:28:48 -04:00
zkbot cc10005247 Auto merge of #1486 - str4d:1456-writewitnesscache-exception-safety, r=bitcartel
WriteWitnessCache: Catch errors and abort transaction

Closes #1452
2016-10-14 17:37:53 -04:00
zkbot 3fceaca3a1 Auto merge of #1506 - bitcartel:master_1478_fix_testnet3_test_issue, r=bitcartel
Stop some wallet tests creating ~/.zcash/testnet3 folder by setting -datadir environment

Closes #1478
2016-10-14 17:03:11 -04:00
zkbot 27bc01a05b Auto merge of #1523 - bitcartel:master_1504_z_logging, r=bitcartel
Refine LogPrint debugging for z_* rpc calls

For #1504 ZCA011
2016-10-14 11:11:26 -04:00
zkbot 6432b8c453 Auto merge of #1499 - arcalinea:document-coinbase-maturity-security, r=bitcartel
Note that Coinbase maturity interval does not protect JoinSplits

Changed wording of Block Chain Reorganization section in security-warnings.md to note that we did not change Coinbase maturity #1387, but that this also does not protect JoinSplits from becoming invalidated in the case of a block chain reorg #953
2016-10-13 23:52:37 -04:00
zkbot bb25bd4bc1 Auto merge of #1533 - bitcartel:master_1447_document_getfilterednotes, r=bitcartel
Document CWallet::GetFilteredNotes

Also fixes return type of method which should be void.

Part of #1447
2016-10-13 20:25:19 -04:00
zkbot 2b29970e28 Auto merge of #1531 - str4d:1447-document-findmynotes, r=bitcartel
Document CWalletTx::FindMyNotes

Part of #1447
2016-10-13 19:51:06 -04:00
zkbot 8eb672251b Auto merge of #1513 - bitcartel:master_1491_fix_help_message_rpc_z_importkey, r=daira
Fixes #1491 by updating help message for rpc call z_importkey
2016-10-13 19:05:08 -04:00
zkbot a9243e4f15 Auto merge of #1512 - arcalinea:cleanup-documentation, r=daira
Cleanup documentation

Start cleaning up unused/obsolete documentation. ref #1500
2016-10-13 18:24:57 -04:00
zkbot 49fc58b782 Auto merge of #1514 - bitcartel:master_1481_client_identifier, r=bitcartel
Rename client identifier from Satoshi to MagicBean (closes #1481)

@ageis seeder will have be to updated too.
2016-10-13 02:02:58 -04:00
zkbot 3fdca8a8ed Auto merge of #1511 - arcalinea:document-hidden-service-in-tor.md, r=bitcartel
Tor.md: change alpha to beta testnet, add new zcash hidden service address

Note: When @ageis and I checked this the other day, we were getting multiple peer connections. Think we said we'd change this before launch, so I opened issue #1510. Leaving documentation to expect a single peer.
2016-10-12 14:55:03 -04:00
zkbot 137d1f14eb Auto merge of #1507 - ageis:wget-retry, r=bitcartel
Set wget retry options for fetching parameters

This will retry upon refused connections and similar errors, wait 1 second before the next retry, time out after 10 seconds if no data is received or the connection times out, plus try an infinite number of times.

Resolves #1196.
2016-10-11 21:57:39 -04:00
zkbot 7dc49cbc6a Auto merge of #1490 - str4d:1454-deprecate-accounts, r=bitcartel
Throw an RPC error for all accounts except the default

Closes #1454
2016-10-10 23:55:02 -04:00
zkbot 4210e20c9c Auto merge of #1501 - ebfull:100kb-max-tx, r=ebfull
Make 100KB transaction size limit a consensus rule, rather than a standard rule

Closes #1475
2016-10-10 15:39:42 -04:00
zkbot bc0629230a Auto merge of #1493 - bitcartel:master_1446_gettransaction, r=bitcartel
Add vjoinsplit to JSON output of RPC call gettransaction

Closes #1446.
2016-10-08 02:41:18 -04:00
zkbot f2c99399b8 Auto merge of #1492 - arcalinea:document-wallet-reindex, r=bitcartel
Document wallet reindexing for z_importkey description in payment-api.md

Documents how to enable funds for imported keys  #1395
2016-10-07 12:13:53 -04:00
zkbot b4526f4d22 Auto merge of #1458 - str4d:1386-remove-findanddelete-and-codeseparator, r=ageis
Remove FindAndDelete and disable OP_CODESEPARATOR

Closes #1386
2016-10-04 21:51:29 -04:00
zkbot a1e7dda816 Auto merge of #1480 - ageis:update-release-process, r=str4d
Adds note about updating guide during testnet deployment
2016-10-04 19:40:50 -04:00
zkbot 1f4515a8c0 Auto merge of #1477 - zcash:812.change-address-prefixes.0, r=str4d
Update address prefixes

Closes #812 and #1450
2016-10-04 18:59:20 -04:00
zkbot d86218a52f Auto merge of #1476 - ebfull:update-parameters, r=str4d
Update to beta2 public parameters

Also gets rid of the `testnet3`/`regtest` subdirectories/symlinks and other such things.
2016-10-04 04:54:02 -04:00
zkbot ed3e736af0 Auto merge of #1474 - ageis:update-release-process, r=str4d
Inserts some notes related to testnet deployment

Should satisfy #959 for now. I don't want to get too detailed here, since the infrastructure automation is in a still non-public repository, but instead supply a basic overview. We can write more detailed documentation and attach it to that repo.
2016-10-04 04:22:00 -04:00
zkbot 4cfbe798bf Auto merge of #1429 - str4d:867-update-dependencies, r=str4d
Update all dependencies

Also re-enables disabled compiler warnings.

Closes #867, #944, #1241, #1255, #1348.
2016-10-04 03:48:42 -04:00
zkbot 4f49d32a28 Auto merge of #1427 - bitcartel:master_1345_getbalance, r=bitcartel
Fixes #1345 so that RPC getbalance star calculates balance of UTXOs correctly.
2016-10-04 01:20:12 -04:00
zkbot efe18f2e9b Auto merge of #1374 - str4d:1106-alert-safe-mode, r=str4d
Enable high-priority alerts to put the RPC into safe mode

This reverts the changes in 986b5e257e and adds a priority check.

Continuation of #1337
Closes #1106
2016-10-03 17:36:59 -04:00
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
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
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
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
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
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
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
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
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
zkbot 2271d3feda Auto merge of #1338 - str4d:147-tweak-difficulty-adjustment-algorithm, r=ebfull
Tweaks to difficulty adjustment algorithm

This PR changes the difficulty algorithm to adjust from the average difficulty over the
block window instead of from the last difficulty. It also removes the special rules for the
testnet, which are incompatible with difficulty averaging.

Closes #147 again.
2016-09-08 02:21:13 +00:00
zkbot 0372ce1f92 Auto merge of #1355 - bitcartel:zc.v0.11.2.latest_paymentapi, r=ebfull
Update payment API documentation for beta 1

Remove 'not in alpha 9' labels as RPC calls are now implemented.
2016-09-08 01:40:49 +00:00
zkbot 02932fc9cc Auto merge of #1341 - ebfull:fix-checktransaction-bug, r=ebfull
Fix CheckTransaction bugs.

Closes #1319.

Does not address the name of `vpub_old` or `vpub_new`.
2016-09-07 20:22:13 +00:00
zkbot c5b5d50004 Auto merge of #1342 - ebfull:remove-todo, r=ebfull
Remove TODO 808.

Closes #1309.
2016-09-07 16:55:23 +00:00
zkbot b181f7032b Auto merge of #1328 - bitcartel:zc.v0.11.2.latest_1298_rest_interface, r=ebfull
Update security-warnings.md about REST interface

Closes #1298
2016-09-02 03:43:16 +00:00
zkbot 485ace0a1b Auto merge of #1311 - ebfull:cleanup-pp, r=ebfull
Deallocate the public parameters during Shutdown.

This also has it deallocated in `GenerateParams` and `test_bitcoin`. The virtual destructor probably isn't necessary but I added it just in case we need it some other time.
2016-09-02 03:03:45 +00:00
zkbot 2640989d9a Auto merge of #1308 - str4d:1181-getmininginfo-testnet-difficulty-rules, r=ebfull
Separate concepts of block difficulty and network difficulty in RPC

"Block difficulty" is the difficulty listed in a block's header, which in the
testnet can sometimes be min-difficulty (if time-since-last-block is too large).

"Network difficulty" is the difficulty that the network was trying to satisfy
at a particular block height. In mainnet this is always equal to the difficulty
of the solved block for that height, but in testnet the network difficulty is
derived from the last non-min-difficulty block difficulty.

This commit fixes the RPC APIs that are intended to show network difficulty, so
that on testnet they don't sometimes drop to 1.0, confusing users.

Closes #1181
2016-09-01 18:12:46 +00:00
zkbot 8a620d507f Auto merge of #1326 - str4d:1185-remove-mainnet-dns-seeds, r=ebfull
Remove mainnet DNS seeds, set checkpoint to genesis

Closes #1185
2016-09-01 13:54:52 +00:00
zkbot a723794f81 Auto merge of #1233 - str4d:1199-note-tracking, r=str4d
Add Note tracking

This PR extends the existing transaction tracking in the wallet to track spendable Notes.

Closes #1199
2016-09-01 08:17:07 +00:00
zkbot 83ec5cb87b Auto merge of #1322 - bitcartel:zc.v0.11.2.z9_1316_getblocksubsidy, r=ebfull
Closes #1315 - change to RPC getblocksubsidy

For #1315
RPC getblocksubsidy height parameter is now optional
Returns result for future block
Test has been added to verify parameter input and results
2016-08-31 21:45:11 +00:00
zkbot 54ce3c46dd Auto merge of #1323 - bitcartel:zc.v0.11.2.latest_update_payment_api_doc, r=ebfull
Update payment-api.md

Add z_getoperationresult to documentation.

@ebfull This document might be updated again with a few notes, so let's merge closer to release.  Thanks.
2016-08-31 20:06:34 +00:00
zkbot f9c02827d4 Auto merge of #1300 - ThisIsNotOfficialCodeItsJustForks:t915-add-wformat-security.2, r=ebfull
Add -Wformat -Wformat-security

Closes #915. Supersedes #1267 (because of weird rebase/github/zkbot bug).
2016-08-30 22:31:48 +00:00
zkbot 835588a629 Auto merge of #1314 - str4d:fix-getblock-solution-output, r=ebfull
Output Equihash solution in RPC results as a hex string

When the Equihash solution was changed to a compact form in #1175, the block header changed from storing a vector of indices to a vector of chars. `blockToJSON()` was not updated, which meant that RPC calls like `getblock` returned the solution as a list of 1344 integers.

This PR changes `blockToJSON()` to output the Equihash solution as a hex string, identical to how it appears in the block header.
2016-08-30 18:40:19 +00:00
zkbot 6731665a12 Auto merge of #1313 - bitcartel:zc.v0.11.2.z9_1122, r=ebfull
Fixes #1122 where json_spirit could stack overflow

See #1122 for details.
2016-08-30 18:00:11 +00:00
zkbot e0fa312756 Auto merge of #1307 - str4d:remove-debug-pow-code, r=ebfull
Undo debugging change from 5be6abbf84

This was unintentionally committed, and caused Equihash verification of blocks
without parents to be skipped. This only affects the genesis block on the test
network, but also causes the "time verifyequihash" benchmark to incorrectly
appear instantaneous.
2016-08-29 22:09:17 +00:00