zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6213 from zcash/version-5.3.0 

Merge v5.3.0 release branch back to `master`.
This commit is contained in:
Daira Hopwood 2022-10-21 14:01:42 +01:00 committed by GitHub
parent cc34f4f9ba 35186b0092
commit e89d94d8b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
35 changed files with 1642 additions and 466 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.cargo/config.offline
View File

@ -4,20 +4,5 @@ linker = "aarch64-linux-gnu-gcc"
[source.crates-io]
replace-with = "vendored-sources"
[source."https://github.com/zcash/librustzcash.git"]
git = "https://github.com/zcash/librustzcash.git"
rev = "913aa0a9885acbd6af9cf3525221d632e4f5a6e4"
replace-with = "vendored-sources"
[source."https://github.com/zcash/orchard.git"]
git = "https://github.com/zcash/orchard.git"
rev = "f206b3f5d4e31bba75d03d9d03d5fa25825a9384"
replace-with = "vendored-sources"
[source."https://github.com/zkcrypto/group.git"]
git = "https://github.com/zkcrypto/group.git"
rev = "f61e3e420ed1220c8f1f80988f8c6c5e202d8715"
replace-with = "vendored-sources"
[source.vendored-sources]
# The directory for this source is set to RUST_VENDORED_SOURCES by src/Makefile.am

527
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

28
Cargo.toml
View File

@ -49,33 +49,33 @@ libc = "0.2"
jubjub = "0.9"
memuse = "0.2"
nonempty = "0.7"
orchard = "0.2"
orchard = "0.3"
secp256k1 = "0.21"
subtle = "2.2"
rand_core = "0.6"
tracing = "0.1"
tracing-core = "0.1"
tracing-appender = "0.2"
zcash_address = "0.1"
zcash_encoding = "0.1"
zcash_address = "0.2"
zcash_encoding = "0.2"
zcash_history = "0.3"
zcash_note_encryption = "0.1"
zcash_primitives = { version = "0.7", features = ["transparent-inputs"] }
zcash_proofs = { version = "0.7.1", features = ["directories"] }
zcash_note_encryption = "0.2"
zcash_primitives = { version = "0.8.1", features = ["transparent-inputs"] }
zcash_proofs = { version = "0.8", features = ["directories"] }
ed25519-zebra = "3"
zeroize = "1.4.2"
# Rust/C++ interop
# The version needs to match depends/packages/native_cxxbridge.mk
cxx = { version = "=1.0.76", features = ["c++17"] }
cxx = { version = "=1.0.79", features = ["c++17"] }
# Rust threading
rayon = "1.5"
# Metrics
ipnet = "2"
metrics = "0.19"
metrics-exporter-prometheus = "0.10"
metrics = "0.20"
metrics-exporter-prometheus = "0.11"
# General tool dependencies
gumdrop = "0.8"
@ -110,13 +110,3 @@ lto = true
panic = 'abort'
codegen-units = 1
[patch.crates-io]
equihash = { git = "https://github.com/zcash/librustzcash.git", rev = "913aa0a9885acbd6af9cf3525221d632e4f5a6e4" }
zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "913aa0a9885acbd6af9cf3525221d632e4f5a6e4" }
zcash_encoding = { git = "https://github.com/zcash/librustzcash.git", rev = "913aa0a9885acbd6af9cf3525221d632e4f5a6e4" }
zcash_history = { git = "https://github.com/zcash/librustzcash.git", rev = "913aa0a9885acbd6af9cf3525221d632e4f5a6e4" }
zcash_note_encryption = { git = "https://github.com/zcash/librustzcash.git", rev = "913aa0a9885acbd6af9cf3525221d632e4f5a6e4" }
zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "913aa0a9885acbd6af9cf3525221d632e4f5a6e4" }
zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "913aa0a9885acbd6af9cf3525221d632e4f5a6e4" }
orchard = { git = "https://github.com/zcash/orchard.git", rev = "f206b3f5d4e31bba75d03d9d03d5fa25825a9384" }
group = { git = "https://github.com/zkcrypto/group.git", rev = "f61e3e420ed1220c8f1f80988f8c6c5e202d8715" }

2
README.md
View File

@ -1,4 +1,4 @@
Zcash 5.2.0
Zcash 5.3.0
<img align="right" width="120" height="80" src="doc/imgs/logo.png">
===========

2
configure.ac
View File

@ -1,7 +1,7 @@
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 5)
define(_CLIENT_VERSION_MINOR, 2)
define(_CLIENT_VERSION_MINOR, 3)
define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 50)
define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))

12
contrib/debian/changelog
View File

@ -1,3 +1,15 @@
zcash (5.3.0) stable; urgency=medium
* 5.3.0 release.
-- Electric Coin Company <team@electriccoin.co> Thu, 20 Oct 2022 10:52:37 -0600
zcash (5.3.0~rc1) stable; urgency=medium
* 5.3.0-rc1 release.
-- Electric Coin Company <team@electriccoin.co> Tue, 11 Oct 2022 11:30:02 +0000
zcash (5.2.0) stable; urgency=medium
* 5.2.0 release.

143
contrib/gitian-descriptors/gitian-linux-parallel.yml Normal file
View File

@ -0,0 +1,143 @@
---
name: "zcash-5.3.0-rc1"
enable_cache: true
distro: "debian"
suites:
- "buster"
- "bullseye"
architectures:
- "amd64"
packages:
- "curl"
- "autoconf"
- "automake"
- "bsdmainutils"
- "binutils-gold"
- "ca-certificates"
- "faketime"
- "g++-multilib"
- "git-core"
- "libc6-dev"
- "libtinfo5"
- "libtool"
- "libxml2"
- "m4"
- "ncurses-dev"
- "pkg-config"
- "python"
- "unzip"
- "wget"
- "zlib1g-dev"
remotes:
- "url": "https://github.com/zcash/zcash.git"
"dir": "zcash"
files: []
script: |
WRAP_DIR=$HOME/wrapped
HOSTS="x86_64-linux-gnu"
CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --enable-hardening --enable-werror"
MAKEOPTS="V=1 -j$(nproc)"
FAKETIME_HOST_PROGS=""
FAKETIME_PROGS="date ar ranlib nm strip objcopy"
HOST_CFLAGS=""
HOST_CXXFLAGS=""
HOST_LDFLAGS=-static-libstdc++
export QT_RCC_TEST=0
export GZIP="-9n"
export TAR_OPTIONS="--mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME""
export TZ="UTC"
export BUILD_DIR="$PWD"
mkdir -p ${WRAP_DIR}
if test -n "$GBUILD_CACHE_ENABLED"; then
export SOURCES_PATH=${GBUILD_COMMON_CACHE}
export BASE_CACHE=${GBUILD_PACKAGE_CACHE}
mkdir -p ${BASE_CACHE} ${SOURCES_PATH}
fi
function create_global_faketime_wrappers {
for prog in ${FAKETIME_PROGS}; do
echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${prog}
echo "REAL=\`which -a ${prog} | grep -v ${WRAP_DIR}/${prog} | head -1\`" >> ${WRAP_DIR}/${prog}
echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${prog}
echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${prog}
echo "\$REAL \$@" >> $WRAP_DIR/${prog}
chmod +x ${WRAP_DIR}/${prog}
done
}
function create_per-host_faketime_wrappers {
for i in $HOSTS; do
for prog in ${FAKETIME_HOST_PROGS}; do
echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${i}-${prog}
echo "REAL=\`which -a ${i}-${prog} | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}
echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog}
echo "\$REAL \$@" >> $WRAP_DIR/${i}-${prog}
chmod +x ${WRAP_DIR}/${i}-${prog}
done
done
}
export PATH=${WRAP_DIR}:${PATH}
# Faketime for depends so intermediate results are comparable
create_global_faketime_wrappers "2000-01-01 12:00:00"
create_per-host_faketime_wrappers "2000-01-01 12:00:00"
cd zcash
BASEPREFIX="${PWD}/depends"
# Build dependencies for each host
for i in $HOSTS; do
make ${MAKEOPTS} -C ${BASEPREFIX} HOST="${i}"
done
# Faketime for binaries
create_global_faketime_wrappers "${REFERENCE_DATETIME}"
create_per-host_faketime_wrappers "${REFERENCE_DATETIME}"
# Create the release tarball using (arbitrarily) the first host
export GIT_DIR="$PWD/.git"
./autogen.sh
CONFIG_SITE=${BASEPREFIX}/$(echo "${HOSTS}" | awk '{print $1;}')/share/config.site ./configure --prefix=/
make dist
SOURCEDIST=$(echo zcash-*.tar.gz)
DISTNAME=${SOURCEDIST/%.tar.gz}
# Correct tar file order
mkdir -p temp
pushd temp
tar xf ../$SOURCEDIST
find zcash* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
popd
ORIGPATH="$PATH"
# Extract the release tarball into a dir for each host and build
for i in ${HOSTS}; do
export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH}
mkdir -p distsrc-${i}
cd distsrc-${i}
INSTALLPATH="${PWD}/installed/${DISTNAME}"
mkdir -p ${INSTALLPATH}
tar --strip-components=1 -xf ../$SOURCEDIST
CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}"
make ${MAKEOPTS}
make ${MAKEOPTS} -C src check-security
make install DESTDIR=${INSTALLPATH}
cd installed
find . -name "lib*.la" -delete
find . -name "lib*.a" -delete
rm -rf ${DISTNAME}/lib/pkgconfig
find ${DISTNAME}/bin -type f -executable -exec objcopy --only-keep-debug {} {}.dbg \; -exec strip -s {} \; -exec objcopy --add-gnu-debuglink={}.dbg {} \;
# Commented out while we don't build any libraries
#find ${DISTNAME}/lib -type f -exec objcopy --only-keep-debug {} {}.dbg \; -exec strip -s {} \; -exec objcopy --add-gnu-debuglink={}.dbg {} \;
find ${DISTNAME} -not -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz
find ${DISTNAME} -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}-debug.tar.gz
cd ../../
rm -rf distsrc-${i}
done
mkdir -p $OUTDIR/src
mv $SOURCEDIST $OUTDIR/src
mv ${OUTDIR}/${DISTNAME}-x86_64-*-debug.tar.gz ${OUTDIR}/${DISTNAME}-linux64-debug.tar.gz
mv ${OUTDIR}/${DISTNAME}-x86_64-*.tar.gz ${OUTDIR}/${DISTNAME}-linux64.tar.gz

2
contrib/gitian-descriptors/gitian-linux.yml
View File

@ -1,5 +1,5 @@
---
name: "zcash-5.2.0"
name: "zcash-5.3.0"
enable_cache: true
distro: "debian"
suites:

