DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
14,798 Commits 5 Branches 7 Tags
2ab1a322f3f4a7c33aea20c6716d7077a936c71d
Commit Graph
83 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zkbot f630519d86 Auto merge of #2213 - daira:2211.release-1.0.8, r=daira 
2211.release-1.0.8

Release 1.0.8. refs #2211
 2017-03-28 01:22:21 +00:00
zkbot 45faa928ec Auto merge of #2177 - str4d:2061-tor-ephemeral-hs, r=daira 
Tor ephemeral hidden services

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6503 (included to reduce merge conflicts)
- bitcoin/bitcoin#6639
- bitcoin/bitcoin#6643
- bitcoin/bitcoin#7090
- bitcoin/bitcoin#7035
- bitcoin/bitcoin#7170
- bitcoin/bitcoin#7218 (non-QT part)
- bitcoin/bitcoin#7313
- bitcoin/bitcoin#7438
- bitcoin/bitcoin#7553
- bitcoin/bitcoin#7637
- bitcoin/bitcoin#7683
- bitcoin/bitcoin#7813
- bitcoin/bitcoin#7703
- bitcoin/bitcoin#8203
- bitcoin/bitcoin#9004
- bitcoin/bitcoin#9234
- bitcoin/bitcoin#9911 (partial)

Closes #2061.
 2017-03-26 02:44:06 +00:00
zkbot f7fcad709b Auto merge of #2203 - arcalinea:2142_security_log_message, r=daira 
Add message directing users to security guide

Addresses #2142, which was blocking on updates to zcash/support/security.html. That page has now been added, so this message directing users to the site can be included.

It displays in the zcash-cli --help and --version message text, and on the zcashd metrics screen.
 2017-03-26 01:36:24 +00:00
zkbot f9f48667be Auto merge of #2176 - str4d:1593-libevent, r=bitcartel 
libevent-based http server

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#5677
- bitcoin/bitcoin#6695
- bitcoin/bitcoin#6899
- bitcoin/bitcoin#7016
- bitcoin/bitcoin#7964
- bitcoin/bitcoin#8722
- bitcoin/bitcoin#8730
- bitcoin/bitcoin#9073
- bitcoin/bitcoin#9265
- bitcoin/bitcoin#9387
- bitcoin/bitcoin#9471
- bitcoin/bitcoin#9647
- bitcoin/bitcoin#9903
- bitcoin/bitcoin#6640
- bitcoin/bitcoin#8139
- bitcoin/bitcoin#8839

Closes #1593 and #1856.
 2017-03-25 04:52:16 +00:00
zkbot 2bdb37276e Auto merge of #2198 - str4d:2139-timer, r=str4d 
Improve mining metrics

Closes #2139.
 2017-03-25 00:08:47 +00:00
zkbot 6344719817 Auto merge of #2052 - str4d:2032-z_importkey-partial-rescan, r=bitcartel 
Usability improvements for z_importkey

- Add height parameter to z_importkey to reduce rescan range
- Change semantics of rescan parameter, so users can explicitly force a rescan
  for existing keys.

Closes #2032
 2017-03-24 03:47:11 +00:00
zkbot 23f792c2f5 Auto merge of #2187 - bitcartel:1.0.7_getblock_by_height, r=bitcartel 
Closes #2186. RPC getblock now accepts height or hash.
 2017-03-24 02:55:27 +00:00
zkbot 7d9bf65501 Auto merge of #2168 - str4d:2164-getblock-anchor, r=daira 
Add anchor to output of getblock

Closes #2164.
 2017-03-23 18:21:10 +00:00
zkbot 00e59e5935 Auto merge of #2175 - str4d:2074-txn-mempool, r=bitcartel 
Bitcoin 0.12 mempool memory usage PRs

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6410
- bitcoin/bitcoin#6453
- bitcoin/bitcoin#6013 (excludes changes to docs we deleted)

