Commit Graph
100 Commits
Author SHA1 Message Date
Homu 0ad9255d2a Auto merge of #2858 - sandakersmann:patch-1, r=daira
Changed http:// to https:// on some links

Changed http:// to https:// on some links in code_of_conduct.md
2018-01-14 00:37:05 -08:00
Homu b2a114a8c9 Auto merge of #2771 - syd0:fix-snark-dep-build, r=str4d
Fix libsnark dependency build.

This changes libsnark to build in-place, instead of copying first to
a build directory. Previously, modifications made to the original
sources wouldn't get rebuilt without a 'make clean' because users
would be pointing to the copies.

This closes #2689.
2018-01-04 17:06:33 -08:00
Homu 8dbe11451a Auto merge of #2770 - syd0:remove-some-cruft, r=str4d
Remove OSX and Windows files from Makefile + share directory.

These are stale holdovers from bitcoin.

This closes #2169.
2018-01-04 16:02:27 -08:00
Homu db9f6f0485 Auto merge of #2821 - str4d:2335-scope-ecdsa-constants, r=str4d
Scope the ECDSA constant sizes to CPubKey / CKey classes

Cherry-picked from https://github.com/bitcoin/bitcoin/pull/10657, upstreaming our patches from #2335.
2018-01-04 14:47:50 -08:00
Homu 1ddecf644f Auto merge of #2849 - str4d:release-v1.0.14, r=str4d
Release v1.0.14
2018-01-03 16:39:43 -08:00
Homu 8912a0647b Auto merge of #2830 - str4d:release-v1.0.14-rc1, r=str4d
Release v1.0.14-rc1
2017-12-22 06:21:17 -08:00
Homu 12cf9f18c0 Auto merge of #2826 - str4d:pyflakes-warnings, r=str4d
Fix pyflakes warnings in zkey_import_export RPC test
2017-12-21 10:53:32 -08:00
Homu 7dc1e1ca30 Auto merge of #2823 - str4d:2755-release-notes, r=str4d
List all commits in final release notes

This alters the release notes to display the following commit ranges:

Version | Diff
------- | ---
`X-rc1` | `(X-1)..X-rc1`
`X-rc2` | `(X-1)..X-rc2`
`X`     | `(X-1)..X`

Closes #2755.
2017-12-21 00:29:31 -08:00
Homu 1683c2d5bf Auto merge of #2143 - str4d:1997-viewing-keys, r=str4d
Implement incoming viewing keys

Closes #1997.
2017-12-20 14:11:05 -08:00
Homu c1b0db70e5 Auto merge of #2779 - arcalinea:2515_test_zimportkey, r=str4d
Add RPC test that exercises z_importkey

Part of #2515.
2017-12-18 08:32:28 -08:00
Homu efda4bafef Auto merge of #2796 - per-gron:less-verbose-tests, r=daira
Less verbose tests

Fixes #2453 and deduplicates some related code.
2017-12-17 00:22:38 -08:00
Homu 7888624f74 Auto merge of #2795 - str4d:2351-sprout-circuit-value, r=str4d
Track net value entering and exiting the Sprout circuit

Delta values will be stored for new blocks; old blocks can be filled in by
re-indexing. The net value currently in the Sprout circuit is only calculated
when delta values for all previous blocks are present.

Part of #2351.
2017-12-16 02:09:40 -08:00
Homu 2a48fa62bf Auto merge of #2780 - str4d:1272-secp256k1, r=daira
Merge current secp256k1 subtree

Part of #1272.
2017-12-15 12:35:13 -08:00
Homu c720d15c45 Auto merge of #2700 - kozyilmaz:emptyspaces, r=str4d
PATH variable containing spaces cause build failure

Spaces in PATH variable is creating build issues (observed on macOS). For example "VMware Fusion" adds itself to PATH like `/Applications/VMware Fusion.app/Contents/Public`.
2017-12-15 11:35:05 -08:00
Homu f44a4cea42 Auto merge of #2790 - bitcartel:2746_payment_disclosure_prefix, r=str4d
Closes #2746. Payment disclosure blobs now use 'zpd:' prefix.
2017-12-15 10:31:58 -08:00
Homu b9c7d84990 Auto merge of #2800 - str4d:2788-libsnark-test-hardening, r=str4d
Fix buffer overflow in libsnark

