Merge pull request #15 from zcash/rust-updates

Rust updates
This commit is contained in:
str4d 2019-03-13 20:04:07 +13:00 committed by GitHub
commit db5abb889c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 86 additions and 1632 deletions

202
Cargo.lock generated
View File

@ -43,15 +43,6 @@ dependencies = [
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "argon2rs"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
"scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "arrayvec"
version = "0.4.10"
@ -103,23 +94,23 @@ dependencies = [
[[package]]
name = "bech32"
version = "0.5.0"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "bellman"
version = "0.1.0"
source = "git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3#59c57e260d09a054a99d4b0060fe71abeef7add3"
source = "git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8#fe22862d3910f617ff58dfd0fff6fe6d60436db8"
dependencies = [
"bit-vec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"ff 0.4.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"ff 0.4.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"group 0.1.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"group 0.1.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"pairing 0.14.2 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"pairing 0.14.2 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -143,15 +134,6 @@ dependencies = [
"constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "blake2-rfc"
version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
"constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "block-buffer"
version = "0.7.0"
@ -327,16 +309,6 @@ dependencies = [
"generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "dirs"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_users 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "either"
version = "1.5.0"
@ -375,17 +347,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "ff"
version = "0.4.0"
source = "git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3#59c57e260d09a054a99d4b0060fe71abeef7add3"
source = "git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8#fe22862d3910f617ff58dfd0fff6fe6d60436db8"
dependencies = [
"byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ff_derive 0.3.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"ff_derive 0.3.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "ff_derive"
version = "0.3.0"
source = "git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3#59c57e260d09a054a99d4b0060fe71abeef7add3"
source = "git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8#fe22862d3910f617ff58dfd0fff6fe6d60436db8"
dependencies = [
"num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
@ -459,9 +431,9 @@ dependencies = [
[[package]]
name = "group"
version = "0.1.0"
source = "git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3#59c57e260d09a054a99d4b0060fe71abeef7add3"
source = "git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8#fe22862d3910f617ff58dfd0fff6fe6d60436db8"
dependencies = [
"ff 0.4.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"ff 0.4.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -736,11 +708,11 @@ dependencies = [
[[package]]
name = "pairing"
version = "0.14.2"
source = "git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3#59c57e260d09a054a99d4b0060fe71abeef7add3"
source = "git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8#fe22862d3910f617ff58dfd0fff6fe6d60436db8"
dependencies = [
"byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ff 0.4.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"group 0.1.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"ff 0.4.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"group 0.1.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -932,25 +904,6 @@ name = "redox_syscall"
version = "0.1.51"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "redox_users"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "remove_dir_all"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "rusqlite"
version = "0.15.0"
@ -991,14 +944,14 @@ dependencies = [
[[package]]
name = "sapling-crypto"
version = "0.0.1"
source = "git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3#59c57e260d09a054a99d4b0060fe71abeef7add3"
source = "git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8#fe22862d3910f617ff58dfd0fff6fe6d60436db8"
dependencies = [
"bellman 0.1.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"bellman 0.1.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"blake2-rfc 0.2.18 (git+https://github.com/gtank/blake2-rfc?rev=7a5b5fc99ae483a0043db7547fb79a6fa44b88a9)",
"byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
"ff 0.4.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"pairing 0.14.2 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"ff 0.4.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"pairing 0.14.2 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1007,11 +960,6 @@ name = "scoped-tls"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "scoped_threadpool"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "scopeguard"
version = "0.3.3"
@ -1103,19 +1051,6 @@ dependencies = [
"unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "tempfile"
version = "3.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)",
"remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "time"
version = "0.1.42"
@ -1463,95 +1398,87 @@ name = "zcash-android-wallet-sdk"
version = "0.0.1"
dependencies = [
"android_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"ff 0.4.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"ff 0.4.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"grpc 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"jni 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"log-panics 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"pairing 0.14.2 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"protobuf 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"rusqlite 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sapling-crypto 0.0.1 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"tempfile 3.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
"zcash_client_backend 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"zcash_primitives 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"zip32 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"pairing 0.14.2 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"sapling-crypto 0.0.1 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"zcash_client_backend 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"zcash_primitives 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"zip32 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
]
[[package]]
name = "zcash_client_backend"
version = "0.0.0"
source = "git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3#59c57e260d09a054a99d4b0060fe71abeef7add3"
source = "git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8#fe22862d3910f617ff58dfd0fff6fe6d60436db8"
dependencies = [
"bech32 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bellman 0.1.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"blake2-rfc 0.2.18 (git+https://github.com/gtank/blake2-rfc?rev=7a5b5fc99ae483a0043db7547fb79a6fa44b88a9)",
"byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"chacha20-poly1305-aead 0.1.2 (git+https://github.com/gtank/chacha20-poly1305-aead?rev=aefc71f95e8bc43f2070e3c5b08130d9c86bbf4f)",
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"ff 0.4.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"bech32 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bellman 0.1.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"ff 0.4.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"pairing 0.14.2 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"pairing 0.14.2 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"protobuf 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"protobuf-codegen-pure 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"sapling-crypto 0.0.1 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"zcash_primitives 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"zcash_proofs 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"zip32 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"rusqlite 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sapling-crypto 0.0.1 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
"zcash_primitives 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"zcash_proofs 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"zip32 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
]
[[package]]
name = "zcash_primitives"
version = "0.0.0"
source = "git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3#59c57e260d09a054a99d4b0060fe71abeef7add3"
source = "git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8#fe22862d3910f617ff58dfd0fff6fe6d60436db8"
dependencies = [
"blake2-rfc 0.2.18 (git+https://github.com/gtank/blake2-rfc?rev=7a5b5fc99ae483a0043db7547fb79a6fa44b88a9)",
"byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"ff 0.4.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"chacha20-poly1305-aead 0.1.2 (git+https://github.com/gtank/chacha20-poly1305-aead?rev=aefc71f95e8bc43f2070e3c5b08130d9c86bbf4f)",
"ff 0.4.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"pairing 0.14.2 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"pairing 0.14.2 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"sapling-crypto 0.0.1 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"sapling-crypto 0.0.1 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "zcash_proofs"
version = "0.0.0"
source = "git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3#59c57e260d09a054a99d4b0060fe71abeef7add3"
source = "git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8#fe22862d3910f617ff58dfd0fff6fe6d60436db8"
dependencies = [
"bellman 0.1.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"bellman 0.1.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"blake2-rfc 0.2.18 (git+https://github.com/gtank/blake2-rfc?rev=7a5b5fc99ae483a0043db7547fb79a6fa44b88a9)",
"byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ff 0.4.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"pairing 0.14.2 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"ff 0.4.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"pairing 0.14.2 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"sapling-crypto 0.0.1 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"zcash_primitives 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"sapling-crypto 0.0.1 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"zcash_primitives 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
]
[[package]]
name = "zip32"
version = "0.0.0"
source = "git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3#59c57e260d09a054a99d4b0060fe71abeef7add3"
source = "git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8#fe22862d3910f617ff58dfd0fff6fe6d60436db8"
dependencies = [
"aes 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"blake2-rfc 0.2.18 (git+https://github.com/gtank/blake2-rfc?rev=7a5b5fc99ae483a0043db7547fb79a6fa44b88a9)",
"byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ff 0.4.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"ff 0.4.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"fpe 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"pairing 0.14.2 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"sapling-crypto 0.0.1 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"zcash_primitives 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)",
"pairing 0.14.2 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"sapling-crypto 0.0.1 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
"zcash_primitives 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)",
]
[metadata]
@ -1560,19 +1487,17 @@ dependencies = [
"checksum aesni 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6810b7fb9f2bb4f76f05ac1c170b8dde285b6308955dc3afd89710268c958d9e"
"checksum android_log-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b8052e2d8aabbb8d556d6abbcce2a22b9590996c5f849b9c7ce4544a2e3b984e"
"checksum android_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bad99185bc195e796e1591740c26716667b58ac9210a48731f71f803fc6ca43a"
"checksum argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392"
"checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
"checksum ascii 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a5fc969a8ce2c9c0c4b0429bb8431544f6658283c8326ba5ff8c762b75369335"
"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
"checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"
"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
"checksum bech32 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad20b907fd16610c3960c7fe9dae13dd243343409bab80299774c9a8b5d7bed8"
"checksum bellman 0.1.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)" = "<none>"
"checksum bech32 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "58946044516aa9dc922182e0d6e9d124a31aafe6b421614654eb27cf90cec09c"
"checksum bellman 0.1.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)" = "<none>"
"checksum bit-vec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f"
"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
"checksum blake2-rfc 0.2.18 (git+https://github.com/gtank/blake2-rfc?rev=7a5b5fc99ae483a0043db7547fb79a6fa44b88a9)" = "<none>"
"checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
"checksum block-buffer 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49665c62e0e700857531fa5d3763e91b539ff1abeebd56808d378b495870d60d"
"checksum block-cipher-trait 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "370424437b9459f3dfd68428ed9376ddfe03d8b70ede29cc533b3557df186ab4"
"checksum block-padding 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d75255892aeb580d3c566f213a2b6fdc1c66667839f45719ee1d30ebf2aea591"
@ -1595,14 +1520,13 @@ dependencies = [
"checksum crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c"
"checksum digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90"
"checksum digest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f47366984d3ad862010e22c7ce81a7dbcaebbdfb37241a620f8b6596ee135c"
"checksum dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "88972de891f6118092b643d85a0b28e0678e0f948d7f879aa32f2d5aafe97d2a"
"checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0"
"checksum error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07e791d3be96241c77c43846b665ef1384606da2cd2a48730abe606a12906e02"
"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
"checksum ff 0.4.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)" = "<none>"
"checksum ff_derive 0.3.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)" = "<none>"
"checksum ff 0.4.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)" = "<none>"
"checksum ff_derive 0.3.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)" = "<none>"
"checksum fpe 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce3371c82bfbd984f624cab093f55e7336f5a6e589f8518e1258f54f011b89ad"
"checksum fuchsia-cprng 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "81f7f8eb465745ea9b02e2704612a9946a59fa40572086c6fd49d6ddcf30bf31"
"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
@ -1611,7 +1535,7 @@ dependencies = [
"checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
"checksum generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c0f28c2f5bfb5960175af447a2da7c18900693738343dc896ffbcabd9839592"
"checksum generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d"
"checksum group 0.1.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)" = "<none>"
"checksum group 0.1.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)" = "<none>"
"checksum grpc 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8e530ef7894a104a1c8525ce68787b3491efa2098ce5e5454e8324ea78893548"
"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
"checksum httpbis 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7689cfa896b2a71da4f16206af167542b75d242b6906313e53857972a92d5614"
@ -1643,7 +1567,7 @@ dependencies = [
"checksum opaque-debug 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d620c9c26834b34f039489ac0dfdb12c7ac15ccaf818350a64c9b5334a452ad7"
"checksum opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "93f5bb2e8e8dec81642920ccff6b61f1eb94fa3020c5a325c9851ff604152409"
"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
"checksum pairing 0.14.2 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)" = "<none>"
"checksum pairing 0.14.2 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)" = "<none>"
"checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
"checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
"checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c"
@ -1665,16 +1589,13 @@ dependencies = [
"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
"checksum redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)" = "423e376fffca3dfa06c9e9790a9ccd282fafb3cc6e6397d01dbf64f9bacc6b85"
"checksum redox_users 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "214a97e49be64fd2c86f568dd0cb2c757d2cc53de95b273b6ad0a1c908482f26"
"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
"checksum rusqlite 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "39bae767eb27866f5c0be918635ae54af705bc09db11be2c43a3c6b361cf3462"
"checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
"checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9"
"checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267"
"checksum sapling-crypto 0.0.1 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)" = "<none>"
"checksum sapling-crypto 0.0.1 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)" = "<none>"
"checksum scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28"
"checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
@ -1687,7 +1608,6 @@ dependencies = [
"checksum syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)" = "261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741"
"checksum syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9"
"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
"checksum tempfile 3.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "37daa55a7240c4931c84559f03b3cad7d19535840d1c4a0cc4e9b2fb0dcf70ff"
"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
"checksum tls-api 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "e452fe2fdf40a10715adb3a5f244c7411cdf2ecc887b07160310939785db9182"
"checksum tls-api-stub 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "25a2dcddd0fd52bdbedf9b4f0fd1cb884abfa0984e6a54121d4cefdf3d234e4c"
@ -1722,7 +1642,7 @@ dependencies = [
"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
"checksum zcash_client_backend 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)" = "<none>"
"checksum zcash_primitives 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)" = "<none>"
"checksum zcash_proofs 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)" = "<none>"
"checksum zip32 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=59c57e260d09a054a99d4b0060fe71abeef7add3)" = "<none>"
"checksum zcash_client_backend 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)" = "<none>"
"checksum zcash_primitives 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)" = "<none>"
"checksum zcash_proofs 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)" = "<none>"
"checksum zip32 0.0.0 (git+https://github.com/str4d/librustzcash.git?rev=fe22862d3910f617ff58dfd0fff6fe6d60436db8)" = "<none>"

View File

@ -18,38 +18,31 @@ hex = "0.3"
jni = { version = "0.10", default-features = false }
log = "0.4"
log-panics = "2.0.0"
protobuf = "2"
rand = "0.4"
rusqlite = { version = "0.15", features = ["bundled"] }
time = "0.1"
[dependencies.ff]
git = "https://github.com/str4d/librustzcash.git"
rev = "59c57e260d09a054a99d4b0060fe71abeef7add3"
rev = "fe22862d3910f617ff58dfd0fff6fe6d60436db8"
[dependencies.pairing]
git = "https://github.com/str4d/librustzcash.git"
rev = "59c57e260d09a054a99d4b0060fe71abeef7add3"
rev = "fe22862d3910f617ff58dfd0fff6fe6d60436db8"
[dependencies.sapling-crypto]
git = "https://github.com/str4d/librustzcash.git"
rev = "59c57e260d09a054a99d4b0060fe71abeef7add3"
rev = "fe22862d3910f617ff58dfd0fff6fe6d60436db8"
[dependencies.zcash_client_backend]
git = "https://github.com/str4d/librustzcash.git"
rev = "59c57e260d09a054a99d4b0060fe71abeef7add3"
rev = "fe22862d3910f617ff58dfd0fff6fe6d60436db8"
features = ["sqlite"]
[dependencies.zcash_primitives]
git = "https://github.com/str4d/librustzcash.git"
rev = "59c57e260d09a054a99d4b0060fe71abeef7add3"
rev = "fe22862d3910f617ff58dfd0fff6fe6d60436db8"
[dependencies.zip32]
git = "https://github.com/str4d/librustzcash.git"
rev = "59c57e260d09a054a99d4b0060fe71abeef7add3"
[dev-dependencies]
dirs = "1"
tempfile = "3"
rev = "fe22862d3910f617ff58dfd0fff6fe6d60436db8"
[features]
updater = ["futures", "grpc"]

View File

@ -1,8 +1,6 @@
#[macro_use]
extern crate log;
extern crate hex;
mod sql;
mod utils;
const SAPLING_CONSENSUS_BRANCH_ID: u32 = 0x76b8_09bb;
@ -24,19 +22,17 @@ use zcash_client_backend::{
decode_extended_spending_key, decode_payment_address, encode_extended_spending_key,
},
keystore::spending_key,
note_encryption::Memo,
prover::LocalTxProver,
sqlite::{
get_address, get_balance, get_received_memo_as_utf8, get_sent_memo_as_utf8,
get_verified_balance, init_accounts_table, init_blocks_table, init_data_database,
scan_cached_blocks, send_to_address,
},
};
use zcash_primitives::transaction::components::Amount;
use zcash_primitives::{note_encryption::Memo, transaction::components::Amount};
use zip32::ExtendedFullViewingKey;
use crate::{
sql::{
get_address, get_balance, get_verified_balance, init_accounts_table, init_blocks_table,
init_data_database, scan_cached_blocks, send_to_address,
},
utils::exception::unwrap_exc_or,
};
use crate::utils::exception::unwrap_exc_or;
#[no_mangle]
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initLogs(
@ -222,7 +218,7 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getReceivedMemo
let res = panic::catch_unwind(|| {
let db_data = utils::java_string_to_rust(&env, db_data);
let memo = match crate::sql::get_received_memo_as_utf8(db_data, id_note) {
let memo = match get_received_memo_as_utf8(db_data, id_note) {
Ok(memo) => memo.unwrap_or_default(),
Err(e) => return Err(format_err!("Error while fetching memo: {}", e)),
};
@ -243,7 +239,7 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getSentMemoAsUt
let res = panic::catch_unwind(|| {
let db_data = utils::java_string_to_rust(&env, db_data);
let memo = match crate::sql::get_sent_memo_as_utf8(db_data, id_note) {
let memo = match get_sent_memo_as_utf8(db_data, id_note) {
Ok(memo) => memo.unwrap_or_default(),
Err(e) => return Err(format_err!("Error while fetching memo: {}", e)),
};
@ -302,20 +298,26 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_sendToAddress(
let extsk =
match decode_extended_spending_key(HRP_SAPLING_EXTENDED_SPENDING_KEY_TEST, &extsk) {
Ok(extsk) => extsk,
Ok(Some(extsk)) => extsk,
Ok(None) => {
return Err(format_err!("ExtendedSpendingKey is for the wrong network"));
}
Err(e) => {
return Err(format_err!("Invalid ExtendedSpendingKey: {}", e));
}
};
let to = match decode_payment_address(HRP_SAPLING_PAYMENT_ADDRESS_TEST, &to) {
Ok(to) => to,
Ok(Some(to)) => to,
Ok(None) => {
return Err(format_err!("PaymentAddress is for the wrong network"));
}
Err(e) => {
return Err(format_err!("Invalid PaymentAddress: {}", e));
}
};
let memo = Some(Memo::from_str(&memo)?);
let memo = Memo::from_str(&memo);
let prover = LocalTxProver::new(
Path::new(&spend_params),

File diff suppressed because it is too large Load Diff