Commit Graph

14162 Commits

Author SHA1 Message Date
Homu ebc8de390c Auto merge of #4776 - str4d:logging-files, r=str4d
MOVEONLY: Move logging code from util.{h,cpp} to new files

Based on bitcoin/bitcoin#13021 but implemented from scratch.

This introduces a cyclic dependency between `logging` and `util` that
should be cleaned up in a future PR.
2020-10-09 16:16:51 +00:00
Jack Grigg b42582395b MOVEONLY: Move logging code from util.{h,cpp} to new files
Based on bitcoin/bitcoin#13021 but implemented from scratch.

This introduces a cyclic dependency between `logging` and `util` that
should be cleaned up in a future PR.
2020-10-09 16:32:02 +01:00
Homu e2d3533de3 Auto merge of #4773 - str4d:4651-combined-params-init, r=daira
FFI: Merge librustzcash_init_zksnark_params variants into one function

Rust 1.39.0 added support for attributes on function parameters.

Closes #4651.
2020-10-09 11:15:40 +00:00
Homu ce26c21fb4 Auto merge of #4772 - daira:log-invalid-notept, r=daira
Add logging when we receive an invalid note plaintext (using the "receiveunsafe" log category)

fixes #4735

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-10-08 23:35:53 +00:00
Jack Grigg 508aadd2f3 FFI: Merge librustzcash_init_zksnark_params variants into one function
Rust 1.39.0 added support for attributes on function parameters.

Closes #4651.
2020-10-08 22:50:57 +01:00
Homu 6e4090d840 Auto merge of #4766 - str4d:update-zeromq, r=str4d
Update ZeroMQ

Includes changes cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#9254
- bitcoin/bitcoin#13578
- bitcoin/bitcoin#15844
- bitcoin/bitcoin#16370
  - Only the ZeroMQ changes.
- bitcoin/bitcoin#16949
2020-10-08 17:37:41 +00:00
Daira Hopwood 007de07745 Add logging when we receive an invalid note plaintext (using the "receiveunsafe" log category).
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-10-08 14:29:23 +01:00
str4d a5c2daf618
depends: Update packages documentation for Zcash
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2020-10-08 14:15:03 +01:00
Jack Grigg 7c9fa28274 depends: ZeroMQ 4.3.3 2020-10-06 00:03:21 +01:00
fanquake 3c4f9d383f build: pass --enable-option-checking to applicable packages 2020-10-05 23:48:58 +01:00
fanquake 3420f0171e build: only pass --disable-dependency-tracking to packages that understand it
By blanket passing --disable-dependency-tracking to all depends packages
we end up with some warnings like:

configure: WARNING: unrecognized options: --disable-dependency-tracking

So instead, only pass it to packages that understand it.

Related to https://github.com/bitcoin/bitcoin/issues/16354.
2020-10-05 23:46:38 +01:00
fanquake 13f0e7874a depends: zeromq: disable draft classes and methods 2020-10-05 23:42:15 +01:00
Carl Dong 84dfe68465 depends: Purge libtool archives
We use pkg-config where we can, which generally replaces libtool at a
higher level and does not have the same downsides as libtool. These
archives sit in our depends tree with no purpose and pollute the final
bitcoin build with massive overlinking.
2020-10-05 23:37:09 +01:00
Carl Dong df60fd966b depends: Build secondary deps statically.
Secondary dependencies don't need to be shared.
2020-10-05 23:36:26 +01:00
mruddy edfb4d98e7 [depends, zmq, doc] avoid deprecated zeromq api functions
Zcash: Backported from bitcoin/bitcoin#13578
2020-10-05 22:54:19 +01:00
fanquake 92aa4d6178 depends: Disable unused ZeroMQ features
Zcash: From upstream commit 387879dd4cbecd4d39bcf691bfe910047e5ed85c
2020-10-05 22:46:58 +01:00
Homu b646bad8c2 Auto merge of #4765 - str4d:more-depends-updates, r=str4d
Update more dependencies

