Merge pull request zcash#6937 from zcash/version-5.10.0

Version 5.10.0 post-release merge
sircsq · Aug 28, 2024 · ecfe777 · ecfe777
2 parents 7ac8c9a + afeab4d
commit ecfe777
Show file tree

Hide file tree

Showing 35 changed files with 730 additions and 488 deletions.
diff --git a/.cargo/config.toml.offline b/.cargo/config.toml.offline
@@ -4,10 +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 = "f69316e5bd940d5e4760c1ee0b0f3bef56d71534"
-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/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -78,18 +78,18 @@ jobs:
               test_os: ubuntu-22.04
               host: x86_64-pc-linux-gnu
 
-            - name: macos-12
-              tier: 3
-              platform: macOS 12 Monterey
-              build_os: macos-12
-              test_os: macos-12
-              brew_deps: >
-                autoconf
-                automake
-                coreutils
-                libtool
-                pkgconfig
-              host: x86_64-apple-darwin
+            # - name: macos-12
+            #   tier: 3
+            #   platform: macOS 12 Monterey
+            #   build_os: macos-12
+            #   test_os: macos-12
+            #   brew_deps: >
+            #     autoconf
+            #     automake
+            #     coreutils
+            #     libtool
+            #     pkgconfig
+            #   host: x86_64-apple-darwin
 
             - name: mingw32
               tier: 3

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -59,20 +59,20 @@ redjubjub = "0.7"
 tracing = "0.1"
 tracing-core = "0.1"
 tracing-appender = "0.2"
-zcash_address = "0.4"
+zcash_address = "0.5"
 zcash_encoding = "0.2.1"
 zcash_history = "0.4"
 zcash_note_encryption = "0.4"
-zcash_primitives = { version = "0.16", features = ["temporary-zcashd", "transparent-inputs"] }
-zcash_proofs = { version = "0.16", features = ["directories"] }
-zcash_protocol = { version = "0.2", features = ["local-consensus"] }
+zcash_primitives = { version = "0.17", features = ["temporary-zcashd", "transparent-inputs"] }
+zcash_proofs = { version = "0.17", features = ["directories"] }
+zcash_protocol = { version = "0.3", features = ["local-consensus"] }
 ed25519-zebra = "4"
 zeroize = "1.4.2"
 wagyu-zcash-parameters = "0.2"
 
 # Rust/C++ interop
 # The version needs to match depends/packages/native_cxxbridge.mk
-cxx = { version = "=1.0.124", features = ["c++17"] }
+cxx = { version = "=1.0.126", features = ["c++17"] }
 
 # Rust threading
 rayon = "1.5"
@@ -100,7 +100,7 @@ time = { version = "0.3", features = ["formatting", "macros"] }
 [dev-dependencies]
 incrementalmerkletree = { version = "0.6", features = ["test-dependencies"] }
 proptest = "1.0.0"
-zcash_primitives = { version = "0.16", features = ["temporary-zcashd", "transparent-inputs", "test-dependencies"] }
+zcash_primitives = { version = "0.17", features = ["temporary-zcashd", "transparent-inputs", "test-dependencies"] }
 
 [dependencies.tracing-subscriber]
 version = "0.3"

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Zcash 5.9.1
+Zcash 5.10.0
 <img align="right" width="120" height="80" src="doc/imgs/logo.png">
 ===========
 

diff --git a/configure.ac b/configure.ac
@@ -1,8 +1,8 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 5)
-define(_CLIENT_VERSION_MINOR, 9)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_MINOR, 10)
+define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 50)
 define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
 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)))

diff --git a/contrib/debian/changelog b/contrib/debian/changelog
@@ -1,3 +1,15 @@
+zcash (5.10.0) stable; urgency=medium
+
+  * 5.10.0 release.
+
+ -- Electric Coin Company <team@electriccoin.co>  Tue, 27 Aug 2024 10:40:33 -0600
+
+zcash (5.10.0~rc1) stable; urgency=medium
+
+  * 5.10.0-rc1 release.
+
+ -- Electric Coin Company <team@electriccoin.co>  Wed, 21 Aug 2024 22:55:30 -0600
+
 zcash (5.9.1) stable; urgency=medium
 
   * 5.9.1 release.

diff --git a/contrib/gitian-descriptors/gitian-linux-parallel.yml b/contrib/gitian-descriptors/gitian-linux-parallel.yml
@@ -1,5 +1,5 @@
 ---
-name: "zcash-5.9.1"
+name: "zcash-5.10.0"
 enable_cache: true
 distro: "debian"
 suites:

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
@@ -1,5 +1,5 @@
 ---
-name: "zcash-5.9.1"
+name: "zcash-5.10.0"
 enable_cache: true
 distro: "debian"
 suites:

