zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade to `orchard 0.2.0`

This commit is contained in:
Jack Grigg 2022-06-23 20:45:52 +00:00
parent 107cb9636c
commit 0430fdf20d
5 changed files with 69 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
Cargo.lock generated
View File

@ -79,12 +79,6 @@ version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
[[package]]
name = "arrayvec"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
[[package]]
name = "arrayvec"
version = "0.7.2"
@ -186,17 +180,6 @@ dependencies = [
"wyz",
]
[[package]]
name = "blake2b_simd"
version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
dependencies = [
"arrayref",
"arrayvec 0.5.2",
"constant_time_eq",
]
[[package]]
name = "blake2b_simd"
version = "1.0.0"
@ -204,7 +187,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127"
dependencies = [
"arrayref",
"arrayvec 0.7.2",
"arrayvec",
"constant_time_eq",
]
@ -215,7 +198,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db539cc2b5f6003621f1cd9ef92d7ded8ea5232c7de0f9faa2de251cd98730d4"
dependencies = [
"arrayref",
"arrayvec 0.7.2",
"arrayvec",
"constant_time_eq",
]
@ -580,11 +563,11 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
[[package]]
name = "equihash"
version = "0.1.0"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4127688f6177e3f57521881cb1cfd90d1228214f9dc43b8efe6f6c6948cd8280"
checksum = "ab579d7cf78477773b03e80bc2f89702ef02d7112c711d54ca93dcdce68533d5"
dependencies = [
"blake2b_simd 0.5.11",
"blake2b_simd",
"byteorder",
]
@ -594,7 +577,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a83e8d7fd0c526af4aad893b7c9fe41e2699ed8a776a6c74aecdeafe05afc75"
dependencies = [
"blake2b_simd 1.0.0",
"blake2b_simd",
]
[[package]]
@ -751,11 +734,11 @@ dependencies = [
[[package]]
name = "halo2_gadgets"
version = "0.1.0"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13f3914f58cc4af5e4fe83d48b02d582be18976bc7e96c3151aa2bf1c98e9f60"
checksum = "85e10bf9924da1754e443641c9e7f9f00483749f8fb837fde696ef6ed6e2f079"
dependencies = [
"arrayvec 0.7.2",
"arrayvec",
"bitvec",
"ff",
"group",
@ -769,16 +752,17 @@ dependencies = [
[[package]]
name = "halo2_proofs"
version = "0.1.0"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e925780549adee8364c7f2b685c753f6f3df23bde520c67416e93bf615933760"
checksum = "cff771b9a2445cd2545c9ef26d863c290fbb44ae440c825a20eb7156f67a949a"
dependencies = [
"blake2b_simd 1.0.0",
"blake2b_simd",
"ff",
"group",
"pasta_curves",
"rand_core 0.6.3",
"rayon",
"tracing",
]
[[package]]
@ -992,7 +976,7 @@ dependencies = [
"anyhow",
"backtrace",
"bellman",
"blake2b_simd 1.0.0",
"blake2b_simd",
"blake2s_simd",
"bls12_381",
"byteorder",
@ -1315,13 +1299,13 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "orchard"
version = "0.1.0"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f918076e191a68d55c5517a16e075ecfe58fc63ed112408263f3d6194597bfcf"
checksum = "7619db7f917afd9b1139044c595fab1b6166de2db62317794b5f5e34a2104ae1"
dependencies = [
"aes",
"bitvec",
"blake2b_simd 1.0.0",
"blake2b_simd",
"ff",
"fpe",
"group",
@ -1337,6 +1321,7 @@ dependencies = [
"reddsa",
"serde",
"subtle",
"tracing",
"zcash_note_encryption",
]
@ -1364,7 +1349,7 @@ version = "3.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8b44461635bbb1a0300f100a841e571e7d919c81c73075ef5d152ffdb521066"
dependencies = [
"arrayvec 0.7.2",
"arrayvec",
"bitvec",
"byte-slice-cast",
"impl-trait-for-tuples",
@ -1426,7 +1411,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "369d7785168ad7ff0cbe467d968ca3e19a927d8536b11ef9c21b4e454b15ba42"
dependencies = [
"blake2b_simd 1.0.0",
"blake2b_simd",
"ff",
"group",
"lazy_static",
@ -1704,7 +1689,7 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4cc8038c8b7e481bdf688d0585d4897ed0e9e0cee10aa365dde51238c20e4182"
dependencies = [
"blake2b_simd 1.0.0",
"blake2b_simd",
"byteorder",
"group",
"jubjub",
@ -2352,7 +2337,7 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb611a28a4e13ac715ee712f4344d6b279b767daf6345dafefb2c4bf582b6679"
dependencies = [
"blake2b_simd 1.0.0",
"blake2b_simd",
"byteorder",
"primitive-types",
]
@ -2371,14 +2356,14 @@ dependencies = [
[[package]]
name = "zcash_primitives"
version = "0.6.0"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcb1ef5719fb24b42450dcd6b10e6155793be5668f0d962ad8132b6e4d108635"
checksum = "4fbb401f5dbc482b831954aaa7cba0a8fe148241db6d19fe7cebda78252ca680"
dependencies = [
"aes",
"bip0039",
"bitvec",
"blake2b_simd 1.0.0",
"blake2b_simd",
"blake2s_simd",
"bls12_381",
"bs58",
@ -2408,12 +2393,12 @@ dependencies = [
[[package]]
name = "zcash_proofs"
version = "0.6.0"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e67054525b4897a97386ce562240f08ac9bcad07183130fe8d797224d712112d"
checksum = "92c0928a33ab146a4e93e2a1141ce589de1bbe93c90219965dcccadc15f4e4e8"
dependencies = [
"bellman",
"blake2b_simd 1.0.0",
"blake2b_simd",
"bls12_381",
"byteorder",
"directories",

6
Cargo.toml
View File

@ -44,7 +44,7 @@ libc = "0.2"
jubjub = "0.9"
memuse = "0.2"
nonempty = "0.7"
orchard = "0.1"
orchard = "0.2"
secp256k1 = "0.21"
subtle = "2.2"
rand_core = "0.6"
@ -55,8 +55,8 @@ zcash_address = "0.1"
zcash_encoding = "0.1"
zcash_history = "0.3"
zcash_note_encryption = "0.1"
zcash_primitives = { version = "0.6", features = ["transparent-inputs"] }
zcash_proofs = "0.6"
zcash_primitives = { version = "0.7", features = ["transparent-inputs"] }
zcash_proofs = "0.7"
ed25519-zebra = "3"
zeroize = "1.4.2"

4
contrib/debian/copyright
View File

@ -1880,8 +1880,8 @@ License: BOSL-1
restricted or conditioned by this License or by law, and Licensor promises not
to interfere with or be responsible for such uses by You.
.
16. **Modification of This License.** This License is Copyright © 2007 Zooko
Wilcox-O'Hearn. Permission is granted to copy, distribute, or communicate this
16. **Modification of This License.** This License is Copyright © 2021-2022 Electric Coin Company.
Permission is granted to copy, distribute, or communicate this
License without modification. Nothing in this License permits You to modify
this License as applied to the Original Work or to Derivative Works. However,
You may modify the text of this License and copy, distribute or communicate

36
qa/supply-chain/audits.toml
View File

@ -13,6 +13,12 @@ criteria = "safe-to-deploy"
version = "0.1.0"
notes = "The ECC core team maintains this crate, and we have reviewed every line."
[[audits.equihash]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
delta = "0.1.0 -> 0.2.0"
notes = "The ECC core team maintains this crate, and we have reviewed every line."
[[audits.f4jumble]]
who = "Jack Grigg <jack@z.cash>"
criteria = "crypto-reviewed"
@ -37,6 +43,12 @@ criteria = "safe-to-deploy"
version = "0.1.0"
notes = "The ECC core team maintains this crate, and we have reviewed every line."
[[audits.halo2_gadgets]]
who = "Jack Grigg <jack@z.cash>"
criteria = ["crypto-reviewed", "safe-to-deploy"]
delta = "0.1.0 -> 0.2.0"
notes = "The ECC core team maintains this crate, and we have reviewed every line."
[[audits.halo2_proofs]]
who = "Jack Grigg <jack@z.cash>"
criteria = "crypto-reviewed"
@ -49,6 +61,12 @@ criteria = "safe-to-deploy"
version = "0.1.0"
notes = "The ECC core team maintains this crate, and we have reviewed every line."
[[audits.halo2_proofs]]
who = "Jack Grigg <jack@z.cash>"
criteria = ["crypto-reviewed", "safe-to-deploy"]
delta = "0.1.0 -> 0.2.0"
notes = "The ECC core team maintains this crate, and we have reviewed every line."
[[audits.orchard]]
who = "Jack Grigg <jack@z.cash>"
criteria = "crypto-reviewed"
@ -61,6 +79,12 @@ criteria = "safe-to-deploy"
version = "0.1.0"
notes = "The ECC core team maintains this crate, and we have reviewed every line."
[[audits.orchard]]
who = "Jack Grigg <jack@z.cash>"
criteria = ["crypto-reviewed", "safe-to-deploy"]
delta = "0.1.0 -> 0.2.0"
notes = "The ECC core team maintains this crate, and we have reviewed every line."
[[audits.zcash_address]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
@ -103,6 +127,12 @@ criteria = "safe-to-deploy"
version = "0.6.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"]
delta = "0.6.0 -> 0.7.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"
@ -115,3 +145,9 @@ criteria = "safe-to-deploy"
version = "0.6.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"]
delta = "0.6.0 -> 0.7.0"
notes = "The ECC core team maintains this crate, and we have reviewed every line."

1
qa/supply-chain/config.toml
View File

@ -1,6 +1,5 @@
# cargo-vet config file
[[unaudited.addr2line]]
version = "0.17.0"
criteria = "safe-to-deploy"