Commit Graph

15508 Commits

Author SHA1 Message Date
Jack Grigg e24deba8a7 qa: Bump all postponed dependencies
We have a pending PR to address the `native_ccache` and `googletest`
dependencies, and we aren't going to touch `bdb`.

(cherry picked from commit 4c49af7750)
2022-04-04 20:49:57 +01:00
Daira Hopwood 10bf089b76 Merge branch 'use-debian-libtinfo' (#5600) into backports-v4.6.0-2
(corresponds to merge commit f37d186e7e)
2022-04-04 20:48:27 +01:00
sasha 9c59279802 remove superfluous space at end of native_packages line
(cherry picked from commit 077f5550d4)
2022-04-04 20:48:16 +01:00
Daira Hopwood 14b05d8b34 Merge branch 'use-debian-libtinfo' (#5576) into backports-v4.6.0-2
(corresponds to merge commit 7d9dda4b7e)
2022-04-04 20:46:54 +01:00
sasha c79ee78a28 on Arch only, use Debian's libtinfo5_6.0 to satisfy clang
(cherry picked from commit 2d6dcd4750)
2022-04-04 20:46:00 +01:00
Taylor Hornby ca63d98169 Untested, not working yet, use libtinfo from the debian packages
(cherry picked from commit a2c647d4bf)
2022-04-04 20:45:48 +01:00
Daira Hopwood 6f2285b035 Merge branch '2022-02-getblocktemplate-locking' (#5594) into backports-v4.6.0-2
(corresponds to merge commit 5141c2971c)
2022-04-04 20:44:19 +01:00
Larry Ruane 5869659e2e document global variables
(cherry picked from commit e170c3abd6)
2022-04-04 20:43:43 +01:00
Pieter Wuille f4e92165f0 Modernize best block mutex/cv/hash variable naming
(cherry picked from commit bitcoin/bitcoin@4a6c0e3dcf)
(cherry picked from commit c079a518c0)
2022-04-04 20:43:33 +01:00
Pieter Wuille 82b98164a5 Fix csBestBlock/cvBlockChange waiting in rpc/mining
(cherry picked from commit bitcoin/bitcoin@45dd135039)
(cherry picked from commit 4693f8165f)
2022-04-04 20:43:23 +01:00
Daira Hopwood 3898c8cccb Merge branch 'update_dockerfile_to_debian_11' (#5323) into backports-v4.6.0-2
(corresponds to merge commit 30c20c0046)
2022-04-04 20:41:16 +01:00
Charlie O'Keefe 6b0067c1e0 Update base image used by Dockerfile from debian 10 to debian 11
I built a docker image with this change and verified that it successfully started zcashd

(cherry picked from commit 21d6835efa)
2022-04-04 20:40:52 +01:00
Daira Hopwood 4bfb8a3828 Merge branch 'fix-drop-warning' (#5459) into backports-v4.6.0-2
(corresponds to merge commit ed93cf5aff)
2022-04-04 20:39:09 +01:00
Daira Hopwood 619a9a1d47 Replace call to drop with zeroization.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
(cherry picked from commit 0e073a53ee)
2022-04-04 20:35:18 +01:00
Daira Hopwood cfa4590c75 Avoid a warning by explicitly calling drop.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
(cherry picked from commit 4f7d15508f)
2022-04-04 20:35:14 +01:00
str4d fe7b87a96c
Merge pull request #5452 from str4d/release-v4.6.0-1
Release v4.6.0-1
2022-01-05 22:18:46 +00:00
Jack Grigg daef0041e0 Add release notes for v4.6.0-1 2022-01-05 20:24:29 +00:00
Jack Grigg cf22fa7fe3 make-release.py: Updated release notes and changelog for 4.6.0-1. 2022-01-05 20:18:43 +00:00
Jack Grigg b97133daaf make-release.py: Updated manpages for 4.6.0-1. 2022-01-05 20:18:43 +00:00
Jack Grigg 5bf937b422 make-release.py: Versioning changes for 4.6.0-1. 2022-01-05 20:16:10 +00:00
str4d 7b820cfa8f
Merge pull request #5451 from zcash/2022-01-getblocktemplate-regression-fix
rpc: Fix regression in getblocktemplate output
2022-01-05 20:07:44 +00:00
Jack Grigg 4559186596 rpc: Fix regression in getblocktemplate output
We added support for the NU5 consensus rules in v4.5.0, which alters the
block header to contain a `hashBlockCommitments` value instead of the
chain history root. However, the output of `getblocktemplate` wasn't
returning this value; once NU5 activated, the `blockcommitmentshash`
field was being set to "null" (all-zeroes).

In v4.6.0 we added full NU5 support to `getblocktemplate`, by adding a
`defaultroots` field that gave default values for `hashBlockCommitments`
and the components required to derive it. However, in doing so we
introduced a regression in the (now-deprecated) legacy fields, where
prior to NU5 activation they contained nonsense.

This commit fixes the output of `getblocktemplate` to have the intended
semantics for all fields:

- The `blockcommitmentshash` and `authdataroot` fields in `defaultroots`
  are now omitted from block templates for heights before NU5 activation.

- The legacy fields now always contain the default value to be placed
  into the block header (regaining their previous semantics).

Co-authored-by: Larry Ruane <larry@z.cash>
2022-01-05 12:07:46 +00:00
Larry Ruane 97a76f1b61 test: Fix ZIP 244 implementation
Script codes must be serialized in their field encoding, which
includes the CompactSize length prefix.

Co-authored-by: Jack Grigg <jack@z.cash>
2022-01-05 12:07:46 +00:00
Larry Ruane dfefab2f55 test: check getblocktemplate output before and after NU5
This test currently fails with submitblock returning the error
"bad-heartwood-root-in-block".

Added authdigest to GBT coinbasetxn field because we can't obtain this
via getrawtransaction.

Co-authored-by: Jack Grigg <jack@z.cash>
2022-01-05 12:07:46 +00:00
Larry Ruane 1f223ebed7 assert that the return value of submitblock is None 2021-12-28 22:10:13 -07:00
Sasha ba4b4791c1
Merge pull request #5436 from superbaud/release-v4.6.0
Release v4.6.0
2021-12-22 19:13:55 -08:00
Sasha 25278c312a str4d suggested changes to release-notes-4.6.0.md 2021-12-22 17:36:39 -08:00
Sasha eeecf63dae make-release.py: Updated release notes and changelog for 4.6.0. 2021-12-23 00:35:41 +00:00
Sasha de4dd9f231 make-release.py: Updated manpages for 4.6.0. 2021-12-23 00:35:40 +00:00
Sasha baa3de9250 make-release.py: Versioning changes for 4.6.0. 2021-12-23 00:13:51 +00:00
Sasha bc6e565bcc
Merge pull request #5431 from LarryRuane/2021-12-test-getblocktemplate-submitblock
test: Use result of getblocktemplate to submitblock
2021-12-22 16:06:42 -08:00
Larry Ruane b538577359 test: Use result of getblocktemplate to submitblock
This will ensure that miners can use the values returned by
getblocktemplate (in particular, the block commitment hash)
to submit a valid block using the submitblock RPC.
2021-12-22 15:35:46 -07:00
Larry Ruane 8c0177a507 test: fix bugs in test framework 2021-12-22 15:05:38 -07:00
Charlie O'Keefe a2a66df5e0
Merge pull request #5435 from charlieok/add_libtinfo5_to_gitian_packages_list
Add libtinfo5 to gitian packages list
2021-12-21 11:06:43 -08:00
Charlie O'Keefe 04c292a379 Add libtinfo5 to gitian packages list
libtinfo5 is a build dependency of zcashd
https://zcash.readthedocs.io/en/latest/rtd_pages/Debian-Ubuntu-build.html
2021-12-21 09:17:51 -07:00
str4d 213ba58fae
Merge pull request #5434 from superbaud/config.offline-update
update librustzcash hash in config.offline, and remove all other repos from config.offline
2021-12-21 03:02:52 +00:00
Sasha 87101eeaed
only librustzcash in config.offline 2021-12-20 17:11:25 -08:00
Sasha 4e928fa67f
update hash for librustzcash 2021-12-20 16:25:05 -08:00
str4d 12e022a53a
Merge pull request #5430 from str4d/release-v4.6.0-rc1
Release v4.6.0-rc1
2021-12-18 06:30:31 +00:00
Jack Grigg 9c4a1e7ad7 make-release.py: Updated release notes and changelog for 4.6.0-rc1. 2021-12-18 04:25:50 +00:00
Jack Grigg 1c910cf9cc make-release.py: Updated manpages for 4.6.0-rc1. 2021-12-18 04:25:50 +00:00
Jack Grigg d4b850d3f7 make-release.py: Versioning changes for 4.6.0-rc1. 2021-12-18 04:23:05 +00:00
str4d 75b539400c
Merge pull request #5429 from str4d/pre-4.6.0-rc1-changes
Pre-4.6.0-rc1 changes
2021-12-18 04:07:03 +00:00
Jack Grigg 8387aa40cf Update release notes 2021-12-18 01:44:27 +00:00
Jack Grigg d85bfb4744 Migrate to latest revisions of Zcash Rust crates 2021-12-18 01:44:27 +00:00
str4d eb175dddaa
Merge pull request #5426 from str4d/5379-revert-lint-fix
Revert lint: Fix false positive
2021-12-17 22:05:17 +00:00
Kris Nuttycombe 8b093a79da
Merge pull request #5402 from LarryRuane/2021-12-getblocktemplate
Add defaultroots field to getblocktemplate
2021-12-17 12:28:06 -07:00
str4d 72aad89859
Merge pull request #5404 from LarryRuane/2021-12-05-getmininginfo
[rpc] mining: Omit uninitialized currentblockweight, currentblocktx
2021-12-17 18:07:44 +00:00
MarcoFalke 6d60f1a9c9 [rpc] mining: Omit uninitialized currentblockweight, currentblocktx
zcash/zcash:
The `getmininginfo` RPC now omits `currentblockize` and `currentblocktx`
when a block was never assembled via RPC on this node during its current
process instantiation. The relevant RPCs are `generate` (regtest only) and
`getblocktemplate`. Blocks are also assembled when running the internal
miner (`zcashd -gen=1`), after the node mines its first block.

(cherry picked from commit bitcoin/bitcoin@fa178a6385)
2021-12-17 09:35:30 -07:00
str4d 9e4b6f670d
Merge pull request #5398 from str4d/ed25519-zebra-3
`ed25519-zebra` 3
2021-12-17 03:55:46 +00:00