4
depends/packages/native_cxxbridge.mk
View File

@ -1,10 +1,10 @@
package=native_cxxbridge
# The version needs to match cxx in Cargo.toml
$(package)_version=1.0.76
$(package)_version=1.0.79
$(package)_download_path=https://github.com/dtolnay/cxx/archive/refs/tags
$(package)_file_name=native_cxxbridge-$($(package)_version).tar.gz
$(package)_download_file=$($(package)_version).tar.gz
$(package)_sha256_hash=9264771d043e2860405309c50b9f5acebc8153f4ad242804122680bd2913b954
$(package)_sha256_hash=4da400783dee17e9a99dd39a17cd2cc346df311cb8745832e2b4d5173c23dfcd
$(package)_build_subdir=gen/cmd
$(package)_dependencies=native_rust
$(package)_extra_sources=$(package)-$($(package)_version)-vendored.tar.gz

33
doc/authors.md
View File

@ -1,14 +1,14 @@
Zcash Contributors
==================
Jack Grigg (1190)
Kris Nuttycombe (570)
Jack Grigg (1243)
Kris Nuttycombe (582)
Simon Liu (460)
Sean Bowe (389)
Daira Hopwood (334)
Daira Hopwood (343)
Eirik Ogilvie-Wigley (216)
Wladimir J. van der Laan (152)
Pieter Wuille (142)
Wladimir J. van der Laan (158)
Pieter Wuille (143)
Alfredo Garcia (119)
Taylor Hornby (118)
Marshall Gaucher (116)
@ -16,20 +16,21 @@ Ying Tong Lai (90)
Jonas Schnelli (90)
Jay Graber (89)
Larry Ruane (88)
Marco Falke (85)
Marco Falke (86)
Cory Fields (78)
Matt Corallo (60)
sasha (58)
Nathan Wilcox (56)
sasha (59)
Nathan Wilcox (57)
practicalswift (42)
Kevin Gallagher (38)
Dimitris Apostolou (38)
fanquake (36)
Luke Dashjr (26)
Carl Dong (26)
Luke Dashjr (24)
Gregory Maxwell (24)
John Newbery (23)
Jorge Timón (22)
Greg Pfeil (20)
furszy (18)
Jonathan "Duke" Leto (18)
syd (16)
@ -61,6 +62,8 @@ Jeff Garzik (8)
Chun Kuan Lee (8)
Ben Wilson (8)
Karl-Johan Alm (7)
Hennadii Stepanov (7)
Alex Wied (7)
James O'Beirne (6)
David Mercer (6)
Daniel Kraft (6)
@ -74,13 +77,13 @@ Johnathan Corgan (5)
George Tankersley (5)
Gavin Andresen (5)
Gareth Davies (5)
Alex Wied (5)
sandakersmann (4)
gladcow (4)
WO (4)
Sjors Provoost (4)
Nate Wilcox (4)
Jim Posen (4)
Ben Woosley (4)
mruddy (3)
lpescher (3)
isle2983 (3)
@ -94,7 +97,7 @@ Evan Klitzke (3)
Ethan Heilman (3)
Eric Lombrozo (3)
Danny Willems (3)
Ben Woosley (3)
Conrado Gouvea (3)
Anthony Towns (3)
Alfie John (3)
Aditya Kulkarni (3)
@ -128,20 +131,21 @@ Jesse Cohen (2)
Jeffrey Czyz (2)
Jack Gavigan (2)
ITH4Coinomia (2)
Hennadii Stepanov (2)
DeckerSU (2)
Dan Raviv (2)
Dagur Valberg Johannsson (2)
Conrado Gouvea (2)
Bryant Eisenbach (2)
Brian Stafford (2)
Brad Miller (2)
Bjorn Hjortsberg (2)
Amgad Abdelhafez (2)
Alex Tsankov (2)
Alex (2)
Akio Nakamura (2)
ロハン ダル (1)
zathras-crypto (1)
vim88 (1)
user (1)
unsystemizer (1)
tulip (1)
tpantin (1)
@ -214,6 +218,7 @@ Jonas Nick (1)
Jon Layton (1)
Jeffrey Walton (1)
Janito Vaqueiro Ferreira Filho (1)
James White (1)
Jainan-Tandel (1)
Igor Cota (1)
Ian T (1)
@ -241,10 +246,10 @@ Bob McElrath (1)
Bitcoin Error Log (1)
Bernhard M. Wiedemann (1)
Ashley Holman (1)
Andrés G. Aragoneses (1)
Andrew Chow (1)
Allan Niemerg (1)
Alex van der Peet (1)
Alex (1)
Ahmad Kazi (1)
Adam Weiss (1)
Adam Langley (1)

8
doc/man/zcash-cli.1
View File

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
.TH ZCASH-CLI "1" "July 2022" "zcash-cli v5.2.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
.TH ZCASH-CLI "1" "October 2022" "zcash-cli v5.3.0" "User Commands"
.SH NAME
zcash-cli \- manual page for zcash-cli v5.2.0
zcash-cli \- manual page for zcash-cli v5.3.0
.SH DESCRIPTION
Zcash RPC client version v5.2.0
Zcash RPC client version v5.3.0
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/>.

8
doc/man/zcash-tx.1
View File

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
.TH ZCASH-TX "1" "July 2022" "zcash-tx v5.2.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
.TH ZCASH-TX "1" "October 2022" "zcash-tx v5.3.0" "User Commands"
.SH NAME
zcash-tx \- manual page for zcash-tx v5.2.0
zcash-tx \- manual page for zcash-tx v5.3.0
.SH DESCRIPTION
Zcash zcash\-tx utility version v5.2.0
Zcash zcash\-tx utility version v5.3.0
.SS "Usage:"
.TP
zcash\-tx [options] <hex\-tx> [commands]

6
doc/man/zcashd-wallet-tool.1
View File

@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
.TH ZCASHD-WALLET-TOOL "1" "July 2022" "zcashd-wallet-tool v5.2.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
.TH ZCASHD-WALLET-TOOL "1" "October 2022" "zcashd-wallet-tool v5.3.0" "User Commands"
.SH NAME
zcashd-wallet-tool \- manual page for zcashd-wallet-tool v5.2.0
zcashd-wallet-tool \- manual page for zcashd-wallet-tool v5.3.0
.SH SYNOPSIS
.B zcashd-wallet-tool
[\fI\,OPTIONS\/\fR]

