Skip to content

Commit 16ab6e8

Browse files
committed
rust: Remove zcash-inspect binary
This has been moved into the `zcash/librustzcash` repository as a devtool.
1 parent 76c0489 commit 16ab6e8

File tree

14 files changed

+10
-1813
lines changed

14 files changed

+10
-1813
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,6 @@ jobs:
277277
${{ format('./src/zcashd{0}', matrix.file_ext) }}
278278
${{ format('./src/zcash-cli{0}', matrix.file_ext) }}
279279
${{ format('./src/zcashd-wallet-tool{0}', matrix.file_ext) }}
280-
${{ format('./src/zcash-inspect{0}', matrix.file_ext) }}
281280
${{ format('./src/zcash-tx{0}', matrix.file_ext) }}
282281
${{ format('./src/test/test_bitcoin{0}', matrix.file_ext) }}
283282
${{ format('./src/zcash-gtest{0}', matrix.file_ext) }}

Cargo.lock

Lines changed: 0 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ name = "rustzcash"
2929
path = "src/rust/src/lib.rs"
3030
crate-type = ["staticlib"]
3131

32-
[[bin]]
33-
name = "zcash-inspect"
34-
path = "src/rust/bin/inspect/main.rs"
35-
3632
[[bin]]
3733
name = "zcashd-wallet-tool"
3834
path = "src/rust/bin/wallet_tool.rs"
@@ -47,6 +43,7 @@ byteorder = "1"
4743
crossbeam-channel = "0.5"
4844
getrandom = "0.2"
4945
group = "0.13"
46+
hex = "0.4"
5047
incrementalmerkletree = "0.5"
5148
libc = "0.2"
5249
jubjub = "0.10"
@@ -89,16 +86,6 @@ tokio = { version = "1", features = ["rt", "net", "time"] }
8986
# General tool dependencies
9087
gumdrop = "0.8"
9188

92-
# zcash-inspect tool
93-
bech32 = "0.9"
94-
equihash = "0.2"
95-
hex = "0.4"
96-
lazy_static = "1.4"
97-
serde = "1.0"
98-
serde_json = "1.0"
99-
sha2 = "0.10"
100-
uint = "0.9"
101-
10289
# Wallet tool
10390
# (also depends on tracing, and tracing-subscriber with "env-filter" and "fmt" features)
10491
anyhow = "1.0"

doc/release-notes.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,10 @@ Platform Support
1010
- Debian 10 (Buster) has been removed from the list of supported platforms.
1111
It reached EoL on June 30th 2024, and does not satisfy our Tier 2 policy
1212
requirements.
13+
14+
Other
15+
-----
16+
17+
- The `zcash-inspect` tool (which was never distributed, and was present in this
18+
repository for debugging purposes) has been moved to the `devtools` subfolder
19+
of the https://github.com/zcash/librustzcash repository.

qa/supply-chain/config.toml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -490,10 +490,6 @@ criteria = "safe-to-deploy"
490490
version = "0.3.0"
491491
criteria = "safe-to-deploy"
492492

493-
[[exemptions.ryu]]
494-
version = "1.0.11"
495-
criteria = "safe-to-deploy"
496-
497493
[[exemptions.secp256k1]]
498494
version = "0.26.0"
499495
criteria = "safe-to-deploy"
@@ -506,10 +502,6 @@ criteria = "safe-to-deploy"
506502
version = "0.8.0"
507503
criteria = "safe-to-deploy"
508504

509-
[[exemptions.serde_json]]
510-
version = "1.0.81"
511-
criteria = "safe-to-deploy"
512-
513505
[[exemptions.sha2]]
514506
version = "0.10.8"
515507
criteria = "safe-to-deploy"

qa/supply-chain/imports.lock

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1105,16 +1105,6 @@ who = "Ameer Ghani <[email protected]>"
11051105
criteria = "safe-to-deploy"
11061106
version = "1.12.1"
11071107

1108-
[[audits.isrg.audits.serde_json]]
1109-
who = "Brandon Pitman <[email protected]>"
1110-
criteria = "safe-to-deploy"
1111-
delta = "1.0.93 -> 1.0.94"
1112-
1113-
[[audits.isrg.audits.serde_json]]
1114-
who = "Brandon Pitman <[email protected]>"
1115-
criteria = "safe-to-deploy"
1116-
delta = "1.0.94 -> 1.0.95"
1117-
11181108
[[audits.isrg.audits.thiserror]]
11191109
who = "Brandon Pitman <[email protected]>"
11201110
criteria = "safe-to-deploy"
@@ -1410,36 +1400,6 @@ criteria = "safe-to-deploy"
14101400
delta = "0.6.27 -> 0.6.28"
14111401
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
14121402

