From 8a99b166e2ca668dc5bd22851364f829e4351b2f Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Thu, 21 Dec 2023 16:41:34 +0000 Subject: [PATCH 01/13] make-release.py: Versioning changes for 5.8.0-rc1. --- README.md | 2 +- configure.ac | 4 ++-- contrib/gitian-descriptors/gitian-linux-parallel.yml | 2 +- contrib/gitian-descriptors/gitian-linux.yml | 2 +- src/clientversion.h | 4 ++-- src/deprecation.h | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 24d0f16639e..645be82d5c9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Zcash 5.7.0 +Zcash 5.8.0-rc1 =========== diff --git a/configure.ac b/configure.ac index aa8bb044cec..7d892fc5ceb 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, 7) +define(_CLIENT_VERSION_MINOR, 8) 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-parallel.yml b/contrib/gitian-descriptors/gitian-linux-parallel.yml index fc6baba38f5..4b096386593 100644 --- a/contrib/gitian-descriptors/gitian-linux-parallel.yml +++ b/contrib/gitian-descriptors/gitian-linux-parallel.yml @@ -1,5 +1,5 @@ --- -name: "zcash-5.7.0" +name: "zcash-5.8.0-rc1" enable_cache: true distro: "debian" suites: diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index caf49df175c..5b1dfc654ab 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "zcash-5.7.0" +name: "zcash-5.8.0-rc1" enable_cache: true distro: "debian" suites: diff --git a/src/clientversion.h b/src/clientversion.h index f36a614a4e3..72226fdadf6 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 7 +#define CLIENT_VERSION_MINOR 8 #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 diff --git a/src/deprecation.h b/src/deprecation.h index d0624e43eed..c5e03ed2523 100644 --- a/src/deprecation.h +++ b/src/deprecation.h @@ -13,7 +13,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 = 2243176; +static const int APPROX_RELEASE_HEIGHT = 2339276; 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 a7f0758609919c31ef240bfad12ccff83d90a46e Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Thu, 21 Dec 2023 16:56:49 +0000 Subject: [PATCH 02/13] make-release.py: Updated manpages for 5.8.0-rc1. --- doc/man/zcash-cli.1 | 6 +++--- doc/man/zcash-tx.1 | 6 +++--- doc/man/zcashd-wallet-tool.1 | 4 ++-- doc/man/zcashd.1 | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1 index f8d2be50f1b..6519d7d5cf8 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" "September 2023" "zcash-cli v5.7.0" "User Commands" +.TH ZCASH-CLI "1" "December 2023" "zcash-cli v5.8.0-rc1" "User Commands" .SH NAME -zcash-cli \- manual page for zcash-cli v5.7.0 +zcash-cli \- manual page for zcash-cli v5.8.0-rc1 .SH DESCRIPTION -Zcash RPC client version v5.7.0 +Zcash RPC client version v5.8.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 bebbd8491da..0f6ea556782 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" "September 2023" "zcash-tx v5.7.0" "User Commands" +.TH ZCASH-TX "1" "December 2023" "zcash-tx v5.8.0-rc1" "User Commands" .SH NAME -zcash-tx \- manual page for zcash-tx v5.7.0 +zcash-tx \- manual page for zcash-tx v5.8.0-rc1 .SH DESCRIPTION -Zcash zcash\-tx utility version v5.7.0 +Zcash zcash\-tx utility version v5.8.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 3da89b4d2c8..afe08100612 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" "September 2023" "zcashd-wallet-tool v5.7.0" "User Commands" +.TH ZCASHD-WALLET-TOOL "1" "December 2023" "zcashd-wallet-tool v5.8.0-rc1" "User Commands" .SH NAME -zcashd-wallet-tool \- manual page for zcashd-wallet-tool v5.7.0 +zcashd-wallet-tool \- manual page for zcashd-wallet-tool v5.8.0-rc1 .SH SYNOPSIS .B zcashd-wallet-tool [\fI\,OPTIONS\/\fR] diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1 index 0acc8ed1b54..71e3a9e7b0e 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.1. -.TH ZCASHD "1" "September 2023" "zcashd v5.7.0" "User Commands" +.TH ZCASHD "1" "December 2023" "zcashd v5.8.0-rc1" "User Commands" .SH NAME -zcashd \- manual page for zcashd v5.7.0 +zcashd \- manual page for zcashd v5.8.0-rc1 .SH DESCRIPTION -Zcash Daemon version v5.7.0 +Zcash Daemon version v5.8.0\-rc1 .PP In order to ensure you are adequately protecting your privacy when using Zcash, please see . From 39e1a4b0823c5c24c7b091a3fc1665baab72e938 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Thu, 21 Dec 2023 16:56:50 +0000 Subject: [PATCH 03/13] make-release.py: Updated release notes and changelog for 5.8.0-rc1. --- contrib/debian/changelog | 6 ++++ doc/release-notes/release-notes-5.8.0-rc1.md | 36 ++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 doc/release-notes/release-notes-5.8.0-rc1.md diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 9a00b619445..d7e36b68470 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +zcash (5.8.0~rc1) stable; urgency=medium + + * 5.8.0-rc1 release. + + -- Electric Coin Company Thu, 21 Dec 2023 16:56:50 +0000 + zcash (5.7.0) stable; urgency=medium * 5.7.0 release. diff --git a/doc/release-notes/release-notes-5.8.0-rc1.md b/doc/release-notes/release-notes-5.8.0-rc1.md new file mode 100644 index 00000000000..9a7bb3e2724 --- /dev/null +++ b/doc/release-notes/release-notes-5.8.0-rc1.md @@ -0,0 +1,36 @@ +Changelog +========= + +Daira Emma Hopwood (2): + Suppress compilation warnings for K&R-style prototypes when building bdb by adding `-Wno-deprecated-non-prototype` to `CFLAGS`. + Suppress link warnings when building bdb by adding `-Wno-unused-command-line-argument` to `LDFLAGS`. + +Jack Grigg (19): + CI: Use latest stable Rust for book deployment + CI: Rename build workflow to CI + CI: Only run CI workflow once per PR + CI: Switch to 8-core Ubuntu runners + CI: Move matrix definition into a separate job + CI: Rename `matrix.os` to `matrix.build_os` + CI: Upload artifacts from regular build + CI: Run btests and gtests + CI: Split config flag bitrot builds into a separate job + CI: Fix CCache path on macOS + cargo vet prune + cargo update + depends: utfcpp 4.0.4 + depends: ZeroMQ 4.3.5 + depends: native_cmake 3.28.1 + depends: cxx 1.0.111 + qa: Bump postponed dependencies + make-release.py: Versioning changes for 5.8.0-rc1. + make-release.py: Updated manpages for 5.8.0-rc1. + +Yasser Isa (3): + Delete contrib/ci-builders directory + Delete contrib/ci-workers directory + CI: Add sharding to GoogleTest job + +dependabot[bot] (1): + build(deps): bump actions/checkout from 3 to 4 + From 7ed2ff081f01d5186b0fdcb9d437fc1a5a66d04d Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Thu, 21 Dec 2023 16:56:50 +0000 Subject: [PATCH 04/13] make-release.py: Updated book for 5.8.0-rc1. --- doc/book/src/user/release-support.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/book/src/user/release-support.md b/doc/book/src/user/release-support.md index d6ca46069e5..97da2ecfaa3 100644 --- a/doc/book/src/user/release-support.md +++ b/doc/book/src/user/release-support.md @@ -42,9 +42,7 @@ time, and may shift due to changes in network solution power. | `zcashd` version | Release date | Halt height | End of Support | | ---------------- | ------------ | ----------- | -------------- | -| 5.6.0-rc1 | 2023-06-08 | 2243024 | 2023-09-28 | -| 5.6.0 | 2023-06-14 | 2250924 | 2023-10-04 | -| 5.6.1 | 2023-06-21 | 2258800 | 2023-10-11 | | 5.7.0-rc1 | 2023-09-22 | 2365300 | 2024-01-12 | | 5.7.0 | 2023-09-28 | 2372200 | 2024-01-18 | +| 5.8.0-rc1 | 2023-12-21 | 2468300 | 2024-04-11 | From 467d72422df3b64422c26a78fa3635bad5c8f9c7 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sat, 30 Dec 2023 03:20:59 +0000 Subject: [PATCH 05/13] Update Rust dependencies for 5.8.0 --- Cargo.lock | 152 +++++++++++------------ Cargo.toml | 6 +- qa/supply-chain/audits.toml | 232 +++++++++++++++++++++++++++++++++++ qa/supply-chain/config.toml | 6 +- qa/supply-chain/imports.lock | 20 +-- 5 files changed, 311 insertions(+), 105 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 18147320b7f..47624f1d67a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -40,9 +40,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", "once_cell", @@ -67,9 +67,9 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "arrayref" @@ -378,9 +378,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c3242926edf34aec4ac3a77108ad4854bffaa2e4ddc1824124ce59231302d5" +checksum = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2" dependencies = [ "cfg-if", "crossbeam-utils", @@ -399,21 +399,20 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.16" +version = "0.9.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2fe95351b870527a5d09bf563ed3c97c0cffb87cf1c78a591bf48bb218d9aa" +checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset", ] [[package]] name = "crossbeam-utils" -version = "0.8.17" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f" +checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" dependencies = [ "cfg-if", ] @@ -459,7 +458,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.46", ] [[package]] @@ -488,7 +487,7 @@ checksum = "5c6888cd161769d65134846d4d4981d5a6654307cc46ec83fb917e530aea5f84" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.46", ] [[package]] @@ -503,9 +502,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] @@ -672,30 +671,30 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-core", "futures-task", @@ -1174,18 +1173,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memuse" @@ -1227,13 +1217,13 @@ dependencies = [ [[package]] name = "metrics-macros" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" +checksum = "38b4faf00617defe497754acde3024865bc143d44a86799b24e191ecff91354f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.46", ] [[package]] @@ -1545,9 +1535,9 @@ dependencies = [ [[package]] name = "platforms" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" +checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" [[package]] name = "poly1305" @@ -1601,9 +1591,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "2de98502f212cfcea8d0bb305bd0f49d7ebdd75b64ba0a68f937d888f4e0d6db" dependencies = [ "unicode-ident", ] @@ -1652,9 +1642,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -1939,29 +1929,29 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.194" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.194" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.46", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "6fbd975230bada99c8bb618e0c365c2eefa219158d5c6c29610fd09ff1833257" dependencies = [ "itoa", "ryu", @@ -2060,9 +2050,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.41" +version = "2.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" +checksum = "89456b690ff72fddcecf231caedbe615c59480c93358a93dfae7fc29e3ebbf0e" dependencies = [ "proc-macro2", "quote", @@ -2077,15 +2067,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if", "fastrand", "redox_syscall", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2103,22 +2093,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.51" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.51" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.46", ] [[package]] @@ -2133,9 +2123,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ "deranged", "itoa", @@ -2153,9 +2143,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" dependencies = [ "time-core", ] @@ -2177,9 +2167,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "libc", @@ -2243,7 +2233,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.46", ] [[package]] @@ -2441,7 +2431,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.46", "wasm-bindgen-shared", ] @@ -2463,7 +2453,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.46", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2652,9 +2642,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.28" +version = "0.5.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2" +checksum = "97a4882e6b134d6c28953a387571f1acdd3496830d5e36c5e3a1075580ea641c" dependencies = [ "memchr", ] @@ -2722,9 +2712,9 @@ dependencies = [ [[package]] name = "zcash_primitives" -version = "0.13.0-rc.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc4391d9325e0a51a7cbff02b5c4b5472d66087bd9c903ddb12dea7ec22f3e0" +checksum = "d17e4c94ca8d69d2fcf2be97522da5732a580eb2125cda3b150761952f8df8e6" dependencies = [ "aes", "bip0039", @@ -2759,9 +2749,9 @@ dependencies = [ [[package]] name = "zcash_proofs" -version = "0.13.0-rc.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48f22eff3bdc382327ef28f809024ddc89ec6d903ba71be629b2cbea34afdda2" +checksum = "df0c99f65a840ff256c106b28d67d702d9759d206112473d4982c92003262406" dependencies = [ "bellman", "blake2b_simd", @@ -2780,22 +2770,22 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.46", ] [[package]] @@ -2815,5 +2805,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.46", ] diff --git a/Cargo.toml b/Cargo.toml index a56a5209bb8..0c05ce0e299 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,8 +63,8 @@ zcash_address = "0.3" zcash_encoding = "0.2" zcash_history = "0.3" zcash_note_encryption = "0.4" -zcash_primitives = { version = "=0.13.0-rc.1", features = ["temporary-zcashd", "transparent-inputs"] } -zcash_proofs = { version = "=0.13.0-rc.1", features = ["directories"] } +zcash_primitives = { version = "0.13", features = ["temporary-zcashd", "transparent-inputs"] } +zcash_proofs = { version = "0.13", features = ["directories"] } ed25519-zebra = "4" zeroize = "1.4.2" wagyu-zcash-parameters = "0.2" @@ -109,7 +109,7 @@ time = { version = "0.3", features = ["formatting", "macros"] } [dev-dependencies] incrementalmerkletree = { version = "0.5", features = ["test-dependencies"] } proptest = "1.0.0" -zcash_primitives = { version = "=0.13.0-rc.1", features = ["temporary-zcashd", "transparent-inputs", "test-dependencies"] } +zcash_primitives = { version = "0.13", features = ["temporary-zcashd", "transparent-inputs", "test-dependencies"] } [dependencies.tracing-subscriber] version = "0.3" diff --git a/qa/supply-chain/audits.toml b/qa/supply-chain/audits.toml index 8ee6cfacba0..57e2d39bcb9 100644 --- a/qa/supply-chain/audits.toml +++ b/qa/supply-chain/audits.toml @@ -24,6 +24,12 @@ who = "Jack Grigg " criteria = ["safe-to-deploy", "crypto-reviewed"] delta = "0.5.1 -> 0.5.2" +[[audits.ahash]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.8.6 -> 0.8.7" +notes = "Build-time `stdsimd` detection is replaced with a nightly-only feature flag." + [[audits.aho-corasick]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -77,6 +83,28 @@ notes = """ nightly features are available. """ +[[audits.anyhow]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.75 -> 1.0.77" +notes = """ +- Build script changes are to rerun cargo if the `RUSTC_BOOTSTRAP` env variable + changes, and enable a few more `rustc` config flags. +- Some `unsafe fn`s were altered to add `unsafe` blocks, to make the safety + contracts in the code clearer (instead of using the `unsafe fn`'s implicit + `unsafe` block); no actual `unsafe` changes were made. +""" + +[[audits.anyhow]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.77 -> 1.0.79" +notes = """ +Build script changes are to refactor the existing probe into a separate file +(which removes a filesystem write), and adjust how it gets rerun in response to +changes in the build environment. +""" + [[audits.arrayref]] who = "Sean Bowe " criteria = "safe-to-deploy" @@ -328,6 +356,15 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.5.8 -> 0.5.9" +[[audits.crossbeam-channel]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.5.9 -> 0.5.10" +notes = """ +Changes to `unsafe` code are to use `MaybeUninit::assume_init_drop` (which is +now usable with the new MSRV) instead of dropping via casting. +""" + [[audits.crossbeam-deque]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -357,6 +394,15 @@ criteria = "safe-to-deploy" delta = "0.9.15 -> 0.9.16" notes = "Moved an `unsafe` block while removing `scopeguard` dependency." +[[audits.crossbeam-epoch]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.9.16 -> 0.9.17" +notes = """ +Changes to `unsafe` code are to replace manual pointer logic with equivalent +`unsafe` stdlib methods, now that MSRV is high enough to use them. +""" + [[audits.crossbeam-utils]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -388,6 +434,16 @@ notes = """ access newer `Atomic*` methods). """ +[[audits.crossbeam-utils]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.8.17 -> 0.8.18" +notes = """ +Changes to `unsafe` code are to construct and drop `MaybeUninit` directly +via its methods (one of which is now usable with the new MSRV) instead of via +casting. +""" + [[audits.crypto-common]] who = "Jack Grigg " criteria = ["crypto-reviewed", "safe-to-deploy"] @@ -604,6 +660,15 @@ generated code clearer (instead of using the `unsafe fn`'s implicit `unsafe` block). """ +[[audits.deranged]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.3.10 -> 0.3.11" +notes = """ +Two new `unsafe` blocks to construct ranges via `T::new_unchecked`. The safety +comments correctly document why the checks are unnecessary. +""" + [[audits.directories]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -746,6 +811,12 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.3.28 -> 0.3.29" +[[audits.futures-channel]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.3.29 -> 0.3.30" +notes = "Removes `build.rs` now that it can rely on the `target_has_atomic` attribute." + [[audits.futures-core]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -771,6 +842,12 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.3.28 -> 0.3.29" +[[audits.futures-core]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.3.29 -> 0.3.30" +notes = "Removes `build.rs` now that it can rely on the `target_has_atomic` attribute." + [[audits.futures-task]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -798,6 +875,12 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.3.28 -> 0.3.29" +[[audits.futures-task]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.3.29 -> 0.3.30" +notes = "Removes `build.rs` now that it can rely on the `target_has_atomic` attribute." + [[audits.futures-util]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -828,6 +911,20 @@ Only change to `unsafe` code is to add a `Fut: Send` bound to the `unsafe impl Sync for FuturesUnordered`. """ +[[audits.futures-util]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.3.29 -> 0.3.30" +notes = """ +- Removes `build.rs` now that it can rely on the `target_has_atomic` attribute. +- Almost all changes to `unsafe` blocks are to either move them around, or + replace them with safe method calls. +- One new `unsafe` block is added for a slice lifetime transmutation. The slice + reconstruction is obviously correct. AFAICT the lifetime transmutation is also + correct; the slice's lifetime logically comes from the `AsyncBufRead` reader + inside `FillBuf`, rather than the `Context`. +""" + [[audits.generic-array]] who = "Sean Bowe " criteria = "safe-to-deploy" @@ -1151,6 +1248,16 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "2.6.3 -> 2.6.4" +[[audits.memchr]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "2.6.4 -> 2.7.1" +notes = """ +Change to an `unsafe fn` is to rework the short-tail handling of a fixed-length +comparison between `u8` pointers. The new tail code matches the existing head +code (but adapted to `u16` and `u8` reads, instead of `u32`). +""" + [[audits.memoffset]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1193,6 +1300,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.5.1 -> 0.6.0" +[[audits.metrics-macros]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.7.0 -> 0.7.1" + [[audits.metrics-util]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1461,6 +1573,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "3.1.2 -> 3.2.0" +[[audits.platforms]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "3.2.0 -> 3.3.0" + [[audits.poly1305]] who = "Daira Hopwood " criteria = "safe-to-deploy" @@ -1527,6 +1644,26 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.67 -> 1.0.70" +[[audits.proc-macro2]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.70 -> 1.0.71" +notes = """ +New `unsafe` blocks are all inside `unsafe fn`s, and are added to make the +safety contracts in the code clearer (instead of using the `unsafe fn`'s +implicit `unsafe` block). +""" + +[[audits.proc-macro2]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.71 -> 1.0.74" +notes = """ +Build script changes are to replace `RUSTFLAGS` string parsing with a probe file +that is compiled with whatever `RUSTC` is set to (but the build script already +relies on the `RUSTC` environment variable for inspecting the compiler version). +""" + [[audits.proptest]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1552,6 +1689,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.31 -> 1.0.33" +[[audits.quote]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.33 -> 1.0.35" + [[audits.rand_xorshift]] who = "Sean Bowe " criteria = "safe-to-deploy" @@ -1740,6 +1882,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.188 -> 1.0.193" +[[audits.serde]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.193 -> 1.0.194" + [[audits.serde_derive]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1776,6 +1923,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.188 -> 1.0.193" +[[audits.serde_derive]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.193 -> 1.0.194" + [[audits.serde_json]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1806,6 +1958,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.107 -> 1.0.108" +[[audits.serde_json]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.108 -> 1.0.110" + [[audits.sha2]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1922,6 +2079,21 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "2.0.37 -> 2.0.41" +[[audits.syn]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "2.0.41 -> 2.0.43" +notes = """ +New `unsafe` blocks are all inside `unsafe fn`s, and are added to make the +safety contracts in the code clearer (instead of using the `unsafe fn`'s +implicit `unsafe` block). +""" + +[[audits.syn]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "2.0.43 -> 2.0.46" + [[audits.tempfile]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1938,6 +2110,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "3.8.0 -> 3.8.1" +[[audits.tempfile]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "3.8.1 -> 3.9.0" + [[audits.terminfo]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1966,6 +2143,22 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.48 -> 1.0.51" +[[audits.thiserror]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.51 -> 1.0.52" +notes = "Reruns the build script if the `RUSTC_BOOTSTRAP` env variable changes." + +[[audits.thiserror]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.52 -> 1.0.56" +notes = """ +Build script changes are to refactor the existing probe into a separate file +(which removes a filesystem write), and adjust how it gets rerun in response to +changes in the build environment. +""" + [[audits.thiserror-impl]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1988,6 +2181,16 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.48 -> 1.0.51" +[[audits.thiserror-impl]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.51 -> 1.0.52" + +[[audits.thiserror-impl]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.52 -> 1.0.56" + [[audits.thread_local]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -2008,6 +2211,15 @@ Fixes alignment (by using `#[repr(C)]`) of some `union`s that are used in either `UtcOffset` or `()`. """ +[[audits.time]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.3.30 -> 0.3.31" +notes = """ +Removes one `unsafe` block by repurposing a constructor containing a more +general invocation of the same `unsafe` function. +""" + [[audits.time-core]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -2057,12 +2269,22 @@ and its macro-only constructor is now `unsafe`. Safe because the macro ensures that `ordinal` is non-zero while parsing. """ +[[audits.time-macros]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.2.15 -> 0.2.16" + [[audits.tinyvec_macros]] who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.1.0 -> 0.1.1" notes = "Adds `#![forbid(unsafe_code)]` and license files." +[[audits.tokio]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.35.0 -> 1.35.1" + [[audits.toml_datetime]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -2288,6 +2510,16 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "2.5.0 -> 2.5.2" +[[audits.zerocopy]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.7.31 -> 0.7.32" + +[[audits.zerocopy-derive]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.7.31 -> 0.7.32" + [[audits.zeroize]] who = "Daira Hopwood " criteria = "safe-to-deploy" diff --git a/qa/supply-chain/config.toml b/qa/supply-chain/config.toml index 0ed15f4c588..bd8dc22f74c 100644 --- a/qa/supply-chain/config.toml +++ b/qa/supply-chain/config.toml @@ -331,10 +331,6 @@ criteria = "safe-to-deploy" version = "2.6.3" criteria = "safe-to-deploy" -[[exemptions.memoffset]] -version = "0.6.5" -criteria = "safe-to-deploy" - [[exemptions.memuse]] version = "0.2.0" criteria = "safe-to-deploy" @@ -696,7 +692,7 @@ version = "0.4.0" criteria = "safe-to-deploy" [[exemptions.winnow]] -version = "0.5.28" +version = "0.5.31" criteria = "safe-to-deploy" [[exemptions.wyz]] diff --git a/qa/supply-chain/imports.lock b/qa/supply-chain/imports.lock index 4afa0afc337..b1cc37600fd 100644 --- a/qa/supply-chain/imports.lock +++ b/qa/supply-chain/imports.lock @@ -209,14 +209,14 @@ user-login = "nuttycom" user-name = "Kris Nuttycombe" [[publisher.zcash_primitives]] -version = "0.13.0-rc.1" -when = "2023-09-08" +version = "0.13.0" +when = "2023-09-25" user-id = 6289 user-login = "str4d" [[publisher.zcash_proofs]] -version = "0.13.0-rc.1" -when = "2023-09-08" +version = "0.13.0" +when = "2023-09-25" user-id = 6289 user-login = "str4d" @@ -377,12 +377,6 @@ who = "Pat Hickey " criteria = "safe-to-deploy" version = "0.1.0" -[[audits.bytecode-alliance.audits.memoffset]] -who = "Alex Crichton " -criteria = "safe-to-deploy" -delta = "0.7.1 -> 0.8.0" -notes = "This was a small update to the crate which has to do with Rust language features and compiler versions, no substantial changes." - [[audits.bytecode-alliance.audits.miniz_oxide]] who = "Alex Crichton " criteria = "safe-to-deploy" @@ -1134,12 +1128,6 @@ criteria = "safe-to-deploy" version = "0.4.1" aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" -[[audits.mozilla.audits.memoffset]] -who = "Gabriele Svelto " -criteria = "safe-to-deploy" -delta = "0.6.5 -> 0.7.1" -aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" - [[audits.mozilla.audits.nom]] who = "Mike Hommey " criteria = "safe-to-deploy" From acb070df6c89de0dd6a9812ff64a44f592382c87 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sat, 30 Dec 2023 03:32:07 +0000 Subject: [PATCH 06/13] Postpone update to Rust 1.75.0 --- qa/zcash/postponed-updates.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/qa/zcash/postponed-updates.txt b/qa/zcash/postponed-updates.txt index b63ed5fc12d..124f21dabfc 100644 --- a/qa/zcash/postponed-updates.txt +++ b/qa/zcash/postponed-updates.txt @@ -48,6 +48,7 @@ native_rust 1.72.1 2024-03-15 native_rust 1.73.0 2024-03-15 native_rust 1.74.0 2024-03-15 native_rust 1.74.1 2024-03-15 +native_rust 1.75.0 2024-03-15 # We follow upstream Bitcoin Core's LevelDB updates leveldb 1.23 2024-03-15 From d031ce53797a62f76b2cd442e41e0e6d5048b840 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Tue, 2 Jan 2024 14:09:28 +0000 Subject: [PATCH 07/13] depends: cxx 1.0.113 --- Cargo.lock | 12 +++--- Cargo.toml | 2 +- depends/packages/native_cxxbridge.mk | 6 +-- depends/patches/native_cxxbridge/Cargo.lock | 44 ++++++++++----------- qa/supply-chain/audits.toml | 15 +++++++ 5 files changed, 47 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 47624f1d67a..f3bdc2f583a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -463,9 +463,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.111" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9fc0c733f71e58dedf4f034cd2a266f80b94cc9ed512729e1798651b68c2cba" +checksum = "048948e14bc2c2652ec606c8e3bb913407f0187288fb351a0b2d972beaf12070" dependencies = [ "cc", "cxxbridge-flags", @@ -475,15 +475,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.111" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8511afbe34ea242697784da5cb2c5d4a0afb224ca8b136bdf93bfe180cbe5884" +checksum = "af40b0467c68d3d9fb7550ef984edc8ad47252f703ef0f1f2d1052e0e4af8793" [[package]] name = "cxxbridge-macro" -version = "1.0.111" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6888cd161769d65134846d4d4981d5a6654307cc46ec83fb917e530aea5f84" +checksum = "7743446286141c9f6d4497c493c01234eb848e14d2e20866ae9811eae0630cb9" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 0c05ce0e299..aa4da879110 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -71,7 +71,7 @@ wagyu-zcash-parameters = "0.2" # Rust/C++ interop # The version needs to match depends/packages/native_cxxbridge.mk -cxx = { version = "=1.0.111", features = ["c++17"] } +cxx = { version = "=1.0.113", features = ["c++17"] } # Rust threading rayon = "1.5" diff --git a/depends/packages/native_cxxbridge.mk b/depends/packages/native_cxxbridge.mk index 2d7ed5ec745..47224859a86 100644 --- a/depends/packages/native_cxxbridge.mk +++ b/depends/packages/native_cxxbridge.mk @@ -1,14 +1,14 @@ package=native_cxxbridge # The version needs to match cxx in Cargo.toml -$(package)_version=1.0.111 +$(package)_version=1.0.113 $(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=89b80c4b50410b28e4a78db99cd2764cd017bfbffed0c7ca91f8e01ba9539cd4 +$(package)_sha256_hash=0760e02a1faf3357b28f0ee759ffaae05299092d8d3081a23ec2557e55aaf947 $(package)_build_subdir=gen/cmd $(package)_dependencies=native_rust # This file is somewhat annoying to update, but can be done like so from the repo base: -# $ export VERSION=1.0.111 +# $ export VERSION=1.0.113 # $ rm .cargo/config .cargo/.configured-for-offline # $ mkdir tmp # $ cd tmp diff --git a/depends/patches/native_cxxbridge/Cargo.lock b/depends/patches/native_cxxbridge/Cargo.lock index dd6ade40eb6..5224d724fb4 100644 --- a/depends/patches/native_cxxbridge/Cargo.lock +++ b/depends/patches/native_cxxbridge/Cargo.lock @@ -96,7 +96,7 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.111" +version = "1.0.113" dependencies = [ "cc", "cxx-build", @@ -111,7 +111,7 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.111" +version = "1.0.113" dependencies = [ "cc", "codespan-reporting", @@ -127,7 +127,7 @@ dependencies = [ [[package]] name = "cxx-gen" -version = "0.7.111" +version = "0.7.113" dependencies = [ "codespan-reporting", "proc-macro2", @@ -146,7 +146,7 @@ dependencies = [ [[package]] name = "cxxbridge-cmd" -version = "1.0.111" +version = "1.0.113" dependencies = [ "clap", "codespan-reporting", @@ -157,11 +157,11 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.111" +version = "1.0.113" [[package]] name = "cxxbridge-macro" -version = "1.0.111" +version = "1.0.113" dependencies = [ "clang-ast", "cxx", @@ -262,24 +262,24 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "2de98502f212cfcea8d0bb305bd0f49d7ebdd75b64ba0a68f937d888f4e0d6db" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -310,18 +310,18 @@ checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.194" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.194" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0" dependencies = [ "proc-macro2", "quote", @@ -330,9 +330,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "6fbd975230bada99c8bb618e0c365c2eefa219158d5c6c29610fd09ff1833257" dependencies = [ "itoa", "ryu", @@ -347,9 +347,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "2.0.41" +version = "2.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" +checksum = "89456b690ff72fddcecf231caedbe615c59480c93358a93dfae7fc29e3ebbf0e" dependencies = [ "proc-macro2", "quote", @@ -367,9 +367,9 @@ dependencies = [ [[package]] name = "trybuild" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196a58260a906cedb9bf6d8034b6379d0c11f552416960452f267402ceeddff1" +checksum = "8419ecd263363827c5730386f418715766f584e2f874d32c23c5b00bd9727e7e" dependencies = [ "basic-toml", "dissimilar", diff --git a/qa/supply-chain/audits.toml b/qa/supply-chain/audits.toml index 57e2d39bcb9..c9de9c803b6 100644 --- a/qa/supply-chain/audits.toml +++ b/qa/supply-chain/audits.toml @@ -531,6 +531,11 @@ criteria = "safe-to-deploy" delta = "1.0.107 -> 1.0.111" notes = "Build script change is to look for `src/cxx.cc` in the same folder as `include/cxx.h`." +[[audits.cxx]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.111 -> 1.0.113" + [[audits.cxxbridge-flags]] who = "Daira Hopwood " criteria = "safe-to-deploy" @@ -587,6 +592,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.107 -> 1.0.111" +[[audits.cxxbridge-flags]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.111 -> 1.0.113" + [[audits.cxxbridge-macro]] who = "Daira Hopwood " criteria = "safe-to-deploy" @@ -660,6 +670,11 @@ generated code clearer (instead of using the `unsafe fn`'s implicit `unsafe` block). """ +[[audits.cxxbridge-macro]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.111 -> 1.0.113" + [[audits.deranged]] who = "Jack Grigg " criteria = "safe-to-deploy" From 103db269d66e03f9b7ab38a2b4ee53ae0919251f Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Tue, 2 Jan 2024 14:14:22 +0000 Subject: [PATCH 08/13] depends: native_ccache 4.9 --- depends/packages/native_ccache.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/depends/packages/native_ccache.mk b/depends/packages/native_ccache.mk index 1385a27aec8..658a860a772 100644 --- a/depends/packages/native_ccache.mk +++ b/depends/packages/native_ccache.mk @@ -1,8 +1,8 @@ package=native_ccache -$(package)_version=4.8.3 +$(package)_version=4.9 $(package)_download_path=https://github.com/ccache/ccache/releases/download/v$($(package)_version) $(package)_file_name=ccache-$($(package)_version).tar.gz -$(package)_sha256_hash=d59dd569ad2bbc826c0bc335c8ebd73e78ed0f2f40ba6b30069347e63585d9ef +$(package)_sha256_hash=866b2223d59333640f0e7a003cbb85b32d9ca3c9445bd9e3cf142942e69dd3ec $(package)_build_subdir=build $(package)_dependencies=native_cmake native_zstd From a4f8fabe2f3d25377f59c7b7316013b8685ec838 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Tue, 2 Jan 2024 14:31:45 +0000 Subject: [PATCH 09/13] depends: utfcpp 4.0.5 --- depends/packages/utfcpp.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/depends/packages/utfcpp.mk b/depends/packages/utfcpp.mk index 8ac4ec7368e..6ce7ce676d4 100644 --- a/depends/packages/utfcpp.mk +++ b/depends/packages/utfcpp.mk @@ -1,9 +1,9 @@ package=utfcpp -$(package)_version=4.0.4 +$(package)_version=4.0.5 $(package)_download_path=https://github.com/nemtrif/$(package)/archive/refs/tags $(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_download_file=v$($(package)_version).tar.gz -$(package)_sha256_hash=7c8a403d0c575d52473c8644cd9eb46c6ba028d2549bc3e0cdc2d45f5cfd78a0 +$(package)_sha256_hash=ffc668a310e77607d393f3c18b32715f223da1eac4c4d6e0579a11df8e6b59cf define $(package)_stage_cmds mkdir -p $($(package)_staging_dir)$(host_prefix)/include && \ From 7ef8a69a94aef66cba71426a666080cafdd7f968 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Tue, 2 Jan 2024 19:15:04 +0000 Subject: [PATCH 10/13] make-release.py: Versioning changes for 5.8.0. --- README.md | 2 +- configure.ac | 2 +- contrib/gitian-descriptors/gitian-linux-parallel.yml | 2 +- contrib/gitian-descriptors/gitian-linux.yml | 2 +- src/clientversion.h | 2 +- src/deprecation.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 645be82d5c9..01a04061390 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Zcash 5.8.0-rc1 +Zcash 5.8.0 =========== diff --git a/configure.ac b/configure.ac index 7d892fc5ceb..9e50a3fcf11 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 5) define(_CLIENT_VERSION_MINOR, 8) 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-parallel.yml b/contrib/gitian-descriptors/gitian-linux-parallel.yml index 4b096386593..d1d090c8e6b 100644 --- a/contrib/gitian-descriptors/gitian-linux-parallel.yml +++ b/contrib/gitian-descriptors/gitian-linux-parallel.yml @@ -1,5 +1,5 @@ --- -name: "zcash-5.8.0-rc1" +name: "zcash-5.8.0" enable_cache: true distro: "debian" suites: diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 5b1dfc654ab..e252d32cdfb 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "zcash-5.8.0-rc1" +name: "zcash-5.8.0" enable_cache: true distro: "debian" suites: diff --git a/src/clientversion.h b/src/clientversion.h index 72226fdadf6..6707795b0ee 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -18,7 +18,7 @@ #define CLIENT_VERSION_MAJOR 5 #define CLIENT_VERSION_MINOR 8 #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 c5e03ed2523..c546092c3aa 100644 --- a/src/deprecation.h +++ b/src/deprecation.h @@ -13,7 +13,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 = 2339276; +static const int APPROX_RELEASE_HEIGHT = 2353176; 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 b426faf9036db3b42643e1668d65c007d330511b Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Tue, 2 Jan 2024 19:19:13 +0000 Subject: [PATCH 11/13] make-release.py: Updated manpages for 5.8.0. --- doc/man/zcash-cli.1 | 6 +++--- doc/man/zcash-tx.1 | 6 +++--- doc/man/zcashd-wallet-tool.1 | 4 ++-- doc/man/zcashd.1 | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1 index 6519d7d5cf8..f8866658d54 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" "December 2023" "zcash-cli v5.8.0-rc1" "User Commands" +.TH ZCASH-CLI "1" "January 2024" "zcash-cli v5.8.0" "User Commands" .SH NAME -zcash-cli \- manual page for zcash-cli v5.8.0-rc1 +zcash-cli \- manual page for zcash-cli v5.8.0 .SH DESCRIPTION -Zcash RPC client version v5.8.0\-rc1 +Zcash RPC client version v5.8.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 0f6ea556782..6b98a3ebc04 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" "December 2023" "zcash-tx v5.8.0-rc1" "User Commands" +.TH ZCASH-TX "1" "January 2024" "zcash-tx v5.8.0" "User Commands" .SH NAME -zcash-tx \- manual page for zcash-tx v5.8.0-rc1 +zcash-tx \- manual page for zcash-tx v5.8.0 .SH DESCRIPTION -Zcash zcash\-tx utility version v5.8.0\-rc1 +Zcash zcash\-tx utility version v5.8.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 afe08100612..bd89717edbc 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" "December 2023" "zcashd-wallet-tool v5.8.0-rc1" "User Commands" +.TH ZCASHD-WALLET-TOOL "1" "January 2024" "zcashd-wallet-tool v5.8.0" "User Commands" .SH NAME -zcashd-wallet-tool \- manual page for zcashd-wallet-tool v5.8.0-rc1 +zcashd-wallet-tool \- manual page for zcashd-wallet-tool v5.8.0 .SH SYNOPSIS .B zcashd-wallet-tool [\fI\,OPTIONS\/\fR] diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1 index 71e3a9e7b0e..8ef2802578b 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.1. -.TH ZCASHD "1" "December 2023" "zcashd v5.8.0-rc1" "User Commands" +.TH ZCASHD "1" "January 2024" "zcashd v5.8.0" "User Commands" .SH NAME -zcashd \- manual page for zcashd v5.8.0-rc1 +zcashd \- manual page for zcashd v5.8.0 .SH DESCRIPTION -Zcash Daemon version v5.8.0\-rc1 +Zcash Daemon version v5.8.0 .PP In order to ensure you are adequately protecting your privacy when using Zcash, please see . From 51dd1cca584454cdd12d9446484c2c411f2eaa71 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Tue, 2 Jan 2024 19:19:15 +0000 Subject: [PATCH 12/13] make-release.py: Updated release notes and changelog for 5.8.0. --- contrib/debian/changelog | 6 ++++ doc/authors.md | 8 ++--- doc/release-notes/release-notes-5.8.0.md | 45 ++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 doc/release-notes/release-notes-5.8.0.md diff --git a/contrib/debian/changelog b/contrib/debian/changelog index d7e36b68470..2847ee489f4 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +zcash (5.8.0) stable; urgency=medium + + * 5.8.0 release. + + -- Electric Coin Company Tue, 02 Jan 2024 19:19:15 +0000 + zcash (5.8.0~rc1) stable; urgency=medium * 5.8.0-rc1 release. diff --git a/doc/authors.md b/doc/authors.md index f8ab46da20a..9186aefab50 100644 --- a/doc/authors.md +++ b/doc/authors.md @@ -1,7 +1,7 @@ Zcash Contributors ================== -Jack Grigg (1388) +Jack Grigg (1416) Kris Nuttycombe (702) Simon Liu (460) Sean Bowe (409) @@ -22,7 +22,7 @@ sasha (80) Cory Fields (78) Matt Corallo (62) Nathan Wilcox (57) -Daira Emma Hopwood (49) +Daira Emma Hopwood (51) practicalswift (43) Dimitris Apostolou (43) Kevin Gallagher (38) @@ -80,6 +80,7 @@ Gareth Davies (5) sandakersmann (4) instagibbs (4) gladcow (4) +Yasser Isa (4) WO (4) Sjors Provoost (4) Nate Wilcox (4) @@ -114,6 +115,7 @@ kpcyrd (2) kobake (2) hexabot (2) face (2) +dependabot[bot] (2) aniemerg (2) Yuri Zhykin (2) UdjinM6 (2) @@ -170,7 +172,6 @@ ewillbefull@gmail.com (1) emilrus (1) dismad (1) dexX7 (1) -dependabot[bot] (1) daniel (1) cronicc (1) codetriage-readme-bot (1) @@ -179,7 +180,6 @@ ayleph (1) avnish98 (1) adityapk00 (1) Za Wilcox (1) -Yasser Isa (1) Yasser (1) William M Peaster (1) Vidar Holen (1) diff --git a/doc/release-notes/release-notes-5.8.0.md b/doc/release-notes/release-notes-5.8.0.md new file mode 100644 index 00000000000..d292f64b71a --- /dev/null +++ b/doc/release-notes/release-notes-5.8.0.md @@ -0,0 +1,45 @@ +Changelog +========= + +Daira Emma Hopwood (2): + Suppress compilation warnings for K&R-style prototypes when building bdb by adding `-Wno-deprecated-non-prototype` to `CFLAGS`. + Suppress link warnings when building bdb by adding `-Wno-unused-command-line-argument` to `LDFLAGS`. + +Jack Grigg (28): + CI: Use latest stable Rust for book deployment + CI: Rename build workflow to CI + CI: Only run CI workflow once per PR + CI: Switch to 8-core Ubuntu runners + CI: Move matrix definition into a separate job + CI: Rename `matrix.os` to `matrix.build_os` + CI: Upload artifacts from regular build + CI: Run btests and gtests + CI: Split config flag bitrot builds into a separate job + CI: Fix CCache path on macOS + cargo vet prune + cargo update + depends: utfcpp 4.0.4 + depends: ZeroMQ 4.3.5 + depends: native_cmake 3.28.1 + depends: cxx 1.0.111 + qa: Bump postponed dependencies + make-release.py: Versioning changes for 5.8.0-rc1. + make-release.py: Updated manpages for 5.8.0-rc1. + make-release.py: Updated release notes and changelog for 5.8.0-rc1. + make-release.py: Updated book for 5.8.0-rc1. + Update Rust dependencies for 5.8.0 + Postpone update to Rust 1.75.0 + depends: cxx 1.0.113 + depends: native_ccache 4.9 + depends: utfcpp 4.0.5 + make-release.py: Versioning changes for 5.8.0. + make-release.py: Updated manpages for 5.8.0. + +Yasser Isa (3): + Delete contrib/ci-builders directory + Delete contrib/ci-workers directory + CI: Add sharding to GoogleTest job + +dependabot[bot] (1): + build(deps): bump actions/checkout from 3 to 4 + From 14c3355894f232ff4f898fb1331bf20c925f9220 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Tue, 2 Jan 2024 19:19:15 +0000 Subject: [PATCH 13/13] make-release.py: Updated book for 5.8.0. --- doc/book/src/user/release-support.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/book/src/user/release-support.md b/doc/book/src/user/release-support.md index 97da2ecfaa3..5e336446691 100644 --- a/doc/book/src/user/release-support.md +++ b/doc/book/src/user/release-support.md @@ -45,4 +45,5 @@ time, and may shift due to changes in network solution power. | 5.7.0-rc1 | 2023-09-22 | 2365300 | 2024-01-12 | | 5.7.0 | 2023-09-28 | 2372200 | 2024-01-18 | | 5.8.0-rc1 | 2023-12-21 | 2468300 | 2024-04-11 | +| 5.8.0 | 2024-01-02 | 2482200 | 2024-04-23 |