Migrate to Rust revision with scan queue initialization

Electric-Coin-Company · Aug 29, 2023 · f92cab7 · f92cab7
1 parent 2419311
commit f92cab7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/backend-lib/Cargo.lock b/backend-lib/Cargo.lock
diff --git 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
@@ -1180,6 +1180,7 @@ fn encode_scan_range<'a>(
     scan_range: ScanRange,
 ) -> jni::errors::Result<JObject<'a>> {
     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
@@ -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),