Commit Graph
100 Commits
Author SHA1 Message Date
Homu 4d6498b900 Auto merge of #3082 - str4d:overwinter-info, r=daira
Add link to Overwinter info page
2018-03-23 07:25:09 -07:00
Homu 8ed0346284 Auto merge of #3077 - str4d:asan-initialization-order-fiasco, r=str4d
Split declaration and definition of SPROUT_BRANCH_ID constant

Fixes an initialization-order-fiasco error detected by ASan:
https://ci.z.cash/#/builders/7/builds/149
2018-03-20 16:16:13 -07:00
Homu 64de921747 Auto merge of #3091 - bitcartel:cache_invalidation_qa, r=str4d
Closes #1988. Add qa test for cache invalidation bug found in v1.0.0 to v1.0.3.
2018-03-20 11:28:08 -07:00
Homu 70e2522306 Auto merge of #3090 - bitcartel:3084_log_expired_txid, r=bitcartel
Closes #3084.  Log txid when removing expired transactions from mempool.
2018-03-19 14:59:30 -07:00
Homu 601fc2414d Auto merge of #3093 - bitcartel:3092_clean_up_qa_test_operationid_status, r=str4d
Remove local function wait_and_assert_operationid_status which is now defined in test framework

Closes #3092
2018-03-19 03:24:21 -07:00
HomuandMarshall Gaucher 01c31ec57f Auto merge of #3069 - braddmiller:3034-disable-auto-dep, r=daira
Disable auto-deprecation on regtest and testnet

Prevents auto-senescence based on @str4d's recommendation to early return out of `EnforceNodeDeprecation` if net is not `main`.

Closes #2876.

Co-authored-by: Marshall Gaucher <marshall@z.cash>
2018-03-15 18:45:15 -07:00
Homu bc8221da81 Auto merge of #3089 - kozyilmaz:clang, r=str4d
[macOS] Fix test/gtest bugs caught by latest clang

Tests fail with latest clang on macOS (clang-900.0.39.2)

```
test/rpc_wallet_tests.cpp:1064:26: error: implicit conversion from 'double' to 'CAmount' (aka 'long long') changes value from 123.456 to 123 [-Werror,-Wliteral-conversion]
test/rpc_wallet_tests.cpp:1071:18: error: implicit conversion from 'double' to 'CAmount' (aka 'long long') changes value from 1.111 to 1 [-Werror,-Wliteral-conversion]
gtest/test_deprecation.cpp:28:1: error: control reaches end of non-void function [-Werror,-Wreturn-type]
```

Part of #2246.
2018-03-15 17:21:23 -07:00
Homu 5abe4e6348 Auto merge of #3079 - daira:pyflakes-cleanup, r=str4d
pyflakes cleanups to RPC tests after Overwinter PRs.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2018-03-13 07:57:07 -07:00
Homu d88a12262c Auto merge of #3050 - bitcartel:cleanup_define_X, r=daira
Code clean up. Remove use of X macro.

Closes #3049
2018-03-08 03:19:29 -08:00
Homu b3a656cf53 Auto merge of #3048 - str4d:analysis-tools, r=str4d
Add configure flags for enabling ASan/UBSan and TSan

Also adds an environment variable for setting configure flags in `./zcutil/build.sh`.
2018-03-06 11:53:43 -08:00
Homu 99d9e1483f Auto merge of #2987 - leto:rpc-readme, r=bitcartel
Fix references to Bitcoin in RPC tests readme

This is a vintage documentation bug, which I just fixed in Hush as well.
2018-03-05 15:22:36 -08:00
Homu 796ea3815e Auto merge of #2965 - rofl0r:patch-1, r=str4d
fix build error due to usage of obsolete boost_system-mt

closes #2304 for real
2018-03-05 06:25:56 -08:00
Homu 9a6a81afff Auto merge of #3036 - plutomonkey:typo, r=daira
Fix typo in comment: should link to issue #1359.

Fix typo in comment.
2018-03-02 06:21:20 -08:00
Homu 112ec9886a Auto merge of #3027 - rex4539:master, r=daira
Fix typos in various files

Fix documentation and comment typos.
2018-03-02 04:50:49 -08:00
Homu 93332d6e84 Auto merge of #3030 - str4d:release-v1.0.15, r=str4d
Release v1.0.15
2018-02-28 09:18:35 -08:00
Homu b10aaacadd Auto merge of #3002 - str4d:2957-overwinter-release-notes, r=str4d
Overwinter release notes and testnet activation height

