From 3b9f7c2a69ecc2f532db3f76a963c005f03f3835 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 23 Sep 2022 18:05:08 +0000 Subject: [PATCH 01/29] rust: Update to `metrics 0.20` --- Cargo.lock | 72 ++++++++++++++++--------------------- Cargo.toml | 4 +-- qa/supply-chain/audits.toml | 48 +++++++++++++++++++++++++ qa/supply-chain/config.toml | 14 +++----- 4 files changed, 85 insertions(+), 53 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d7ed55c5e..642a671a4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -77,15 +77,6 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" -[[package]] -name = "atomic-shim" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cd4b51d303cf3501c301e8125df442128d3c6d7c69f71b27833d253de47e77" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -751,9 +742,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.11.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ "ahash", ] @@ -883,9 +874,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.8.1" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", "hashbrown", @@ -900,15 +891,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if 1.0.0", -] - [[package]] name = "ipnet" version = "2.4.0" @@ -1089,19 +1071,20 @@ dependencies = [ [[package]] name = "metrics" -version = "0.19.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "142c53885123b68d94108295a09d4afe1a1388ed95b54d5dacd9a454753030f2" +checksum = "7b9b8653cec6897f73b519a43fba5ee3d50f62fe9af80b428accdcc093b4a849" dependencies = [ "ahash", "metrics-macros", + "portable-atomic", ] [[package]] name = "metrics-exporter-prometheus" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953cbbb6f9ba4b9304f4df79b98cdc9d14071ed93065a9fca11c00c5d9181b66" +checksum = "8603921e1f54ef386189335f288441af761e0fc61bcb552168d9cedfe63ebc70" dependencies = [ "hyper", "indexmap", @@ -1109,6 +1092,7 @@ dependencies = [ "metrics", "metrics-util", "parking_lot", + "portable-atomic", "quanta", "thiserror", "tokio", @@ -1117,9 +1101,9 @@ dependencies = [ [[package]] name = "metrics-macros" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49e30813093f757be5cf21e50389a24dc7dbb22c49f23b7e8f51d69b508a5ffa" +checksum = "731f8ecebd9f3a4aa847dfe75455e4757a45da40a7793d2f0b1f9b6ed18b23f3" dependencies = [ "proc-macro2", "quote", @@ -1128,17 +1112,17 @@ dependencies = [ [[package]] name = "metrics-util" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1f4b69bef1e2b392b2d4a12902f2af90bb438ba4a66aa222d1023fa6561b50" +checksum = "f7d24dc2dbae22bff6f1f9326ffce828c9f07ef9cc1e8002e5279f845432a30a" dependencies = [ - "atomic-shim", "crossbeam-epoch", "crossbeam-utils", "hashbrown", "metrics", "num_cpus", "parking_lot", + "portable-atomic", "quanta", "sketches-ddsketch", ] @@ -1326,27 +1310,25 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.11.2" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ - "instant", "lock_api", "parking_lot_core", ] [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" dependencies = [ "cfg-if 1.0.0", - "instant", "libc", "redox_syscall", "smallvec", - "winapi", + "windows-sys", ] [[package]] @@ -1446,6 +1428,12 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "portable-atomic" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16" + [[package]] name = "ppv-lite86" version = "0.2.16" @@ -1484,9 +1472,9 @@ dependencies = [ [[package]] name = "quanta" -version = "0.9.3" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20afe714292d5e879d8b12740aa223c6a88f118af41870e8b6196e39a02238a8" +checksum = "b7e31331286705f455e56cca62e0e717158474ff02b7936c1fa596d983f4ae27" dependencies = [ "crossbeam-utils", "libc", @@ -1841,9 +1829,9 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "sketches-ddsketch" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04d2ecae5fcf33b122e2e6bd520a57ccf152d2dde3b38c71039df1a6867264ee" +checksum = "ceb945e54128e09c43d8e4f1277851bd5044c6fc540bbaa2ad888f60b3da9ae7" [[package]] name = "smallvec" diff --git a/Cargo.toml b/Cargo.toml index ca5e1ea45..bf81d1bbc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -74,8 +74,8 @@ 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" diff --git a/qa/supply-chain/audits.toml b/qa/supply-chain/audits.toml index 218de0bf2..535438234 100644 --- a/qa/supply-chain/audits.toml +++ b/qa/supply-chain/audits.toml @@ -148,6 +148,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 " +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 " criteria = "safe-to-deploy" @@ -166,6 +172,26 @@ 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 " +criteria = "safe-to-deploy" +delta = "0.19.0 -> 0.20.1" + +[[audits.metrics-exporter-prometheus]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.10.0 -> 0.11.0" + +[[audits.metrics-macros]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.5.1 -> 0.6.0" + +[[audits.metrics-util]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.13.0 -> 0.14.0" + [[audits.mio]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -204,6 +230,17 @@ 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.parking_lot]] +who = "Jack Grigg " +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 " +criteria = "safe-to-deploy" +delta = "0.8.5 -> 0.9.3" + [[audits.poly1305]] who = "Daira Hopwood " criteria = "safe-to-deploy" @@ -215,6 +252,11 @@ who = "Daira Hopwood " criteria = "safe-to-deploy" delta = "1.0.37 -> 1.0.41" +[[audits.quanta]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.9.3 -> 0.10.1" + [[audits.serde]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -227,6 +269,12 @@ criteria = "safe-to-deploy" delta = "1.0.136 -> 1.0.143" notes = "Bumps syn, inverts some build flags." +[[audits.sketches-ddsketch]] +who = "Jack Grigg " +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 " criteria = "safe-to-deploy" diff --git a/qa/supply-chain/config.toml b/qa/supply-chain/config.toml index 7b050b277..70cfaf6bf 100644 --- a/qa/supply-chain/config.toml +++ b/qa/supply-chain/config.toml @@ -67,10 +67,6 @@ 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" @@ -324,7 +320,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]] @@ -379,10 +375,6 @@ 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" criteria = "safe-to-deploy" @@ -571,6 +563,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" From 1f836859f3df05df3223030c71c6f5c09d2bc917 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Mon, 10 Oct 2022 18:56:12 +0000 Subject: [PATCH 02/29] depends: Update cxx to 1.0.78 --- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- depends/packages/native_cxxbridge.mk | 4 ++-- qa/supply-chain/audits.toml | 15 +++++++++++++++ 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 642a671a4..25984e484 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -442,9 +442,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd0492b760d2a9b9c5d1e2132db2dcbba07a2045df6f14694b136eec5b2053ef" +checksum = "19f39818dcfc97d45b03953c1292efc4e80954e1583c4aa770bac1383e2310a4" dependencies = [ "cc", "cxxbridge-flags", @@ -454,15 +454,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ebfd09b0a600cf97b53c16eec6591893cbcaffe3f98c17c4e89b3b3a672c33a" +checksum = "56a46460b88d1cec95112c8c363f0e2c39afdb237f60583b0b36343bf627ea9c" [[package]] name = "cxxbridge-macro" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1ccac323f5afe0678c7129b8346c2be2d2213d8c58507facfb4987d109abf1b" +checksum = "747b608fecf06b0d72d440f27acc99288207324b793be2c17991839f3d4995ea" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index bf81d1bbc..389b01848 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -67,7 +67,7 @@ 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.78", features = ["c++17"] } # Rust threading rayon = "1.5" diff --git a/depends/packages/native_cxxbridge.mk b/depends/packages/native_cxxbridge.mk index 8a8e56b79..d135fbe5c 100644 --- a/depends/packages/native_cxxbridge.mk +++ b/depends/packages/native_cxxbridge.mk @@ -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.78 $(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=0cf9aa04757dff1bb7a2aa569b9f363392e953532a14ec0cadf7335fe12b2728 $(package)_build_subdir=gen/cmd $(package)_dependencies=native_rust $(package)_extra_sources=$(package)-$($(package)_version)-vendored.tar.gz diff --git a/qa/supply-chain/audits.toml b/qa/supply-chain/audits.toml index 535438234..2d9ece217 100644 --- a/qa/supply-chain/audits.toml +++ b/qa/supply-chain/audits.toml @@ -77,6 +77,11 @@ 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 " +criteria = "safe-to-deploy" +delta = "1.0.76 -> 1.0.78" + [[audits.cxxbridge-flags]] who = "Daira Hopwood " criteria = "safe-to-deploy" @@ -87,6 +92,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.72 -> 1.0.76" +[[audits.cxxbridge-flags]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.76 -> 1.0.78" + [[audits.cxxbridge-macro]] who = "Daira Hopwood " criteria = "safe-to-deploy" @@ -97,6 +107,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.72 -> 1.0.76" +[[audits.cxxbridge-macro]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.76 -> 1.0.78" + [[audits.equihash]] who = "Jack Grigg " criteria = "safe-to-deploy" From f7b59a5ddbab5b903b94390ef65a6e12a799b0fc Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Mon, 10 Oct 2022 18:56:49 +0000 Subject: [PATCH 03/29] qa: Postpone Clang 15.0.2 --- qa/zcash/postponed-updates.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qa/zcash/postponed-updates.txt b/qa/zcash/postponed-updates.txt index d735dd658..f58a06b9a 100644 --- a/qa/zcash/postponed-updates.txt +++ b/qa/zcash/postponed-updates.txt @@ -23,8 +23,10 @@ native_ccache 4.6.3 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 native_clang 15.0.0 2022-11-01 native_clang 15.0.1 2022-11-01 +native_clang 15.0.2 2022-11-01 # We're never updating to this version bdb 18.1.40 2024-02-01 From 9a69c2b01e0518e7e1297d20f2837b45cee6e54c Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Mon, 10 Oct 2022 19:04:39 +0000 Subject: [PATCH 04/29] rust: Update to `cpufeatures 0.2.5` Closes zcash/zcash#6195. --- Cargo.lock | 4 ++-- qa/supply-chain/audits.toml | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 25984e484..0008c3e27 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -348,9 +348,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "cpufeatures" -version = "0.2.2" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" dependencies = [ "libc", ] diff --git a/qa/supply-chain/audits.toml b/qa/supply-chain/audits.toml index 2d9ece217..b0be90127 100644 --- a/qa/supply-chain/audits.toml +++ b/qa/supply-chain/audits.toml @@ -60,6 +60,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 " +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 " criteria = ["crypto-reviewed", "safe-to-deploy"] From 13657342c870fcffe055c48772503a29db6073e2 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Mon, 10 Oct 2022 19:05:51 +0000 Subject: [PATCH 05/29] qa: Recommend cargo-upgrades instead of cargo-outdated Closes zcash/zcash#6090. --- qa/zcash/updatecheck.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/zcash/updatecheck.py b/qa/zcash/updatecheck.py index 75d903aee..9a4b8342d 100755 --- a/qa/zcash/updatecheck.py +++ b/qa/zcash/updatecheck.py @@ -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: From 2477ef9c4b20d06e4546176a523396a80b7bdf3b Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Tue, 11 Oct 2022 04:07:54 +0000 Subject: [PATCH 06/29] rust: Audit some dependency updates --- Cargo.lock | 36 +++++++++++++------------- qa/supply-chain/audits.toml | 50 +++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0008c3e27..b8cfc0de5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -61,9 +61,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.61" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "508b352bb5c066aac251f6daf6b36eccd03e8a88e8081cd44959ea277a3af9a8" +checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" [[package]] name = "arrayref" @@ -940,9 +940,9 @@ checksum = "ec647867e2bf0772e28c8bcde4f0d19a9216916e890543b5a03ed8ef27b8f259" [[package]] name = "libm" -version = "0.2.2" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db" +checksum = "292a948cd991e376cf75541fe5b97a1081d713c618b4f1b9500f8844e49eb565" [[package]] name = "librustzcash" @@ -1001,18 +1001,18 @@ dependencies = [ [[package]] name = "link-cplusplus" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cae2cd7ba2f3f63938b9c724475dfb7b9861b545a90324476324ed21dbc8c8" +checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" dependencies = [ "cc", ] [[package]] name = "lock_api" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" dependencies = [ "autocfg", "scopeguard", @@ -1020,9 +1020,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.16" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if 1.0.0", ] @@ -1770,18 +1770,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.143" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553" +checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.143" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391" +checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" dependencies = [ "proc-macro2", "quote", @@ -1911,18 +1911,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.32" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.32" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" dependencies = [ "proc-macro2", "quote", diff --git a/qa/supply-chain/audits.toml b/qa/supply-chain/audits.toml index b0be90127..e7a9d3dfa 100644 --- a/qa/supply-chain/audits.toml +++ b/qa/supply-chain/audits.toml @@ -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 " +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 " criteria = ["crypto-reviewed", "safe-to-deploy"] @@ -187,6 +193,28 @@ criteria = "safe-to-deploy" delta = "1.0.1 -> 1.0.3" notes = "Update makes no changes to code." +[[audits.libm]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.2.2 -> 0.2.5" + +[[audits.link-cplusplus]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.6 -> 1.0.7" + +[[audits.lock_api]] +who = "Jack Grigg " +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 " +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 " criteria = "safe-to-deploy" @@ -284,12 +312,22 @@ criteria = "safe-to-deploy" delta = "1.0.136 -> 1.0.143" notes = "Bumps serde-derive and adds some constructors." +[[audits.serde]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.143 -> 1.0.145" + [[audits.serde_derive]] who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.136 -> 1.0.143" notes = "Bumps syn, inverts some build flags." +[[audits.serde_derive]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.143 -> 1.0.145" + [[audits.sketches-ddsketch]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -307,12 +345,24 @@ criteria = "safe-to-deploy" delta = "1.0.30 -> 1.0.32" notes = "Bumps thiserror-impl, no code changes." +[[audits.thiserror]] +who = "Jack Grigg " +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 " 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 " +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 " criteria = "safe-to-deploy" From 4871fba26ac37672e1acb92ef96b478ed5d3c9cf Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Tue, 11 Oct 2022 10:13:41 +0000 Subject: [PATCH 07/29] rust: Update remaining dependencies The audit exemptions have been regenerated for these dependencies. --- Cargo.lock | 357 ++++++++++++++++++------------------ qa/supply-chain/config.toml | 152 +++++++-------- 2 files changed, 260 insertions(+), 249 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b8cfc0de5..506df5197 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -50,15 +50,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anyhow" version = "1.0.65" @@ -85,9 +76,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.64" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f" +checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" dependencies = [ "addr2line", "cc", @@ -126,7 +117,7 @@ dependencies = [ "log", "num_cpus", "pairing", - "rand_core 0.6.3", + "rand_core 0.6.4", "rayon", "subtle", ] @@ -153,9 +144,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ "funty", "radium", @@ -196,9 +187,9 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" dependencies = [ "generic-array", ] @@ -228,7 +219,7 @@ dependencies = [ "ff", "group", "pairing", - "rand_core 0.6.3", + "rand_core 0.6.4", "subtle", ] @@ -243,9 +234,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.8.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c" +checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" [[package]] name = "byte-slice-cast" @@ -261,9 +252,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.1.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" +checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" [[package]] name = "cc" @@ -357,9 +348,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -367,9 +358,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", @@ -378,26 +369,24 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.8" +version = "0.9.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" +checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" dependencies = [ "autocfg", "cfg-if 1.0.0", "crossbeam-utils", - "lazy_static", "memoffset", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.8" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" +checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" dependencies = [ "cfg-if 1.0.0", - "lazy_static", ] [[package]] @@ -413,7 +402,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core 0.6.3", + "rand_core 0.6.4", "typenum", ] @@ -480,11 +469,11 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" dependencies = [ - "block-buffer 0.10.2", + "block-buffer 0.10.3", "crypto-common", ] @@ -526,7 +515,7 @@ checksum = "403ef3e961ab98f0ba902771d29f842058578bb1ce7e3c59dad5a6a93e784c69" dependencies = [ "curve25519-dalek", "hex", - "rand_core 0.6.3", + "rand_core 0.6.4", "serde", "sha2", "thiserror", @@ -535,9 +524,9 @@ dependencies = [ [[package]] name = "either" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" [[package]] name = "equihash" @@ -563,7 +552,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df689201f395c6b90dfe87127685f8dbfc083a5e779e613575d8bd7314300c3e" dependencies = [ "bitvec", - "rand_core 0.6.3", + "rand_core 0.6.4", "subtle", ] @@ -607,30 +596,30 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures-channel" -version = "0.3.21" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.21" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" +checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" [[package]] name = "futures-task" -version = "0.3.21" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" +checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" [[package]] name = "futures-util" -version = "0.3.21" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" dependencies = [ "futures-core", "futures-task", @@ -640,9 +629,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.5" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ "typenum", "version_check", @@ -672,9 +661,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" +checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" [[package]] name = "group" @@ -683,7 +672,7 @@ source = "git+https://github.com/zkcrypto/group.git?rev=f61e3e420ed1220c8f1f8098 dependencies = [ "ff", "memuse", - "rand_core 0.6.3", + "rand_core 0.6.4", "subtle", ] @@ -735,7 +724,7 @@ dependencies = [ "ff", "group", "pasta_curves", - "rand_core 0.6.3", + "rand_core 0.6.4", "rayon", "tracing", ] @@ -756,7 +745,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cd89bf343be18dbe1e505100e48168bbd084760e842a8fed0317d2361470193" dependencies = [ "lazy_static", - "rand_core 0.6.3", + "rand_core 0.6.4", "ring", "secp256k1", ] @@ -788,9 +777,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ "bytes", "fnv", @@ -799,9 +788,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", "http", @@ -810,9 +799,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" @@ -822,9 +811,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.18" +version = "0.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2" +checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" dependencies = [ "bytes", "futures-channel", @@ -893,21 +882,21 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e70ee094dc02fd9c13fdad4940090f22dbd6ac7c9e7094a46cf0232a50bc7c" +checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" [[package]] name = "itoa" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" +checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" [[package]] name = "js-sys" -version = "0.3.57" +version = "0.3.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" dependencies = [ "wasm-bindgen", ] @@ -922,7 +911,7 @@ dependencies = [ "bls12_381", "ff", "group", - "rand_core 0.6.3", + "rand_core 0.6.4", "subtle", ] @@ -934,9 +923,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.122" +version = "0.2.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec647867e2bf0772e28c8bcde4f0d19a9216916e890543b5a03ed8ef27b8f259" +checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c" [[package]] name = "libm" @@ -975,7 +964,7 @@ dependencies = [ "nonempty", "orchard", "rand 0.8.5", - "rand_core 0.6.3", + "rand_core 0.6.4", "rayon", "secp256k1", "secrecy", @@ -1047,9 +1036,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" @@ -1129,12 +1118,11 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.4.4" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" dependencies = [ "adler", - "autocfg", ] [[package]] @@ -1176,6 +1164,16 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7" +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num-bigint" version = "0.4.3" @@ -1199,9 +1197,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] @@ -1218,27 +1216,27 @@ dependencies = [ [[package]] name = "num_threads" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" dependencies = [ "libc", ] [[package]] name = "object" -version = "0.27.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" +checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.10.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" +checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" [[package]] name = "opaque-debug" @@ -1273,6 +1271,12 @@ dependencies = [ "zcash_note_encryption", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "pairing" version = "0.22.0" @@ -1284,9 +1288,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.1.2" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b44461635bbb1a0300f100a841e571e7d919c81c73075ef5d152ffdb521066" +checksum = "366e44391a8af4cfd6002ef6ba072bae071a96aafca98d7d448a34c5dca38b6a" dependencies = [ "arrayvec", "bitvec", @@ -1298,9 +1302,9 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.1.2" +version = "3.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c45ed1f39709f5a89338fab50e59816b2e8815f5bb58276e7ddf9afd495f73f8" +checksum = "9299338969a3d2f491d65f140b00ddec470858402f888af98e8642fb5e8965cd" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -1338,7 +1342,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d791538a6dcc1e7cb7fe6f6b58aca40e7f79403c45b2bc274008b5e647af1d8" dependencies = [ "base64ct", - "rand_core 0.6.3", + "rand_core 0.6.4", "subtle", ] @@ -1407,9 +1411,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" @@ -1453,19 +1457,20 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.1.3" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" +checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" dependencies = [ + "once_cell", "thiserror", "toml", ] [[package]] name = "proc-macro2" -version = "1.0.41" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdcc2916cde080c1876ff40292a396541241fe0072ef928cd76582e9ea5d60d2" +checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" dependencies = [ "unicode-ident", ] @@ -1488,9 +1493,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.17" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" dependencies = [ "proc-macro2", ] @@ -1523,7 +1528,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -1543,7 +1548,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -1557,9 +1562,9 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ "getrandom 0.2.7", ] @@ -1584,18 +1589,18 @@ dependencies = [ [[package]] name = "raw-cpuid" -version = "10.3.0" +version = "10.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "738bc47119e3eeccc7e94c4a506901aea5e7b4944ecd0829cbebf4af04ceda12" +checksum = "a6823ea29436221176fe662da99998ad3b4db2c7f31e7b6f5fe43adccd6320bb" dependencies = [ "bitflags", ] [[package]] name = "rayon" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" dependencies = [ "autocfg", "crossbeam-deque", @@ -1605,14 +1610,13 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" dependencies = [ "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "lazy_static", "num_cpus", ] @@ -1627,7 +1631,7 @@ dependencies = [ "group", "jubjub", "pasta_curves", - "rand_core 0.6.3", + "rand_core 0.6.4", "serde", "thiserror", "zeroize", @@ -1643,7 +1647,7 @@ dependencies = [ "byteorder", "digest 0.9.0", "jubjub", - "rand_core 0.6.3", + "rand_core 0.6.4", "serde", "thiserror", "zeroize", @@ -1651,9 +1655,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.13" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ "bitflags", ] @@ -1671,9 +1675,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.5" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" dependencies = [ "regex-syntax", ] @@ -1689,9 +1693,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.6.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" [[package]] name = "ring" @@ -1710,11 +1714,11 @@ dependencies = [ [[package]] name = "ripemd" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1facec54cb5e0dc08553501fa740091086d0259ad0067e0d4103448e4cb22ed3" +checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" dependencies = [ - "digest 0.10.3", + "digest 0.10.5", ] [[package]] @@ -1731,9 +1735,9 @@ checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" [[package]] name = "ryu" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" +checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" [[package]] name = "scopeguard" @@ -1790,9 +1794,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" +checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074" dependencies = [ "itoa", "ryu", @@ -1835,15 +1839,15 @@ checksum = "ceb945e54128e09c43d8e4f1277851bd5044c6fc540bbaa2ad888f60b3da9ae7" [[package]] name = "smallvec" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "socket2" -version = "0.4.4" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" dependencies = [ "libc", "winapi", @@ -1869,9 +1873,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.98" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" dependencies = [ "proc-macro2", "quote", @@ -1940,9 +1944,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.9" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" +checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c" dependencies = [ "itoa", "libc", @@ -1958,9 +1962,9 @@ checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" [[package]] name = "tinyvec" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] @@ -1973,14 +1977,13 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.20.1" +version = "1.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581" +checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" dependencies = [ "autocfg", "libc", "mio", - "once_cell", "pin-project-lite", "socket2", "winapi", @@ -1997,15 +2000,15 @@ dependencies = [ [[package]] name = "tower-service" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.32" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if 1.0.0", "pin-project-lite", @@ -2026,9 +2029,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.20" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", @@ -2037,23 +2040,23 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.24" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90442985ee2f57c9e1b548ee72ae842f4a9a20e3f417cc38dbc5dc684d9bb4ee" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ - "lazy_static", + "once_cell", "valuable", ] [[package]] name = "tracing-subscriber" -version = "0.3.10" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9df98b037d039d03400d9dd06b0f8ce05486b5f25e9a2d7d36196e142ebbc52" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" dependencies = [ - "ansi_term", - "lazy_static", "matchers", + "nu-ansi-term", + "once_cell", "regex", "sharded-slab", "thread_local", @@ -2076,9 +2079,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "uint" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f03af7ccf01dd611cc450a0d10dbc9b745770d096473e2faf0ca6e2d66d1e0" +checksum = "a45526d29728d135c2900b0d30573fe3ee79fceb12ef534c7bb30e810a91b601" dependencies = [ "byteorder", "crunchy", @@ -2088,24 +2091,24 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] [[package]] name = "unicode-xid" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "universal-hash" @@ -2165,9 +2168,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.80" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -2175,13 +2178,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.80" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" dependencies = [ "bumpalo", - "lazy_static", "log", + "once_cell", "proc-macro2", "quote", "syn", @@ -2190,9 +2193,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.80" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2200,9 +2203,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.80" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2", "quote", @@ -2213,15 +2216,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.80" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" [[package]] name = "web-sys" -version = "0.3.57" +version = "0.3.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" dependencies = [ "js-sys", "wasm-bindgen", @@ -2229,13 +2232,13 @@ dependencies = [ [[package]] name = "which" -version = "4.2.5" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" +checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" dependencies = [ "either", - "lazy_static", "libc", + "once_cell", ] [[package]] @@ -2351,7 +2354,7 @@ dependencies = [ "chacha20poly1305", "cipher 0.4.3", "group", - "rand_core 0.6.3", + "rand_core 0.6.4", "subtle", ] @@ -2382,7 +2385,7 @@ dependencies = [ "nonempty", "orchard", "rand 0.8.5", - "rand_core 0.6.3", + "rand_core 0.6.4", "ripemd", "secp256k1", "sha2", @@ -2406,7 +2409,7 @@ dependencies = [ "group", "jubjub", "lazy_static", - "rand_core 0.6.3", + "rand_core 0.6.4", "redjubjub", "tracing", "zcash_primitives", diff --git a/qa/supply-chain/config.toml b/qa/supply-chain/config.toml index 70cfaf6bf..e14c25c9e 100644 --- a/qa/supply-chain/config.toml +++ b/qa/supply-chain/config.toml @@ -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" @@ -72,7 +68,7 @@ version = "1.1.0" criteria = "safe-to-deploy" [[exemptions.backtrace]] -version = "0.3.64" +version = "0.3.66" criteria = "safe-to-deploy" [[exemptions.base64ct]] @@ -96,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]] @@ -112,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]] @@ -132,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]] @@ -144,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]] @@ -184,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]] @@ -232,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]] @@ -252,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]] @@ -276,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]] @@ -304,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]] @@ -340,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]] @@ -356,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]] @@ -376,15 +372,15 @@ version = "1.8.1" 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]] @@ -396,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]] @@ -424,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]] @@ -452,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]] @@ -471,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" @@ -480,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]] @@ -488,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]] @@ -552,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]] @@ -576,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]] @@ -588,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]] @@ -616,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]] @@ -628,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]] @@ -648,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]] @@ -656,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]] @@ -664,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]] @@ -672,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]] @@ -684,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]] @@ -712,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]] @@ -732,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]] @@ -752,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]] @@ -780,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]] @@ -788,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]] @@ -796,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]] @@ -804,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]] @@ -816,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]] @@ -836,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]] @@ -880,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]] From 78d23a2a96f22b9f6ea421c94329980a7e94c60d Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Tue, 11 Oct 2022 11:17:23 +0000 Subject: [PATCH 08/29] make-release.py: Versioning changes for 5.3.0-rc1. --- README.md | 2 +- configure.ac | 4 ++-- contrib/gitian-descriptors/gitian-linux.yml | 2 +- src/clientversion.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7da3b3ffb..4ad2d15c9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Zcash 5.2.0 +Zcash 5.3.0-rc1 =========== diff --git a/configure.ac b/configure.ac index cce1a76d0..e40ff9dbd 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ 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(_CLIENT_VERSION_BUILD, 25) 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))) define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1))) define(_CLIENT_VERSION_IS_RELEASE, true) diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 3e5b385f4..e6ecc763c 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "zcash-5.2.0" +name: "zcash-5.3.0-rc1" enable_cache: true distro: "debian" suites: diff --git a/src/clientversion.h b/src/clientversion.h index c0af64569..cdf0f1dab 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -16,9 +16,9 @@ //! 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 +#define CLIENT_VERSION_BUILD 25 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true From 4f03ebb2a5d4bd03ded347fae739d9bf28eae049 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Tue, 11 Oct 2022 11:30:01 +0000 Subject: [PATCH 09/29] make-release.py: Updated manpages for 5.3.0-rc1. --- doc/man/zcash-cli.1 | 8 ++++---- doc/man/zcash-tx.1 | 8 ++++---- doc/man/zcashd-wallet-tool.1 | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1 index 0fdca7865..8a9632ab2 100644 --- a/doc/man/zcash-cli.1 +++ b/doc/man/zcash-cli.1 @@ -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-rc1" "User Commands" .SH NAME -zcash-cli \- manual page for zcash-cli v5.2.0 +zcash-cli \- manual page for zcash-cli v5.3.0-rc1 .SH DESCRIPTION -Zcash RPC client version v5.2.0 +Zcash RPC client version v5.3.0\-rc1 .PP In order to ensure you are adequately protecting your privacy when using Zcash, please see . diff --git a/doc/man/zcash-tx.1 b/doc/man/zcash-tx.1 index 948dbd3ea..7626ce290 100644 --- a/doc/man/zcash-tx.1 +++ b/doc/man/zcash-tx.1 @@ -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-rc1" "User Commands" .SH NAME -zcash-tx \- manual page for zcash-tx v5.2.0 +zcash-tx \- manual page for zcash-tx v5.3.0-rc1 .SH DESCRIPTION -Zcash zcash\-tx utility version v5.2.0 +Zcash zcash\-tx utility version v5.3.0\-rc1 .SS "Usage:" .TP zcash\-tx [options] [commands] diff --git a/doc/man/zcashd-wallet-tool.1 b/doc/man/zcashd-wallet-tool.1 index e51d09560..060784e72 100644 --- a/doc/man/zcashd-wallet-tool.1 +++ b/doc/man/zcashd-wallet-tool.1 @@ -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-rc1" "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-rc1 .SH SYNOPSIS .B zcashd-wallet-tool [\fI\,OPTIONS\/\fR] From 2b28a56c27d99aa4515e519d96026fe99532a861 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Tue, 11 Oct 2022 11:30:02 +0000 Subject: [PATCH 10/29] make-release.py: Updated release notes and changelog for 5.3.0-rc1. --- contrib/debian/changelog | 6 + doc/release-notes/release-notes-5.3.0-rc1.md | 176 +++++++++++++++++++ 2 files changed, 182 insertions(+) create mode 100644 doc/release-notes/release-notes-5.3.0-rc1.md diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 32fb6c5d2..e973ec7aa 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +zcash (5.3.0~rc1) stable; urgency=medium + + * 5.3.0-rc1 release. + + -- Electric Coin Company Tue, 11 Oct 2022 11:30:02 +0000 + zcash (5.2.0) stable; urgency=medium * 5.2.0 release. diff --git a/doc/release-notes/release-notes-5.3.0-rc1.md b/doc/release-notes/release-notes-5.3.0-rc1.md new file mode 100644 index 000000000..a737bc179 --- /dev/null +++ b/doc/release-notes/release-notes-5.3.0-rc1.md @@ -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. + From 8cb655c3ffa5980c123d53819c666621d7aec121 Mon Sep 17 00:00:00 2001 From: Greg Pfeil Date: Thu, 1 Sep 2022 09:44:59 -0600 Subject: [PATCH 11/29] Fix display of binary name in error messages. Ensures that test failures report the name of the actual binary that was run. --- qa/rpc-tests/test_framework/util.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py index 9d283258c..638f94035 100644 --- a/qa/rpc-tests/test_framework/util.py +++ b/qa/rpc-tests/test_framework/util.py @@ -54,6 +54,9 @@ PORT_MIN = 11000 PORT_RANGE = 5000 +def bitcoind_binary(): + return os.getenv("ZCASHD", ZCASHD_BINARY) + class PortSeed: # Must be initialized with a unique integer for each process n = None @@ -211,7 +214,7 @@ def wait_for_bitcoind_start(process, url, i): ''' while True: if process.poll() is not None: - raise Exception('bitcoind exited with status %i during initialization' % process.returncode) + raise Exception('%s exited with status %i during initialization' % (bitcoind_binary(), process.returncode)) try: rpc = get_rpc_proxy(url, i) rpc.getblockcount() @@ -257,7 +260,7 @@ def initialize_chain(test_dir, num_nodes, cachedir, cache_behavior='current'): block_time = int(time.time()) - (200 * PRE_BLOSSOM_BLOCK_TARGET_SPACING) for i in range(MAX_NODES): datadir = initialize_datadir(cachedir, i) - args = [ os.getenv("ZCASHD", ZCASHD_BINARY), "-keypool=1", "-datadir="+datadir, "-discover=0" ] + args = [ bitcoind_binary(), "-keypool=1", "-datadir="+datadir, "-discover=0" ] args.extend([ '-nuparams=5ba81b19:1', # Overwinter '-nuparams=76b809bb:1', # Sapling @@ -267,7 +270,7 @@ def initialize_chain(test_dir, num_nodes, cachedir, cache_behavior='current'): args.append("-connect=127.0.0.1:"+str(p2p_port(0))) bitcoind_processes[i] = subprocess.Popen(args) if os.getenv("PYTHON_DEBUG", ""): - print("initialize_chain: bitcoind started, waiting for RPC to come up") + print("initialize_chain: %s started, waiting for RPC to come up" % bitcoind_binary()) wait_for_bitcoind_start(bitcoind_processes[i], rpc_url(i), i) if os.getenv("PYTHON_DEBUG", ""): print("initialize_chain: RPC successfully started") @@ -438,9 +441,9 @@ def assert_start_raises_init_error(i, dirname, extra_args=None, expected_msg=Non raise AssertionError("Expected error \"" + expected_msg + "\" not found in:\n" + stderr) else: if expected_msg is None: - assert_msg = "bitcoind should have exited with an error" + assert_msg = "%s should have exited with an error" % bitcoind_binary() else: - assert_msg = "bitcoind should have exited with expected error " + expected_msg + assert_msg = "%s should have exited with expected error %s" % (bitcoind_binary(), expected_msg) raise AssertionError(assert_msg) def start_nodes(num_nodes, dirname, extra_args=None, rpchost=None, binary=None): From 1e480d2b4dd8722f67bb2ceaf8873624391f648c Mon Sep 17 00:00:00 2001 From: Greg Pfeil Date: Mon, 3 Oct 2022 14:33:16 -0600 Subject: [PATCH 12/29] Address review feedback and fixed test failures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some tests were checking error message strings, but the check was still hardcoded to “bitcoind”. --- qa/rpc-tests/test_framework/util.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py index 638f94035..bfbb72cef 100644 --- a/qa/rpc-tests/test_framework/util.py +++ b/qa/rpc-tests/test_framework/util.py @@ -54,7 +54,7 @@ PORT_MIN = 11000 PORT_RANGE = 5000 -def bitcoind_binary(): +def zcashd_binary(): return os.getenv("ZCASHD", ZCASHD_BINARY) class PortSeed: @@ -214,7 +214,7 @@ def wait_for_bitcoind_start(process, url, i): ''' while True: if process.poll() is not None: - raise Exception('%s exited with status %i during initialization' % (bitcoind_binary(), process.returncode)) + raise Exception('%s exited with status %i during initialization' % (zcashd_binary(), process.returncode)) try: rpc = get_rpc_proxy(url, i) rpc.getblockcount() @@ -260,7 +260,7 @@ def initialize_chain(test_dir, num_nodes, cachedir, cache_behavior='current'): block_time = int(time.time()) - (200 * PRE_BLOSSOM_BLOCK_TARGET_SPACING) for i in range(MAX_NODES): datadir = initialize_datadir(cachedir, i) - args = [ bitcoind_binary(), "-keypool=1", "-datadir="+datadir, "-discover=0" ] + args = [ zcashd_binary(), "-keypool=1", "-datadir="+datadir, "-discover=0" ] args.extend([ '-nuparams=5ba81b19:1', # Overwinter '-nuparams=76b809bb:1', # Sapling @@ -270,7 +270,7 @@ def initialize_chain(test_dir, num_nodes, cachedir, cache_behavior='current'): args.append("-connect=127.0.0.1:"+str(p2p_port(0))) bitcoind_processes[i] = subprocess.Popen(args) if os.getenv("PYTHON_DEBUG", ""): - print("initialize_chain: %s started, waiting for RPC to come up" % bitcoind_binary()) + print("initialize_chain: %s started, waiting for RPC to come up" % zcashd_binary()) wait_for_bitcoind_start(bitcoind_processes[i], rpc_url(i), i) if os.getenv("PYTHON_DEBUG", ""): print("initialize_chain: RPC successfully started") @@ -433,7 +433,7 @@ def assert_start_raises_init_error(i, dirname, extra_args=None, expected_msg=Non node = start_node(i, dirname, extra_args, stderr=log_stderr) stop_node(node, i) except Exception as e: - assert 'bitcoind exited' in str(e) #node must have shutdown + assert ("%s exited" % zcashd_binary()) in str(e) #node must have shutdown if expected_msg is not None: log_stderr.seek(0) stderr = log_stderr.read().decode('utf-8') @@ -441,9 +441,9 @@ def assert_start_raises_init_error(i, dirname, extra_args=None, expected_msg=Non raise AssertionError("Expected error \"" + expected_msg + "\" not found in:\n" + stderr) else: if expected_msg is None: - assert_msg = "%s should have exited with an error" % bitcoind_binary() + assert_msg = "%s should have exited with an error" % zcashd_binary() else: - assert_msg = "%s should have exited with expected error %s" % (bitcoind_binary(), expected_msg) + assert_msg = "%s should have exited with expected error %s" % (zcashd_binary(), expected_msg) raise AssertionError(assert_msg) def start_nodes(num_nodes, dirname, extra_args=None, rpchost=None, binary=None): From 774fa691aa879df3fe0e17954cefb496328c0911 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Sun, 9 Oct 2022 18:41:25 +0100 Subject: [PATCH 13/29] Always use a tuple as right argument of % in new Python code. Signed-off-by: Daira Hopwood --- qa/rpc-tests/test_framework/util.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py index bfbb72cef..13b439b10 100644 --- a/qa/rpc-tests/test_framework/util.py +++ b/qa/rpc-tests/test_framework/util.py @@ -270,7 +270,7 @@ def initialize_chain(test_dir, num_nodes, cachedir, cache_behavior='current'): args.append("-connect=127.0.0.1:"+str(p2p_port(0))) bitcoind_processes[i] = subprocess.Popen(args) if os.getenv("PYTHON_DEBUG", ""): - print("initialize_chain: %s started, waiting for RPC to come up" % zcashd_binary()) + print("initialize_chain: %s started, waiting for RPC to come up" % (zcashd_binary(),)) wait_for_bitcoind_start(bitcoind_processes[i], rpc_url(i), i) if os.getenv("PYTHON_DEBUG", ""): print("initialize_chain: RPC successfully started") @@ -433,7 +433,7 @@ def assert_start_raises_init_error(i, dirname, extra_args=None, expected_msg=Non node = start_node(i, dirname, extra_args, stderr=log_stderr) stop_node(node, i) except Exception as e: - assert ("%s exited" % zcashd_binary()) in str(e) #node must have shutdown + assert ("%s exited" % (zcashd_binary(),)) in str(e) #node must have shutdown if expected_msg is not None: log_stderr.seek(0) stderr = log_stderr.read().decode('utf-8') @@ -441,7 +441,7 @@ def assert_start_raises_init_error(i, dirname, extra_args=None, expected_msg=Non raise AssertionError("Expected error \"" + expected_msg + "\" not found in:\n" + stderr) else: if expected_msg is None: - assert_msg = "%s should have exited with an error" % zcashd_binary() + assert_msg = "%s should have exited with an error" % (zcashd_binary(),) else: assert_msg = "%s should have exited with expected error %s" % (zcashd_binary(), expected_msg) raise AssertionError(assert_msg) From 5c19487991ca1ca6b5e87337624cc33c2d86f75b Mon Sep 17 00:00:00 2001 From: Greg Pfeil Date: Mon, 17 Oct 2022 10:06:03 -0600 Subject: [PATCH 14/29] Add test for `zcashd --help` Currently failing. --- qa/pull-tester/rpc-tests.py | 1 + qa/rpc-tests/show_help.py | 504 ++++++++++++++++++++++++++++ qa/rpc-tests/test_framework/util.py | 2 +- 3 files changed, 506 insertions(+), 1 deletion(-) create mode 100755 qa/rpc-tests/show_help.py diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py index 72200a696..33755dca4 100755 --- a/qa/pull-tester/rpc-tests.py +++ b/qa/pull-tester/rpc-tests.py @@ -144,6 +144,7 @@ BASE_SCRIPTS= [ 'wallet_z_sendmany.py', 'wallet_zero_value.py', 'threeofthreerestore.py', + 'show_help.py', ] ZMQ_SCRIPTS = [ diff --git a/qa/rpc-tests/show_help.py b/qa/rpc-tests/show_help.py new file mode 100755 index 000000000..ff8458261 --- /dev/null +++ b/qa/rpc-tests/show_help.py @@ -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 . + +Usage: + zcashd [options] Start Zcash Daemon + +Options: + + -? + This help message + + -alerts + Receive and display P2P network alerts (default: 1) + + -alertnotify= + Execute command when a relevant alert is received or we see a really + long fork (%s in cmd is replaced by message) + + -allowdeprecated= + Explicitly allow the use of the specified deprecated feature. Multiple + instances of this parameter are permitted; values for 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= + Execute command when the best block changes (%s in cmd is replaced by + block hash) + + -checkblocks= + How many blocks to check at startup (default: 288, 0 = all) + + -checklevel= + How thorough the block verification of -checkblocks is (0-4, default: 3) + + -conf= + Specify configuration file (default: zcash.conf) + + -daemon + Run in the background as a daemon and accept commands + + -datadir= + Specify data directory (this path cannot use '~') + + -paramsdir= + Specify Zcash network parameters directory + + -dbcache= + Set database cache size in megabytes (4 to 16384, default: 450) + + -debuglogfile= + Specify location of debug log file: this can be an absolute path or a + path relative to the data directory (default: debug.log) + + -exportdir= + 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= + Imports blocks from external blk000??.dat file on startup + + -maxorphantx= + Keep at most unconnectable transactions in memory (default: 100) + + -par= + Set the number of script verification threads (-8 to 16, 0 = auto, <0 = + leave that many cores free, default: 0) + + -pid= + Specify pid file (default: zcashd.pid) + + -prune= + 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= + 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= + Add a node to connect to and attempt to keep the connection open + + -banscore= + Threshold for disconnecting misbehaving peers (default: 100) + + -bantime= + Number of seconds to keep misbehaving peers from reconnecting (default: + 86400) + + -bind= + Bind to given address and always listen on it. Use [host]:port notation + for IPv6 + + -connect= + 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= + 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= + Maintain at most connections to peers (default: 125) + + -maxreceivebuffer= + Maximum per-connection receive buffer, *1000 bytes (default: 5000) + + -maxsendbuffer= + Maximum per-connection send buffer, *1000 bytes (default: 1000) + + -mempoolevictionmemoryminutes= + The number of minutes before allowing rejected transactions to re-enter + the mempool. (default: 60) + + -mempooltxcostlimit= + An upper bound on the maximum size in bytes of all transactions in the + mempool. (default: 80000000) + + -onion= + Use separate SOCKS5 proxy to reach peers via Tor hidden services + (default: -proxy) + + -onlynet= + Only connect to nodes in network (ipv4, ipv6 or onion) + + -permitbaremultisig + Relay non-P2SH multisig (default: 1) + + -peerbloomfilters + Support filtering of blocks and transaction with bloom filters (default: + 1) + + -port= + Listen for connections on (default: 8233 or testnet: 18233) + + -proxy= + Connect through SOCKS5 proxy + + -proxyrandomize + Randomize credentials for every proxy connection. This enables Tor + stream isolation (default: 1) + + -seednode= + Connect to a node to retrieve peer addresses, and disconnect + + -timeout= + Specify connection timeout in milliseconds (minimum: 1, default: 5000) + + -torcontrol=: + Tor control port to use if onion listening enabled (default: + 127.0.0.1:9051) + + -torpassword= + Tor control port password (default: empty) + + -whitebind= + Bind to given address and whitelist peers connecting to it. Use + [host]:port notation for IPv6 + + -whitelist= + 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= + 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= + Set key pool size to (default: 100) + + -migration + Enable the Sprout to Sapling migration + + -migrationdestaddress= + Set the Sapling migration address + + -mintxfee= + Fees (in ZEC/kB) smaller than this are considered zero fee for + transaction creation (default: 0.00001) + + -orchardactionlimit= + Set the maximum number of Orchard actions permitted in a transaction + (default 50) + + -paytxfee= + 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= + 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= + 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= + Execute command when a wallet transaction changes (%s in cmd is replaced + by TxID) + + -zapwallettxes= + 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= + 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=
+ Enable publish hash block in
+ + -zmqpubhashtx=
+ Enable publish hash transaction in
+ + -zmqpubrawblock=
+ Enable publish raw block in
+ + -zmqpubrawtx=
+ Enable publish raw transaction in
+ +Monitoring options: + + -metricsallowip= + Allow metrics connections from specified source. Valid for 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= + Bind to given address to listen for metrics connections. (default: bind + to all interfaces) + + -prometheusport= + Expose node metrics in the Prometheus exposition format. An HTTP + listener will be started on , which responds to GET requests on + any request path. Use -metricsallowip and -metricsbind to control + access. + +Debugging/Testing options: + + -debug= + Output debugging information (default: 0, supplying is + optional). If is not supplied or if = 1, output + all debugging information. 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= 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= + Fees (in ZEC/kB) smaller than this are considered zero fee for relaying, + mining and transaction creation (default: 0.000001) + + -maxtxfee= + 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 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= + Set minimum block size in bytes (default: 0) + + -blockmaxsize= + Set maximum block size in bytes (default: 2000000) + + -blockprioritysize= + Set maximum size of high-priority/low-fee transactions in bytes + (default: 1000000) + +Mining options: + + -gen + Generate coins (default: 0) + + -genproclimit= + Set the number of threads for coin generation if enabled (-1 = all + cores, default: 1) + + -equihashsolver= + Specify the Equihash solver to be used if enabled (default: "default") + + -mineraddress= + 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= + 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= + Username for JSON-RPC connections + + -rpcpassword= + Password for JSON-RPC connections + + -rpcauth= + Username and hashed password for JSON-RPC connections. The field + comes in the format: :$. A canonical + python script is included in share/rpcuser. This option can be specified + multiple times + + -rpcport= + Listen for JSON-RPC connections on (default: 8232 or testnet: + 18232) + + -rpcallowip= + Allow JSON-RPC connections from specified source. Valid for 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= + 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() diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py index 13b439b10..90b127f4e 100644 --- a/qa/rpc-tests/test_framework/util.py +++ b/qa/rpc-tests/test_framework/util.py @@ -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 From fa494a10a1a2376f54d88e1871b9f5abdddb289f Mon Sep 17 00:00:00 2001 From: Greg Pfeil Date: Mon, 17 Oct 2022 10:14:01 -0600 Subject: [PATCH 15/29] Fix `zcashd --help` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When I cleaned up the debug log reporting, I included the path to the debug log in the help message, which unfortunately required the base params to be loaded. They don’t get loaded before the help message (and they shouldn’t), so this caused an assertion failure. The fix is to use “debug log” in the help message, rather than the path to the actual debug log. This is the right thing to do, because the help message explains how to set the path to the debug log, so the literal path when run with `--help` would possibly not be the correct one at runtime. Fixes #6184. --- src/init.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index c05efec0a..71ab368a5 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -474,12 +474,12 @@ std::string HelpMessage(HelpMessageMode mode) CURRENCY_UNIT, FormatMoney(DEFAULT_MIN_RELAY_TX_FEE))); strUsage += HelpMessageOpt("-maxtxfee=", 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 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 debug log on client startup (default: 1 when no -debug)")); AppendParamsHelpMessages(strUsage, showDebug); From 04d314d067cc5d5d09a2331484909a044df7204f Mon Sep 17 00:00:00 2001 From: Greg Pfeil Date: Mon, 17 Oct 2022 13:25:06 -0600 Subject: [PATCH 16/29] Apply suggestions from code review Co-authored-by: Kris Nuttycombe --- qa/rpc-tests/show_help.py | 2 +- src/init.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qa/rpc-tests/show_help.py b/qa/rpc-tests/show_help.py index ff8458261..f20662536 100755 --- a/qa/rpc-tests/show_help.py +++ b/qa/rpc-tests/show_help.py @@ -376,7 +376,7 @@ Debugging/Testing options: 0.10) -printtoconsole - Send trace/debug info to console instead of debug log + Send trace/debug info to console instead of the debug log Chain selection options: diff --git a/src/init.cpp b/src/init.cpp index 71ab368a5..19a02c452 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -474,12 +474,12 @@ std::string HelpMessage(HelpMessageMode mode) CURRENCY_UNIT, FormatMoney(DEFAULT_MIN_RELAY_TX_FEE))); strUsage += HelpMessageOpt("-maxtxfee=", 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", _("Send trace/debug info to console instead of debug log")); + 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", _("Shrink debug log on client startup (default: 1 when no -debug)")); + // strUsage += HelpMessageOpt("-shrinkdebugfile", _("Shrink the debug log on client startup (default: 1 when no -debug)")); AppendParamsHelpMessages(strUsage, showDebug); From 669a1b9ba083c71173edb6e22153e63b01e2a8c5 Mon Sep 17 00:00:00 2001 From: Greg Pfeil Date: Thu, 13 Oct 2022 10:21:32 -0600 Subject: [PATCH 17/29] Qualify a `string` This only gets triggered with `./configure --disable-wallet`, but clang complains about this unqualified identifier. --- src/init.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/init.cpp b/src/init.cpp index c05efec0a..0c62860a1 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -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 uacomments; + std::vector uacomments; for (std::string cmt : mapMultiArgs["-uacomment"]) { if (cmt != SanitizeString(cmt, SAFE_CHARS_UA_COMMENT)) From dd7b8b580f32356996a05e550cb556130041243a Mon Sep 17 00:00:00 2001 From: Greg Pfeil Date: Thu, 13 Oct 2022 11:21:36 -0600 Subject: [PATCH 18/29] =?UTF-8?q?Don=E2=80=99t=20define=20wallet-needing?= =?UTF-8?q?=20code=20when=20--disable-wallet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Daira Hopwood --- src/gtest/utils.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/gtest/utils.cpp b/src/gtest/utils.cpp index 1252dc056..820902482 100644 --- a/src/gtest/utils.cpp +++ b/src/gtest/utils.cpp @@ -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(); -} \ No newline at end of file +} + +#endif From 05110068d960874ddf8d358bbca28585301343a9 Mon Sep 17 00:00:00 2001 From: Kris Nuttycombe Date: Wed, 19 Oct 2022 10:09:03 -0600 Subject: [PATCH 19/29] Update and/or postpone dependencies for 5.3.0 --- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- depends/packages/native_cxxbridge.mk | 4 ++-- qa/zcash/postponed-updates.txt | 3 +++ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 506df5197..53914cba5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -431,9 +431,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f39818dcfc97d45b03953c1292efc4e80954e1583c4aa770bac1383e2310a4" +checksum = "3f83d0ebf42c6eafb8d7c52f7e5f2d3003b89c7aa4fd2b79229209459a849af8" dependencies = [ "cc", "cxxbridge-flags", @@ -443,15 +443,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56a46460b88d1cec95112c8c363f0e2c39afdb237f60583b0b36343bf627ea9c" +checksum = "99d2199b00553eda8012dfec8d3b1c75fce747cf27c169a270b3b99e3448ab78" [[package]] name = "cxxbridge-macro" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747b608fecf06b0d72d440f27acc99288207324b793be2c17991839f3d4995ea" +checksum = "dcb67a6de1f602736dd7eaead0080cf3435df806c61b24b13328db128c58868f" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 389b01848..f19397779 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -67,7 +67,7 @@ zeroize = "1.4.2" # Rust/C++ interop # The version needs to match depends/packages/native_cxxbridge.mk -cxx = { version = "=1.0.78", features = ["c++17"] } +cxx = { version = "=1.0.79", features = ["c++17"] } # Rust threading rayon = "1.5" diff --git a/depends/packages/native_cxxbridge.mk b/depends/packages/native_cxxbridge.mk index d135fbe5c..3fe05a407 100644 --- a/depends/packages/native_cxxbridge.mk +++ b/depends/packages/native_cxxbridge.mk @@ -1,10 +1,10 @@ package=native_cxxbridge # The version needs to match cxx in Cargo.toml -$(package)_version=1.0.78 +$(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=0cf9aa04757dff1bb7a2aa569b9f363392e953532a14ec0cadf7335fe12b2728 +$(package)_sha256_hash=4da400783dee17e9a99dd39a17cd2cc346df311cb8745832e2b4d5173c23dfcd $(package)_build_subdir=gen/cmd $(package)_dependencies=native_rust $(package)_extra_sources=$(package)-$($(package)_version)-vendored.tar.gz diff --git a/qa/zcash/postponed-updates.txt b/qa/zcash/postponed-updates.txt index f58a06b9a..139cdf904 100644 --- a/qa/zcash/postponed-updates.txt +++ b/qa/zcash/postponed-updates.txt @@ -19,14 +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 From 2f734ce6eabd66c2702abc6b58f6fff9f74d8e37 Mon Sep 17 00:00:00 2001 From: Kris Nuttycombe Date: Wed, 19 Oct 2022 12:21:37 -0600 Subject: [PATCH 20/29] Vet cxxbridge upgrade. --- qa/supply-chain/audits.toml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/qa/supply-chain/audits.toml b/qa/supply-chain/audits.toml index e7a9d3dfa..6c394c7d1 100644 --- a/qa/supply-chain/audits.toml +++ b/qa/supply-chain/audits.toml @@ -94,6 +94,16 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.76 -> 1.0.78" +[[audits.cxx]] +who = "Kris Nuttycombe " +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 " criteria = "safe-to-deploy" @@ -109,6 +119,12 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.76 -> 1.0.78" +[[audits.cxxbridge-flags]] +who = "Kris Nuttycombe " +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 " criteria = "safe-to-deploy" @@ -124,6 +140,12 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.76 -> 1.0.78" +[[audits.cxxbridge-macro]] +who = "Kris Nuttycombe " +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 " criteria = "safe-to-deploy" From 741e6b1108af846c87950cc137fecc28d472834a Mon Sep 17 00:00:00 2001 From: Kris Nuttycombe Date: Wed, 19 Oct 2022 18:24:46 -0600 Subject: [PATCH 21/29] Update to released versions of librustzcash crates. --- .cargo/config.offline | 15 ---------- Cargo.lock | 46 +++++++++++++++++------------ Cargo.toml | 22 ++++---------- src/rust/bin/inspect/transaction.rs | 2 +- src/rust/src/rustzcash.rs | 13 ++++---- 5 files changed, 40 insertions(+), 58 deletions(-) diff --git a/.cargo/config.offline b/.cargo/config.offline index c1c31ca9d..8b7762d20 100644 --- a/.cargo/config.offline +++ b/.cargo/config.offline @@ -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 diff --git a/Cargo.lock b/Cargo.lock index 53914cba5..e315b28c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -531,7 +531,8 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" [[package]] name = "equihash" version = "0.2.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=913aa0a9885acbd6af9cf3525221d632e4f5a6e4#913aa0a9885acbd6af9cf3525221d632e4f5a6e4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab579d7cf78477773b03e80bc2f89702ef02d7112c711d54ca93dcdce68533d5" dependencies = [ "blake2b_simd", "byteorder", @@ -540,7 +541,8 @@ dependencies = [ [[package]] name = "f4jumble" version = "0.1.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=913aa0a9885acbd6af9cf3525221d632e4f5a6e4#913aa0a9885acbd6af9cf3525221d632e4f5a6e4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a83e8d7fd0c526af4aad893b7c9fe41e2699ed8a776a6c74aecdeafe05afc75" dependencies = [ "blake2b_simd", ] @@ -667,8 +669,9 @@ checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" [[package]] name = "group" -version = "0.12.0" -source = "git+https://github.com/zkcrypto/group.git?rev=f61e3e420ed1220c8f1f80988f8c6c5e202d8715#f61e3e420ed1220c8f1f80988f8c6c5e202d8715" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ "ff", "memuse", @@ -1246,8 +1249,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "orchard" -version = "0.2.0" -source = "git+https://github.com/zcash/orchard.git?rev=f206b3f5d4e31bba75d03d9d03d5fa25825a9384#f206b3f5d4e31bba75d03d9d03d5fa25825a9384" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f06b263206a75a7d96ca75d46a3e9ca8eaf7ab7feea209749bb8b818d22f427" dependencies = [ "aes", "bitvec", @@ -2317,8 +2321,9 @@ dependencies = [ [[package]] name = "zcash_address" -version = "0.1.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=913aa0a9885acbd6af9cf3525221d632e4f5a6e4#913aa0a9885acbd6af9cf3525221d632e4f5a6e4" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "804268e702b664fc09d3e2ce82786d0addf4ae57ba6976469be63e09066bf9f7" dependencies = [ "bech32", "bs58", @@ -2328,8 +2333,9 @@ dependencies = [ [[package]] name = "zcash_encoding" -version = "0.1.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=913aa0a9885acbd6af9cf3525221d632e4f5a6e4#913aa0a9885acbd6af9cf3525221d632e4f5a6e4" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f03391b81727875efa6ac0661a20883022b6fba92365dc121c48fa9b00c5aac0" dependencies = [ "byteorder", "nonempty", @@ -2338,7 +2344,8 @@ dependencies = [ [[package]] name = "zcash_history" version = "0.3.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=913aa0a9885acbd6af9cf3525221d632e4f5a6e4#913aa0a9885acbd6af9cf3525221d632e4f5a6e4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb611a28a4e13ac715ee712f4344d6b279b767daf6345dafefb2c4bf582b6679" dependencies = [ "blake2b_simd", "byteorder", @@ -2347,21 +2354,22 @@ dependencies = [ [[package]] name = "zcash_note_encryption" -version = "0.1.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=913aa0a9885acbd6af9cf3525221d632e4f5a6e4#913aa0a9885acbd6af9cf3525221d632e4f5a6e4" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2be9c12532389fd03786b7068fb7936c17fade23b48f584707bdc5f79f3ec867" dependencies = [ "chacha20", "chacha20poly1305", "cipher 0.4.3", - "group", "rand_core 0.6.4", "subtle", ] [[package]] name = "zcash_primitives" -version = "0.7.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=913aa0a9885acbd6af9cf3525221d632e4f5a6e4#913aa0a9885acbd6af9cf3525221d632e4f5a6e4" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c2e24cb5e3352f751c699f47d363279178871b126d23f49d9018f6bae49219a" dependencies = [ "aes", "bip0039", @@ -2397,15 +2405,15 @@ dependencies = [ [[package]] name = "zcash_proofs" -version = "0.7.1" -source = "git+https://github.com/zcash/librustzcash.git?rev=913aa0a9885acbd6af9cf3525221d632e4f5a6e4#913aa0a9885acbd6af9cf3525221d632e4f5a6e4" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b5cdd6f43c8b56449e52f760d71241b8490530dc10a88d990e8dcf0c435a957" dependencies = [ "bellman", "blake2b_simd", "bls12_381", "byteorder", "directories", - "ff", "group", "jubjub", "lazy_static", diff --git a/Cargo.toml b/Cargo.toml index f19397779..0c957ab68 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,19 +49,19 @@ 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" @@ -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" } diff --git a/src/rust/bin/inspect/transaction.rs b/src/rust/bin/inspect/transaction.rs index 4140cdd82..218292226 100644 --- a/src/rust/bin/inspect/transaction.rs +++ b/src/rust/bin/inspect/transaction.rs @@ -261,7 +261,7 @@ pub(crate) fn inspect(tx: Transaction, context: Option) { let ctx = Secp256k1::::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. diff --git a/src/rust/src/rustzcash.rs b/src/rust/src/rustzcash.rs index 3f5e5b15f..39906f5cb 100644 --- a/src/rust/src/rustzcash.rs +++ b/src/rust/src/rustzcash.rs @@ -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 }; From 06a1c789413b210a321c83e8ffffa1c085e70283 Mon Sep 17 00:00:00 2001 From: Kris Nuttycombe Date: Wed, 19 Oct 2022 18:29:15 -0600 Subject: [PATCH 22/29] Certify librustzcash crate upgrades. --- qa/supply-chain/audits.toml | 40 +++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/qa/supply-chain/audits.toml b/qa/supply-chain/audits.toml index 6c394c7d1..de6c9c558 100644 --- a/qa/supply-chain/audits.toml +++ b/qa/supply-chain/audits.toml @@ -140,6 +140,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.76 -> 1.0.78" +[[audits.cxxbridge-macro]] +who = "Kris Nuttycombe " +criteria = "safe-to-deploy" +delta = "1.0.78 -> 1.0.79" + [[audits.cxxbridge-macro]] who = "Kris Nuttycombe " criteria = "safe-to-deploy" @@ -173,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 " +criteria = "safe-to-deploy" +delta = "0.12.0 -> 0.12.1" + [[audits.halo2_gadgets]] who = "Jack Grigg " criteria = ["crypto-reviewed", "safe-to-deploy"] @@ -301,6 +311,11 @@ 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 " +criteria = "safe-to-deploy" +delta = "0.2.0 -> 0.3.0" + [[audits.parking_lot]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -457,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 " +criteria = "safe-to-deploy" +delta = "0.1.0 -> 0.2.0" + [[audits.zcash_encoding]] who = "Jack Grigg " 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 " +criteria = "safe-to-deploy" +delta = "0.1.0 -> 0.2.0" + [[audits.zcash_history]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -475,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 " +criteria = "safe-to-deploy" +delta = "0.1.0 -> 0.2.0" + [[audits.zcash_primitives]] who = "Jack Grigg " criteria = ["crypto-reviewed", "safe-to-deploy"] @@ -487,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 " +criteria = "safe-to-deploy" +delta = "0.7.0 -> 0.8.1" + [[audits.zcash_proofs]] who = "Jack Grigg " criteria = ["crypto-reviewed", "safe-to-deploy"] @@ -505,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 " +criteria = "safe-to-deploy" +delta = "0.7.1 -> 0.8.0" + [[audits.zeroize]] who = "Daira Hopwood " criteria = "safe-to-deploy" From 16c49a844ec821084bcc130fcf9088cb9e0b79c3 Mon Sep 17 00:00:00 2001 From: Kris Nuttycombe Date: Wed, 19 Oct 2022 18:32:28 -0600 Subject: [PATCH 23/29] Fix clippy lints. --- src/rust/bin/inspect/block.rs | 4 ++-- src/rust/src/builder_ffi.rs | 2 +- src/rust/src/incremental_merkle_tree.rs | 2 +- src/rust/src/metrics_ffi.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/rust/bin/inspect/block.rs b/src/rust/bin/inspect/block.rs index edaeeecaa..f9be3b113 100644 --- a/src/rust/bin/inspect/block.rs +++ b/src/rust/bin/inspect/block.rs @@ -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; } diff --git a/src/rust/src/builder_ffi.rs b/src/rust/src/builder_ffi.rs index 5e3c4ab12..437ad45f4 100644 --- a/src/rust/src/builder_ffi.rs +++ b/src/rust/src/builder_ffi.rs @@ -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)), diff --git a/src/rust/src/incremental_merkle_tree.rs b/src/rust/src/incremental_merkle_tree.rs index 83c6e335c..0f51b9635 100644 --- a/src/rust/src/incremental_merkle_tree.rs +++ b/src/rust/src/incremental_merkle_tree.rs @@ -17,7 +17,7 @@ use zcash_primitives::merkle_tree::{ pub fn write_checkpoint_v2(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) })?; diff --git a/src/rust/src/metrics_ffi.rs b/src/rust/src/metrics_ffi.rs index 1354389b4..169f82da8 100644 --- a/src/rust/src/metrics_ffi.rs +++ b/src/rust/src/metrics_ffi.rs @@ -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( From e1b716b7538b83c95b5fc9c6768cb186d682bb9c Mon Sep 17 00:00:00 2001 From: sasha Date: Wed, 27 Jul 2022 15:12:50 -0700 Subject: [PATCH 24/29] Make make-release.py aware of the parallel build gitian descriptor file --- zcutil/make-release.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zcutil/make-release.py b/zcutil/make-release.py index d0082bfa4..d6e6ca08b 100755 --- a/zcutil/make-release.py +++ b/zcutil/make-release.py @@ -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()) From 75397a623e0514032ef1925d9fc34ef7e0b5f478 Mon Sep 17 00:00:00 2001 From: sasha Date: Thu, 20 Oct 2022 09:25:43 -0700 Subject: [PATCH 25/29] Use linux gitian descriptor as a base for the parallel linux descriptor --- .../gitian-linux-parallel.yml | 143 ++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 contrib/gitian-descriptors/gitian-linux-parallel.yml diff --git a/contrib/gitian-descriptors/gitian-linux-parallel.yml b/contrib/gitian-descriptors/gitian-linux-parallel.yml new file mode 100644 index 000000000..e6ecc763c --- /dev/null +++ b/contrib/gitian-descriptors/gitian-linux-parallel.yml @@ -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" + 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 From 6c85d52504b1b93c2a901f8cee9b619c52543663 Mon Sep 17 00:00:00 2001 From: sasha Date: Thu, 20 Oct 2022 09:26:59 -0700 Subject: [PATCH 26/29] Add `-j$(nproc)` to the parallel gitian descriptor --- contrib/gitian-descriptors/gitian-linux-parallel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/gitian-descriptors/gitian-linux-parallel.yml b/contrib/gitian-descriptors/gitian-linux-parallel.yml index e6ecc763c..ca16bdea6 100644 --- a/contrib/gitian-descriptors/gitian-linux-parallel.yml +++ b/contrib/gitian-descriptors/gitian-linux-parallel.yml @@ -36,7 +36,7 @@ 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" + MAKEOPTS="V=1 -j$(nproc)" FAKETIME_HOST_PROGS="" FAKETIME_PROGS="date ar ranlib nm strip objcopy" HOST_CFLAGS="" From 5a084253d695e2b049526115d341aa80c8d28a47 Mon Sep 17 00:00:00 2001 From: Greg Pfeil Date: Thu, 20 Oct 2022 10:38:42 -0600 Subject: [PATCH 27/29] make-release.py: Versioning changes for 5.3.0. --- README.md | 2 +- configure.ac | 2 +- contrib/gitian-descriptors/gitian-linux.yml | 2 +- src/clientversion.h | 2 +- src/deprecation.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 4ad2d15c9..9d9a121a5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Zcash 5.3.0-rc1 +Zcash 5.3.0 =========== diff --git a/configure.ac b/configure.ac index e40ff9dbd..4421ed480 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 5) define(_CLIENT_VERSION_MINOR, 3) define(_CLIENT_VERSION_REVISION, 0) -define(_CLIENT_VERSION_BUILD, 25) +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))) define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1))) define(_CLIENT_VERSION_IS_RELEASE, true) diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index e6ecc763c..7c9ece4f5 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "zcash-5.3.0-rc1" +name: "zcash-5.3.0" enable_cache: true distro: "debian" suites: diff --git a/src/clientversion.h b/src/clientversion.h index cdf0f1dab..3bd546896 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -18,7 +18,7 @@ #define CLIENT_VERSION_MAJOR 5 #define CLIENT_VERSION_MINOR 3 #define CLIENT_VERSION_REVISION 0 -#define CLIENT_VERSION_BUILD 25 +#define CLIENT_VERSION_BUILD 50 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true diff --git a/src/deprecation.h b/src/deprecation.h index 2012b1037..411649a8f 100644 --- a/src/deprecation.h +++ b/src/deprecation.h @@ -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."); From b6681791fc85639b6b2fe0974302e448b00b0659 Mon Sep 17 00:00:00 2001 From: Greg Pfeil Date: Thu, 20 Oct 2022 10:52:37 -0600 Subject: [PATCH 28/29] make-release.py: Updated manpages for 5.3.0. --- doc/man/zcash-cli.1 | 6 +++--- doc/man/zcash-tx.1 | 6 +++--- doc/man/zcashd-wallet-tool.1 | 4 ++-- doc/man/zcashd.1 | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1 index 8a9632ab2..6bc31fbcb 100644 --- a/doc/man/zcash-cli.1 +++ b/doc/man/zcash-cli.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1. -.TH ZCASH-CLI "1" "October 2022" "zcash-cli v5.3.0-rc1" "User Commands" +.TH ZCASH-CLI "1" "October 2022" "zcash-cli v5.3.0" "User Commands" .SH NAME -zcash-cli \- manual page for zcash-cli v5.3.0-rc1 +zcash-cli \- manual page for zcash-cli v5.3.0 .SH DESCRIPTION -Zcash RPC client version v5.3.0\-rc1 +Zcash RPC client version v5.3.0 .PP In order to ensure you are adequately protecting your privacy when using Zcash, please see . diff --git a/doc/man/zcash-tx.1 b/doc/man/zcash-tx.1 index 7626ce290..ce8c1ae64 100644 --- a/doc/man/zcash-tx.1 +++ b/doc/man/zcash-tx.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1. -.TH ZCASH-TX "1" "October 2022" "zcash-tx v5.3.0-rc1" "User Commands" +.TH ZCASH-TX "1" "October 2022" "zcash-tx v5.3.0" "User Commands" .SH NAME -zcash-tx \- manual page for zcash-tx v5.3.0-rc1 +zcash-tx \- manual page for zcash-tx v5.3.0 .SH DESCRIPTION -Zcash zcash\-tx utility version v5.3.0\-rc1 +Zcash zcash\-tx utility version v5.3.0 .SS "Usage:" .TP zcash\-tx [options] [commands] diff --git a/doc/man/zcashd-wallet-tool.1 b/doc/man/zcashd-wallet-tool.1 index 060784e72..2c19ea2c0 100644 --- a/doc/man/zcashd-wallet-tool.1 +++ b/doc/man/zcashd-wallet-tool.1 @@ -1,7 +1,7 @@ .\" 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-rc1" "User Commands" +.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.3.0-rc1 +zcashd-wallet-tool \- manual page for zcashd-wallet-tool v5.3.0 .SH SYNOPSIS .B zcashd-wallet-tool [\fI\,OPTIONS\/\fR] diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1 index 9ba4f6aea..090c5a511 100644 --- a/doc/man/zcashd.1 +++ b/doc/man/zcashd.1 @@ -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 . @@ -94,7 +94,7 @@ Keep at most unconnectable transactions in memory (default: 100) .HP \fB\-par=\fR .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 @@ -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 From d557b6e5c585a8a856158f9f25f7aa32b90f8147 Mon Sep 17 00:00:00 2001 From: Greg Pfeil Date: Thu, 20 Oct 2022 10:52:37 -0600 Subject: [PATCH 29/29] make-release.py: Updated release notes and changelog for 5.3.0. --- contrib/debian/changelog | 6 + doc/authors.md | 33 ++-- doc/release-notes.md | 26 --- doc/release-notes/release-notes-5.3.0.md | 192 +++++++++++++++++++++++ 4 files changed, 217 insertions(+), 40 deletions(-) create mode 100644 doc/release-notes/release-notes-5.3.0.md diff --git a/contrib/debian/changelog b/contrib/debian/changelog index e973ec7aa..2afc8e388 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +zcash (5.3.0) stable; urgency=medium + + * 5.3.0 release. + + -- Electric Coin Company Thu, 20 Oct 2022 10:52:37 -0600 + zcash (5.3.0~rc1) stable; urgency=medium * 5.3.0-rc1 release. diff --git a/doc/authors.md b/doc/authors.md index d3a0e048f..d3a1e5457 100644 --- a/doc/authors.md +++ b/doc/authors.md @@ -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) diff --git a/doc/release-notes.md b/doc/release-notes.md index 7b5ae4bbf..a29094b51 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -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. diff --git a/doc/release-notes/release-notes-5.3.0.md b/doc/release-notes/release-notes-5.3.0.md new file mode 100644 index 000000000..e2e5435be --- /dev/null +++ b/doc/release-notes/release-notes-5.3.0.md @@ -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. +