Part of #2074.
 2017-03-23 17:29:35 +00:00
zkbot 3b11e24f92 Auto merge of #2183 - ebfull:rust-introduction, r=ebfull 
Introduce Rust/librustzcash into the zcash build system

Introduces Rust into the build system and brings a trivial xor operation into the code (near where we will likely be working).
 2017-03-21 03:40:12 +00:00
zkbot c4a7c9f20f Auto merge of #2157 - arcalinea:1652_submitblock_documentation, r=daira 
Document returned results of submitblock

documentation for #1652
 2017-03-20 17:11:50 +00:00
zkbot 7ab5912a78 Auto merge of #2184 - zcash:jackgavigan-COPYING-changes, r=bitcartel 
Removed markdown from COPYING

Updated the Copyright statement at the top of the file from "2016" to "2016-2017" and removed markdown markup from the main text.
 2017-03-16 23:09:46 +00:00
zkbot db0f7159c3 Auto merge of #2161 - arcalinea:2160_revise_release_process, r=str4d 
Edit release-process.md for clarity

For #2160
 2017-03-16 01:47:35 +00:00
zkbot a28b17b7b7 Auto merge of #1636 - daira:fix-licensing-and-remove-qt, r=str4d 
Remove QT code

This removes the QT wallet code, and updates license documentation accordingly.
 2017-03-10 23:47:43 +00:00
zkbot 00740e0358 Auto merge of #2162 - arcalinea:release_process_1.0.7-1, r=str4d 
Release process 1.0.7 1
 2017-03-09 00:11:56 +00:00
zkbot f5fbf40375 Auto merge of #2153 - arcalinea:1.0.7_release_process, r=str4d 
1.0.7 release
 2017-03-04 06:06:28 +00:00
zkbot a7cf698873 Auto merge of #2100 - str4d:2074-rpc, r=arcalinea 
Bitcoin 0.12 RPC PRs 1

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6266
- bitcoin/bitcoin#6257
- bitcoin/bitcoin#6271
- bitcoin/bitcoin#6158
- bitcoin/bitcoin#6307
- bitcoin/bitcoin#6290
- bitcoin/bitcoin#6262
- bitcoin/bitcoin#6088
- bitcoin/bitcoin#6339
- bitcoin/bitcoin#6299 (partial, remainder in #2099)
- bitcoin/bitcoin#6350
- bitcoin/bitcoin#6247
- bitcoin/bitcoin#6362
- bitcoin/bitcoin#5486
- bitcoin/bitcoin#6417
- bitcoin/bitcoin#6398 (partial, remainder was included in #1950)
- bitcoin/bitcoin#6444
- bitcoin/bitcoin#6456 (partial, remainder was included in #2082)
- bitcoin/bitcoin#6380
- bitcoin/bitcoin#6970

Part of #2074.
 2017-03-04 02:57:46 +00:00
zkbot dadb1ab74c Auto merge of #2101 - str4d:2074-tests, r=arcalinea 
Bitcoin 0.12 test PRs 1

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6337
- bitcoin/bitcoin#6390
- bitcoin/bitcoin#5515
- bitcoin/bitcoin#6287 (partial, remainder included in bitcoin/bitcoin#6703)
- bitcoin/bitcoin#6465

Part of #2074.
 2017-03-03 21:25:03 +00:00
zkbot 99c4c6de0c Auto merge of #2099 - str4d:2074-misc, r=arcalinea 
Bitcoin 0.12 misc PRs 1

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6198
- bitcoin/bitcoin#6206
- bitcoin/bitcoin#5927
- bitcoin/bitcoin#6213
- bitcoin/bitcoin#6061
- bitcoin/bitcoin#6283 (partial, remainder was pulled in #929)
- bitcoin/bitcoin#6272
- bitcoin/bitcoin#6316
- bitcoin/bitcoin#6133
- bitcoin/bitcoin#6387
- bitcoin/bitcoin#6401
- bitcoin/bitcoin#6434
- bitcoin/bitcoin#6372
- bitcoin/bitcoin#6447
- bitcoin/bitcoin#6149
- bitcoin/bitcoin#6468