- Boost 1.74.0
- ccache 3.7.12
- `cargo update` for the Rust dependencies.
2020-10-05 19:19:01 +00:00
Jack Grigg b56e5aa7b8 cargo update 2020-10-05 20:01:58 +01:00
Jack Grigg be700a89cc depends: ccache 3.7.12 2020-10-05 19:58:39 +01:00
Jack Grigg a9f62bdda0 depends: Boost 1.74.0
- The old patch is no longer necessary because of this upstream fix:
    https://github.com/boostorg/build/pull/560

- Boost 1.72 removed a <deque> from an include, which exposed a missing
  include in src/httpserver.cpp.

- Boost 1.73 moved function placeholders into the boost::placeholders
  namespace.

- The new patch is a fix from just after Boost 1.74 was released, fixing
  a warning that was missed.
2020-10-05 19:48:46 +01:00
Homu 4705aae32e Auto merge of #4763 - rex4539:remove-bitcoin-release-notes, r=str4d
Remove Bitcoin release notes

Those appear to be totally unnecessary.
2020-10-05 17:53:53 +00:00
Homu d3978dbf87 Auto merge of #4762 - rex4539:remove-deprecated-init, r=str4d
Remove deprecated init.md

After https://github.com/zcash/zcash/pull/4460 was merged, `init.md` got deprecated.
2020-10-05 14:15:11 +00:00
Dimitris Apostolou c84ae00cbf
Remove Bitcoin release notes 2020-10-03 22:58:39 +03:00
Dimitris Apostolou 1fa5d4670a
Remove deprecated init.md 2020-10-03 22:43:45 +03:00
Homu b667bfaa14 Auto merge of #4760 - rex4539:fix-zeromq-warning, r=daira
Fix zeromq warning

Fixes https://github.com/zcash/zcash/issues/4759.
2020-10-03 17:04:31 +00:00
Dimitris Apostolou 95a5c30339
Fix zeromq warning 2020-10-03 09:13:35 +03:00
Homu ce44f60c26 Auto merge of #4758 - str4d:depends-updates, r=str4d
Update dependencies
2020-10-01 16:34:04 +00:00
Homu eb4c9ea0a3 Auto merge of #4484 - defuse:fix-undefined-behavior-in-bitcoin-test, r=str4d
Fix undefined behavior in the test_bitcoin tests
2020-10-01 15:19:39 +00:00
Taylor Hornby 3693b96ed4 Fix undefined behavior in the test_bitcoin tests 2020-10-01 13:59:47 +01:00
Homu a983344931 Auto merge of #4752 - str4d:small-httpserver-backports, r=daira
Small httpserver.cpp backports

Also includes a change to the `uiInterface.NotifyBlockTip` signal API.
These remove merge conflicts from subsequent backports for `sync.h`.

Cherry-picked from the following upstream PRs:
- bitcoin/bitcoin#6859
- bitcoin/bitcoin#7112
  - Only the non-QT changes.
- bitcoin/bitcoin#7966
- bitcoin/bitcoin#8421
  - We already backported the second commit in zcash/zcash#2555
2020-10-01 12:48:58 +00:00
str4d 2fbc111efb
httpserver: Code style cleanups
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2020-10-01 13:46:21 +01:00
Jack Grigg e15eaf0343 QA: Fix backporting bugs in httpbasics.py 2020-10-01 13:44:21 +01:00
Homu 939c5dfce6 Auto merge of #4756 - str4d:4755-exorcise-openssl, r=str4d
build: Remove a stray -lcrypto

