zec
/
zcash-android-wallet-sdk
mirror of https://github.com/zcash/zcash-android-wallet-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[#1023] Move Fetch UTXOs Before Block Sync 

* [#1023] Move Fetch UTXOs Before Sync

* Add refreshTransparentBalance() after UTXOs fetch

* Add refreshTransactions() after UTXOs fetched
This commit is contained in:
Honza Rychnovsky 2023-05-11 14:55:58 +02:00 committed by GitHub
parent dfaa827fd1
commit 15603fcdf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
sdk-lib/src/main/java/cash/z/ecc/android/sdk/SdkSynchronizer.kt
View File

@ -379,36 +379,46 @@ class SdkSynchronizer private constructor(
return !validateAddress(address).isNotValid
}
private fun CoroutineScope.onReady() = launch(CoroutineExceptionHandler(::onCriticalError)) {
private fun CoroutineScope.onReady() {
Twig.debug { "Starting synchronizer…" }
var lastScanTime = 0L
processor.onProcessorErrorListener = ::onProcessorError
processor.onSetupErrorListener = ::onSetupError
processor.onChainErrorListener = ::onChainError
processor.state.onEach {
when (it) {
is Synced -> {
val now = System.currentTimeMillis()
// do a bit of housekeeping and then report synced status
onScanComplete(it.syncedRange, now - lastScanTime)
lastScanTime = now
SYNCED
}
// Triggering UTXOs fetch and transparent balance update at the beginning of the block sync right after the app
// start, as it makes the transparent transactions appearance faster
launch(CoroutineExceptionHandler(::onCriticalError)) {
refreshUtxos()
refreshTransparentBalance()
refreshTransactions()
}
is Stopped -> STOPPED
is Disconnected -> DISCONNECTED
is Syncing, Initialized -> SYNCING
is Enhancing -> ENHANCING
}.let { synchronizerStatus ->
// ignore enhancing status for now
// TODO [#682]: clean this up and handle enhancing gracefully
// TODO [#682]: https://github.com/zcash/zcash-android-wallet-sdk/issues/682
if (synchronizerStatus != ENHANCING) _status.value = synchronizerStatus
}
}.launchIn(this)
processor.start()
Twig.debug { "Completed starting synchronizer" }
launch(CoroutineExceptionHandler(::onCriticalError)) {
var lastScanTime = 0L
processor.onProcessorErrorListener = ::onProcessorError
processor.onSetupErrorListener = ::onSetupError
processor.onChainErrorListener = ::onChainError
processor.state.onEach {
when (it) {
is Synced -> {
val now = System.currentTimeMillis()
// do a bit of housekeeping and then report synced status
onScanComplete(it.syncedRange, now - lastScanTime)
lastScanTime = now
SYNCED
}
is Stopped -> STOPPED
is Disconnected -> DISCONNECTED
is Syncing, Initialized -> SYNCING
is Enhancing -> ENHANCING
}.let { synchronizerStatus ->
// ignore enhancing status for now
// TODO [#682]: clean this up and handle enhancing gracefully
// TODO [#682]: https://github.com/zcash/zcash-android-wallet-sdk/issues/682
if (synchronizerStatus != ENHANCING) _status.value = synchronizerStatus
}
}.launchIn(this)
processor.start()
Twig.debug { "Completed starting synchronizer" }
}
}
@Suppress("UNUSED_PARAMETER")

2
sdk-lib/src/main/java/cash/z/ecc/android/sdk/block/CompactBlockProcessor.kt
View File

@ -645,7 +645,7 @@ class CompactBlockProcessor internal constructor(
Twig.debug { "All UTXOs from height $startHeight fetched successfully" }
}
}.collect { utxo ->
Twig.debug { "Fetched UTXO with txid: ${utxo.txid}" }
Twig.verbose { "Fetched UTXO at height: ${utxo.height}" }
val processResult = processUtxoResult(utxo)
if (processResult) {
count++