Part of #2074.
 2017-03-03 20:41:57 +00:00
zkbot 28a5393401 Auto merge of #2138 - daira:2137.compactsize-portability.0, r=arcalinea 
Don't assume sizes of unsigned short and unsigned int in GetSizeOfCompactSize and WriteCompactSize.

Fixes #2137

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2017-03-02 21:07:20 +00:00
zkbot b75b2de004 Auto merge of #2124 - str4d:2086-help2man, r=str4d 
Improve autogenerated manpages

Cherry-picked from bitcoin/bitcoin#8608.

Closes #2086.
 2017-03-02 19:20:10 +00:00
zkbot 6ee75b3b7b Auto merge of #2014 - arcalinea:test-prioritisetransaction, r=arcalinea 
Test prioritisetransaction

After talking with @str4d about #1884 , I wrote a test for prioritisetransaction. It uses small blocks (11kb), and checks whether a transaction makes it into the next block after being prioritized by that node.

Should this be improved with a larger number of txs in the mempool, or by testing over multiple runs?

As for getblocktemplate(), it seems to return the prioritized transaction within the block size set by the node (about 50 txs fit in an 11kb block), but the block "sizelimit" it displays is set at 2 MB in `rpcmining.cpp` line 690:
```
result.push_back(Pair("sizelimit", (int64_t)MAX_BLOCK_SIZE));
```

This was quite confusing, I didn't think the `-blockmaxsize` parameter I was setting was working for awhile.
 2017-03-02 06:47:04 +00:00
zkbot 14711a4a43 Auto merge of #2141 - bitcartel:1969_free_rate_limiter, r=daira 
Closes #1969. Large shielded transactions using the default fee are no longer treated as "free" transactions
 2017-03-02 03:51:14 +00:00
zkbot c1cff6069f Auto merge of #2130 - str4d:2095-metrics-reindex-msg, r=arcalinea 
Do not ask a UI question on metrics screen

Based on bitcoin/bitcoin#8257.

Closes #2095.
 2017-03-02 03:08:29 +00:00
zkbot 1a41597af8 Auto merge of #2114 - bitcartel:fix_fr_test_bug_and_new_testnet_addresses, r=daira 
Closes #2113. Fixes bug in test and updates testnet fr addresses.

Updating the testnet fr addresses will introduce a consensus change on testnet, so all testnet nodes will be required to upgrade.  See #2113 for more information.
 2017-03-02 02:18:33 +00:00
zkbot 312fbd9d0e Auto merge of #1932 - aniemerg:1522-pause-mining-for-joinsplit, r=arcalinea 
Pause mining during JoinSplit creation

Closes #1522 .
 2017-03-02 01:23:44 +00:00
zkbot 44ccf1ff20 Auto merge of #2123 - bitcartel:2112_z_getoperationresult_returns_executing_status, r=arcalinea 
Closes #2112 where z_getoperationresult could return stale status.

The problem was similar to a check-then-act race condition.  Status object was obtained from an operation, which might be in an 'executing' state.  Instead of checking the state recorded in the status object, the operation was queried again to see if it was in a finished state (failed,success,cancelled) and if yes, the status object was returned to the user.  However, if the operation had changed state in the background, the status object would be stale.
 2017-03-02 00:24:26 +00:00
zkbot 6f5d8fbe81 Auto merge of #2126 - bitcartel:checkpoint_mainnet_67500, r=daira 
Add checkpoint at block 67500 (mainnet)

Close #2125
 2017-02-28 01:01:56 +00:00
zkbot 98ddf87d18 Auto merge of #2128 - bitcartel:checkpoint_testnet_38000, r=daira 
Add checkpoint at block 38000 (testnet)

