Use published `zcash_primitives 0.11` and `zcash_proofs 0.11`

Closes zcash/zcash#6462.
This commit is contained in:
Jack Grigg 2023-04-15 01:51:29 +00:00
parent 6ad60e7340
commit 716720775e
5 changed files with 45 additions and 51 deletions

View File

@ -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 = "edb1941f19d85fb6dff11440e03cd53f2c5494ed"
replace-with = "vendored-sources"
[source.vendored-sources]
# The directory for this source is set to RUST_VENDORED_SOURCES by src/Makefile.am

30
Cargo.lock generated
View File

@ -517,7 +517,8 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
[[package]]
name = "equihash"
version = "0.2.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=edb1941f19d85fb6dff11440e03cd53f2c5494ed#edb1941f19d85fb6dff11440e03cd53f2c5494ed"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab579d7cf78477773b03e80bc2f89702ef02d7112c711d54ca93dcdce68533d5"
dependencies = [
"blake2b_simd",
"byteorder",
@ -526,7 +527,8 @@ dependencies = [
[[package]]
name = "f4jumble"
version = "0.1.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=edb1941f19d85fb6dff11440e03cd53f2c5494ed#edb1941f19d85fb6dff11440e03cd53f2c5494ed"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a83e8d7fd0c526af4aad893b7c9fe41e2699ed8a776a6c74aecdeafe05afc75"
dependencies = [
"blake2b_simd",
]
@ -2312,8 +2314,9 @@ dependencies = [
[[package]]
name = "zcash_address"
version = "0.2.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=edb1941f19d85fb6dff11440e03cd53f2c5494ed#edb1941f19d85fb6dff11440e03cd53f2c5494ed"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52be35a205369d480378646bff9c9fedafd8efe8af1e0e54bb858f405883f2b2"
dependencies = [
"bech32",
"bs58",
@ -2324,7 +2327,8 @@ dependencies = [
[[package]]
name = "zcash_encoding"
version = "0.2.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=edb1941f19d85fb6dff11440e03cd53f2c5494ed#edb1941f19d85fb6dff11440e03cd53f2c5494ed"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f03391b81727875efa6ac0661a20883022b6fba92365dc121c48fa9b00c5aac0"
dependencies = [
"byteorder",
"nonempty",
@ -2333,7 +2337,8 @@ dependencies = [
[[package]]
name = "zcash_history"
version = "0.3.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=edb1941f19d85fb6dff11440e03cd53f2c5494ed#edb1941f19d85fb6dff11440e03cd53f2c5494ed"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb611a28a4e13ac715ee712f4344d6b279b767daf6345dafefb2c4bf582b6679"
dependencies = [
"blake2b_simd",
"byteorder",
@ -2343,7 +2348,8 @@ dependencies = [
[[package]]
name = "zcash_note_encryption"
version = "0.3.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=edb1941f19d85fb6dff11440e03cd53f2c5494ed#edb1941f19d85fb6dff11440e03cd53f2c5494ed"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2eb2149e6cd5fbee36c5b87c601715a8c35554602f7fe84af38b636afa2db318"
dependencies = [
"chacha20",
"chacha20poly1305",
@ -2354,8 +2360,9 @@ dependencies = [
[[package]]
name = "zcash_primitives"
version = "0.10.2"
source = "git+https://github.com/zcash/librustzcash.git?rev=edb1941f19d85fb6dff11440e03cd53f2c5494ed#edb1941f19d85fb6dff11440e03cd53f2c5494ed"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "914d2195a478d5b63191584dff126f552751115181857b290211ec88e68acc3e"
dependencies = [
"aes",
"bip0039",
@ -2389,8 +2396,9 @@ dependencies = [
[[package]]
name = "zcash_proofs"
version = "0.10.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=edb1941f19d85fb6dff11440e03cd53f2c5494ed#edb1941f19d85fb6dff11440e03cd53f2c5494ed"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5c8147884952748b00aa443d36511ae2d7b49acfec74cfd39c0959fbb61ef14"
dependencies = [
"bellman",
"blake2b_simd",

View File

@ -61,8 +61,8 @@ zcash_address = "0.2"
zcash_encoding = "0.2"
zcash_history = "0.3"
zcash_note_encryption = "0.3"
zcash_primitives = { version = "0.10.2", features = ["temporary-zcashd", "transparent-inputs"] }
zcash_proofs = { version = "0.10", features = ["directories"] }
zcash_primitives = { version = "0.11", features = ["temporary-zcashd", "transparent-inputs"] }
zcash_proofs = { version = "0.11", features = ["directories"] }
ed25519-zebra = "3"
zeroize = "1.4.2"
@ -112,12 +112,3 @@ features = ["ansi", "env-filter", "fmt", "time"]
lto = 'thin'
panic = 'abort'
codegen-units = 1
[patch.crates-io]
equihash = { git = "https://github.com/zcash/librustzcash.git", rev = "edb1941f19d85fb6dff11440e03cd53f2c5494ed" }
zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "edb1941f19d85fb6dff11440e03cd53f2c5494ed" }
zcash_encoding = { git = "https://github.com/zcash/librustzcash.git", rev = "edb1941f19d85fb6dff11440e03cd53f2c5494ed" }
zcash_history = { git = "https://github.com/zcash/librustzcash.git", rev = "edb1941f19d85fb6dff11440e03cd53f2c5494ed" }
zcash_note_encryption = { git = "https://github.com/zcash/librustzcash.git", rev = "edb1941f19d85fb6dff11440e03cd53f2c5494ed" }
zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "edb1941f19d85fb6dff11440e03cd53f2c5494ed" }
zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "edb1941f19d85fb6dff11440e03cd53f2c5494ed" }

View File

@ -1455,6 +1455,12 @@ who = "Kris Nuttycombe <kris@nutty.land>"
criteria = "safe-to-deploy"
delta = "0.1.0 -> 0.2.0"
[[audits.zcash_address]]
who = "Jack Grigg <jack@electriccoin.co>"
criteria = "safe-to-deploy"
delta = "0.2.0 -> 0.2.1"
notes = "The ECC core team maintains this crate, and we have reviewed every line."
[[audits.zcash_encoding]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
@ -1483,6 +1489,12 @@ who = "Kris Nuttycombe <kris@nutty.land>"
criteria = "safe-to-deploy"
delta = "0.1.0 -> 0.2.0"
[[audits.zcash_note_encryption]]
who = "Jack Grigg <jack@electriccoin.co>"
criteria = ["safe-to-deploy", "crypto-reviewed"]
delta = "0.2.0 -> 0.3.0"
notes = "The ECC core team maintains this crate, and we have reviewed every line."
[[audits.zcash_primitives]]
who = "Jack Grigg <jack@z.cash>"
criteria = ["crypto-reviewed", "safe-to-deploy"]
@ -1530,6 +1542,12 @@ The ECC core team maintains this crate, and we have reviewed every line.
This point release temporarily re-exposes a constructor.
"""
[[audits.zcash_primitives]]
who = "Jack Grigg <jack@electriccoin.co>"
criteria = ["safe-to-deploy", "crypto-reviewed"]
delta = "0.10.2 -> 0.11.0"
notes = "The ECC core team maintains this crate, and we have reviewed every line."
[[audits.zcash_proofs]]
who = "Jack Grigg <jack@z.cash>"
criteria = ["crypto-reviewed", "safe-to-deploy"]
@ -1564,6 +1582,12 @@ criteria = ["safe-to-deploy", "crypto-reviewed"]
delta = "0.9.0 -> 0.10.0"
notes = "The ECC core team maintains this crate, and we have reviewed every line."
[[audits.zcash_proofs]]
who = "Jack Grigg <jack@electriccoin.co>"
criteria = ["safe-to-deploy", "crypto-reviewed"]
delta = "0.10.0 -> 0.11.0"
notes = "The ECC core team maintains this crate, and we have reviewed every line."
[[audits.zeroize]]
who = "Daira Hopwood <daira@jacaranda.org>"
criteria = "safe-to-deploy"

View File

@ -19,30 +19,6 @@ url = "https://raw.githubusercontent.com/divviup/libprio-rs/main/supply-chain/au
[imports.mozilla]
url = "https://raw.githubusercontent.com/mozilla/supply-chain/main/audits.toml"
[policy.equihash]
audit-as-crates-io = false
[policy.f4jumble]
audit-as-crates-io = false
[policy.zcash_address]
audit-as-crates-io = false
[policy.zcash_encoding]
audit-as-crates-io = false
[policy.zcash_history]
audit-as-crates-io = false
[policy.zcash_note_encryption]
audit-as-crates-io = false
[policy.zcash_primitives]
audit-as-crates-io = false
[policy.zcash_proofs]
audit-as-crates-io = false
[[exemptions.addr2line]]
version = "0.17.0"
criteria = "safe-to-deploy"