diff --git a/deny.toml b/deny.toml
@@ -25,18 +25,9 @@ allow = [
 exceptions = [
     { name = "arrayref", allow = ["BSD-2-Clause"] },
     { name = "curve25519-dalek", allow = ["BSD-3-Clause"] },
-    { name = "ring", allow = ["LicenseRef-ring"] },
     { name = "secp256k1", allow = ["CC0-1.0"] },
     { name = "secp256k1-sys", allow = ["CC0-1.0"] },
     { name = "subtle", allow = ["BSD-3-Clause"] },
     { name = "terminfo", allow = ["WTFPL"] },
     { name = "unicode-ident", allow = ["Unicode-DFS-2016"] },
-    { name = "untrusted", allow = ["ISC"] },
-]
-
-[[licenses.clarify]]
-name = "ring"
-expression = "LicenseRef-ring"
-license-files = [
-    { path = "LICENSE", hash = 0xbd0eed23 },
 ]
diff --git 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.124
+$(package)_version=1.0.126
 $(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=ee25ea9b2157de797a087cee7fe02e92af53eba435b009b5e42317ea47fc8551
+$(package)_sha256_hash=9ad1aecb0dae3e9419c240a5acc1ab5a19194b6eee15c53c2b4a941192ba1a18
 $(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:

diff --git a/depends/packages/native_rust.mk b/depends/packages/native_rust.mk
@@ -3,16 +3,16 @@ package=native_rust
 # ./contrib/devtools/update-rust-hashes.sh
 # The Rust compiler should use the same LLVM version as the Clang compiler; you
 # can check this with `rustc --version -v`.
-$(package)_version=1.80.0
+$(package)_version=1.80.1
 $(package)_download_path=https://static.rust-lang.org/dist
 $(package)_file_name_linux=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.gz
-$(package)_sha256_hash_linux=702d3b60816eb9410c84947895c0188e20f588cb91b3aee8d84cec23ddb63582
+$(package)_sha256_hash_linux=9eedaea9719914a0f4673899aa11693607f25486569913fcca5905ef1da784ec
 $(package)_file_name_darwin=rust-$($(package)_version)-x86_64-apple-darwin.tar.gz
-$(package)_sha256_hash_darwin=18352bc5802e117189c029b6ed63bf83bfbcde7141f33eee69f037acd1767676
+$(package)_sha256_hash_darwin=4fcc0dad8b47066e13877e2839760ef1f40754a90a8fe83ecd4a1f14bf63c71a
 $(package)_file_name_freebsd=rust-$($(package)_version)-x86_64-unknown-freebsd.tar.gz
-$(package)_sha256_hash_freebsd=d9eb6a65ee2b51ce982999c093a9f1f2e37f65c3a3d47dff2e0e74b7e01f534c
+$(package)_sha256_hash_freebsd=d7f4f66c3cc97616bcd37d9f63ed14c3c22c72a467f308453df2f1b128ffe0bc
 $(package)_file_name_aarch64_linux=rust-$($(package)_version)-aarch64-unknown-linux-gnu.tar.gz
-$(package)_sha256_hash_aarch64_linux=0aa0f0327c8054f3805cc4d83be2c17d1e846d23292aa872ecd6f78d86f84ce5
+$(package)_sha256_hash_aarch64_linux=4ae791da82be6e7223f4f6cd477799624481aa1011e17c37753a57d257f89198
 
 # Mapping from GCC canonical hosts to Rust targets
 # If a mapping is not present, we assume they are identical, unless $host_os is
@@ -21,10 +21,10 @@ $(package)_rust_target_x86_64-pc-linux-gnu=x86_64-unknown-linux-gnu
 $(package)_rust_target_x86_64-w64-mingw32=x86_64-pc-windows-gnu
 
 # Mapping from Rust targets to SHA-256 hashes
-$(package)_rust_std_sha256_hash_aarch64-unknown-linux-gnu=6cdbe8c2b502ca90f42c581b8906b725ccc55bbb3427a332379236bf22be59b3
-$(package)_rust_std_sha256_hash_x86_64-apple-darwin=069dcd20861c1031a2e1484ef4085503b1e239fdca6b7c6dd4d834c9cc8aff70
-$(package)_rust_std_sha256_hash_x86_64-pc-windows-gnu=0d6a58268bd94d66280812c042c41521f65acd773e3aae3219eb8a088654be72
-$(package)_rust_std_sha256_hash_x86_64-unknown-freebsd=c53712accc2d631b6afcf50c090752de01be2e92dd9e013fb9b036fe2cafae71
+$(package)_rust_std_sha256_hash_aarch64-unknown-linux-gnu=2465f0df2ee35d32bd9690e05dd84d9c38bf81e8a5e9fd940d7347b66447c97f
+$(package)_rust_std_sha256_hash_x86_64-apple-darwin=8fe1bd5ac9fb8741d3049b753a6eabec0e88d9c2c0276fdff34f868b35edda41
+$(package)_rust_std_sha256_hash_x86_64-pc-windows-gnu=4fb82d57b0422ad31894529d3b45f84c41dec92009e643aa66fc4f418178b475
+$(package)_rust_std_sha256_hash_x86_64-unknown-freebsd=b293f4ad4baa7298b2ccff0da3224b1e9bb64e34d5d1158d0a03fea37adb0402
 
 define rust_target
 $(if $($(1)_rust_target_$(2)),$($(1)_rust_target_$(2)),$(if $(findstring darwin,$(3)),x86_64-apple-darwin,$(if $(findstring freebsd,$(3)),x86_64-unknown-freebsd,$(2))))