Closes #2127
 2017-02-28 00:12:04 +00:00
zkbot 5f619492e8 Auto merge of #2107 - bitcartel:fix_release_process_docs, r=str4d 
Update release process documentation.

Closes #2083, #2084, #2088.
 2017-02-23 01:33:01 +00:00
zkbot 4e338b0c36 Auto merge of #2093 - bitcartel:sent_network_alerts, r=daira 
Closes #2092. Maintain record of alerts sent onto mainnet.
 2017-02-20 17:28:40 +00:00
zkbot e96c8725af Auto merge of #2089 - elopio:patch-1, r=str4d 
Fix the path to the example configuration
 2017-02-20 15:18:53 +00:00
zkbot 73779d8c6d Auto merge of #1888 - mvrilo:busybox-sha256sum, r=daira 
Fix sha256sum on busybox

Busybox's version of `sha256sum` doesn't support `--check` parameter

```
/usr/bin/sha256sum: unrecognized option: check
BusyBox v1.24.2 (2016-08-12 14:38:34 GMT) multi-call binary.

Usage: sha256sum [-c[sw]] [FILE]...

Print or check SHA256 checksums

	-c	Check sums against list in FILEs
	-s	Don't output anything, status code shows success
	-w	Warn about improperly formatted checksum lines
The command '/bin/sh -c ./zcutil/fetch-params.sh' returned a non-zero code: 1```
 2017-02-20 14:08:51 +00:00
zkbot be5ac31607 Auto merge of #2087 - bitcartel:1.0.6_release_process_add_missing_file, r=bitcartel 
1.0.6 release process

Add release notes generated by script (accidentally excluded from last PR).
 2017-02-11 00:07:56 +00:00
zkbot ac8e575205 Auto merge of #2085 - bitcartel:1.0.6_release_process, r=bitcartel 
1.0.6 release process
 2017-02-10 22:52:47 +00:00
zkbot 93baaeee3e Auto merge of #2081 - daira:1955-single-address-mining, r=bitcartel 
Address @str4d's comment on #1965 about the case where -gen is not set

https://github.com/zcash/zcash/pull/1965#discussion_r100414069

Note that the case of calling the ``setgenerate true`` RPC with the wallet disabled was already handled correctly.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2017-02-10 08:58:19 +00:00
zkbot eaaa5f625f Auto merge of #2082 - str4d:univalue-subtree, r=bitcartel 
Add UniValue as subtree

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6637
- bitcoin/bitcoin#6239
- bitcoin/bitcoin#6379
- bitcoin/bitcoin#6456
- bitcoin/bitcoin#6788
 2017-02-10 07:46:58 +00:00
zkbot e51bd1b556 Auto merge of #1990 - str4d:1985-replace-json-spirit-with-univalue, r=str4d 
Convert entire source tree from json_spirit to UniValue

This PR cherry-picks bitcoin/bitcoin#6121 and then migrates the Zcash-specific code to UniValue.

Also cherry-picks:
- bitcoin/bitcoin#6241
- bitcoin/bitcoin#6234

Closes #1985.
 2017-02-10 05:15:53 +00:00
zkbot 44788f9990 Auto merge of #2080 - ebfull:libsnark-update, r=bitcartel 
Update libsnark.

This updates libsnark to adopt https://github.com/zcash/libsnark/pull/11. Do not merge this until https://github.com/zcash/libsnark/pull/11 is merged.

Closes #2043
 2017-02-10 03:51:13 +00:00
zkbot f52293b982 Auto merge of #2078 - ebfull:uaf, r=bitcartel 
Fix use after free in transaction_tests.

Fixes #2026
 2017-02-10 00:29:57 +00:00
zkbot 7d4ced95ed Auto merge of #2056 - str4d:2035-experimental-mode, r=bitcartel 
Add a flag for enabling experimental features

