Skip to content

chore: use dpp 2.0.0-SNAPSHOT #1409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 29, 2025
Merged

chore: use dpp 2.0.0-SNAPSHOT #1409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1502dc
chore: use dpp 2.0.0-SNAPSHOT
HashEngineering Jul 7, 2025
32ece79
fix: eliminate rare crash on reset wallet
HashEngineering Jul 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
coroutinesVersion = '1.6.4'
ok_http_version = '4.9.1'
dashjVersion = '21.1.10'
dppVersion = "1.7.5"
dppVersion = "2.0.0-SNAPSHOT"
hiltVersion = '2.53'
hiltCompilerVersion = '1.2.0'
hiltWorkVersion = '1.2.0'
Expand Down
56 changes: 35 additions & 21 deletions wallet/src/de/schildbach/wallet/service/BlockchainServiceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,10 +1042,14 @@ class BlockchainServiceImpl : LifecycleService(), BlockchainService {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
startForegroundAndCatch(createNetworkSyncNotification())
}
val wallet = application.wallet
serviceScope.launch {
cleanupDeferred?.await()
propagateContext()
val wallet = application.wallet
if (wallet == null) {
log.error("onCreate: wallet is null after cleanup, service cannot continue")
return@launch
}
peerConnectivityListener = PeerConnectivityListener()
broadcastPeerState(0)
blockChainFile =
Expand All @@ -1057,7 +1061,7 @@ class BlockchainServiceImpl : LifecycleService(), BlockchainService {
if (!blockChainFileExists) {
log.info("blockchain does not exist, resetting wallet")
propagateContext()
wallet?.reset()
wallet.reset()
resetMNLists(false)
resetMNListsOnPeerGroupStart = true
}
Expand All @@ -1067,7 +1071,7 @@ class BlockchainServiceImpl : LifecycleService(), BlockchainService {
headerStore = SPVBlockStore(Constants.NETWORK_PARAMETERS, headerChainFile)
headerStore?.chainHead // detect corruptions as early as possible
withContext(Dispatchers.Main) { verifyBlockStores() }
val earliestKeyCreationTime = wallet!!.earliestKeyCreationTime
val earliestKeyCreationTime = wallet.earliestKeyCreationTime
if (!blockChainFileExists && earliestKeyCreationTime > 0) {
try {
val watch = Stopwatch.createStarted()
Expand Down Expand Up @@ -1117,12 +1121,12 @@ class BlockchainServiceImpl : LifecycleService(), BlockchainService {
connectivityReceiverRegistered = true
log.info("receiver register: connectivityReceiver, {}", connectivityReceiver)
}
application.wallet!!.addCoinsReceivedEventListener(
wallet.addCoinsReceivedEventListener(
Threading.SAME_THREAD,
walletEventListener
)
application.wallet!!.addCoinsSentEventListener(Threading.SAME_THREAD, walletEventListener)
application.wallet!!.addChangeEventListener(Threading.SAME_THREAD, walletEventListener)
wallet.addCoinsSentEventListener(Threading.SAME_THREAD, walletEventListener)
wallet.addChangeEventListener(Threading.SAME_THREAD, walletEventListener)
config.registerOnSharedPreferenceChangeListener(sharedPrefsChangeListener)
withContext(Dispatchers.Main) {
registerReceiver(tickReceiver, IntentFilter(Intent.ACTION_TIME_TICK))
Expand Down Expand Up @@ -1231,18 +1235,23 @@ class BlockchainServiceImpl : LifecycleService(), BlockchainService {
} else if (BlockchainService.ACTION_BROADCAST_TRANSACTION == action) {
val hash = Sha256Hash
.wrap(intent.getByteArrayExtra(BlockchainService.ACTION_BROADCAST_TRANSACTION_HASH))
val tx = application.wallet!!.getTransaction(hash)
if (peerGroup != null) {
log.info("broadcasting transaction " + tx!!.hashAsString)
val count = peerGroup!!.numConnectedPeers()
var minimum = peerGroup!!.minBroadcastConnections
// if the number of peers is <= 3, then only require that number of peers to send
// if the number of peers is 0, then require 3 peers (default min connections)
if (count in 1..3) minimum = count
peerGroup!!.broadcastTransaction(tx, minimum, true)
val wallet = application.wallet
if (wallet != null) {
val tx = wallet.getTransaction(hash)
if (peerGroup != null) {
log.info("broadcasting transaction " + tx!!.hashAsString)
val count = peerGroup!!.numConnectedPeers()
var minimum = peerGroup!!.minBroadcastConnections
// if the number of peers is <= 3, then only require that number of peers to send
// if the number of peers is 0, then require 3 peers (default min connections)
if (count in 1..3) minimum = count
peerGroup!!.broadcastTransaction(tx, minimum, true)
} else {
log.info("peergroup not available, not broadcasting transaction {}", tx!!.txId)
tx.confidence.setPeerInfo(0, 1)
}
} else {
log.info("peergroup not available, not broadcasting transaction {}", tx!!.txId)
tx.confidence.setPeerInfo(0, 1)
log.error("wallet is null, cannot broadcast transaction")
}
} else if (BlockchainService.ACTION_RESET_BLOOMFILTERS == action) {
if (peerGroup != null) {
Expand Down Expand Up @@ -1305,9 +1314,12 @@ class BlockchainServiceImpl : LifecycleService(), BlockchainService {
onCreateCompleted.await() // wait until onCreate is finished
checkMutex.lock()
WalletApplication.scheduleStartBlockchainService(this@BlockchainServiceImpl) //disconnect feature
application.wallet!!.removeChangeEventListener(walletEventListener)
application.wallet!!.removeCoinsSentEventListener(walletEventListener)
application.wallet!!.removeCoinsReceivedEventListener(walletEventListener)
val wallet = application.wallet
if (wallet != null) {
wallet.removeChangeEventListener(walletEventListener)
wallet.removeCoinsSentEventListener(walletEventListener)
wallet.removeCoinsReceivedEventListener(walletEventListener)
}
config.unregisterOnSharedPreferenceChangeListener(sharedPrefsChangeListener)
platformSyncService.shutdown()
if (peerGroup != null) {
Expand All @@ -1320,7 +1332,9 @@ class BlockchainServiceImpl : LifecycleService(), BlockchainService {
blockchainStateDataProvider.setNetworkStatus(NetworkStatus.DISCONNECTING)
peerGroup!!.stop()
blockchainStateDataProvider.setNetworkStatus(NetworkStatus.STOPPED)
application.wallet!!.riskAnalyzer = defaultRiskAnalyzer
if (wallet != null) {
wallet.riskAnalyzer = defaultRiskAnalyzer
}
riskAnalyzer!!.shutdown()
log.info("peergroup stopped")
}
Expand Down