Closes #2957.
2018-02-28 05:29:48 -08:00
Homu f9dbd1e2d5 Auto merge of #2993 - str4d:2977-performance-regression, r=str4d
Use block hash comparison for consistency check when loading block index

The Equihash check caused block index loading to take around 38x longer.
However, we don't need to check it directly, as the only paths to writing a
block header to disk already go through a proof-of-work check (e.g. receiving a
block over the network). By forcing the block header inside the CBlockIndex to
be re-serialized, we retain the benefits of the consistency check without the
overhead at startup.
2018-02-26 16:53:42 -08:00
Homu be262f065f Auto merge of #2985 - str4d:release-v1.0.15-rc1, r=ebfull
Release v1.0.15-rc1
2018-02-23 21:08:05 -08:00
Homu a418756ef4 Auto merge of #2874 - arcalinea:tx_block_expiry, r=arcalinea
Transaction expiry height

Implements ZIP 203.

- Only applies after Overwinter blockheight.

Closes #754.
2018-02-23 18:37:48 -08:00
Homu e6e483b2b0 Auto merge of #2919 - bitcartel:2904_branch_id_protocol_handshake, r=str4d
Overwinter peer management

Implements ZIP 201.

Part of #2904.
2018-02-23 17:18:04 -08:00
Homu c5904fb2a4 Auto merge of #2797 - str4d:2493-active-merging, r=bitcartel
Implement z_mergetoaddress for combining UTXOs and notes

Closes #2493.
2018-02-22 20:59:51 -08:00
Homu f472edd0e2 Auto merge of #2960 - bitcartel:2959_overwinter_fix_sighash_test, r=str4d
Closes #2954 and #2959.  Fixes Overwinter issues in sighash_tests.
2018-02-22 17:47:14 -08:00
Homu 0be6cb979e Auto merge of #2978 - bitcartel:2906_v1_tx_no_assert, r=str4d
Closes #2964. z_sendmany once again makes v1 tx for taddr to taddr.
2018-02-22 07:47:49 -08:00
Homu c2d98b47c1 Auto merge of #2808 - arcalinea:2785_upgrades_rpc, r=str4d
Add network upgrade details to getblockchaininfo

Closes #2785. Closes #2974.
2018-02-22 06:03:06 -08:00
Homu 933e0d6675 Auto merge of #2968 - maxgubler:v1.0.14-edit, r=str4d
Fix documentation examples for z_importwallet z_exportwallet exportdir

Closes #2967.
2018-02-21 20:14:32 -08:00
Homu 50400310af Auto merge of #2977 - str4d:loadblockindexguts-correctness, r=str4d
Check Equihash solution when loading block index

An additional consistency check, which also ensures that the in-memory representation
matches the stored index.
2018-02-21 19:05:23 -08:00
Homu 6264927fef Auto merge of #2931 - jc23424:hashreserved-diskindex, r=str4d
read hashReserved from disk

This fixes a bug where the hashReserved field of the block header is not properly read back into CBlockIndex when loaded from disk. This happens to cause no issues currently because hashReserved has always been its default value (== 0), but if a block were ever mined where this was not the case, headers read back from disk would appear to have an invalid solution
2018-02-21 14:35:58 -08:00
Homu d4d2844829 Auto merge of #2463 - str4d:713-rollback-limit, r=str4d
Implement roll-back limit for reorganisation

Part of  #2905. Closes #713.
2018-02-20 15:17:22 -08:00
Homu 8487be8360 Auto merge of #2903 - str4d:1408-sighash, r=str4d
Overwinter SignatureHash

Implements ZIP 143.

Includes code cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7276
- bitcoin/bitcoin#7976
- bitcoin/bitcoin#8118
- bitcoin/bitcoin#8149
  - Only amount validation and SignatureHash commits.
- bitcoin/bitcoin#8346
- bitcoin/bitcoin#8524

Part of #2074 and #2254. Closes #1408 and #2584.
2018-02-20 03:59:45 -08:00
Homu 49274558c6 Auto merge of #2940 - str4d:nu-activation-mempool-expiry, r=str4d
Mempool improvements, branch ID awareness