12
doc/man/zcashd.1
View File

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
.TH ZCASHD "1" "July 2022" "zcashd v5.2.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
.TH ZCASHD "1" "October 2022" "zcashd v5.3.0" "User Commands"
.SH NAME
zcashd \- manual page for zcashd v5.2.0
zcashd \- manual page for zcashd v5.3.0
.SH DESCRIPTION
Zcash Daemon version v5.2.0
Zcash Daemon version v5.3.0
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/>.
@ -94,7 +94,7 @@ Keep at most <n> unconnectable transactions in memory (default: 100)
.HP
\fB\-par=\fR<n>
.IP
Set the number of script verification threads (\fB\-16\fR to 16, 0 = auto, <0 =
Set the number of script verification threads (\fB\-8\fR to 16, 0 = auto, <0 =
leave that many cores free, default: 0)
.HP
\fB\-pid=\fR<file>
@ -458,7 +458,7 @@ transaction; setting this too low may abort large transactions (default:
.HP
\fB\-printtoconsole\fR
.IP
Send trace/debug info to console instead of debug.log file
Send trace/debug info to console instead of the debug log
.PP
Chain selection options:
.HP

26
doc/release-notes.md
View File

@ -4,29 +4,3 @@ release-notes at release time)
Notable changes
===============
Wallet Performance Improvements
-------------------------------
`zcashd 5.2.0` improved the performance of wallet scanning with multithreaded
batched trial decryption of Sapling outputs. However, for some nodes this
resulted in growing memory usage that would eventually cause an OOM abort. We
have identified the cause of the growth, and made significant improvements to
reduce the memory usage of the batch scanner. In addition, the batch scanner now
has a memory limit of 100 MiB.
`zcashd` now reports the following new metrics when `-prometheusport` is set:
- (counter) `zcashd.wallet.batchscanner.outputs.scanned`
- (gauge) `zcashd.wallet.batchscanner.size.transactions`
- (gauge) `zcashd.wallet.batchscanner.usage.bytes`
- (gauge) `zcashd.wallet.synced.block.height`
RPC Interface
-------------
- The `finalorchardroot` field in the `getblock` result and the
`orchard.commitments.finalRoot` field in the `z_gettreestate` result have
been changed to match the byte ordering used for the `orchard.anchor`
field in the `getrawtransaction` result. These previously produced different
hash values from the `orchard.anchor` field due to having been byte-flipped
in their internal representation in zcashd.

176
doc/release-notes/release-notes-5.3.0-rc1.md Normal file
View File

@ -0,0 +1,176 @@
Notable changes
===============
Wallet Performance Improvements
-------------------------------
`zcashd 5.2.0` improved the performance of wallet scanning with multithreaded
batched trial decryption of Sapling outputs. However, for some nodes this
resulted in growing memory usage that would eventually cause an OOM abort. We
have identified the cause of the growth, and made significant improvements to
reduce the memory usage of the batch scanner. In addition, the batch scanner now
has a memory limit of 100 MiB.
`zcashd` now reports the following new metrics when `-prometheusport` is set:
- (counter) `zcashd.wallet.batchscanner.outputs.scanned`
- (gauge) `zcashd.wallet.batchscanner.size.transactions`
- (gauge) `zcashd.wallet.batchscanner.usage.bytes`
- (gauge) `zcashd.wallet.synced.block.height`
RPC Interface
-------------
- The `finalorchardroot` field in the `getblock` result and the
`orchard.commitments.finalRoot` field in the `z_gettreestate` result have
been changed to match the byte ordering used for the `orchard.anchor`
field in the `getrawtransaction` result. These previously produced different
hash values from the `orchard.anchor` field due to having been byte-flipped
in their internal representation in zcashd.
Changelog
=========
Alex (1):
build: update book.yml Signed-off-by: sashashura <93376818+sashashura@users.noreply.github.com>
Alex Wied (2):
cuckoocache: Add missing header
build: Reorder link targets to properly build on Nix
Andrés G. Aragoneses (1):
autogen.sh: warn about needing autoconf if autoreconf is not found
Ben Woosley (1):
doc: Correct spelling errors in comments
Conrado Gouvea (1):
Include algorithm.h in cuckoocache.h
Daira Hopwood (8):
Add contrib/debian/copyright entry for crc32c.
Apply suggestions from code review
Update doc/book/src/user/security-warnings.md
Update librustzcash commit and adapt to changes in `DiversifierKey`.
Avoid an implicit clone of the Orchard bundle in ContextualCheckTransaction.
Use prepared epks and ivks in trial decryption.
Audit dependency updates.
Include memory usage of the `tags` vector. This fixes *one* of the bugs pointed out by @str4d at https://github.com/zcash/zcash/pull/6156/files#r979122874
DeckerSU (2):
miner: fix MAXSOLS
test_framework: fix AttributeError in sapling_spends_compact_digest
Greg Pfeil (11):
Eliminate indirection for debug log
Define some basic cross-editor configuration
Canonicalize some user-provided paths
Add an `rpc-tests` make target
Add simplejson to requirements for rpc-tests
Also canonicalize paramsdir.
Backport tor.md changes from readthedocs
Don't recommend -reindex-chainstate.
Add a finalorchardroot RPC test
Fix finalorchardroot serialization
Apply suggestions from code review
Hennadii Stepanov (5):
Enable ShellCheck rules
script: Lint Gitian descriptors with ShellCheck
script: Enable SC2006 rule for Gitian scripts
script: Enable SC2155 rule for Gitian scripts
script: Enable SC2001 rule for Gitian scripts
Jack Grigg (52):
Squashed 'src/leveldb/' changes from f545dfabff..f8ae182c1e
Squashed 'src/crc32c/' content from commit 224988680f
depends: Update Rust to 1.62.1
depends: Update Clang / libcxx to LLVM 14.0.6
depends: Update Rust to 1.63.0
CI: Migrate to published versions of cargo-vet
rust: Update some of the pinned dependencies
rust: Add `zcash-inspect` binary for inspecting Zcash data
rust: Add P2PKH signature checking to `zcash-inspect`
rust: Add address inspection to `zcash-inspect`
rust: Add mnemonic phrase inspection to `zcash-inspect`
rust: Simplify `next_pow2` in `zcash-inspect`
rust: Place tighter bound on encoded heights in `zcash-inspect`
lint: Fix shell lints
CI: Enforce shell lints to prevent regression
lint: Fix ShellCheck lints in Zcash scripts
lint: Disable some ShellChecks on Gitian descriptors
rust: Add shielded sighash to `zcash-inspect` output for txs
rust: `zcash-inspect` 32-byte hex as maybe a commitment or nullifier
build: Build Rust library and binaries at the same time
rust: Migrate to latest `zcash_primitives` revision
rust: Migrate Rust tests to latest `zcash_primitives` revision
wallet: Use `auto&` to avoid copying inside `ThreadNotifyWallets`
wallet: Refactor `ThreadNotifyWallets` to support batch memory limits
wallet: Add dynamic memory usage tracking to `BatchScanner`
wallet: Collect metrics on the number of scanned outputs
wallet: Set a memory limit of 100 MiB for batch scanning
wallet: Only store successful trial decryptions in batch scanner
depends: Update Rust to 1.64.0
qa: Postpone dependencies that require CMake
qa: Postpone Clang 15 to retain LLVM 14 pin
depends: Update cxx to 1.0.76
depends: Update Boost to 1.80.0
Fix clippy lints
qa: Add audit policies for patched Rust crates
metrics: Add gauge for the height to which the wallet is synced
wallet: Move heap tracking of batch tasks behind a trait
wallet: Correctly track heap usage of batch items
wallet: Improve estimation of `rayon` spawned task size
Squashed 'src/secp256k1/' changes from a4abaab793..efad3506a8
Squashed 'src/secp256k1/' changes from efad3506a8..1758a92ffd
build: Disable secp256k1 OpenSSL tests
wallet: Remove lock on cs_main from CWallet::ChainTip
rust: Update to `metrics 0.20`
depends: Update cxx to 1.0.78
qa: Postpone Clang 15.0.2
rust: Update to `cpufeatures 0.2.5`
qa: Recommend cargo-upgrades instead of cargo-outdated
rust: Audit some dependency updates
rust: Update remaining dependencies
make-release.py: Versioning changes for 5.3.0-rc1.
make-release.py: Updated manpages for 5.3.0-rc1.
James White (1):
Add IPv6 support to qos.sh
Kris Nuttycombe (7):
Update `z_sendmany` help to clarify what happens when sending from a UA
Revert "redirect and update source documentation"
Fix documentation line wrapping
Backport changes from zcash.readthedocs.io
Move restored documentation into the zcashd book
Replace manual mangement of the Sapling proving context with cxx
Apply suggestions from code review
Luke Dashjr (2):
Bugfix: Only use git for build info if the repository is actually the right one
Bugfix: Detect genbuild.sh in repo correctly
Marco Falke (1):
Remove script to clean up datadirs
Nathan Wilcox (1):
Update rust.md
Pieter Wuille (1):
libsecp256k1 no longer has --with-bignum= configure option
Wladimir J. van der Laan (6):
build: Update build system for new leveldb
doc: Add crc32c subtree to developer notes
test: Add crc32c to subtree check linter
test: Add crc32c exception to various linters and generation scripts
build: CRC32C build system integration
build: Get rid of `CLIENT_DATE`
sasha (1):
Make RUST_DIST in Makefile.am refer to rust-toolchain.toml (baf7d9e)
user (1):
README.md: Clarify distinction between protocol vs zcashd implementation; link to Zebra; line wrapping.

192
doc/release-notes/release-notes-5.3.0.md Normal file
View File

@ -0,0 +1,192 @@
Notable changes
===============
Wallet Performance Improvements
-------------------------------
`zcashd 5.2.0` improved the performance of wallet scanning with multithreaded
batched trial decryption of Sapling outputs. However, for some nodes this
resulted in growing memory usage that would eventually cause an OOM abort. We
have identified the cause of the growth, and made significant improvements to
reduce the memory usage of the batch scanner. In addition, the batch scanner now
has a memory limit of 100 MiB.
`zcashd` now reports the following new metrics when `-prometheusport` is set:
- (counter) `zcashd.wallet.batchscanner.outputs.scanned`
- (gauge) `zcashd.wallet.batchscanner.size.transactions`
- (gauge) `zcashd.wallet.batchscanner.usage.bytes`
- (gauge) `zcashd.wallet.synced.block.height`
RPC Interface
-------------
- The `finalorchardroot` field in the `getblock` result and the
`orchard.commitments.finalRoot` field in the `z_gettreestate` result have
been changed to match the byte ordering used for the `orchard.anchor`
field in the `getrawtransaction` result. These previously produced different
hash values from the `orchard.anchor` field due to having been byte-flipped
in their internal representation in zcashd.
Changelog
=========
Alex (1):
build: update book.yml Signed-off-by: sashashura <93376818+sashashura@users.noreply.github.com>
Alex Wied (2):
cuckoocache: Add missing header
build: Reorder link targets to properly build on Nix
Andrés G. Aragoneses (1):
autogen.sh: warn about needing autoconf if autoreconf is not found
Ben Woosley (1):
doc: Correct spelling errors in comments
Conrado Gouvea (1):
Include algorithm.h in cuckoocache.h
Daira Hopwood (9):
Add contrib/debian/copyright entry for crc32c.
Apply suggestions from code review
Update doc/book/src/user/security-warnings.md
Update librustzcash commit and adapt to changes in `DiversifierKey`.
Avoid an implicit clone of the Orchard bundle in ContextualCheckTransaction.
Use prepared epks and ivks in trial decryption.
Audit dependency updates.
Include memory usage of the `tags` vector. This fixes *one* of the bugs pointed out by @str4d at https://github.com/zcash/zcash/pull/6156/files#r979122874
Always use a tuple as right argument of % in new Python code.
DeckerSU (2):
miner: fix MAXSOLS
test_framework: fix AttributeError in sapling_spends_compact_digest
Greg Pfeil (20):
Eliminate indirection for debug log
Define some basic cross-editor configuration
Canonicalize some user-provided paths
Add an `rpc-tests` make target
Add simplejson to requirements for rpc-tests
Also canonicalize paramsdir.
Backport tor.md changes from readthedocs
Don't recommend -reindex-chainstate.
Add a finalorchardroot RPC test
Fix finalorchardroot serialization
Apply suggestions from code review
Fix display of binary name in error messages.
Address review feedback and fixed test failures
Add test for `zcashd --help`
Fix `zcashd --help`
Apply suggestions from code review
Qualify a `string`
Don’t define wallet-needing code when --disable-wallet
make-release.py: Versioning changes for 5.3.0.
make-release.py: Updated manpages for 5.3.0.
Hennadii Stepanov (5):
Enable ShellCheck rules
script: Lint Gitian descriptors with ShellCheck
script: Enable SC2006 rule for Gitian scripts
script: Enable SC2155 rule for Gitian scripts
script: Enable SC2001 rule for Gitian scripts
Jack Grigg (53):
Squashed 'src/leveldb/' changes from f545dfabff..f8ae182c1e
Squashed 'src/crc32c/' content from commit 224988680f
depends: Update Rust to 1.62.1
depends: Update Clang / libcxx to LLVM 14.0.6
depends: Update Rust to 1.63.0
CI: Migrate to published versions of cargo-vet
rust: Update some of the pinned dependencies
rust: Add `zcash-inspect` binary for inspecting Zcash data
rust: Add P2PKH signature checking to `zcash-inspect`
rust: Add address inspection to `zcash-inspect`
rust: Add mnemonic phrase inspection to `zcash-inspect`
rust: Simplify `next_pow2` in `zcash-inspect`
rust: Place tighter bound on encoded heights in `zcash-inspect`
lint: Fix shell lints
CI: Enforce shell lints to prevent regression
lint: Fix ShellCheck lints in Zcash scripts
lint: Disable some ShellChecks on Gitian descriptors
rust: Add shielded sighash to `zcash-inspect` output for txs
rust: `zcash-inspect` 32-byte hex as maybe a commitment or nullifier
build: Build Rust library and binaries at the same time
rust: Migrate to latest `zcash_primitives` revision
rust: Migrate Rust tests to latest `zcash_primitives` revision
wallet: Use `auto&` to avoid copying inside `ThreadNotifyWallets`
wallet: Refactor `ThreadNotifyWallets` to support batch memory limits
wallet: Add dynamic memory usage tracking to `BatchScanner`
wallet: Collect metrics on the number of scanned outputs
wallet: Set a memory limit of 100 MiB for batch scanning
wallet: Only store successful trial decryptions in batch scanner
depends: Update Rust to 1.64.0
qa: Postpone dependencies that require CMake
qa: Postpone Clang 15 to retain LLVM 14 pin
depends: Update cxx to 1.0.76
depends: Update Boost to 1.80.0
Fix clippy lints
qa: Add audit policies for patched Rust crates
metrics: Add gauge for the height to which the wallet is synced
wallet: Move heap tracking of batch tasks behind a trait
wallet: Correctly track heap usage of batch items
wallet: Improve estimation of `rayon` spawned task size
Squashed 'src/secp256k1/' changes from a4abaab793..efad3506a8
Squashed 'src/secp256k1/' changes from efad3506a8..1758a92ffd
build: Disable secp256k1 OpenSSL tests
wallet: Remove lock on cs_main from CWallet::ChainTip
rust: Update to `metrics 0.20`
depends: Update cxx to 1.0.78
qa: Postpone Clang 15.0.2
rust: Update to `cpufeatures 0.2.5`
qa: Recommend cargo-upgrades instead of cargo-outdated
rust: Audit some dependency updates
rust: Update remaining dependencies
make-release.py: Versioning changes for 5.3.0-rc1.
make-release.py: Updated manpages for 5.3.0-rc1.
make-release.py: Updated release notes and changelog for 5.3.0-rc1.
James White (1):
Add IPv6 support to qos.sh
Kris Nuttycombe (12):
Update `z_sendmany` help to clarify what happens when sending from a UA
Revert "redirect and update source documentation"
Fix documentation line wrapping
Backport changes from zcash.readthedocs.io
Move restored documentation into the zcashd book
Replace manual mangement of the Sapling proving context with cxx
Apply suggestions from code review
Update and/or postpone dependencies for 5.3.0
Vet cxxbridge upgrade.
Update to released versions of librustzcash crates.
Certify librustzcash crate upgrades.
Fix clippy lints.
Luke Dashjr (2):
Bugfix: Only use git for build info if the repository is actually the right one
Bugfix: Detect genbuild.sh in repo correctly
Marco Falke (1):
Remove script to clean up datadirs
Nathan Wilcox (1):
Update rust.md
Pieter Wuille (1):
libsecp256k1 no longer has --with-bignum= configure option
Wladimir J. van der Laan (6):
build: Update build system for new leveldb
doc: Add crc32c subtree to developer notes
test: Add crc32c to subtree check linter
test: Add crc32c exception to various linters and generation scripts
build: CRC32C build system integration
build: Get rid of `CLIENT_DATE`
sasha (1):
Make RUST_DIST in Makefile.am refer to rust-toolchain.toml (baf7d9e)
user (1):
README.md: Clarify distinction between protocol vs zcashd implementation; link to Zebra; line wrapping.

1
qa/pull-tester/rpc-tests.py
View File

@ -144,6 +144,7 @@ BASE_SCRIPTS= [
'wallet_z_sendmany.py',
'wallet_zero_value.py',
'threeofthreerestore.py',
'show_help.py',
]
ZMQ_SCRIPTS = [

504
qa/rpc-tests/show_help.py Executable file
View File

@ -0,0 +1,504 @@
#!/usr/bin/env python3
# Copyright (c) 2014-2016 The Bitcoin Core developers
# Copyright (c) 2017-2022 The Zcash developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or https://www.opensource.org/licenses/mit-license.php .
#
# Test --help
#
from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import assert_equal, assert_true, zcashd_binary
import subprocess
import tempfile
import time
help_message = """
In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/>.
Usage:
zcashd [options] Start Zcash Daemon
Options:
-?
This help message
-alerts
Receive and display P2P network alerts (default: 1)
-alertnotify=<cmd>
Execute command when a relevant alert is received or we see a really
long fork (%s in cmd is replaced by message)
-allowdeprecated=<feature>
Explicitly allow the use of the specified deprecated feature. Multiple
instances of this parameter are permitted; values for <feature> must be
selected from among {"none", "addrtype", "getnewaddress",
"getrawchangeaddress", "legacy_privacy", "wallettxvjoinsplit",
"z_getbalance", "z_getnewaddress", "z_gettotalbalance",
"z_listaddresses", "dumpwallet", "zcrawjoinsplit", "zcrawkeygen",
"zcrawreceive"}
-blocknotify=<cmd>
Execute command when the best block changes (%s in cmd is replaced by
block hash)
-checkblocks=<n>
How many blocks to check at startup (default: 288, 0 = all)
-checklevel=<n>
How thorough the block verification of -checkblocks is (0-4, default: 3)
-conf=<file>
Specify configuration file (default: zcash.conf)
-daemon
Run in the background as a daemon and accept commands
-datadir=<dir>
Specify data directory (this path cannot use '~')
-paramsdir=<dir>
Specify Zcash network parameters directory
-dbcache=<n>
Set database cache size in megabytes (4 to 16384, default: 450)
-debuglogfile=<file>
Specify location of debug log file: this can be an absolute path or a
path relative to the data directory (default: debug.log)
-exportdir=<dir>
Specify directory to be used when exporting data
-ibdskiptxverification
Skip transaction verification during initial block download up to the
last checkpoint height. Incompatible with flags that disable
checkpoints. (default = 0)
-loadblock=<file>
Imports blocks from external blk000??.dat file on startup
-maxorphantx=<n>
Keep at most <n> unconnectable transactions in memory (default: 100)
-par=<n>
Set the number of script verification threads (-8 to 16, 0 = auto, <0 =
leave that many cores free, default: 0)
-pid=<file>
Specify pid file (default: zcashd.pid)
-prune=<n>
Reduce storage requirements by pruning (deleting) old blocks. This mode
disables wallet support and is incompatible with -txindex. Warning:
Reverting this setting requires re-downloading the entire blockchain.
(default: 0 = disable pruning blocks, >550 = target size in MiB to use
for block files)
-reindex-chainstate
Rebuild chain state from the currently indexed blocks (implies -rescan)
-reindex
Rebuild chain state and block index from the blk*.dat files on disk
(implies -rescan)
-sysperms
Create new files with system default permissions, instead of umask 077
(only effective with disabled wallet functionality)
-txexpirynotify=<cmd>
Execute command when transaction expires (%s in cmd is replaced by
transaction id)
-txindex
Maintain a full transaction index, used by the getrawtransaction rpc
call (default: 0)
Connection options:
-addnode=<ip>
Add a node to connect to and attempt to keep the connection open
-banscore=<n>
Threshold for disconnecting misbehaving peers (default: 100)
-bantime=<n>
Number of seconds to keep misbehaving peers from reconnecting (default:
86400)
-bind=<addr>
Bind to given address and always listen on it. Use [host]:port notation
for IPv6
-connect=<ip>
Connect only to the specified node(s); -noconnect or -connect=0 alone to
disable automatic connections
-discover
Discover own IP addresses (default: 1 when listening and no -externalip
or -proxy)
-dns
Allow DNS lookups for -addnode, -seednode and -connect (default: 1)
-dnsseed
Query for peer addresses via DNS lookup, if low on addresses (default: 1
unless -connect/-noconnect)
-externalip=<ip>
Specify your own public address
-forcednsseed
Always query for peer addresses via DNS lookup (default: 0)
-listen
Accept connections from outside (default: 1 if no -proxy or
-connect/-noconnect)
-listenonion
Automatically create Tor hidden service (default: 1)
-maxconnections=<n>
Maintain at most <n> connections to peers (default: 125)
-maxreceivebuffer=<n>
Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)
-maxsendbuffer=<n>
Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)
-mempoolevictionmemoryminutes=<n>
The number of minutes before allowing rejected transactions to re-enter
the mempool. (default: 60)
-mempooltxcostlimit=<n>
An upper bound on the maximum size in bytes of all transactions in the
mempool. (default: 80000000)
-onion=<ip:port>
Use separate SOCKS5 proxy to reach peers via Tor hidden services
(default: -proxy)
-onlynet=<net>
Only connect to nodes in network <net> (ipv4, ipv6 or onion)
-permitbaremultisig
Relay non-P2SH multisig (default: 1)
-peerbloomfilters
Support filtering of blocks and transaction with bloom filters (default:
1)
-port=<port>
Listen for connections on <port> (default: 8233 or testnet: 18233)
-proxy=<ip:port>
Connect through SOCKS5 proxy
-proxyrandomize
Randomize credentials for every proxy connection. This enables Tor
stream isolation (default: 1)
-seednode=<ip>
Connect to a node to retrieve peer addresses, and disconnect
-timeout=<n>
Specify connection timeout in milliseconds (minimum: 1, default: 5000)
-torcontrol=<ip>:<port>
Tor control port to use if onion listening enabled (default:
127.0.0.1:9051)
-torpassword=<pass>
Tor control port password (default: empty)
-whitebind=<addr>
Bind to given address and whitelist peers connecting to it. Use
[host]:port notation for IPv6
-whitelist=<netmask>
Whitelist peers connecting from the given netmask or IP address. Can be
specified multiple times. Whitelisted peers cannot be DoS banned and
their transactions are always relayed, even if they are already in the
mempool, useful e.g. for a gateway
-whitelistrelay
Accept relayed transactions received from whitelisted inbound peers even
when not relaying transactions (default: 1)
-whitelistforcerelay
Force relay of transactions from whitelisted inbound peers even they
violate local relay policy (default: 1)
-maxuploadtarget=<n>
Tries to keep outbound traffic under the given target (in MiB per 24h),
0 = no limit (default: 0)
Wallet options:
-disablewallet
Do not load the wallet and disable wallet RPC calls
-keypool=<n>
Set key pool size to <n> (default: 100)
-migration
Enable the Sprout to Sapling migration
-migrationdestaddress=<zaddr>
Set the Sapling migration address
-mintxfee=<amt>
Fees (in ZEC/kB) smaller than this are considered zero fee for
transaction creation (default: 0.00001)
-orchardactionlimit=<n>
Set the maximum number of Orchard actions permitted in a transaction
(default 50)
-paytxfee=<amt>
Fee (in ZEC/kB) to add to transactions you send (default: 0.00)
-rescan
Rescan the block chain for missing wallet transactions on startup
-salvagewallet
Attempt to recover private keys from a corrupt wallet on startup
(implies -rescan)
-sendfreetransactions
Send transactions as zero-fee transactions if possible (default: 0)
-spendzeroconfchange
Spend unconfirmed change when sending transactions (default: 1)
-txconfirmtarget=<n>
If paytxfee is not set, include enough fee so transactions begin
confirmation on average within n blocks (default: 2)
-txexpirydelta
Set the number of blocks after which a transaction that has not been
mined will become invalid (min: 4, default: 20 (pre-Blossom) or 40
(post-Blossom))
-upgradewallet
Upgrade wallet to latest format on startup
-wallet=<file>
Specify wallet file absolute path or a path relative to the data
directory (default: wallet.dat)
-walletbroadcast
Make the wallet broadcast transactions (default: 1)
-walletnotify=<cmd>
Execute command when a wallet transaction changes (%s in cmd is replaced
by TxID)
-zapwallettxes=<mode>
Delete all wallet transactions and only recover those parts of the
blockchain through -rescan on startup (1 = keep tx meta data e.g.
account owner and payment request information, 2 = drop tx meta data)
-walletrequirebackup=<bool>
By default, the wallet will not allow generation of new spending keys &
addresses from the mnemonic seed until the backup of that seed has been
confirmed with the `zcashd-wallet-tool` utility. A user may start zcashd
with `-walletrequirebackup=false` to allow generation of spending keys
even if the backup has not yet been confirmed.
ZeroMQ notification options:
-zmqpubhashblock=<address>
Enable publish hash block in <address>
-zmqpubhashtx=<address>
Enable publish hash transaction in <address>
-zmqpubrawblock=<address>
Enable publish raw block in <address>
-zmqpubrawtx=<address>
Enable publish raw transaction in <address>
Monitoring options:
-metricsallowip=<ip>
Allow metrics connections from specified source. Valid for <ip> are a
single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0)
or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified
multiple times. (default: only localhost)
-metricsbind=<addr>
Bind to given address to listen for metrics connections. (default: bind
to all interfaces)
-prometheusport=<port>
Expose node metrics in the Prometheus exposition format. An HTTP
listener will be started on <port>, which responds to GET requests on
any request path. Use -metricsallowip and -metricsbind to control
access.
Debugging/Testing options:
-debug=<category>
Output debugging information (default: 0, supplying <category> is
optional). If <category> is not supplied or if <category> = 1, output
all debugging information. <category> can be: addrman, alert, bench,
coindb, db, estimatefee, http, libevent, lock, mempool, mempoolrej, net,
partitioncheck, pow, proxy, prune, rand, receiveunsafe, reindex, rpc,
selectcoins, tor, zmq, zrpc, zrpcunsafe (implies zrpc). For multiple
specific categories use -debug=<category> multiple times.
-experimentalfeatures
Enable use of experimental features
-help-debug
Show all debugging options (usage: --help -help-debug)
-logips
Include IP addresses in debug output (default: 0)
-logtimestamps
Prepend debug output with timestamp (default: 1)
-minrelaytxfee=<amt>
Fees (in ZEC/kB) smaller than this are considered zero fee for relaying,
mining and transaction creation (default: 0.000001)
-maxtxfee=<amt>
Maximum total fees (in ZEC) to use in a single wallet transaction or raw
transaction; setting this too low may abort large transactions (default:
0.10)
-printtoconsole
Send trace/debug info to console instead of the debug log
Chain selection options:
-testnet
Use the test chain
Node relay options:
-datacarrier
Relay and mine data carrier transactions (default: 1)
-datacarriersize
Maximum size of data in data carrier transactions we relay and mine
(default: 83)
Block creation options:
-blockminsize=<n>
Set minimum block size in bytes (default: 0)
-blockmaxsize=<n>
Set maximum block size in bytes (default: 2000000)
-blockprioritysize=<n>
Set maximum size of high-priority/low-fee transactions in bytes
(default: 1000000)
Mining options:
-gen
Generate coins (default: 0)
-genproclimit=<n>
Set the number of threads for coin generation if enabled (-1 = all
cores, default: 1)
-equihashsolver=<name>
Specify the Equihash solver to be used if enabled (default: "default")
-mineraddress=<addr>
Send mined coins to a specific single address
-minetolocalwallet
Require that mined blocks use a coinbase address in the local wallet
(default: 1)
RPC server options:
-server
Accept command line and JSON-RPC commands
-rest
Accept public REST requests (default: 0)
-rpcbind=<addr>
Bind to given address to listen for JSON-RPC connections. Use
[host]:port notation for IPv6. This option can be specified multiple
times (default: bind to all interfaces)
-rpcuser=<user>
Username for JSON-RPC connections
-rpcpassword=<pw>
Password for JSON-RPC connections
-rpcauth=<userpw>
Username and hashed password for JSON-RPC connections. The field
<userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical
python script is included in share/rpcuser. This option can be specified
multiple times
-rpcport=<port>
Listen for JSON-RPC connections on <port> (default: 8232 or testnet:
18232)
-rpcallowip=<ip>
Allow JSON-RPC connections from specified source. Valid for <ip> are a
single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0)
or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified
multiple times
-rpcthreads=<n>
Set the number of threads to service RPC calls (default: 4)
Metrics Options (only if -daemon and -printtoconsole are not set):
-showmetrics
Show metrics on stdout (default: 1 if running in a console, 0 otherwise)
-metricsui
Set to 1 for a persistent metrics screen, 0 for sequential metrics
output (default: 1 if running in a console, 0 otherwise)
-metricsrefreshtime
Number of seconds between metrics refreshes (default: 1 if running in a
console, 600 otherwise)
Compatibility options:
-preferredtxversion
Preferentially create transactions having the specified version when
possible (default: 4)
"""
class ShowHelpTest(BitcoinTestFramework):
def setup_network(self):
self.nodes = []
def show_help(self):
with tempfile.SpooledTemporaryFile(max_size=2**16) as log_stdout:
args = [ zcashd_binary(), "--help" ]
process = subprocess.Popen(args, stdout=log_stdout)
while process.poll() is None:
time.sleep(0.25)
assert_equal(process.returncode, 0)
log_stdout.seek(0)
stdout = log_stdout.read().decode('utf-8')
assert_true(help_message in stdout)
def run_test(self):
self.show_help()
if __name__ == '__main__':
ShowHelpTest().main()

2
qa/rpc-tests/test_framework/util.py
View File

@ -406,7 +406,7 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=
"""
datadir = os.path.join(dirname, "node"+str(i))
if binary is None:
binary = os.getenv("ZCASHD", ZCASHD_BINARY)
binary = zcashd_binary()
args = [ binary, "-datadir="+datadir, "-keypool=1", "-discover=0", "-rest" ]
args.extend([
'-nuparams=5ba81b19:1', # Overwinter

181
qa/supply-chain/audits.toml
View File

@ -19,6 +19,12 @@ criteria = "safe-to-deploy"
delta = "1.0.56 -> 1.0.61"
notes = "Update does not introduce new code. Minor build script changes look fine."
[[audits.anyhow]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "1.0.61 -> 1.0.65"
notes = "Build script changes just alter what it is probing for; no difference in side effects."
[[audits.bellman]]
who = "Jack Grigg <jack@z.cash>"
criteria = ["crypto-reviewed", "safe-to-deploy"]
@ -60,6 +66,12 @@ criteria = "safe-to-deploy"
delta = "1.0.9 -> 1.0.10"
notes = "Bumps nix and removes some of its default features."
[[audits.cpufeatures]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "0.2.2 -> 0.2.5"
notes = "Unsafe changes just introduce `#[inline(never)]` wrappers."
[[audits.crypto-common]]
who = "Jack Grigg <jack@z.cash>"
criteria = ["crypto-reviewed", "safe-to-deploy"]
@ -77,6 +89,21 @@ criteria = "safe-to-deploy"
delta = "1.0.72 -> 1.0.76"
notes = "Impls Unpin for SharedPtr and UniquePtr. The rationale makes sense."
[[audits.cxx]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "1.0.76 -> 1.0.78"
[[audits.cxx]]
who = "Kris Nuttycombe <kris@nutty.land>"
criteria = "safe-to-deploy"
delta = "1.0.78 -> 1.0.79"
notes = """
This release changes the result of the `cxxbridge` `exception` call to return
a struct containing both the pointer to an error message and its length,
instead of just the raw `*const u8`.
"""
[[audits.cxxbridge-flags]]
who = "Daira Hopwood <daira@jacaranda.org>"
criteria = "safe-to-deploy"
@ -87,6 +114,17 @@ who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "1.0.72 -> 1.0.76"
[[audits.cxxbridge-flags]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "1.0.76 -> 1.0.78"
[[audits.cxxbridge-flags]]
who = "Kris Nuttycombe <kris@nutty.land>"
criteria = "safe-to-deploy"
delta = "1.0.78 -> 1.0.79"
notes = "This is exclusively an update to the `cxxbridge` dependency version."
[[audits.cxxbridge-macro]]
who = "Daira Hopwood <daira@jacaranda.org>"
criteria = "safe-to-deploy"
@ -97,6 +135,22 @@ who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "1.0.72 -> 1.0.76"
[[audits.cxxbridge-macro]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "1.0.76 -> 1.0.78"
[[audits.cxxbridge-macro]]
who = "Kris Nuttycombe <kris@nutty.land>"
criteria = "safe-to-deploy"
delta = "1.0.78 -> 1.0.79"
[[audits.cxxbridge-macro]]
who = "Kris Nuttycombe <kris@nutty.land>"
criteria = "safe-to-deploy"
delta = "1.0.78 -> 1.0.79"
notes = "This is exclusively an update to the `cxxbridge` dependency version."
[[audits.equihash]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
@ -124,6 +178,11 @@ Checked that getrandom::wasi::getrandom_inner matches wasi::random_get.
Checked that getrandom::util_libc::Weak lock ordering matches std::sys::unix::weak::DlsymWeak.
"""
[[audits.group]]
who = "Kris Nuttycombe <kris@nutty.land>"
criteria = "safe-to-deploy"
delta = "0.12.0 -> 0.12.1"
[[audits.halo2_gadgets]]
who = "Jack Grigg <jack@z.cash>"
criteria = ["crypto-reviewed", "safe-to-deploy"]
@ -148,6 +207,12 @@ criteria = ["crypto-reviewed", "safe-to-deploy"]
delta = "0.1.0 -> 0.2.0"
notes = "The ECC core team maintains this crate, and we have reviewed every line."
[[audits.indexmap]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "1.8.1 -> 1.9.1"
notes = "I'm satisfied that the assertion guarding the new unsafe block is correct."
[[audits.inout]]
who = "Daira Hopwood <daira@jacaranda.org>"
criteria = "safe-to-deploy"
@ -160,12 +225,54 @@ criteria = "safe-to-deploy"
delta = "1.0.1 -> 1.0.3"
notes = "Update makes no changes to code."
[[audits.libm]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "0.2.2 -> 0.2.5"
[[audits.link-cplusplus]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "1.0.6 -> 1.0.7"
[[audits.lock_api]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "0.4.7 -> 0.4.9"
notes = "The unsafe changes fix soundness bugs. The unsafe additions in the new ArcMutexGuard::into_arc method seem fine, but it should probably have used ManuallyDrop instead of mem::forget."
[[audits.log]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "0.4.16 -> 0.4.17"
notes = "I confirmed that the unsafe transmutes are fine; NonZeroU128 and NonZeroI128 are `#[repr(transparent)]` wrappers around u128 and i128 respectively."
[[audits.memuse]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "0.2.0 -> 0.2.1"
notes = "Exposes an existing macro. Note that I am the author of the crate."
[[audits.metrics]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "0.19.0 -> 0.20.1"
[[audits.metrics-exporter-prometheus]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "0.10.0 -> 0.11.0"
[[audits.metrics-macros]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "0.5.1 -> 0.6.0"
[[audits.metrics-util]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "0.13.0 -> 0.14.0"
[[audits.mio]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
@ -204,6 +311,22 @@ criteria = ["crypto-reviewed", "safe-to-deploy"]
delta = "0.1.0 -> 0.2.0"
notes = "The ECC core team maintains this crate, and we have reviewed every line."
[[audits.orchard]]
who = "Kris Nuttycombe <kris@nutty.land>"
criteria = "safe-to-deploy"
delta = "0.2.0 -> 0.3.0"
[[audits.parking_lot]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "0.11.2 -> 0.12.1"
notes = "Most `unsafe {}` changes were to reduce the scope of the unsafe blocks. I didn't closely review the migration to the asm! macro but it looks reasonable."
[[audits.parking_lot_core]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "0.8.5 -> 0.9.3"
[[audits.poly1305]]
who = "Daira Hopwood <daira@jacaranda.org>"
criteria = "safe-to-deploy"
@ -215,18 +338,39 @@ who = "Daira Hopwood <daira@jacaranda.org>"
criteria = "safe-to-deploy"
delta = "1.0.37 -> 1.0.41"
[[audits.quanta]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "0.9.3 -> 0.10.1"
[[audits.serde]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "1.0.136 -> 1.0.143"
notes = "Bumps serde-derive and adds some constructors."
[[audits.serde]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "1.0.143 -> 1.0.145"
[[audits.serde_derive]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "1.0.136 -> 1.0.143"
notes = "Bumps syn, inverts some build flags."
[[audits.serde_derive]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "1.0.143 -> 1.0.145"
[[audits.sketches-ddsketch]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "0.1.3 -> 0.2.0"
notes = "I did not review the refactor, but there are no unsafe blocks and I didn't see any obvious changes that could result in panics."
[[audits.syn]]
who = "Daira Hopwood <daira@jacaranda.org>"
criteria = "safe-to-deploy"
@ -238,12 +382,24 @@ criteria = "safe-to-deploy"
delta = "1.0.30 -> 1.0.32"
notes = "Bumps thiserror-impl, no code changes."
[[audits.thiserror]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "1.0.32 -> 1.0.37"
notes = "The new build script invokes rustc to determine whether it supports the Provider API. The only side-effect is it overwrites `$OUT_DIR/probe.rs`, which is fine because it is unique to the thiserror package."
[[audits.thiserror-impl]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "1.0.30 -> 1.0.32"
notes = "Only change is to refine an error message."
[[audits.thiserror-impl]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "1.0.32 -> 1.0.37"
notes = "Proc macro changes migrating to the Provider API look fine."
[[audits.unicode-ident]]
who = "Daira Hopwood <daira@jacaranda.org>"
criteria = "safe-to-deploy"
@ -316,12 +472,22 @@ criteria = "safe-to-deploy"
version = "0.1.0"
notes = "The ECC core team maintains this crate, and we have reviewed every line."
[[audits.zcash_address]]
who = "Kris Nuttycombe <kris@nutty.land>"
criteria = "safe-to-deploy"
delta = "0.1.0 -> 0.2.0"
[[audits.zcash_encoding]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
version = "0.1.0"
notes = "The ECC core team maintains this crate, and we have reviewed every line."
[[audits.zcash_encoding]]
who = "Kris Nuttycombe <kris@nutty.land>"
criteria = "safe-to-deploy"
delta = "0.1.0 -> 0.2.0"
[[audits.zcash_history]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
@ -334,6 +500,11 @@ criteria = ["crypto-reviewed", "safe-to-deploy"]
version = "0.1.0"
notes = "The ECC core team maintains this crate, and we have reviewed every line."
[[audits.zcash_note_encryption]]
who = "Kris Nuttycombe <kris@nutty.land>"
criteria = "safe-to-deploy"
delta = "0.1.0 -> 0.2.0"
[[audits.zcash_primitives]]
who = "Jack Grigg <jack@z.cash>"
criteria = ["crypto-reviewed", "safe-to-deploy"]
@ -346,6 +517,11 @@ criteria = ["crypto-reviewed", "safe-to-deploy"]
delta = "0.6.0 -> 0.7.0"
notes = "The ECC core team maintains this crate, and we have reviewed every line."
[[audits.zcash_primitives]]
who = "Kris Nuttycombe <kris@nutty.land>"
criteria = "safe-to-deploy"
delta = "0.7.0 -> 0.8.1"
[[audits.zcash_proofs]]
who = "Jack Grigg <jack@z.cash>"
criteria = ["crypto-reviewed", "safe-to-deploy"]
@ -364,6 +540,11 @@ criteria = ["crypto-reviewed", "safe-to-deploy"]
delta = "0.7.0 -> 0.7.1"
notes = "The ECC core team maintains this crate, and we have reviewed every line."
[[audits.zcash_proofs]]
who = "Kris Nuttycombe <kris@nutty.land>"
criteria = "safe-to-deploy"
delta = "0.7.1 -> 0.8.0"
[[audits.zeroize]]
who = "Daira Hopwood <daira@jacaranda.org>"
criteria = "safe-to-deploy"

166
qa/supply-chain/config.toml
View File

@ -51,10 +51,6 @@ criteria = "safe-to-deploy"
version = "0.7.6"
criteria = "safe-to-deploy"
[[exemptions.ansi_term]]
version = "0.12.1"
criteria = "safe-to-deploy"
[[exemptions.anyhow]]
version = "1.0.56"
criteria = "safe-to-deploy"
@ -67,16 +63,12 @@ criteria = "safe-to-deploy"
version = "0.7.2"
criteria = "safe-to-deploy"
[[exemptions.atomic-shim]]
version = "0.2.0"
criteria = "safe-to-deploy"
[[exemptions.autocfg]]
version = "1.1.0"
criteria = "safe-to-deploy"
[[exemptions.backtrace]]
version = "0.3.64"
version = "0.3.66"
criteria = "safe-to-deploy"
[[exemptions.base64ct]]
@ -100,7 +92,7 @@ version = "1.3.2"
criteria = "safe-to-deploy"
[[exemptions.bitvec]]
version = "1.0.0"
version = "1.0.1"
criteria = "safe-to-deploy"
[[exemptions.blake2b_simd]]
@ -116,7 +108,7 @@ version = "0.9.0"
criteria = "safe-to-deploy"
[[exemptions.block-buffer]]
version = "0.10.2"
version = "0.10.3"
criteria = "safe-to-deploy"
[[exemptions.block-modes]]
@ -136,7 +128,7 @@ version = "0.4.0"
criteria = "safe-to-deploy"
[[exemptions.bumpalo]]
version = "3.8.0"
version = "3.11.0"
criteria = "safe-to-deploy"
[[exemptions.byte-slice-cast]]
@ -148,7 +140,7 @@ version = "1.4.3"
criteria = "safe-to-deploy"
[[exemptions.bytes]]
version = "1.1.0"
version = "1.2.1"
criteria = "safe-to-deploy"
[[exemptions.cc]]
@ -188,19 +180,19 @@ version = "0.2.2"
criteria = "safe-to-deploy"
[[exemptions.crossbeam-channel]]
version = "0.5.4"
version = "0.5.6"
criteria = "safe-to-deploy"
[[exemptions.crossbeam-deque]]
version = "0.8.1"
version = "0.8.2"
criteria = "safe-to-deploy"
[[exemptions.crossbeam-epoch]]
version = "0.9.8"
version = "0.9.11"
criteria = "safe-to-deploy"
[[exemptions.crossbeam-utils]]
version = "0.8.8"
version = "0.8.12"
criteria = "safe-to-deploy"
[[exemptions.crunchy]]
@ -236,7 +228,7 @@ version = "0.9.0"
criteria = "safe-to-deploy"
[[exemptions.digest]]
version = "0.10.3"
version = "0.10.5"
criteria = "safe-to-deploy"
[[exemptions.directories]]
@ -256,7 +248,7 @@ version = "3.0.0"
criteria = "safe-to-deploy"
[[exemptions.either]]
version = "1.6.1"
version = "1.8.0"
criteria = "safe-to-deploy"
[[exemptions.ff]]
@ -280,23 +272,23 @@ version = "2.0.0"
criteria = "safe-to-deploy"
[[exemptions.futures-channel]]
version = "0.3.21"
version = "0.3.24"
criteria = "safe-to-deploy"
[[exemptions.futures-core]]
version = "0.3.21"
version = "0.3.24"
criteria = "safe-to-deploy"
[[exemptions.futures-task]]
version = "0.3.21"
version = "0.3.24"
criteria = "safe-to-deploy"
[[exemptions.futures-util]]
version = "0.3.21"
version = "0.3.24"
criteria = "safe-to-deploy"
[[exemptions.generic-array]]
version = "0.14.5"
version = "0.14.6"
criteria = "safe-to-deploy"
[[exemptions.getrandom]]
@ -308,7 +300,7 @@ version = "0.2.6"
criteria = "safe-to-deploy"
[[exemptions.gimli]]
version = "0.26.1"
version = "0.26.2"
criteria = "safe-to-deploy"
[[exemptions.group]]
@ -324,7 +316,7 @@ version = "0.8.1"
criteria = "safe-to-deploy"
[[exemptions.hashbrown]]
version = "0.11.2"
version = "0.12.3"
criteria = "safe-to-deploy"
[[exemptions.hdwallet]]
@ -344,15 +336,15 @@ version = "0.11.0"
criteria = "safe-to-deploy"
[[exemptions.http]]
version = "0.2.6"
version = "0.2.8"
criteria = "safe-to-deploy"
[[exemptions.http-body]]
version = "0.4.4"
version = "0.4.5"
criteria = "safe-to-deploy"
[[exemptions.httparse]]
version = "1.6.0"
version = "1.8.0"
criteria = "safe-to-deploy"
[[exemptions.httpdate]]
@ -360,7 +352,7 @@ version = "1.0.2"
criteria = "safe-to-deploy"
[[exemptions.hyper]]
version = "0.14.18"
version = "0.14.20"
criteria = "safe-to-deploy"
[[exemptions.impl-codec]]
@ -379,20 +371,16 @@ criteria = "safe-to-deploy"
version = "1.8.1"
criteria = "safe-to-deploy"
[[exemptions.instant]]
version = "0.1.12"
criteria = "safe-to-deploy"
[[exemptions.ipnet]]
version = "2.4.0"
version = "2.5.0"
criteria = "safe-to-deploy"
[[exemptions.itoa]]
version = "1.0.1"
version = "1.0.4"
criteria = "safe-to-deploy"
[[exemptions.js-sys]]
version = "0.3.57"
version = "0.3.60"
criteria = "safe-to-deploy"
[[exemptions.jubjub]]
@ -404,7 +392,7 @@ version = "1.4.0"
criteria = "safe-to-deploy"
[[exemptions.libc]]
version = "0.2.122"
version = "0.2.135"
criteria = "safe-to-deploy"
[[exemptions.libm]]
@ -432,7 +420,7 @@ version = "0.1.0"
criteria = "safe-to-deploy"
[[exemptions.memchr]]
version = "2.4.1"
version = "2.5.0"
criteria = "safe-to-deploy"
[[exemptions.memoffset]]
@ -460,7 +448,7 @@ version = "0.13.0"
criteria = "safe-to-deploy"
[[exemptions.miniz_oxide]]
version = "0.4.4"
version = "0.5.4"
criteria = "safe-to-deploy"
[[exemptions.mio]]
@ -479,6 +467,10 @@ criteria = "safe-to-deploy"
version = "0.7.0"
criteria = "safe-to-deploy"
[[exemptions.nu-ansi-term]]
version = "0.46.0"
criteria = "safe-to-deploy"
[[exemptions.num-bigint]]
version = "0.4.3"
criteria = "safe-to-deploy"
@ -488,7 +480,7 @@ version = "0.1.44"
criteria = "safe-to-deploy"
[[exemptions.num-traits]]
version = "0.2.14"
version = "0.2.15"
criteria = "safe-to-deploy"
[[exemptions.num_cpus]]
@ -496,31 +488,35 @@ version = "1.13.1"
criteria = "safe-to-deploy"
[[exemptions.num_threads]]
version = "0.1.5"
version = "0.1.6"
criteria = "safe-to-deploy"
[[exemptions.object]]
version = "0.27.1"
version = "0.29.0"
criteria = "safe-to-deploy"
[[exemptions.once_cell]]
version = "1.10.0"
version = "1.15.0"
criteria = "safe-to-deploy"
[[exemptions.opaque-debug]]
version = "0.3.0"
criteria = "safe-to-deploy"
[[exemptions.overload]]
version = "0.1.1"
criteria = "safe-to-deploy"
[[exemptions.pairing]]
version = "0.22.0"
criteria = "safe-to-deploy"
[[exemptions.parity-scale-codec]]
version = "3.1.2"
version = "3.2.1"
criteria = "safe-to-deploy"
[[exemptions.parity-scale-codec-derive]]
version = "3.1.2"
version = "3.1.3"
criteria = "safe-to-deploy"
[[exemptions.parking_lot]]
@ -560,7 +556,7 @@ version = "0.8.0"
criteria = "safe-to-deploy"
[[exemptions.pin-project-lite]]
version = "0.2.8"
version = "0.2.9"
criteria = "safe-to-deploy"
[[exemptions.pin-utils]]
@ -571,6 +567,10 @@ criteria = "safe-to-deploy"
version = "0.7.2"
criteria = "safe-to-deploy"
[[exemptions.portable-atomic]]
version = "0.3.15"
criteria = "safe-to-deploy"
[[exemptions.ppv-lite86]]
version = "0.2.16"
criteria = "safe-to-deploy"
@ -580,11 +580,11 @@ version = "0.11.1"
criteria = "safe-to-deploy"
[[exemptions.proc-macro-crate]]
version = "1.1.3"
version = "1.2.1"
criteria = "safe-to-deploy"
[[exemptions.proc-macro2]]
version = "1.0.37"
version = "1.0.46"
criteria = "safe-to-deploy"
[[exemptions.quanta]]
@ -592,7 +592,7 @@ version = "0.9.3"
criteria = "safe-to-deploy"
[[exemptions.quote]]
version = "1.0.17"
version = "1.0.21"
criteria = "safe-to-deploy"
[[exemptions.radium]]
@ -620,7 +620,7 @@ version = "0.5.1"
criteria = "safe-to-deploy"
[[exemptions.rand_core]]
version = "0.6.3"
version = "0.6.4"
criteria = "safe-to-deploy"
[[exemptions.rand_hc]]
@ -632,15 +632,15 @@ version = "0.2.1"
criteria = "safe-to-deploy"
[[exemptions.raw-cpuid]]
version = "10.3.0"
version = "10.6.0"
criteria = "safe-to-deploy"
[[exemptions.rayon]]
version = "1.5.1"
version = "1.5.3"
criteria = "safe-to-deploy"
[[exemptions.rayon-core]]
version = "1.9.1"
version = "1.9.3"
criteria = "safe-to-deploy"
[[exemptions.reddsa]]
@ -652,7 +652,7 @@ version = "0.5.0"
criteria = "safe-to-deploy"
[[exemptions.redox_syscall]]
version = "0.2.13"
version = "0.2.16"
criteria = "safe-to-deploy"
[[exemptions.redox_users]]
@ -660,7 +660,7 @@ version = "0.4.3"
criteria = "safe-to-deploy"
[[exemptions.regex]]
version = "1.5.5"
version = "1.6.0"
criteria = "safe-to-deploy"
[[exemptions.regex-automata]]
@ -668,7 +668,7 @@ version = "0.1.10"
criteria = "safe-to-deploy"
[[exemptions.regex-syntax]]
version = "0.6.25"
version = "0.6.27"
criteria = "safe-to-deploy"
[[exemptions.ring]]
@ -676,7 +676,7 @@ version = "0.16.20"
criteria = "safe-to-deploy"
[[exemptions.ripemd]]
version = "0.1.1"
version = "0.1.3"
criteria = "safe-to-deploy"
[[exemptions.rustc-demangle]]
@ -688,7 +688,7 @@ version = "2.1.0"
criteria = "safe-to-deploy"
[[exemptions.ryu]]
version = "1.0.10"
version = "1.0.11"
criteria = "safe-to-deploy"
[[exemptions.scopeguard]]
@ -716,7 +716,7 @@ version = "1.0.136"
criteria = "safe-to-deploy"
[[exemptions.serde_json]]
version = "1.0.81"
version = "1.0.86"
criteria = "safe-to-deploy"
[[exemptions.sha2]]
@ -736,11 +736,11 @@ version = "0.1.3"
criteria = "safe-to-deploy"
[[exemptions.smallvec]]
version = "1.8.0"
version = "1.10.0"
criteria = "safe-to-deploy"
[[exemptions.socket2]]
version = "0.4.4"
version = "0.4.7"
criteria = "safe-to-deploy"
[[exemptions.spin]]
@ -756,7 +756,7 @@ version = "2.4.1"
criteria = "safe-to-deploy"
[[exemptions.syn]]
version = "1.0.91"
version = "1.0.102"
criteria = "safe-to-deploy"
[[exemptions.synstructure]]
@ -784,7 +784,7 @@ version = "1.1.4"
criteria = "safe-to-deploy"
[[exemptions.time]]
version = "0.3.9"
version = "0.3.15"
criteria = "safe-to-deploy"
[[exemptions.time-macros]]
@ -792,7 +792,7 @@ version = "0.2.4"
criteria = "safe-to-deploy"
[[exemptions.tinyvec]]
version = "1.5.1"
version = "1.6.0"
criteria = "safe-to-deploy"
[[exemptions.tinyvec_macros]]
@ -800,7 +800,7 @@ version = "0.1.0"
criteria = "safe-to-deploy"
[[exemptions.tokio]]
version = "1.20.1"
version = "1.21.2"
criteria = "safe-to-deploy"
[[exemptions.toml]]
@ -808,11 +808,11 @@ version = "0.5.9"
criteria = "safe-to-deploy"
[[exemptions.tower-service]]
version = "0.3.1"
version = "0.3.2"
criteria = "safe-to-deploy"
[[exemptions.tracing]]
version = "0.1.32"
version = "0.1.37"
criteria = "safe-to-deploy"
[[exemptions.tracing-appender]]
@ -820,15 +820,15 @@ version = "0.2.2"
criteria = "safe-to-deploy"
[[exemptions.tracing-attributes]]
version = "0.1.20"
version = "0.1.23"
criteria = "safe-to-deploy"
[[exemptions.tracing-core]]
version = "0.1.24"
version = "0.1.30"
criteria = "safe-to-deploy"
[[exemptions.tracing-subscriber]]
version = "0.3.10"
version = "0.3.16"
criteria = "safe-to-deploy"
[[exemptions.try-lock]]
@ -840,15 +840,19 @@ version = "1.15.0"
criteria = "safe-to-deploy"
[[exemptions.uint]]
version = "0.9.3"
version = "0.9.4"
criteria = "safe-to-deploy"
[[exemptions.unicode-ident]]
version = "1.0.5"
criteria = "safe-to-deploy"
[[exemptions.unicode-normalization]]
version = "0.1.19"
version = "0.1.22"
criteria = "safe-to-deploy"
[[exemptions.unicode-xid]]
version = "0.2.2"
version = "0.2.4"
criteria = "safe-to-deploy"
[[exemptions.universal-hash]]
@ -884,31 +888,31 @@ version = "0.11.0+wasi-snapshot-preview1"
criteria = "safe-to-deploy"
[[exemptions.wasm-bindgen]]
version = "0.2.80"
version = "0.2.83"
criteria = "safe-to-deploy"
[[exemptions.wasm-bindgen-backend]]
version = "0.2.80"
version = "0.2.83"
criteria = "safe-to-deploy"
[[exemptions.wasm-bindgen-macro]]
version = "0.2.80"
version = "0.2.83"
criteria = "safe-to-deploy"
[[exemptions.wasm-bindgen-macro-support]]
version = "0.2.80"
version = "0.2.83"
criteria = "safe-to-deploy"
[[exemptions.wasm-bindgen-shared]]
version = "0.2.80"
version = "0.2.83"
criteria = "safe-to-deploy"
[[exemptions.web-sys]]
version = "0.3.57"
version = "0.3.60"
criteria = "safe-to-deploy"
[[exemptions.which]]
version = "4.2.5"
version = "4.3.0"
criteria = "safe-to-deploy"
[[exemptions.winapi]]

5
qa/zcash/postponed-updates.txt
View File

@ -19,12 +19,17 @@ native_ccache 4.6 2022-11-01
native_ccache 4.6.1 2022-11-01
native_ccache 4.6.2 2022-11-01
native_ccache 4.6.3 2022-11-01
native_ccache 4.7 2022-11-01
# Clang and Rust are currently pinned to LLVM 14
libcxx 15.0.0 2022-11-01
libcxx 15.0.1 2022-11-01
libcxx 15.0.2 2022-11-01
libcxx 15.0.3 2022-11-01
native_clang 15.0.0 2022-11-01
native_clang 15.0.1 2022-11-01
native_clang 15.0.2 2022-11-01
native_clang 15.0.3 2022-11-01
# We're never updating to this version
bdb 18.1.40 2024-02-01

4
qa/zcash/updatecheck.py
View File

@ -411,8 +411,8 @@ def main():
print("""
You should also check the Rust dependencies using cargo:
cargo install cargo-outdated cargo-audit
cargo outdated
cargo install cargo-upgrades cargo-audit
cargo upgrades
cargo audit
""")
if status == 0:

2
src/clientversion.h
View File

@ -16,7 +16,7 @@
//! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 5
#define CLIENT_VERSION_MINOR 2
#define CLIENT_VERSION_MINOR 3
#define CLIENT_VERSION_REVISION 0
#define CLIENT_VERSION_BUILD 50

2
src/deprecation.h
View File

@ -10,7 +10,7 @@
// Per https://zips.z.cash/zip-0200
// Shut down nodes running this version of code, 16 weeks' worth of blocks after the estimated
// release block height. A warning is shown during the 14 days' worth of blocks prior to shut down.
static const int APPROX_RELEASE_HEIGHT = 1750350;
static const int APPROX_RELEASE_HEIGHT = 1849900;
static const int RELEASE_TO_DEPRECATION_WEEKS = 16;
static const int EXPECTED_BLOCKS_PER_HOUR = 3600 / Consensus::POST_BLOSSOM_POW_TARGET_SPACING;
static_assert(EXPECTED_BLOCKS_PER_HOUR == 48, "The value of Consensus::POST_BLOSSOM_POW_TARGET_SPACING was chosen such that this assertion holds.");

8
src/gtest/utils.cpp
View File

@ -1,6 +1,8 @@
#include "gtest/utils.h"
#include "rpc/server.h"
#ifdef ENABLE_WALLET
#include "wallet/wallet.h"
#endif
int GenZero(int n)
{
@ -35,6 +37,8 @@ void LoadProofParameters() {
);
}
#ifdef ENABLE_WALLET
void LoadGlobalWallet() {
CCoinsViewDB *pcoinsdbview;
bool fFirstRun;
@ -66,4 +70,6 @@ void UnloadGlobalWallet() {
bitdb.Flush(true);
bitdb.Reset();
}
}
#endif

6
src/init.cpp
View File

@ -474,12 +474,12 @@ std::string HelpMessage(HelpMessageMode mode)
CURRENCY_UNIT, FormatMoney(DEFAULT_MIN_RELAY_TX_FEE)));
strUsage += HelpMessageOpt("-maxtxfee=<amt>", strprintf(_("Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)"),
CURRENCY_UNIT, FormatMoney(DEFAULT_TRANSACTION_MAXFEE)));
strUsage += HelpMessageOpt("-printtoconsole", strprintf(_("Send trace/debug info to console instead of %s"), GetDebugLogPath()));
strUsage += HelpMessageOpt("-printtoconsole", _("Send trace/debug info to console instead of the debug log"));
if (showDebug)
{
strUsage += HelpMessageOpt("-printpriority", strprintf("Log transaction priority and fee per kB when mining blocks (default: %u)", DEFAULT_PRINTPRIORITY));
}
// strUsage += HelpMessageOpt("-shrinkdebugfile", strprintf(_("Shrink %s on client startup (default: 1 when no -debug)"), GetDebugLogPath()));
// strUsage += HelpMessageOpt("-shrinkdebugfile", _("Shrink the debug log on client startup (default: 1 when no -debug)"));
AppendParamsHelpMessages(strUsage, showDebug);
@ -1524,7 +1524,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
RegisterNodeSignals(GetNodeSignals());
// sanitize comments per BIP-0014, format user agent and check total size
std::vector<string> uacomments;
std::vector<std::string> uacomments;
for (std::string cmt : mapMultiArgs["-uacomment"])
{
if (cmt != SanitizeString(cmt, SAFE_CHARS_UA_COMMENT))

4
src/rust/bin/inspect/block.rs
View File

@ -186,8 +186,8 @@ impl Block {
mutated = true;
}
let mut inner_hasher = Sha256::new();
inner_hasher.update(&merkle_tree[j + i]);
inner_hasher.update(&merkle_tree[j + i2]);
inner_hasher.update(merkle_tree[j + i]);
inner_hasher.update(merkle_tree[j + i2]);
merkle_tree.push(Sha256::digest(&inner_hasher.finalize()));
i += 2;
}

2
src/rust/bin/inspect/transaction.rs
View File

@ -261,7 +261,7 @@ pub(crate) fn inspect(tx: Transaction, context: Option<Context>) {
let ctx = Secp256k1::<VerifyOnly>::gen_new();
for (i, (txin, coin)) in bundle.vin.iter().zip(coins).enumerate() {
match coin.script_pubkey.address() {
match coin.recipient_address() {
Some(addr @ TransparentAddress::PublicKey(_)) => {
// Format is [sig_and_type_len] || sig || [hash_type] || [pubkey_len] || pubkey
// where [x] encodes a single byte.

2
src/rust/src/builder_ffi.rs
View File

@ -171,7 +171,7 @@ pub extern "C" fn orchard_unauthorized_bundle_prove_and_sign(
let mut rng = OsRng;
let res = bundle
.create_proof(pk, &mut rng)
.and_then(|b| b.apply_signatures(&mut rng, *sighash, &signing_keys));
.and_then(|b| b.apply_signatures(rng, *sighash, &signing_keys));
match res {
Ok(signed) => Box::into_raw(Box::new(signed)),

2
src/rust/src/incremental_merkle_tree.rs
View File

@ -17,7 +17,7 @@ use zcash_primitives::merkle_tree::{
pub fn write_checkpoint_v2<W: Write>(mut writer: W, checkpoint: &Checkpoint) -> io::Result<()> {
write_usize_leu64(&mut writer, checkpoint.bridges_len())?;
writer.write_u8(if checkpoint.is_witnessed() { 1 } else { 0 })?;
writer.write_u8(u8::from(checkpoint.is_witnessed()))?;
Vector::write_sized(&mut writer, checkpoint.witnessed().iter(), |w, p| {
write_position(w, *p)
})?;

2
src/rust/src/metrics_ffi.rs
View File

@ -28,7 +28,7 @@ pub extern "C" fn metrics_run(
}
};
// We always allow localhost.
allow_ips.extend(&["127.0.0.0/8", "::1/128"]);
allow_ips.extend(["127.0.0.0/8", "::1/128"]);
// Parse the address to bind to.
let bind_address = SocketAddr::new(

13
src/rust/src/rustzcash.rs
View File

@ -46,10 +46,9 @@ use std::os::windows::ffi::OsStringExt;
use zcash_primitives::{
constants::{CRH_IVK_PERSONALIZATION, PROOF_GENERATION_KEY_GENERATOR, SPENDING_KEY_GENERATOR},
sapling::{
keys::FullViewingKey, note_encryption::sapling_ka_agree, redjubjub, Diversifier, Note,
NullifierDerivingKey, Rseed,
keys::FullViewingKey, merkle_hash, note_encryption::sapling_ka_agree, redjubjub, spend_sig,
Diversifier, Note, NullifierDerivingKey, Rseed,
},
sapling::{merkle_hash, spend_sig},
zip32::{self, sapling_address, sapling_derive_internal_fvk, sapling_find_address},
};
use zcash_proofs::{load_parameters, sprout};
@ -757,7 +756,7 @@ pub extern "C" fn librustzcash_zip32_sapling_derive_internal_fvk(
dk_ret: *mut [c_uchar; 32],
) {
let fvk = FullViewingKey::read(&unsafe { *fvk }[..]).expect("valid Sapling FullViewingKey");
let dk = zip32::DiversifierKey::from_bytes(unsafe { *dk });
let dk = zip32::sapling::DiversifierKey::from_bytes(unsafe { *dk });
let (fvk_internal, dk_internal) = sapling_derive_internal_fvk(&fvk, &dk);
let fvk_ret = unsafe { &mut *fvk_ret };
@ -776,7 +775,7 @@ pub extern "C" fn librustzcash_zip32_sapling_address(
addr_ret: *mut [c_uchar; 43],
) -> bool {
let fvk = FullViewingKey::read(&unsafe { *fvk }[..]).expect("valid Sapling FullViewingKey");
let dk = zip32::DiversifierKey::from_bytes(unsafe { *dk });
let dk = zip32::sapling::DiversifierKey::from_bytes(unsafe { *dk });
let j = zip32::DiversifierIndex(unsafe { *j });
match sapling_address(&fvk, &dk, j) {
@ -800,7 +799,7 @@ pub extern "C" fn librustzcash_zip32_find_sapling_address(
addr_ret: *mut [c_uchar; 43],
) -> bool {
let fvk = FullViewingKey::read(&unsafe { *fvk }[..]).expect("valid Sapling FullViewingKey");
let dk = zip32::DiversifierKey::from_bytes(unsafe { *dk });
let dk = zip32::sapling::DiversifierKey::from_bytes(unsafe { *dk });
let j = zip32::DiversifierIndex(unsafe { *j });
match sapling_find_address(&fvk, &dk, j) {
@ -823,7 +822,7 @@ pub extern "C" fn librustzcash_sapling_diversifier_index(
d: *const [c_uchar; 11],
j_ret: *mut [c_uchar; 11],
) {
let dk = zip32::DiversifierKey::from_bytes(unsafe { *dk });
let dk = zip32::sapling::DiversifierKey::from_bytes(unsafe { *dk });
let diversifier = Diversifier(unsafe { *d });
let j_ret = unsafe { &mut *j_ret };

6
zcutil/make-release.py
View File

@ -246,7 +246,8 @@ def patch_version_in_files(release, releaseprev):
patch_README(release, releaseprev)
patch_clientversion_h(release)
patch_configure_ac(release)
patch_gitian_linux_yml(release, releaseprev)
patch_gitian_linux_yml(release, releaseprev, 'contrib/gitian-descriptors/gitian-linux.yml')
patch_gitian_linux_yml(release, releaseprev, 'contrib/gitian-descriptors/gitian-linux-parallel.yml')
@phase('Patching release height for end-of-support halt.')
@ -374,8 +375,7 @@ def patch_configure_ac(release):
)
def patch_gitian_linux_yml(release, releaseprev):
path = 'contrib/gitian-descriptors/gitian-linux.yml'
def patch_gitian_linux_yml(release, releaseprev, path):
with PathPatcher(path) as (inf, outf):
outf.write(inf.readline())