Merge pull request zcash#6913 from str4d/more-maintenance-5.10.0

More maintenance for 5.10.0
baoguomarshall · Aug 6, 2024 · 98495e8 · 98495e8
2 parents 0bcddb8 + f11acd5
commit 98495e8
Show file tree

Hide file tree

Showing 22 changed files with 35 additions and 1,834 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -277,7 +277,6 @@ jobs:
               ${{ format('./src/zcashd{0}', matrix.file_ext) }}
               ${{ format('./src/zcash-cli{0}', matrix.file_ext) }}
               ${{ format('./src/zcashd-wallet-tool{0}', matrix.file_ext) }}
-              ${{ format('./src/zcash-inspect{0}', matrix.file_ext) }}
               ${{ format('./src/zcash-tx{0}', matrix.file_ext) }}
               ${{ format('./src/test/test_bitcoin{0}', matrix.file_ext) }}
               ${{ format('./src/zcash-gtest{0}', matrix.file_ext) }}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ repository = "https://github.com/zcash/zcash"
 readme = "README.md"
 license = "MIT OR Apache-2.0"
 edition = "2018"
-rust-version = "1.79"
+rust-version = "1.80"
 
 [package.metadata.vet]
 store = { path = "./qa/supply-chain" }
@@ -29,10 +29,6 @@ name = "rustzcash"
 path = "src/rust/src/lib.rs"
 crate-type = ["staticlib"]
 
-[[bin]]
-name = "zcash-inspect"
-path = "src/rust/bin/inspect/main.rs"
-
 [[bin]]
 name = "zcashd-wallet-tool"
 path = "src/rust/bin/wallet_tool.rs"
@@ -47,6 +43,7 @@ byteorder = "1"
 crossbeam-channel = "0.5"
 getrandom = "0.2"
 group = "0.13"
+hex = "0.4"
 incrementalmerkletree = "0.5"
 libc = "0.2"
 jubjub = "0.10"
@@ -89,16 +86,6 @@ tokio = { version = "1", features = ["rt", "net", "time"] }
 # General tool dependencies
 gumdrop = "0.8"
 
-# zcash-inspect tool
-bech32 = "0.9"
-equihash = "0.2"
-hex = "0.4"
-lazy_static = "1.4"
-serde = "1.0"
-serde_json = "1.0"
-sha2 = "0.10"
-uint = "0.9"
-
 # Wallet tool
 # (also depends on tracing, and tracing-subscriber with "env-filter" and "fmt" features)
 anyhow = "1.0"

diff --git a/depends/packages/native_ccache.mk b/depends/packages/native_ccache.mk
@@ -1,8 +1,8 @@
 package=native_ccache
-$(package)_version=4.10.1
+$(package)_version=4.10.2
 $(package)_download_path=https://github.com/ccache/ccache/releases/download/v$($(package)_version)
 $(package)_file_name=ccache-$($(package)_version).tar.gz
-$(package)_sha256_hash=8f8ad60d9363857812aa8af3fa7fb72be5ea5cf193f824d16d237a8a79256be4
+$(package)_sha256_hash=108100960bb7e64573ea925af2ee7611701241abb36ce0aae3354528403a7d87
 $(package)_build_subdir=build
 $(package)_dependencies=native_cmake native_fmt native_xxhash native_zstd
 

diff --git a/depends/packages/native_cmake.mk b/depends/packages/native_cmake.mk
@@ -1,8 +1,8 @@
 package=native_cmake
-$(package)_version=3.30.1
+$(package)_version=3.30.2
 $(package)_download_path=https://github.com/Kitware/CMake/releases/download/v$($(package)_version)
 $(package)_file_name=cmake-$($(package)_version).tar.gz
-$(package)_sha256_hash=df9b3c53e3ce84c3c1b7c253e5ceff7d8d1f084ff0673d048f260e04ccb346e1
+$(package)_sha256_hash=46074c781eccebc433e98f0bbfa265ca3fd4381f245ca3b140e7711531d60db2
 
 define $(package)_set_vars
 $(package)_config_opts += -DCMAKE_BUILD_TYPE:STRING=Release

diff --git a/depends/packages/native_fmt.mk b/depends/packages/native_fmt.mk
@@ -1,9 +1,9 @@
 package=native_fmt
-$(package)_version=10.2.1
+$(package)_version=11.0.2
 $(package)_download_path=https://github.com/fmtlib/fmt/archive/refs/tags
 $(package)_download_file=$($(package)_version).tar.gz
 $(package)_file_name=fmt-$($(package)_version).tar.gz