Whenever the local chain tip is updated, transactions in the mempool which commit to an
unmineable branch ID (for example, just before a network upgrade activates, where the
next block will have a different branch ID) will be removed.

Includes commits cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6654
  - Only the mempool index change.
- bitcoin/bitcoin#6776
- bitcoin/bitcoin#7020
- bitcoin/bitcoin#6915

Part of #2074.
2018-02-19 19:00:30 -08:00
Homu 8da60b127e Auto merge of #2958 - bitcartel:2906_extra_test, r=str4d
Add test to check malformed v1 transaction against Overwinter tx parser
2018-02-17 10:14:31 -08:00
Homu c6ffabb47f Auto merge of #2925 - bitcartel:2906_overwinter_tx_format, r=str4d
Overwinter transaction format

Implements ZIP 202.

Closes #2906.
2018-02-16 11:38:58 -08:00
Homu d527116d46 Auto merge of #2923 - str4d:sighash-tests-env-bug, r=str4d
Use JoinSplitTestingSetup for Boost sighash tests

Symptom: When running all tests, the test suite passed. But when running the
sighash tests on their own, the test suite segfaulted.

Cause: The sighash tests depend on the proving parameters being accessible, but
BasicTestingSetup doesn't load them.
2018-02-15 05:41:18 -08:00
Homu e6850571dd Auto merge of #2898 - str4d:2286-nu-activation-mechanism, r=str4d
Network upgrade activation mechanism

Implements ZIP 200.

Integration with `CChainParams` inspired by https://github.com/bitcoin/bitcoin/pull/7575.

Includes block index rewinding logic cherry-picked from https://github.com/bitcoin/bitcoin/pull/8149.

Closes #2286. Part of #2905.
2018-02-07 02:33:42 -08:00
Homu a0a010c85c Auto merge of #2839 - arcalinea:add_deprecation_alert, r=bitcartel
Add getdeprecationinfo RPC method to return deprecation block height

Closes #2828

Returns:
```
{
  "version": xxxxx,                      (numeric) the server version
  "subversion": "/MagicBean:x.y.z[-v]/",     (string) the server subversion string
  "deprecationheight": xxxxx,            (numeric) the deprecation block height
}
```
2018-02-02 10:23:37 -08:00
Homu 70109a74e9 Auto merge of #2902 - bitcartel:2901_remove_unused_noblks_constants, r=daira
Remove unused NOBLKS_VERSION_{START,END} constants from version.h

Closes #2901. Backport from upstream PR https://github.com/bitcoin/bitcoin/pull/7662.
2018-01-25 04:37:33 -08:00
Homu a4a020de7b Auto merge of #2217 - str4d:2074-chainparams, r=str4d
Bitcoin 0.12 chainparams cleanups

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6222
- bitcoin/bitcoin#6381
- bitcoin/bitcoin#6473
- bitcoin/bitcoin#6242

Part of #2074.
2018-01-22 15:22:24 -08:00
Homu b4a20ae5ac Auto merge of #2897 - str4d:2892-zkey-rpc-bugfix, r=str4d
zkey_import_export: Synchronize mempools before mining

Resolves a race condition that caused the RPC test to intermittently fail.

Closes #2892.
2018-01-22 14:11:50 -08:00
Homu d11230be73 Auto merge of #2886 - bitcartel:2885_cleanup_node_getutxo, r=str4d
Remove redundant service flag NODE_GETUTXO meant for Bitcoin XT.

For #2885. This frees up a service bit.  Zcash has never used this flag
and upstream Bitcoin Core does not support this flag, although
it did reserve it for compatibility with Bitcoin XT.
2018-01-22 08:38:49 -08:00
Homu 38246ea461 Auto merge of #2873 - bitcartel:2793_dbcache, r=bitcartel
Closes #2793 to improve sync performance by increasing default value of dbcache.
2018-01-19 16:53:21 -08:00
Homu fdb59266fb Auto merge of #2848 - str4d:2795-rpc-test-chainValueZat, r=str4d
Check chainValueZat when checking value pool monitoring

Addresses https://github.com/zcash/zcash/pull/2795#discussion_r157343660
2018-01-17 10:17:46 -08:00
Homu d80ab8ad34 Auto merge of #2845 - str4d:exportdir-completion, r=str4d
Enable Bash completion for -exportdir
2018-01-16 15:30:22 -08:00
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