Closes #2035.
 2017-02-09 23:39:02 +00:00
zkbot d32511c72c Auto merge of #2054 - str4d:2030-decoderawtransaction-joinsplit-fields, r=bitcartel 
Show all JoinSplit components in getrawtransaction and decoderawtransaction

Closes #2030.
 2017-02-09 22:56:01 +00:00
zkbot 263c62cb17 Auto merge of #2077 - ebfull:protover, r=bitcartel 
Bump protocol version in release process if necessary.

Closes #2070.
 2017-02-09 22:06:27 +00:00
zkbot 0c78782662 Auto merge of #1965 - str4d:1955-single-address-mining, r=bitcartel 
Switch miner to P2PKH, add -mineraddress option

Closes #945 and #1955.
 2017-02-09 20:58:00 +00:00
zkbot 253c610783 Auto merge of #2050 - str4d:2020-zmq, r=bitcartel 
Add ZeroMQ notifications

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6103
- bitcoin/bitcoin#6684
- bitcoin/bitcoin#6686
- bitcoin/bitcoin#6736
- bitcoin/bitcoin#6739
- bitcoin/bitcoin#6743
- bitcoin/bitcoin#6768
- bitcoin/bitcoin#6779
- bitcoin/bitcoin#6810
- bitcoin/bitcoin#6927
- bitcoin/bitcoin#6980 (only upgrading zeromq)
- bitcoin/bitcoin#6680
- bitcoin/bitcoin#7058
- bitcoin/bitcoin#7621
- bitcoin/bitcoin#7335 (only parts affecting `zmq_test.py`)
- bitcoin/bitcoin#7853 (only parts affecting `zmq_test.py`)
- bitcoin/bitcoin#7762
- bitcoin/bitcoin#7993 (only upgrading zeromq)
- bitcoin/bitcoin#8238
- bitcoin/bitcoin#8701
- bitcoin/bitcoin#6685

Closes #2020.
 2017-02-09 20:08:15 +00:00
zkbot b2e2dccc64 Auto merge of #2068 - bitcartel:2045_sendmany_fee_zero, r=bitcartel 
Closes #2045 by allowing z_sendmany with 0 fee
 2017-02-09 18:56:44 +00:00
zkbot 80a32b2845 Auto merge of #1863 - str4d:1795-config-flag-disable-miner, r=bitcartel 
Add compile flag to disable compilation of mining code

Closes #1795
 2017-02-09 17:43:43 +00:00
zkbot 904c19dca6 Auto merge of #2069 - bitcartel:2024_document_test_method_field_getoperationstatus, r=bitcartel 
Closes #2024 by documenting and testing 'method' field in z_getoperationstatus
 2017-02-08 20:52:36 +00:00
zkbot 138f19b0ba Auto merge of #2072 - bitcartel:2060_debug_zrpc_zrpcunsafe, r=bitcartel 
Closes #2060 by updating zrpc and zrpcunsafe logging
 2017-02-08 18:54:47 +00:00
zkbot dff700c1af Auto merge of #2055 - str4d:1545-note-decryption-error-class, r=daira 
Use a more specific exception class for note decryption failure

Closes #1545.
 2017-02-08 03:12:37 +00:00
zkbot 499e34fc64 Auto merge of #1706 - paragonie:master, r=bitcartel 
Use libsodium's CSPRNG instead of OpenSSL's

Closes #1632.
 2017-02-05 18:26:11 +00:00
zkbot d9bf415d95 Auto merge of #2051 - str4d:2047-openssl-1.1.0d, r=daira 
Upgrade OpenSSL to 1.1.0d

Closes #2047
 2017-02-03 23:57:06 +00:00
zkbot 59a0b7c060 Auto merge of #2058 - bitcartel:2057_extend_zrpc_unsafe, r=bitcartel 
Closes #2057 by adding extra zrpcunsafe logging
 2017-02-02 00:31:25 +00:00