1413-
[[audits.mozilla.audits.ryu]]
1414-
who = "Mike Hommey <[email protected]>"
1415-
criteria = "safe-to-deploy"
1416-
delta = "1.0.11 -> 1.0.12"
1417-
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
1418-
1419-
[[audits.mozilla.audits.serde_json]]
1420-
who = "Mike Hommey <[email protected]>"
1421-
criteria = "safe-to-deploy"
1422-
delta = "1.0.81 -> 1.0.83"
1423-
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
1424-
1425-
[[audits.mozilla.audits.serde_json]]
1426-
who = "Mike Hommey <[email protected]>"
1427-
criteria = "safe-to-deploy"
1428-
delta = "1.0.83 -> 1.0.85"
1429-
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
1430-
1431-
[[audits.mozilla.audits.serde_json]]
1432-
who = "Mike Hommey <[email protected]>"
1433-
criteria = "safe-to-deploy"
1434-
delta = "1.0.85 -> 1.0.91"
1435-
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
1436-
1437-
[[audits.mozilla.audits.serde_json]]
1438-
who = "Mike Hommey <[email protected]>"
1439-
criteria = "safe-to-deploy"
1440-
delta = "1.0.91 -> 1.0.93"
1441-
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
1442-
14431403
[[audits.mozilla.audits.socket2]]
14441404
who = "Kershaw Chang <[email protected]>"
14451405
criteria = "safe-to-deploy"
@@ -1530,12 +1490,6 @@ with Rust 1.80 or later.
15301490
"""
15311491
aggregated-from = "https://raw.githubusercontent.com/zcash/librustzcash/main/supply-chain/audits.toml"
15321492

1533-
[[audits.zcash.audits.serde_json]]
1534-
who = "Jack Grigg <[email protected]>"
1535-
criteria = "safe-to-deploy"
1536-
delta = "1.0.117 -> 1.0.120"
1537-
aggregated-from = "https://raw.githubusercontent.com/zcash/librustzcash/main/supply-chain/audits.toml"
1538-
15391493
[[audits.zcash.audits.thiserror]]
15401494
who = "Daira-Emma Hopwood <[email protected]>"
15411495
criteria = "safe-to-deploy"

qa/zcash/full_test_suite.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def check_security_hardening():
9999
else:
100100
# Equivalent to make check-security (this is just for CI purpose)
101101
bin_programs = ['src/zcashd', 'src/zcash-cli', 'src/zcash-tx', 'src/bench/bench_bitcoin'] # Replace with actual values
102-
bin_scripts = ['src/zcash-inspect', 'src/zcashd-wallet-tool'] # Replace with actual values
102+
bin_scripts = ['src/zcashd-wallet-tool'] # Replace with actual values
103103

104104
print(f"Checking binary security of {bin_programs + bin_scripts}...")
105105

src/Makefile.am

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ LIBSECP256K1=secp256k1/libsecp256k1.la
3636
LIBUNIVALUE=univalue/libunivalue.la
3737
LIBZCASH=libzcash.a
3838

39-
INSPECT_TOOL_BIN=zcash-inspect$(EXEEXT)
40-
INSPECT_TOOL_BUILD=$(top_builddir)/target/$(RUST_TARGET)/release/zcash-inspect$(EXEEXT)
41-
4239
WALLET_TOOL_BIN=zcashd-wallet-tool$(EXEEXT)
4340
WALLET_TOOL_BUILD=$(top_builddir)/target/$(RUST_TARGET)/release/zcashd-wallet-tool$(EXEEXT)
4441

@@ -158,9 +155,6 @@ cargo-build-lib: cargo-build
158155

159156
cargo-build-bins: cargo-build
160157

161-
$(INSPECT_TOOL_BIN): cargo-build-bins
162-
$(AM_V_at)cp $(INSPECT_TOOL_BUILD) $@
163-
164158
$(WALLET_TOOL_BIN): cargo-build-bins
165159
$(AM_V_at)cp $(WALLET_TOOL_BUILD) $@
166160

@@ -210,7 +204,7 @@ endif
210204

211205
if BUILD_BITCOIN_UTILS
212206
bin_PROGRAMS += zcash-cli zcash-tx
213-
bin_SCRIPTS += $(INSPECT_TOOL_BIN) $(WALLET_TOOL_BIN)
207+
bin_SCRIPTS += $(WALLET_TOOL_BIN)
214208
endif
215209

216210
LIBZCASH_H = \

src/rust/bin/inspect/address.rs

Lines changed: 0 additions & 140 deletions
This file was deleted.

0 commit comments

Comments
 (0)