-$(package)_sha256_hash=1250e4cc58bf06ee631567523f48848dc4596133e163f02615c97f78bab6c811
+$(package)_sha256_hash=6cb1e6d37bdcb756dbbe59be438790db409cdb4868c66e888d5df9f13f7c027f
 $(package)_build_subdir=build
 $(package)_dependencies=native_cmake
 

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.79.0
+$(package)_version=1.80.0
 $(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=628efa8ef0658a7c4199883ee132281f19931448d3cfee4ecfd768898fe74c18
+$(package)_sha256_hash_linux=702d3b60816eb9410c84947895c0188e20f588cb91b3aee8d84cec23ddb63582
 $(package)_file_name_darwin=rust-$($(package)_version)-x86_64-apple-darwin.tar.gz
-$(package)_sha256_hash_darwin=62f018aad30bafa0ef8bff0ed60d5d45e6cadc799769aad9d945509203e9f921
+$(package)_sha256_hash_darwin=18352bc5802e117189c029b6ed63bf83bfbcde7141f33eee69f037acd1767676
 $(package)_file_name_freebsd=rust-$($(package)_version)-x86_64-unknown-freebsd.tar.gz
-$(package)_sha256_hash_freebsd=3c8005f488b8dda0fc6d47928868200852106cac2b568934ae9a2e5c89d3a50d
+$(package)_sha256_hash_freebsd=d9eb6a65ee2b51ce982999c093a9f1f2e37f65c3a3d47dff2e0e74b7e01f534c
 $(package)_file_name_aarch64_linux=rust-$($(package)_version)-aarch64-unknown-linux-gnu.tar.gz
-$(package)_sha256_hash_aarch64_linux=f7d3b31581331b54af97cf3162e65b8c26c8aa14d42f71c1ce9adc1078ef54e5
+$(package)_sha256_hash_aarch64_linux=0aa0f0327c8054f3805cc4d83be2c17d1e846d23292aa872ecd6f78d86f84ce5
 
 # 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=e4597274ffbad0b3196dbab9f8badbdf33d4407a07e3f577c074cc90f95c0ca5
-$(package)_rust_std_sha256_hash_x86_64-apple-darwin=52575ebb436bd67016a5fdf8a6e85ffb258c7f1f70c6b2d4a4e0b98204be327d
-$(package)_rust_std_sha256_hash_x86_64-pc-windows-gnu=95acebd9355ab0556b117fbac8ce88dd98cf91af17a3b95b3a6c0a910f13b546
-$(package)_rust_std_sha256_hash_x86_64-unknown-freebsd=68605333389911e56963963b3fa35e6dd1af92386149115e1c029a37b3a483d5
+$(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
 
 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))))

diff --git a/doc/release-notes.md b/doc/release-notes.md
@@ -10,3 +10,10 @@ Platform Support
 - Debian 10 (Buster) has been removed from the list of supported platforms.
   It reached EoL on June 30th 2024, and does not satisfy our Tier 2 policy
   requirements.
+
+Other
+-----
+
+- The `zcash-inspect` tool (which was never distributed, and was present in this
+  repository for debugging purposes) has been moved to the `devtools` subfolder
+  of the https://github.com/zcash/librustzcash repository.
diff --git a/qa/supply-chain/config.toml b/qa/supply-chain/config.toml
@@ -490,10 +490,6 @@ criteria = "safe-to-deploy"
 version = "0.3.0"
 criteria = "safe-to-deploy"
 
-[[exemptions.ryu]]
-version = "1.0.11"
-criteria = "safe-to-deploy"
-
 [[exemptions.secp256k1]]
 version = "0.26.0"
 criteria = "safe-to-deploy"
@@ -506,10 +502,6 @@ criteria = "safe-to-deploy"
 version = "0.8.0"
 criteria = "safe-to-deploy"
 
-[[exemptions.serde_json]]
-version = "1.0.81"
-criteria = "safe-to-deploy"
-
 [[exemptions.sha2]]
 version = "0.10.8"
 criteria = "safe-to-deploy"

diff --git a/qa/supply-chain/imports.lock b/qa/supply-chain/imports.lock
@@ -1105,16 +1105,6 @@ who = "Ameer Ghani <[email protected]>"
 criteria = "safe-to-deploy"
 version = "1.12.1"
 
-[[audits.isrg.audits.serde_json]]
-who = "Brandon Pitman <[email protected]>"
-criteria = "safe-to-deploy"
-delta = "1.0.93 -> 1.0.94"
-
-[[audits.isrg.audits.serde_json]]
-who = "Brandon Pitman <[email protected]>"
-criteria = "safe-to-deploy"
-delta = "1.0.94 -> 1.0.95"
-
 [[audits.isrg.audits.thiserror]]
 who = "Brandon Pitman <[email protected]>"
 criteria = "safe-to-deploy"
@@ -1410,36 +1400,6 @@ criteria = "safe-to-deploy"
 delta = "0.6.27 -> 0.6.28"
 aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
 