zkbot ee6d993561 Auto merge of #2031 - ebfull:1.0.5-release, r=ebfull 
1.0.5 release
 2017-01-20 03:02:12 +00:00
zkbot 0edb3c0f16 Auto merge of #1978 - str4d:1941-scan-whole-chain-on-zkey-import, r=ebfull 
Scan the whole chain whenever a z-key is imported

Closes #1941.
 2017-01-20 00:02:12 +00:00
zkbot c2c7998c2e Auto merge of #1979 - str4d:1786-inform-users-to-fetch-params, r=bitcartel 
Instruct users to run zcash-fetch-params if network params aren't available

Closes #1786.
 2017-01-19 21:47:26 +00:00
zkbot 78674ca79e Auto merge of #2007 - bitcartel:1097_copyright_notice_and_date, r=bitcartel 
Closes #1097 so that zcash-cli displays license info like zcashd.

LicenseInfo is refactored from init.cpp to util.cpp so that the
bitcoin-cli makefile target does not need to be modified.
 2017-01-19 00:56:47 +00:00
zkbot 4458f87138 Auto merge of #2028 - bitcartel:std_numeric_gcc_620_compile_issue, r=ebfull 
Add missing header

Closes #2027 where gcc 6.2.0 identified that `rpcwallet.cpp` was missing a header file `<numeric>` which is required due to usage of `std::accumulate`.
 2017-01-18 19:45:02 +00:00
zkbot 63e0e895a5 Auto merge of #2006 - bitcartel:1497_destination_path_validation_when_exporting, r=bitcartel 
Fixes #1497 ZCA-009 by restricting export to a user defined folder and sanitizing filenames
 2017-01-18 18:19:50 +00:00
zkbot 94f427a211 Auto merge of #1999 - str4d:1950-random-cookie-rpc-auth, r=ebfull 
rpc: Implement random-cookie based authentication

Cherry-picked from bitcoin/bitcoin#6388.

Closes #1950.
 2017-01-18 14:20:25 +00:00
zkbot 9573595745 Auto merge of #2025 - str4d:create-config-file-in-coverage-tests, r=str4d 
Code coverage fixes
 2017-01-18 13:01:53 +00:00
zkbot 4d52160de3 Auto merge of #2001 - bitcartel:1957_add_size_to_listtransactions, r=ebfull 
Closes #1957 by adding tx serialization size to listtransactions output.
 2017-01-18 07:15:35 +00:00
zkbot ecfcf26237 Auto merge of #2000 - str4d:1622-bdb-m4-rename, r=ebfull 
Rename build-aux/m4/bitcoin_find_bdb48.m4 to remove version

Closes #1622.
 2017-01-18 06:33:38 +00:00
zkbot 3b04df9072 Auto merge of #1982 - str4d:1954-update-debug-categories, r=ebfull 
Update debug categories

Closes #1954.
 2017-01-18 05:51:20 +00:00
zkbot f37f0805cc Auto merge of #1980 - bitcartel:fix_z_sendmany_logging_bug_txid, r=ebfull 
Fix bug where z_sendmany logged incorrect txid fragment when sending from taddr

Closes #1987.
 2017-01-18 05:10:18 +00:00
zkbot c583e42e6b Auto merge of #1977 - bitcartel:1967_z_sendmany_debug_age_of_notes, r=ebfull 
Fixes #1967 by adding age of note to z_sendmany logging.
 2017-01-18 04:29:06 +00:00
zkbot 1e8778a274 Auto merge of #1976 - bitcartel:1964_z_sendmany_exception_handling, r=ebfull 
Fixes #1964 to catch general exception in z_sendmany and catch exceptions as reference-to-const.
 2017-01-18 03:48:12 +00:00
zkbot da864da5ce Auto merge of #1974 - str4d:1948-debian-lint, r=ebfull 
Fix Debian lintian warnings

