Commit Graph

10366 Commits

Author SHA1 Message Date
Jack Grigg bec25c91cb
Revert "Closes #1680, temporary fix for rpc deadlock inherited from upstream."
This reverts commit f4404d7b5b.
2017-03-24 09:03:59 +13: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
Sean Bowe 802ea76b3a Allow Rust-language related assets to be disabled with `--disable-rust`. 2017-03-18 07:47:40 -06:00
Sean Bowe 6a0c7ceae9 Introduce librustzcash and Rust to depends system. 2017-03-17 11:46:41 -06: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
Jack Gavigan 6c9ebc6bdc Updated the Bitcoin Core copyright statement 2017-03-16 13:40:42 +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
Jack Grigg 542a7a40f1
Add tests for getmempoolinfo 2017-03-16 14:30:16 +13:00
Jack Gavigan 472dec5352 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-15 12:14:28 +00:00
Jack Grigg 43a03e3bfc
Migrate IncrementalMerkleTree memory usage calls 2017-03-14 18:01:05 +13:00
Pavel Janík 30c163d99d
Implement REST mempool API, add test and documentation. 2017-03-14 13:52:06 +13:00
Pieter Wuille 6bd1d60c97
Separate core memory usage computation in core_memusage.h 2017-03-14 13:45:05 +13:00
Pieter Wuille bde5c8b0f1
Implement accurate memory accounting for mempool 2017-03-14 13:44:39 +13:00
Jay Graber 8144a213ed Edit release-process.md for clarity 2017-03-10 16:14:46 -08: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
Simon abecfc422c Remove redundant gui options from build scripts 2017-03-10 10:35:23 -08:00
Simon ec85287c45 Remove QT translation support files 2017-03-10 10:01:48 -08:00
Jack Grigg 0bc1e2c431
Add anchor to output of getblock
Closes #2164.
2017-03-10 20:09:40 +13:00
Daira Hopwood 6b41a88d20 Delete -rootcertificates from bash completion script.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-03-10 03:49:04 +00:00
Simon 07cf426404 Remove stale Qt comments and dead code 2017-03-09 17:04:59 -08: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
Jay Graber 0195a9fc0f Update debian package changelog for 1.0.7+1 (use + instead of - for debian versioning) 2017-03-08 16:00:02 -08:00
Jay Graber f0046397ca Add updated release notes for v1.0.7-1 2017-03-08 16:00:02 -08:00
Jay Graber 82b6ec23db Update auto-generated manpages to 1.0.7-1 2017-03-08 15:59:52 -08:00
Jay Graber 0fe4b85708 Update version to 1.0.7-1 2017-03-08 12:50:33 -08:00
Jay Graber 24a24abf75 Add -t to git fetch for release-notes.py 2017-03-08 12:32:59 -08:00
Daira Hopwood 8247636d21 Remove unused packages and patches.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-03-07 19:40:09 +00:00
Daira Hopwood f3b6c0e1cc .gitignore cache/ and venv-mnf/
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-03-07 19:15:08 +00:00
Daira Hopwood d596658022 Remove NO_QT make option.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-03-07 19:15:08 +00:00
Daira Hopwood 648dcaffea Update which libraries are allowed to be linked to zcashd by symbol-check.py.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-03-07 19:15:08 +00:00
Daira Hopwood e71162e0b4 Update documentation for QT removal.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-03-07 19:15:08 +00:00
Daira Hopwood 69a2bdde8f Remove some more QT-related stragglers.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-03-07 19:15:08 +00:00
Daira Hopwood 38ba3c666f Remove QT gunk from Makefiles.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-03-07 19:15:08 +00:00
Daira Hopwood 6a30bb41b3 Correct license text for LGPL.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-03-07 19:15:08 +00:00
Daira Hopwood 71d0bbc666 License updates for removal of src/qt.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-03-07 19:14:59 +00:00
Jay Graber 552d755339 Document returned results of submitblock 2017-03-06 13:18:58 -08: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
Jay Graber e723cd1d9e Update README for 1.0.7 release 2017-03-03 22:04:59 -08:00
Jay Graber a3e57afd3f Update debian changelog for 1.0.7 release process 2017-03-03 22:03:10 -08:00
Jay Graber d64a2d5a44 Add 1.0.7 release notes and update authors.md 2017-03-03 22:02:32 -08:00
Jay Graber a83f0677b4 Update release to 1.0.7, generate manpages 2017-03-03 21:55:36 -08:00
Daira Hopwood d395fee8a5 Remove src/qt.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-03-04 05:11:57 +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
Casey Rodarmor df8f8095b6
Don't share objects between TestInstances 2017-03-03 11:47:12 -08:00
Cory Fields 72b25b0ffd
locking: add a quick example of GUARDED_BY
This was chosen not because it's necessarily helpful, but because its locking
assumptions were already correct.
2017-03-03 11:47:10 -08:00