-[[audits.mozilla.audits.ryu]]
-who = "Mike Hommey <[email protected]>"
-criteria = "safe-to-deploy"
-delta = "1.0.11 -> 1.0.12"
-aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
-
-[[audits.mozilla.audits.serde_json]]
-who = "Mike Hommey <[email protected]>"
-criteria = "safe-to-deploy"
-delta = "1.0.81 -> 1.0.83"
-aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
-
-[[audits.mozilla.audits.serde_json]]
-who = "Mike Hommey <[email protected]>"
-criteria = "safe-to-deploy"
-delta = "1.0.83 -> 1.0.85"
-aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
-
-[[audits.mozilla.audits.serde_json]]
-who = "Mike Hommey <[email protected]>"
-criteria = "safe-to-deploy"
-delta = "1.0.85 -> 1.0.91"
-aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
-
-[[audits.mozilla.audits.serde_json]]
-who = "Mike Hommey <[email protected]>"
-criteria = "safe-to-deploy"
-delta = "1.0.91 -> 1.0.93"
-aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
-
 [[audits.mozilla.audits.socket2]]
 who = "Kershaw Chang <[email protected]>"
 criteria = "safe-to-deploy"
@@ -1530,12 +1490,6 @@ with Rust 1.80 or later.
 """
 aggregated-from = "https://raw.githubusercontent.com/zcash/librustzcash/main/supply-chain/audits.toml"
 
-[[audits.zcash.audits.serde_json]]
-who = "Jack Grigg <[email protected]>"
-criteria = "safe-to-deploy"
-delta = "1.0.117 -> 1.0.120"
-aggregated-from = "https://raw.githubusercontent.com/zcash/librustzcash/main/supply-chain/audits.toml"
-
 [[audits.zcash.audits.thiserror]]
 who = "Daira-Emma Hopwood <[email protected]>"
 criteria = "safe-to-deploy"

diff --git a/qa/zcash/full_test_suite.py b/qa/zcash/full_test_suite.py
@@ -99,7 +99,7 @@ def check_security_hardening():
     else:
         # Equivalent to make check-security (this is just for CI purpose)
         bin_programs = ['src/zcashd', 'src/zcash-cli', 'src/zcash-tx', 'src/bench/bench_bitcoin']  # Replace with actual values
-        bin_scripts = ['src/zcash-inspect', 'src/zcashd-wallet-tool']   # Replace with actual values
+        bin_scripts = ['src/zcashd-wallet-tool']   # Replace with actual values
 
         print(f"Checking binary security of {bin_programs + bin_scripts}...")
 

diff --git a/qa/zcash/postponed-updates.txt b/qa/zcash/postponed-updates.txt
@@ -12,10 +12,6 @@ native_b2 1.85.0 2024-09-15
 
 # Clang and Rust are currently pinned to LLVM 18
 
-# fmt 11.0.0 changed where its version string is, CCache needs a patch.
-native_fmt 11.0.0 2024-09-01
-native_fmt 11.0.1 2024-09-01
-
 # We follow upstream Bitcoin Core's LevelDB updates
 leveldb 1.23 2024-09-15
 

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.79.0"
+channel = "1.80.0"
 components = ["clippy", "rustfmt"]
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -36,9 +36,6 @@ LIBSECP256K1=secp256k1/libsecp256k1.la
 LIBUNIVALUE=univalue/libunivalue.la
 LIBZCASH=libzcash.a
 
-INSPECT_TOOL_BIN=zcash-inspect$(EXEEXT)
-INSPECT_TOOL_BUILD=$(top_builddir)/target/$(RUST_TARGET)/release/zcash-inspect$(EXEEXT)
-
 WALLET_TOOL_BIN=zcashd-wallet-tool$(EXEEXT)
 WALLET_TOOL_BUILD=$(top_builddir)/target/$(RUST_TARGET)/release/zcashd-wallet-tool$(EXEEXT)
 
@@ -158,9 +155,6 @@ cargo-build-lib: cargo-build
 
 cargo-build-bins: cargo-build
 
-$(INSPECT_TOOL_BIN): cargo-build-bins
-	$(AM_V_at)cp $(INSPECT_TOOL_BUILD) $@
-
 $(WALLET_TOOL_BIN): cargo-build-bins
 	$(AM_V_at)cp $(WALLET_TOOL_BUILD) $@
 
@@ -210,7 +204,7 @@ endif
 
 if BUILD_BITCOIN_UTILS
   bin_PROGRAMS += zcash-cli zcash-tx
-  bin_SCRIPTS += $(INSPECT_TOOL_BIN) $(WALLET_TOOL_BIN)
+  bin_SCRIPTS += $(WALLET_TOOL_BIN)
 endif
 
 LIBZCASH_H = \