Closes #1948.
 2017-01-18 03:07:07 +00:00
zkbot acabe0a22d Auto merge of #1973 - str4d:1943-remove-extraneous-bins-from-dist, r=ebfull 
Exclude test binaries from make install

Closes #1943.
 2017-01-18 02:26:12 +00:00
zkbot 2a18730417 Auto merge of #1972 - str4d:1950-ensure-messages-are-rendered, r=ebfull 
Ensure messages are rendered in the metrics UI

Part of #1950.
 2017-01-18 01:45:04 +00:00
zkbot ee2f1ebb9d Auto merge of #1942 - str4d:1940-threaded-createjoinsplit, r=ebfull 
Extend createjoinsplit to benchmark parallel JoinSplits

Closes #1940
 2017-01-18 01:04:05 +00:00
zkbot 40248d4089 Auto merge of #1935 - arcalinea:1934_user_followup_in_release_process, r=ebfull 
Update release process to check in with users who opened resolved issues

Updates release-process.md to include a step to check in with users who opened `user support` issues resolved in the release.
Resolves #1934.
 2017-01-18 00:20:57 +00:00
zkbot 4169cddd64 Auto merge of #1991 - bitcartel:1960_z_getoperation_include_call_details, r=ebfull 
Fixes #1960: z_getoperationstatus/result now includes operation details.
 2017-01-17 19:24:07 +00:00
zkbot 970c87e14e Auto merge of #2016 - ioptio:issue-template, r=str4d 
Create ISSUE_TEMPLATE.md
 2017-01-17 13:37:29 +00:00
zkbot fe9259542d Auto merge of #2023 - str4d:create-config-file-in-perf-tests, r=str4d 
Create empty zcash.conf during performance measurements

Fixes benchmarking regression caused by #2013.
 2017-01-17 12:23:49 +00:00
zkbot 9cd91833a5 Auto merge of #2015 - bitcartel:1780_sort_getoperationstatus, r=ebfull 
Closes #1780. Result of z_getoperationstatus now sorted by operation's creation time.
 2017-01-17 04:06:28 +00:00
zkbot 6abf7adc14 Auto merge of #2013 - str4d:2002-require-zcash-conf, r=ebfull 
Require zcash.conf to start zcashd

Closes #2002.
 2017-01-16 23:09:38 +00:00
zkbot 600650c94c Auto merge of #2021 - str4d:1539-fix-test-ordering-again, r=ebfull 
Fix gtest ordering broken by #1949

Part of #1539
 2017-01-16 20:30:22 +00:00
zkbot 35c9272866 Auto merge of #2019 - bitcartel:remove-bom, r=ebfull 
Remove UTF-8 BOM 0xefbbbf from zcash.conf to avoid problems with command line tools

Closes #2018
 2017-01-16 17:02:35 +00:00
zkbot f3a4dae63a Auto merge of #2009 - bitcartel:2008_update_copyright_to_2017, r=str4d 
Bump COPYRIGHT_YEAR from 2016 to 2017.

Closes #2008
 2017-01-10 11:17:13 +00:00
zkbot a6ba873aa8 Auto merge of #1949 - str4d:1810-fix-disablewallet, r=str4d 
Fix --disablewallet

Closes #1810.
 2017-01-09 17:36:41 +00:00
zkbot 06ffa210ee Auto merge of #1986 - tromer:createjoinsplit-startprofiling, r=ebfull 
CreateJoinSplit: add start_profiling() call

This solves the problem of profiling output from the CreteJoinSplit benchmarking binary displaying nonsensical large time values.
 2017-01-05 18:07:53 +00:00
zkbot 258b0a7552 Auto merge of #1981 - ebfull:fixing-homu-merge, r=ebfull 
Add 'CreateJoinSplit' standalone utility to gitignore.

Closes #1926 (I'm going to use this little change to test the homu code change.)
 2017-01-05 07:42:12 +00:00