Applies `-fstack-protector-all` to libsnark, and fixes an underlying bug. This bug was not triggerable in `zcashd` because the function in question was being inlined by the compiler.

Closes #2788.
2017-12-15 07:32:41 -08:00
Homu 83af270002 Auto merge of #2786 - str4d:2074-build, r=str4d
Build system improvements

Includes commits cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6978
  - Only the first commit (second is for QT)
- bitcoin/bitcoin#7059
- bitcoin/bitcoin#7603
  - Only the first commit (without the `BITCOIN_QT_BIN` variable; the rest are for QT)
- bitcoin/bitcoin#7954
- bitcoin/bitcoin#8314
  - Only the second commit (first is for QT)
- bitcoin/bitcoin#8504
  - Only the first commit (second was undoing something we didn't have)
- bitcoin/bitcoin#8520
- bitcoin/bitcoin#8563
- bitcoin/bitcoin#8249
- bitcoin/bitcoin#9156
- bitcoin/bitcoin#9831
- bitcoin/bitcoin#9789
- bitcoin/bitcoin#10766

Part of #2074.
2017-12-15 05:04:44 -08:00
Homu 019c4bddc8 Auto merge of #2741 - bitcartel:stop_dumpwallet_overwriting, r=str4d
Prevent RPC calls dumpwallet and z_exportwallet from overwriting an existing file

Closes #2740
2017-12-04 09:41:52 -08:00
Homu 28e0159707 Auto merge of #2724 - arcalinea:1020-add-examples-for-zrpc, r=str4d
Add examples for z_rpc calls

Adds missing cli and json-rpc examples for `z_` rpc calls

Closes #2723
(Accidentally named the branch being merged in with wrong issue number)
2017-12-04 08:39:20 -08:00
Homu 89aaa67e9e Auto merge of #2769 - syd0:rename-bitcoin-bash-completion, r=str4d
Rename bitcoin bash completion files so that they refer to zcash and not bitcoin.

This closes #2167
2017-12-04 04:58:19 -08:00
Homu 02c4467cb5 Auto merge of #2697 - str4d:darwin-build, r=str4d
Darwin build fixes

Includes fixes cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7136
  - Only the third commit (to avoid a merge conflict)
- bitcoin/bitcoin#7302
  - Excluding the first commit, which is unnecessary (we use Boost 1.62)
- bitcoin/bitcoin#7487
- bitcoin/bitcoin#7606
- bitcoin/bitcoin#7711
- bitcoin/bitcoin#7165
- bitcoin/bitcoin#8002
- bitcoin/bitcoin#8210
  - Only the second commit
- bitcoin/bitcoin#9114
2017-11-30 05:49:07 -08:00
Homu 06f67834ae Auto merge of #2696 - str4d:macos-build-fixes, r=str4d
Cross-platform build.sh

This enables `zcutil/build.sh` to be used on MacOS, and likely other non-Linux platforms.
2017-11-29 08:35:49 -08:00
Homu 37ffef4628 Auto merge of #2767 - syd0:cleanup-reserved-include-guards, r=str4d
Get rid of underscore prefixes for include guards.

This is because they may conflict with reserved names. Also took
this opportunity to make the guards in the zcash subdir a bit
more uniform by having them all conform to ZC_<...>_H_

This closes #1272
2017-11-29 06:52:52 -08:00
Homu 099bf3dd8f Auto merge of #2763 - syd0:upgrade-libsodium, r=daira
Update libsodium from 1.0.11 to 1.0.15

Closes #2693.
2017-11-28 13:20:13 -08:00
Homu 213ac8d1fe Auto merge of #2764 - syd0:remove-old-boost-defines, r=str4d
Remove Boost conditional compilation.

Boost is currently at version 106200 in the depends subsystem
so it is safe to remove code the refers to earlier versions.

This closes #2445
2017-11-28 12:19:27 -08:00
Homu 2ff8ab7dfb Auto merge of #2751 - syd0:upgrade-googletest-1.8.0, r=str4d
Upgrade googletest to 1.8.0

Closes #1432.
2017-11-28 07:37:20 -08:00
Homu ce72b494b1 Auto merge of #2760 - bitcartel:fix_wallet_test_pipe_error, r=str4d
Fix broken pipe error on some platforms when running QA test wallet.py.

Closes #2759.
2017-11-28 06:33:54 -08:00
Homu 9ce4859459 Auto merge of #2766 - syd0:remove-fPowAllowMinDifficultyBlocks, r=str4d
Get rid of consensus.fPowAllowMinDifficultyBlocks.

This closes #1380
2017-11-27 04:06:27 -08:00
Homu 77f4d0505e Auto merge of #2773 - syd0:remove-fp3, r=ebfull
Get rid of fp3 from libsnark, it is not used.

This is for #1544
2017-11-25 17:49:34 -08:00
Homu df1c3debcc Auto merge of #2752 - syd0:fix-sec-hard-tests, r=daira
Get the sec-hard tests to run correctly.

This fixes the way arguments were passed to security-check, and also
a typo in how BIND_NOW was being searched for in a list.

Also fix how symbol-check is invoked although that script isn't
currently used.
2017-11-22 15:22:10 -08:00
Homu 3092ba0a42 Auto merge of #2744 - bitcartel:doc_z_shieldcoinbase, r=str4d
Add documentation for shielding coinbase utxos and payment disclosure
2017-11-20 17:52:56 -08:00
Homu 3ee1d04a8d Auto merge of #2756 - str4d:release-v1.0.13, r=str4d
Release v1.0.13
2017-11-20 13:48:14 -08:00
Homu 05207b865c Auto merge of #2743 - str4d:release-v1.0.13-rc2, r=arcalinea
Release v1.0.13-rc2
2017-11-17 10:05:17 -08:00
Homu 2c72e703c5 Auto merge of #2739 - str4d:2736-gitian-libsnark-bug, r=str4d
Fix Gitian bugs caused by bringing libsnark in-tree

Closes #2736.
2017-11-17 08:17:25 -08:00
Homu c1282bebb8 Auto merge of #2733 - str4d:release-v1.0.13-rc1, r=str4d
Release v1.0.13-rc1
2017-11-14 16:40:00 -08:00
Homu c8ecd49574 Auto merge of #2159 - bitcartel:1.0.7_payment_disclosure, r=str4d
Payment disclosure (experimental feature)
2017-11-14 14:06:22 -08:00
Homu 064600ec8a Auto merge of #2649 - bitcartel:2576_security_url, r=str4d
Closes #2576. Update link to security info on z.cash website.
2017-11-09 15:19:41 -08:00
Homu 6f9f09dfb0 Auto merge of #2670 - arielgabizon:lowmemprover, r=daira
Low memory prover

This PR integrates @ebfull 's low memory changes:  https://github.com/zcash/zcash/pull/2243/commits
on top of @str4d 's work bringing in libsnark as a subtree
https://github.com/zcash/zcash/pull/2652/commits/4699d0eb36e2049f692ead9f44c5886ba87a007c
2017-11-06 04:22:20 -08:00
Homu 086c6bed58 Auto merge of #2704 - bitcartel:fix_qa_shieldcoinbase_hang, r=str4d
Fix an issue where qa test wallet_shieldcoinbase could hang.

Closes #2703. The mempool was not synced so a block could be generated and not
clear out the mempool.  This would then cause subsequent code
which expected the mempool of all nodes to be empty to hang.
2017-11-03 02:06:10 -07:00
Homu 3775ac5250 Auto merge of #2692 - bitcartel:2639_enable_z_shieldcoinbase, r=str4d
Closes #2639. z_shieldcoinbase is now supported, no longer experimental.

This reverts commit 5023af7bd5.
2017-11-02 00:18:40 -07:00
Homu 08c91f49e6 Auto merge of #2698 - bitcartel:2263_fix_broken_pipe, r=str4d
Fix broken pipe error on some platforms when running qa test wallet_protectcoinbase.py

Closes #2263.
2017-10-31 15:47:05 -07:00
Homu fbd59653a2 Auto merge of #2687 - leto:patch-1, r=str4d
Update performance-measurements.sh

Fix error message, as per @daira
2017-10-24 15:29:09 -07:00
Homu 6b58fd2c99 Auto merge of #2665 - leto:perf_fix, r=str4d
Fix bug where performance-measurements.sh fails hards when given no args

Better than "$1: unbound variable", we ran into this when testing this script in the Hush repo, so we are pushing this fix upstream.
2017-10-23 18:37:05 -07:00
Homu fb2f98e00b Auto merge of #2555 - jasondavies:fix-2554, r=str4d
Fix various thread assertion errors caused during shutdown.

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6719
- bitcoin/bitcoin#6990
- bitcoin/bitcoin#8421
  - Second commit only in this PR
- bitcoin/bitcoin#11006

I've cherry-picked the relevant commits, along with a note in each commit referring to the original Bitcoin commit ID (and the Zcash issue numbers where applicable).  I've tested each issue with/without these patches applied.

Closes #2214, #2334, and #2554.
2017-10-23 15:15:14 -07:00
Homu 0952b02585 Auto merge of #2672 - str4d:2667-test-driver-tweaks, r=str4d
Test driver tweaks for dynamic build steps

Part of #2252 and #2667.
2017-10-18 19:34:50 -07:00
Homu 4ca8f506d7 Auto merge of #2652 - str4d:820-libsnark-subtree, r=str4d
Move libsnark in-repo as a git subtree

This PR pulls in the libsnark subtree at the exact commit that we currently fetch via the depends system. To verify:

```
$ ./contrib/devtools/git-subtree-check.sh src/snark
src/snark in HEAD was last updated to upstream commit 9ada3f84ab484c57b2247c2f41091fd6a0916573 (tree c10a38c759)
src/snark in HEAD currently refers to tree 34e916d3f6
:100644 100644 427f4f4ce9 13e54da68b M	Makefile
:040000 040000 42f29e42d1 dd73536163 M	src
FAIL: subtree directory tree doesn't match subtree commit tree
```

This shows that there are changes relative to what we currently use, due to the later commits in the PR. If we exclude them, we see that the code is identical:

```
$ git checkout 26a8f68ea8
$ ./contrib/devtools/git-subtree-check.sh src/snark
src/snark in HEAD was last updated to upstream commit 9ada3f84ab484c57b2247c2f41091fd6a0916573 (tree c10a38c759)
src/snark in HEAD currently refers to tree c10a38c759
GOOD
```

Closes #820.
2017-10-17 20:41:11 -07:00
Homu 4c9b77d8fb Auto merge of #2654 - str4d:429-test-driver-script, r=str4d
[Test] New merge test suite driver script

Running the script with no arguments will run all test stages in succession.
Passing one or more stages as arguments will run just those stages.

Closes #429.
2017-10-16 21:51:21 -07:00
Homu a2dc9be5c5 Auto merge of #2533 - str4d:2530-mininode, r=str4d
Migrate MiniNode to Zcash

This enables various RPC tests that use it (most of them in the extended test suite) to properly test Zcash code.

The PR also fixes bugs in the BIP65 and BIP66 tests that were both masking and masked by the un-migrated MiniNode.

The Python module `pyblake2` is now a requirement for the RPC tests.

Part of #2530.
2017-10-16 08:43:58 -07:00
Homu af549fe6ed Auto merge of #2650 - str4d:2645-listunspent-benchmark, r=str4d
Add benchmark for listunspent

Closes #2645.
2017-10-12 15:24:53 -07:00
Homu d7c4e19f80 Auto merge of #2648 - str4d:ci-workers-grind, r=str4d
Add Ansible playbook for grind workers
2017-10-12 14:09:08 -07:00
Homu 4ad2f17fcb Auto merge of #2659 - str4d:2377-memory-validatelargetx, r=str4d
Add memory benchmark for validatelargetx

Closes #2377.
2017-10-12 13:05:11 -07:00
Homu 4485d5d3f3 Auto merge of #2548 - jasondavies:fix-bitcoin-mentions, r=str4d
Replace "Bitcoin" with "Zcash" in thread names and error messages

Part of #1756.
2017-10-05 10:58:02 -07:00
Homu ab28fc4ec3 Auto merge of #2150 - brunoarueira:removes_btc_mentions, r=str4d
Replace "Bitcoin" with "Zcash" in strings

Closes #1756
2017-10-05 08:55:53 -07:00
Homu b86b9feb6c Auto merge of #2642 - str4d:release-v1.0.12, r=str4d
Release v1.0.12
2017-09-28 01:29:24 -07:00
Homu e806f9c603 Auto merge of #2638 - bitcartel:2637_experimental_feature_z_shieldcoinbase, r=str4d
Closes #2637. Make z_shieldcoinbase an experimental feature.

Can be enabled with: `zcashd -experimentalfeatures -zshieldcoinbase`
2017-09-27 16:09:54 -07:00
Homu e2ef206ee3 Auto merge of #2640 - str4d:perf-benchmark-fixes, r=str4d
Perf benchmark fixes
2017-09-27 11:51:08 -07:00
Homu 056110fe08 Auto merge of #2636 - str4d:pyflakes-fixes, r=str4d
Fix pyflakes warnings in RPC tests
2017-09-27 09:31:21 -07:00
Homu 14148301e6 Auto merge of #2632 - bitcartel:2623_update_getbestanchor_lock, r=str4d
Update which lock to synchronize on when calling GetBestAnchor().

Closes issue #2623.
2017-09-27 07:14:20 -07:00
Homu 6e4ce0dfa2 Auto merge of #2627 - str4d:release-v1.0.12-rc1, r=str4d
Release v1.0.12-rc1
2017-09-23 03:21:25 -07:00
Homu f34c60de37 Auto merge of #2615 - bitcartel:2448_shield_coinbase, r=bitcartel
Add RPC command shield_coinbase #2448.

Shield transparent coinbase funds by sending to a shielded z address. Closes #2448.
2017-09-22 12:04:31 -07:00
Homu 8f16b27304 Auto merge of #2616 - nathan-at-least:importprivkey-shows-address.4, r=str4d
Importprivkey shows address

Scratching an itch: make `importprivkey` output the corresponding address.

Without this PR, `importprivkey` shows no output. Because we're moving towards an "address-based" RPC interface, rather than "account-based", there's a gap when using `importprivkey` because there's no way to assign it to a specific account, but also no easy way to determine the address. This change fixes that wart.
2017-09-21 14:29:03 -07:00
Homu 0eebdefb8a Auto merge of #2597 - kpcyrd:fetch-ipfs, r=str4d
Fetch params from ipfs if possible

This patch allows fetch-params to download the params from [ipfs], if it's installed. This reduces the need for a central server and ensures the params are available if the official server ceases to exist.

For now, the default is still wget. If wget exits with an error, the script automatically tries ipfs. To use ipfs instead of wget:

    ZC_DISABLE_WGET=1 ./zcutil/fetch-params.sh

[ipfs]: https://github.com/ipfs/go-ipfs
2017-09-21 09:26:29 -07:00
Homu 60b4a79000 Auto merge of #2620 - bitcartel:2583_watch_only_fspendable, r=str4d
Closes #2583. Exclude watch-only utxos from coin selection.
2017-09-20 04:49:48 -07:00
Homu e797c7bdb1 Auto merge of #2586 - str4d:release-script-build-progress, r=str4d
Add build progress to the release script if progressbar module is available

Install progressbar2 in your Python path to see the build progress.
2017-09-19 14:43:11 -07:00
Homu 17cb84a63f Auto merge of #2582 - arielgabizon:apitweak, r=daira
add examples to z_getoperationresult

Add examples of usage in payment-api.md
2017-09-19 13:37:58 -07:00
Homu 6e9964ff70 Auto merge of #2613 - arielgabizon:load-wallet-benchmark, r=str4d
Add load-wallet benchmark

Closes #2518.
2017-09-19 01:52:22 -07:00
Homu 2dfc8842ae Auto merge of #2618 - str4d:2596-user-guide-t9n, r=str4d
Update user guide translations as part of release process

Part of #2596.
2017-09-18 18:21:19 -07:00
Homu 151932d478 Auto merge of #2600 - str4d:2497-hotfix-release, r=str4d
Implement process for hotfix releases

Closes #2497.
2017-09-18 16:02:26 -07:00
Homu 61d9c6745a Auto merge of #2545 - bhjortsberg:fixes-for-gcc-7, r=str4d
Fixes for gcc 7

This fixes a few issues when using a newer compiler (in my case gcc 7.1.1) available in for example Arch Linux.
Solves for example this issue: https://github.com/zcash/zcash/issues/2304

The first thing is an error when checking for boost_system and is solved by disabling that warning (wich is treated as an error and, hence, stops the build):

```
configure:22242: checking for exit in -lboost_system-mt
configure:22267: g++ -m64 -o conftest -std=c++11 -pipe -fPIC -O1 -fwrapv -fno-strict-aliasing -Werror -g  -Wformat -Wformat-security -Wstack-protector -fstack-protector-all -fPIE ..<snip>... /x86_64-unknown-linux-gnu/share/../lib conftest.cpp -lboost_system-mt  -lanl  >&5
conftest.cpp:70:6: error: declaration of 'char exit()' conflicts with built-in declaration 'void exit(int)' [-Werror=builtin-declaration-mismatch]
 char exit ();
      ^~~~
cc1plus: all warnings being treated as errors

```

The second thing was to clean some code that is deprecated in C++11 which also lead to a warning treated as error. It could also be fixed with `-Wno-deprecated` but better to fix the issue in my opinion.
2017-09-18 11:45:24 -07:00
Homu e0bef1de56 Auto merge of #2564 - str4d:2074-currency-units, r=str4d
Rationalize currency unit to "ZEC"

Cherry-picked from the upstream PR bitcoin/bitcoin#6504

Part of #2074
2017-09-18 00:07:52 -07:00
Homu d1bba6f1b6 Auto merge of #2601 - str4d:2156-large-wallet-utxos, r=str4d
Benchmark time to call sendtoaddress with many UTXOs

Part of #2156.
2017-09-13 15:38:57 -07:00
Homu 3d2122d5b5 Auto merge of #2609 - str4d:2262-github-release-notes, r=str4d
Add GitHub release notes to release process

Closes #2262.
2017-09-13 13:53:28 -07:00
Homu 446c49b047 Auto merge of #2560 - str4d:ci-workers-bugfix, r=str4d
ci-workers: Bugfixes and improvements
2017-09-06 04:32:03 -07:00
Homu 053fafc21a Auto merge of #2570 - jasondavies:fix-deprecation-comment, r=str4d
Fix deprecation policy comment.

Thanks to @daira for spotting this and suggesting the correct policy.

Feel free to adjust wording, this is primarily to track the issue and suggest a potential fix.
2017-09-04 14:35:39 -07:00
Homu 02dd675a25 Auto merge of #2585 - str4d:release-v1.0.11, r=str4d
Release v1.0.11
2017-08-15 09:22:56 -07:00
Homu 2a42478bff Auto merge of #2562 - arielgabizon:release-v1.0.11-rc1, r=daira
Release v1.0.11 rc1
2017-08-01 12:37:26 -07:00
Homu 10acd8a1fb Auto merge of #2484 - str4d:block-download-completion, r=daira
Add block download progress to metrics UI
2017-07-28 21:57:19 -07:00
Homu d6e6f51724 Auto merge of #2526 - bitcartel:2480_segfault_zeroconf_from_zaddr, r=daira
Fixes #2480 where missing map entry would cause a segfault.

`wtxHeight = mapBlockIndex[wtx.hashBlock]->nHeight;` results in undefined behaviour when the block hash is not present in the map, returning a null value which is dereferenced via `->nHeight`.  This error is triggered by a zero-conf wallet transaction which has not been mined yet.  As discussed in #2480, on some systems there is a segfault whilst on others there is a silent exit.  This makes it difficult to write a test, but the fix has been tested empirically to confirm an exception is thrown.  This PR fixes the segfault and complements #2525 which prevents a user from sending from a zaddr with minconf 0.
2017-07-27 22:42:59 -07:00
Homu e88ab1a920 Auto merge of #2529 - str4d:2444-rpc-www-authenticate, r=daira
[rpc] Add WWW-Authenticate header to 401 response

Fix cherry-picked from upstream PR bitcoin/bitcoin#7472.

Closes #2444.
2017-07-25 15:36:33 -07:00
Homu eeac474228 Auto merge of #2543 - nathan-at-least:2499-specify-ci-worker-criteria, r=daira
Document our criteria for adding CI workers.

This is a doc improvement that came out of #2499.
2017-07-25 14:16:22 -07:00
Homu a698116b28 Auto merge of #2478 - bitcartel:2477_send_alert_1.0.10, r=daira
Alert for 2017-06-23.a degraded networking (fixed in 1.0.10-1)

Alert 1004 (version 1.0.10 only) Issue #2477
2017-07-25 13:03:53 -07:00
Homu 95d18784ec Auto merge of #2525 - bitcartel:2519_no_zero_minconf_from_zaddr_zsendmany, r=daira
When sending from a zaddr, minconf cannot be zero.

Closes #2519.
2017-07-20 08:24:54 -07:00
Homu d2627bc65d Auto merge of #2504 - daira:2501.remove-upnp, r=daira
Remove UPnP support. fixes #2500

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-07-16 03:43:54 -07:00
Homu d3a976095f Auto merge of #2509 - str4d:ci-workers, r=str4d
Ansible playbook for configuring CI workers

The playbook in this PR can be used for configuring common Unix variants to run a Buildbot worker for the Zcash CI, starting from a fresh install (or a VM template provided by a hosting service).
2017-07-14 19:10:21 -07:00
Homu 1738e6957f Auto merge of #2458 - daira:2450.pyflakes-cleanup, r=str4d
pyflakes cleanup

Make the RPC tests pyflakes-clean. fixes #2450

Includes a fix that upstream had in https://github.com/bitcoin/bitcoin/pull/7802
2017-07-14 18:03:03 -07:00
Homu 098e8139c5 Auto merge of #2535 - daira:zcash-is-experimental-wording, r=daira
Change wording in Security Warnings section of README.md.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-07-14 08:52:25 -07:00
Homu 2c0fd9e5e4 Auto merge of #2522 - bitcartel:2446_coinbase_field_listunspent, r=daira
Add generated field to listunspent output

Closes #2446
2017-07-12 23:46:25 -07:00
Homu 5df11e9d8e Auto merge of #2460 - str4d:process-temp-release-notes, r=daira
Pull in temporary release notes during the release process

This PR assumes we always have at least one notable change in `doc/release-notes.md`, which should be the case for every release.
2017-07-10 11:44:00 -07:00
Homu 90a255a747 Auto merge of #2464 - str4d:torcontrol-rbf-resource-leak, r=daira
Net: Fix resource leak in ReadBinaryFile(...)

Introduced in 3290567bbd via PR #2177.

Cherry-picked from Bitcoin PR https://github.com/bitcoin/bitcoin/pull/10408
2017-07-10 10:43:22 -07:00
Homu d6ec3954c6 Auto merge of #2474 - bitcartel:release-v1.0.10-1, r=bitcartel
Release v1.0.10-1
2017-06-23 20:13:47 -07:00
Homu ad5e8a544b Auto merge of #2462 - str4d:2404-gitian-no-proton, r=ebfull
Disable building Proton in Gitian

This is the patch used to build 1.0.9 and 1.0.10.

Part of #2404.
2017-06-23 18:34:31 -07:00
Homu 1605da740e Auto merge of #2473 - ebfull:init-proto-hotfix-release, r=ebfull
Revert changes to INIT_PROTO_VERSION

This reverts https://github.com/zcash/zcash/pull/2245 in order to fix degraded networking behavior for 1.0.10 clients.
2017-06-23 17:26:34 -07:00
Homu d52ac0d498 Auto merge of #2461 - str4d:release-v1.0.10, r=str4d
Release v1.0.10
2017-06-21 20:40:11 -07:00
Homu 59de56eeca Auto merge of #2342 - bitcartel:1081__mempoolpatch, r=str4d
Add ability for node to reject tx from mempool by number of tx inputs

Implement short-term solution described in #2343 so that users can respond promptly to critical short-term problems caused by quadratic validation scaling, such as the getblocktemplate latency, block propagation latency, and mempool size inflation issues described in #2333.
2017-06-21 14:42:13 -07:00
Homu 02e5fffadc Auto merge of #2360 - daira:2359.remove-lax-der-validation, r=arcalinea
Remove unneeded lax ECDSA signature verification

Fixes #2359. Removes code for lax ECDSA verification, and the SCRIPT_VERIFY_DERSIG flag that controlled it. The behaviour is as-if the flag is always set.
2017-06-20 19:05:58 -07:00
Homu c050b99469 Auto merge of #2456 - btccom:master, r=str4d
[mining] let "getblocktemplate" work when disable wallet

we already support GetBlockTemplate without build wallet, see:

https://github.com/zcash/zcash/blob/master/src/rpcmining.cpp

```
    // Wallet or miner address is required because we support coinbasetxn
    if (GetArg("-mineraddress", "").empty()) {
#ifdef ENABLE_WALLET
        if (!pwalletMain) {
            throw JSONRPCError(RPC_METHOD_NOT_FOUND, "Wallet disabled and -mineraddress not set");
        }
#else
        throw JSONRPCError(RPC_METHOD_NOT_FOUND, "zcashd compiled without wallet and -mineraddress not set");
#endif
    }
```

so the macro should be removed from `src/rpcserver.cpp`, otherwise you can't call `getblocktemplate` when you disable wallet.
2017-06-20 01:15:15 -07:00
Homu 00fd23930b Auto merge of #2443 - str4d:1621-priority-download-path, r=str4d
Rename FALLBACK_DOWNLOAD_PATH to PRIORITY_DOWNLOAD_PATH

Closes #1621.
2017-06-19 23:46:44 -07:00
Homu ef24e8e6be Auto merge of #2335 - str4d:2333-validation-speed, r=str4d
Switch to libsecp256k1-based validation for ECDSA

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6983
- bitcoin/bitcoin#6954

Part of #2333.
2017-06-17 07:18:25 -07:00
Homu d5934e9268 Auto merge of #2436 - kozyilmaz:multipath, r=str4d
support per platform filename and hash setting for dependencies

added to support per-platform Rust packages, tested on macOS Sierra 10.12.5 and Ubuntu 16.04 LTS (issue #2431)
2017-06-16 18:03:42 -07:00
Homu dfa4ed19bb Auto merge of #2440 - bitcartel:1360_reduce_info_leakage_vpub_new, r=str4d
Fix intermediate vpub_new leakage in multi joinsplit tx

Resolves information leakage discussed here https://github.com/zcash/zcash/issues/1360#issuecomment-284561331

Example output in debug.log showing how intermediate vpub_new is now 0
https://gist.github.com/bitcartel/86ca316b74f0b1ec6d8de3ac132006da

When reviewing, note that the indentation of a large chunk of code (scenario 3 part 2) changed, so use `git diff -w` (or similar) or append `?w=1` to the Github URL e.g. https://github.com/zcash/zcash/pull/2440/files?w=1
2017-06-15 21:33:01 -07:00