diff --git a/backend-lib/Cargo.lock b/backend-lib/Cargo.lock index 1dffe3e4..ce036664 100644 --- a/backend-lib/Cargo.lock +++ b/backend-lib/Cargo.lock @@ -483,7 +483,7 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "equihash" 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 = [ "blake2b_simd", "byteorder", @@ -513,7 +513,7 @@ dependencies = [ [[package]] name = "f4jumble" 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 = [ "blake2b_simd", ] @@ -2258,7 +2258,7 @@ dependencies = [ [[package]] name = "zcash_address" 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 = [ "bech32", "bs58", @@ -2269,7 +2269,7 @@ dependencies = [ [[package]] name = "zcash_client_backend" 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 = [ "base64", "bech32", @@ -2302,7 +2302,7 @@ dependencies = [ [[package]] name = "zcash_client_sqlite" 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 = [ "bs58", "byteorder", @@ -2328,7 +2328,7 @@ dependencies = [ [[package]] name = "zcash_encoding" 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 = [ "byteorder", "nonempty", @@ -2350,7 +2350,7 @@ dependencies = [ [[package]] name = "zcash_primitives" 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 = [ "aes", "bip0039", @@ -2385,7 +2385,7 @@ dependencies = [ [[package]] name = "zcash_proofs" 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 = [ "bellman", "blake2b_simd", diff --git a/backend-lib/Cargo.toml b/backend-lib/Cargo.toml index 63a2cc9d..4c8952cc 100644 --- a/backend-lib/Cargo.toml +++ b/backend-lib/Cargo.toml @@ -44,11 +44,11 @@ libc = "0.2" 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 = "f61d60bb967308b4c84defcfd6c8c7a70e1c276d" } -zcash_client_backend = { git = "https://github.com/zcash/librustzcash.git", rev = "f61d60bb967308b4c84defcfd6c8c7a70e1c276d" } -zcash_client_sqlite = { git = "https://github.com/zcash/librustzcash.git", rev = "f61d60bb967308b4c84defcfd6c8c7a70e1c276d" } -zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "f61d60bb967308b4c84defcfd6c8c7a70e1c276d" } -zcash_proofs = { 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 = "b580c42bdc9cb0d0fb06a3975783be1bb34395e8" } +zcash_client_sqlite = { git = "https://github.com/zcash/librustzcash.git", rev = "b580c42bdc9cb0d0fb06a3975783be1bb34395e8" } +zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "b580c42bdc9cb0d0fb06a3975783be1bb34395e8" } +zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "b580c42bdc9cb0d0fb06a3975783be1bb34395e8" } ## Uncomment this to test librustzcash changes locally #[patch.crates-io] diff --git a/backend-lib/src/main/rust/lib.rs b/backend-lib/src/main/rust/lib.rs index b79b0a63..3a1d5b67 100644 --- a/backend-lib/src/main/rust/lib.rs +++ b/backend-lib/src/main/rust/lib.rs @@ -1180,6 +1180,7 @@ fn encode_scan_range<'a>( scan_range: ScanRange, ) -> jni::errors::Result> { let priority = match scan_range.priority() { + ScanPriority::Ignored => 0, ScanPriority::Scanned => 10, ScanPriority::Historic => 20, ScanPriority::OpenAdjacent => 30, diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/model/ScanRange.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/model/ScanRange.kt index 39053bf3..e309eb31 100644 --- a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/model/ScanRange.kt +++ b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/model/ScanRange.kt @@ -31,6 +31,7 @@ internal data class ScanRange( @Suppress("MagicNumber") internal enum class SuggestScanRangePriority(val priority: Long) { + Ignored(0), Scanned(10), Historic(20), OpenAdjacent(30),