zcash/zcash#4740 removed OpenSSL from our depends system, so we were
not satisfying this linker flag intentionally. Configurations where a
target OpenSSL could not be found by the linker, such as cross-compiles
and native macOS builds, were therefore failing. However, OpenSSL is
likely available in the system for all the "supported builders" (which
are all Linux-based), so the linker was likely being satisfied by that
library, enabling the previous PR to be merged.
2020-10-01 10:40:15 +00:00
Jack Grigg 0d4a7b032f depends: Use correct HOST for download-linux target
By using the old HOST with -unknown, `make -C depends download` was
interpreting the download-linux step as a cross-compile, and attempting
to download a Rust stdlib for Linux that we weren't pinning (because we
don't support cross-compiling to x86_64 Linux - just build it native).

Follow-up to https://github.com/zcash/zcash/pull/4749.
2020-10-01 11:22:27 +01:00
Jack Grigg 076c1af55c depends: utfcpp 3.1.2 2020-10-01 11:10:33 +01:00
Jack Grigg 78a7230f50 depends: googletest 1.8.1 2020-10-01 10:57:57 +01:00
Jack Grigg 7725f66051 depends: ccache 3.7.11 2020-10-01 10:57:26 +01:00
Jack Grigg 96da9c2c00 depends: libevent 2.1.12
This includes https://github.com/libevent/libevent/pull/637 which fixes
a problem we encounter during cross-compilation with clang.
2020-10-01 10:56:42 +01:00
Jack Grigg be7876adbb build: Remove a stray -lcrypto
zcash/zcash#4740 removed OpenSSL from our depends system, so we were
not satisfying this linker flag intentionally. Configurations where a
target OpenSSL could not be found by the linker, such as cross-compiles
and native macOS builds, were therefore failing. However, OpenSSL is
likely available in the system for all the "supported builders" (which
are all Linux-based), so the linker was likely being satisfied by that
library, enabling the previous PR to be merged.
2020-10-01 09:59:02 +01:00
Homu b5fa52b701 Auto merge of #4740 - str4d:remove-openssl, r=daira
Remove OpenSSL

Includes changes cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7095
- bitcoin/bitcoin#11024
- bitcoin/bitcoin#17165
  - Only the commit removing SSL lib detection (we have long since removed the rest).
- bitcoin/bitcoin#17265
  - We had already migrated away from OpenSSL for randomness.
- bitcoin/bitcoin#17515
  - Only the second commit.

Closes #145.
2020-10-01 00:34:47 +00:00
Daira Hopwood ce0654e13a Cosmetics in CScriptNum code and tests.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-10-01 00:34:31 +01:00
Daira Hopwood 932d627753 It's unnecessary to pass int64_t by const reference.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-10-01 00:34:31 +01:00
Daira Hopwood f432fe5ebf Add assertions for CScriptNum[10] +/- int64_t to avoid the possibility of UB.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-10-01 00:34:31 +01:00
Daira Hopwood 9ba10a8071 Avoid undefined behaviour in scriptnum tests.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-10-01 00:34:31 +01:00
Cory Fields 860e6e600c httpserver: replace boost threads with std
along with mutex/condvar/bind/etc.

httpserver handles its own interruption, so there's no reason not to use std
threading.

While we're at it, may as well kill the BOOST_FOREACH's as well.
2020-09-30 12:48:35 +01:00
Cory Fields 97194f2abc httpserver: use a future rather than relying on boost's try_join_for 2020-09-30 12:48:35 +01:00
Wladimir J. van der Laan 26efd3aaf9 http: use std::move to move HTTPRequest into HTTPWorkItem
Thanks to Cory Fields for the idea.
2020-09-30 12:48:35 +01:00
Wladimir J. van der Laan a500df5561 http: Change boost::scoped_ptr to std::unique_ptr in HTTPRequest
No need for boost here.
2020-09-30 12:48:35 +01:00
Wladimir J. van der Laan 1f106fa803 http: Add log message when work queue is full
More useful error reporting.
2020-09-30 12:48:35 +01:00
Wladimir J. van der Laan fc9ce9e766 http: Do a pending c++11 simplification
Use std::unique_ptr for handling work items.

This makes the code more RAII and, as mentioned in the comment, is what
I planned when I wrote the code in the first place.
2020-09-30 12:48:35 +01:00