Migrate to release candidates of Rust crates

This commit is contained in:
Jack Grigg 2023-09-08 21:46:57 +01:00
parent 1ef0304f92
commit ab6a831f50
2 changed files with 53 additions and 53 deletions

84
backend-lib/Cargo.lock generated
View File

@ -501,7 +501,8 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
[[package]]
name = "equihash"
version = "0.2.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=85156e2b7cb5c53c26c786ea7c5c22fe5cbbcb2d#85156e2b7cb5c53c26c786ea7c5c22fe5cbbcb2d"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab579d7cf78477773b03e80bc2f89702ef02d7112c711d54ca93dcdce68533d5"
dependencies = [
"blake2b_simd",
"byteorder",
@ -537,7 +538,8 @@ dependencies = [
[[package]]
name = "f4jumble"
version = "0.1.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=85156e2b7cb5c53c26c786ea7c5c22fe5cbbcb2d#85156e2b7cb5c53c26c786ea7c5c22fe5cbbcb2d"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a83e8d7fd0c526af4aad893b7c9fe41e2699ed8a776a6c74aecdeafe05afc75"
dependencies = [
"blake2b_simd",
]
@ -801,8 +803,9 @@ dependencies = [
[[package]]
name = "incrementalmerkletree"
version = "0.4.0"
source = "git+https://github.com/zcash/incrementalmerkletree.git?rev=da97e6c399c5acddedad2c1730dbb7ee55499a2f#da97e6c399c5acddedad2c1730dbb7ee55499a2f"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "361c467824d4d9d4f284be4b2608800839419dccc4d4608f28345237fe354623"
dependencies = [
"either",
]
@ -1105,8 +1108,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "orchard"
version = "0.5.0"
source = "git+https://github.com/zcash/orchard.git?rev=6ef89d5f154de2cf7b7dd87edb8d8c49158beebb#6ef89d5f154de2cf7b7dd87edb8d8c49158beebb"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d31e68534df32024dcc89a8390ec6d7bef65edd87d91b45cfb481a2eb2d77c5"
dependencies = [
"aes",
"bitvec",
@ -1242,12 +1246,12 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
[[package]]
name = "prettyplease"
version = "0.1.25"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
dependencies = [
"proc-macro2",
"syn 1.0.109",
"syn 2.0.31",
]
[[package]]
@ -1261,9 +1265,9 @@ dependencies = [
[[package]]
name = "prost"
version = "0.11.9"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
checksum = "aa8473a65b88506c106c28ae905ca4a2b83a2993640467a41bb3080627ddfd2c"
dependencies = [
"bytes",
"prost-derive",
@ -1271,44 +1275,44 @@ dependencies = [
[[package]]
name = "prost-build"
version = "0.11.9"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270"
checksum = "30d3e647e9eb04ddfef78dfee2d5b3fefdf94821c84b710a3d8ebc89ede8b164"
dependencies = [
"bytes",
"heck",
"itertools",
"lazy_static",
"log",
"multimap",
"once_cell",
"petgraph",
"prettyplease",
"prost",
"prost-types",
"regex",
"syn 1.0.109",
"syn 2.0.31",
"tempfile",
"which",
]
[[package]]
name = "prost-derive"
version = "0.11.9"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
checksum = "56075c27b20ae524d00f247b8a4dc333e5784f889fe63099f8e626bc8d73486c"
dependencies = [
"anyhow",
"itertools",
"proc-macro2",
"quote",
"syn 1.0.109",
"syn 2.0.31",
]
[[package]]
name = "prost-types"
version = "0.11.9"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
checksum = "cebe0a918c97f86c217b0f76fd754e966f8b9f41595095cf7d74cb4e59d730f6"
dependencies = [
"prost",
]
@ -1643,10 +1647,11 @@ dependencies = [
[[package]]
name = "shardtree"
version = "0.0.0"
source = "git+https://github.com/zcash/incrementalmerkletree.git?rev=da97e6c399c5acddedad2c1730dbb7ee55499a2f#da97e6c399c5acddedad2c1730dbb7ee55499a2f"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c19f96dde3a8693874f7e7c53d95616569b4009379a903789efbd448f4ea9cc7"
dependencies = [
"bitflags 1.3.2",
"bitflags 2.4.0",
"either",
"incrementalmerkletree",
"tracing",
@ -1804,15 +1809,15 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tonic-build"
version = "0.9.2"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07"
checksum = "8b477abbe1d18c0b08f56cd01d1bc288668c5b5cfd19b2ae1886bbf599c546f1"
dependencies = [
"prettyplease",
"proc-macro2",
"prost-build",
"quote",
"syn 1.0.109",
"syn 2.0.31",
]
[[package]]
@ -2188,7 +2193,8 @@ dependencies = [
[[package]]
name = "zcash_address"
version = "0.3.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=85156e2b7cb5c53c26c786ea7c5c22fe5cbbcb2d#85156e2b7cb5c53c26c786ea7c5c22fe5cbbcb2d"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8944af5c206cf2e37020ad54618e1825501b98548d35a638b73e0ec5762df8d5"
dependencies = [
"bech32",
"bs58",
@ -2198,8 +2204,9 @@ dependencies = [
[[package]]
name = "zcash_client_backend"
version = "0.9.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=85156e2b7cb5c53c26c786ea7c5c22fe5cbbcb2d#85156e2b7cb5c53c26c786ea7c5c22fe5cbbcb2d"
version = "0.10.0-rc.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3dc7204683d2ef58f87a78168f7135edd2612a888d1663812e642d5835b32607"
dependencies = [
"base64",
"bech32",
@ -2232,8 +2239,9 @@ dependencies = [
[[package]]
name = "zcash_client_sqlite"
version = "0.7.1"
source = "git+https://github.com/zcash/librustzcash.git?rev=85156e2b7cb5c53c26c786ea7c5c22fe5cbbcb2d#85156e2b7cb5c53c26c786ea7c5c22fe5cbbcb2d"
version = "0.8.0-rc.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8095730f4fcc20c5eeacee2a9edec10f1e600770e254fcdba6bc6abb2ebd320"
dependencies = [
"bs58",
"byteorder",
@ -2259,7 +2267,8 @@ dependencies = [
[[package]]
name = "zcash_encoding"
version = "0.2.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=85156e2b7cb5c53c26c786ea7c5c22fe5cbbcb2d#85156e2b7cb5c53c26c786ea7c5c22fe5cbbcb2d"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f03391b81727875efa6ac0661a20883022b6fba92365dc121c48fa9b00c5aac0"
dependencies = [
"byteorder",
"nonempty",
@ -2280,8 +2289,9 @@ dependencies = [
[[package]]
name = "zcash_primitives"
version = "0.12.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=85156e2b7cb5c53c26c786ea7c5c22fe5cbbcb2d#85156e2b7cb5c53c26c786ea7c5c22fe5cbbcb2d"
version = "0.13.0-rc.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0cc4391d9325e0a51a7cbff02b5c4b5472d66087bd9c903ddb12dea7ec22f3e0"
dependencies = [
"aes",
"bip0039",
@ -2315,15 +2325,15 @@ dependencies = [
[[package]]
name = "zcash_proofs"
version = "0.12.1"
source = "git+https://github.com/zcash/librustzcash.git?rev=85156e2b7cb5c53c26c786ea7c5c22fe5cbbcb2d#85156e2b7cb5c53c26c786ea7c5c22fe5cbbcb2d"
version = "0.13.0-rc.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48f22eff3bdc382327ef28f809024ddc89ec6d903ba71be629b2cbea34afdda2"
dependencies = [
"bellman",
"blake2b_simd",
"bls12_381",
"group",
"home",
"incrementalmerkletree",
"jubjub",
"known-folders",
"lazy_static",

View File

@ -16,17 +16,17 @@ hdwallet = "0.3.1"
hdwallet-bitcoin = "0.3"
hex = "0.4"
jni = { version = "0.20", default-features = false }
prost = "0.11"
prost = "0.12"
rusqlite = "0.29"
schemer = "0.2"
secp256k1 = "0.21"
secrecy = "0.8"
zcash_address = "0.3"
zcash_client_backend = { version = "0.9", features = ["transparent-inputs", "unstable"] }
zcash_client_sqlite = { version = "0.7.1", features = ["transparent-inputs", "unstable"] }
zcash_primitives = "0.12"
zcash_proofs = "0.12"
orchard = { version = "0.5", default-features = false }
zcash_client_backend = { version = "=0.10.0-rc.1", features = ["transparent-inputs", "unstable"] }
zcash_client_sqlite = { version = "=0.8.0-rc.1", features = ["transparent-inputs", "unstable"] }
zcash_primitives = "=0.13.0-rc.1"
zcash_proofs = "=0.13.0-rc.1"
orchard = { version = "0.6", default-features = false }
# Initialization
rayon = "1.7"
@ -41,16 +41,6 @@ tracing-subscriber = "0.3"
dlopen2 = "0.4"
libc = "0.2"
[patch.crates-io]
incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree.git", rev = "da97e6c399c5acddedad2c1730dbb7ee55499a2f" }
shardtree = { git = "https://github.com/zcash/incrementalmerkletree.git", rev = "da97e6c399c5acddedad2c1730dbb7ee55499a2f" }
orchard = { git = "https://github.com/zcash/orchard.git", rev = "6ef89d5f154de2cf7b7dd87edb8d8c49158beebb" }
zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "85156e2b7cb5c53c26c786ea7c5c22fe5cbbcb2d" }
zcash_client_backend = { git = "https://github.com/zcash/librustzcash.git", rev = "85156e2b7cb5c53c26c786ea7c5c22fe5cbbcb2d" }
zcash_client_sqlite = { git = "https://github.com/zcash/librustzcash.git", rev = "85156e2b7cb5c53c26c786ea7c5c22fe5cbbcb2d" }
zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "85156e2b7cb5c53c26c786ea7c5c22fe5cbbcb2d" }
zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "85156e2b7cb5c53c26c786ea7c5c22fe5cbbcb2d" }
## Uncomment this to test librustzcash changes locally
#[patch.crates-io]
#zcash_address = { path = '../../clones/librustzcash/components/zcash_address' }