zec
/
zcash-android-wallet-sdk
mirror of https://github.com/zcash/zcash-android-wallet-sdk.git

Migrate to Rust revision with scan queue initialization

This commit is contained in:
Jack Grigg 2023-08-29 01:00:32 +01:00 committed by Honza
parent 0e40b3a807
commit 32069bea0a
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backend-lib/Cargo.lock generated
View File

@ -483,7 +483,7 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
[[package]] [[package]]
name = "equihash" name = "equihash"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=f61d60bb967308b4c84defcfd6c8c7a70e1c276d#f61d60bb967308b4c84defcfd6c8c7a70e1c276d" source = "git+https://github.com/zcash/librustzcash.git?rev=b580c42bdc9cb0d0fb06a3975783be1bb34395e8#b580c42bdc9cb0d0fb06a3975783be1bb34395e8"
dependencies = [ dependencies = [
"blake2b_simd", "blake2b_simd",
"byteorder", "byteorder",
@ -513,7 +513,7 @@ dependencies = [
[[package]] [[package]]
name = "f4jumble" name = "f4jumble"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=f61d60bb967308b4c84defcfd6c8c7a70e1c276d#f61d60bb967308b4c84defcfd6c8c7a70e1c276d" source = "git+https://github.com/zcash/librustzcash.git?rev=b580c42bdc9cb0d0fb06a3975783be1bb34395e8#b580c42bdc9cb0d0fb06a3975783be1bb34395e8"
dependencies = [ dependencies = [
"blake2b_simd", "blake2b_simd",
] ]
@ -2258,7 +2258,7 @@ dependencies = [
[[package]] [[package]]
name = "zcash_address" name = "zcash_address"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=f61d60bb967308b4c84defcfd6c8c7a70e1c276d#f61d60bb967308b4c84defcfd6c8c7a70e1c276d" source = "git+https://github.com/zcash/librustzcash.git?rev=b580c42bdc9cb0d0fb06a3975783be1bb34395e8#b580c42bdc9cb0d0fb06a3975783be1bb34395e8"
dependencies = [ dependencies = [
"bech32", "bech32",
"bs58", "bs58",
@ -2269,7 +2269,7 @@ dependencies = [
[[package]] [[package]]
name = "zcash_client_backend" name = "zcash_client_backend"
version = "0.9.0" version = "0.9.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=f61d60bb967308b4c84defcfd6c8c7a70e1c276d#f61d60bb967308b4c84defcfd6c8c7a70e1c276d" source = "git+https://github.com/zcash/librustzcash.git?rev=b580c42bdc9cb0d0fb06a3975783be1bb34395e8#b580c42bdc9cb0d0fb06a3975783be1bb34395e8"
dependencies = [ dependencies = [
"base64", "base64",
"bech32", "bech32",
@ -2302,7 +2302,7 @@ dependencies = [
[[package]] [[package]]
name = "zcash_client_sqlite" name = "zcash_client_sqlite"
version = "0.7.1" version = "0.7.1"
source = "git+https://github.com/zcash/librustzcash.git?rev=f61d60bb967308b4c84defcfd6c8c7a70e1c276d#f61d60bb967308b4c84defcfd6c8c7a70e1c276d" source = "git+https://github.com/zcash/librustzcash.git?rev=b580c42bdc9cb0d0fb06a3975783be1bb34395e8#b580c42bdc9cb0d0fb06a3975783be1bb34395e8"
dependencies = [ dependencies = [
"bs58", "bs58",
"byteorder", "byteorder",
@ -2328,7 +2328,7 @@ dependencies = [
[[package]] [[package]]
name = "zcash_encoding" name = "zcash_encoding"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=f61d60bb967308b4c84defcfd6c8c7a70e1c276d#f61d60bb967308b4c84defcfd6c8c7a70e1c276d" source = "git+https://github.com/zcash/librustzcash.git?rev=b580c42bdc9cb0d0fb06a3975783be1bb34395e8#b580c42bdc9cb0d0fb06a3975783be1bb34395e8"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"nonempty", "nonempty",
@ -2350,7 +2350,7 @@ dependencies = [
[[package]] [[package]]
name = "zcash_primitives" name = "zcash_primitives"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=f61d60bb967308b4c84defcfd6c8c7a70e1c276d#f61d60bb967308b4c84defcfd6c8c7a70e1c276d" source = "git+https://github.com/zcash/librustzcash.git?rev=b580c42bdc9cb0d0fb06a3975783be1bb34395e8#b580c42bdc9cb0d0fb06a3975783be1bb34395e8"
dependencies = [ dependencies = [
"aes", "aes",
"bip0039", "bip0039",
@ -2385,7 +2385,7 @@ dependencies = [
[[package]] [[package]]
name = "zcash_proofs" name = "zcash_proofs"
version = "0.12.1" version = "0.12.1"
source = "git+https://github.com/zcash/librustzcash.git?rev=f61d60bb967308b4c84defcfd6c8c7a70e1c276d#f61d60bb967308b4c84defcfd6c8c7a70e1c276d" source = "git+https://github.com/zcash/librustzcash.git?rev=b580c42bdc9cb0d0fb06a3975783be1bb34395e8#b580c42bdc9cb0d0fb06a3975783be1bb34395e8"
dependencies = [ dependencies = [
"bellman", "bellman",
"blake2b_simd", "blake2b_simd",

10
backend-lib/Cargo.toml
View File

@ -44,11 +44,11 @@ libc = "0.2"
incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree.git", rev = "da97e6c399c5acddedad2c1730dbb7ee55499a2f" } incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree.git", rev = "da97e6c399c5acddedad2c1730dbb7ee55499a2f" }
shardtree = { 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" } orchard = { git = "https://github.com/zcash/orchard.git", rev = "6ef89d5f154de2cf7b7dd87edb8d8c49158beebb" }
zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "f61d60bb967308b4c84defcfd6c8c7a70e1c276d" } zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "b580c42bdc9cb0d0fb06a3975783be1bb34395e8" }
zcash_client_backend = { git = "https://github.com/zcash/librustzcash.git", rev = "f61d60bb967308b4c84defcfd6c8c7a70e1c276d" } zcash_client_backend = { git = "https://github.com/zcash/librustzcash.git", rev = "b580c42bdc9cb0d0fb06a3975783be1bb34395e8" }
zcash_client_sqlite = { git = "https://github.com/zcash/librustzcash.git", rev = "f61d60bb967308b4c84defcfd6c8c7a70e1c276d" } zcash_client_sqlite = { git = "https://github.com/zcash/librustzcash.git", rev = "b580c42bdc9cb0d0fb06a3975783be1bb34395e8" }
zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "f61d60bb967308b4c84defcfd6c8c7a70e1c276d" } zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "b580c42bdc9cb0d0fb06a3975783be1bb34395e8" }
zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "f61d60bb967308b4c84defcfd6c8c7a70e1c276d" } zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "b580c42bdc9cb0d0fb06a3975783be1bb34395e8" }
## Uncomment this to test librustzcash changes locally ## Uncomment this to test librustzcash changes locally
#[patch.crates-io] #[patch.crates-io]

1
backend-lib/src/main/rust/lib.rs
View File

@ -1180,6 +1180,7 @@ fn encode_scan_range<'a>(
scan_range: ScanRange, scan_range: ScanRange,
) -> jni::errors::Result<JObject<'a>> { ) -> jni::errors::Result<JObject<'a>> {
let priority = match scan_range.priority() { let priority = match scan_range.priority() {
ScanPriority::Ignored => 0,
ScanPriority::Scanned => 10, ScanPriority::Scanned => 10,
ScanPriority::Historic => 20, ScanPriority::Historic => 20,
ScanPriority::OpenAdjacent => 30, ScanPriority::OpenAdjacent => 30,

1
sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/model/ScanRange.kt
View File

@ -31,6 +31,7 @@ internal data class ScanRange(
@Suppress("MagicNumber") @Suppress("MagicNumber")
internal enum class SuggestScanRangePriority(val priority: Long) { internal enum class SuggestScanRangePriority(val priority: Long) {
Ignored(0),
Scanned(10), Scanned(10),
Historic(20), Historic(20),
OpenAdjacent(30), OpenAdjacent(30),