permissionlesstech/bitchat-android
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat-android.git synced 2026-07-24 22:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix pow (#417)

Browse Source 
* fix pow

* only pow with nonse
This commit is contained in:
callebtc
2025-09-14 05:01:34 +02:00
committed by GitHub
parent deba156711
commit b96bf180f9
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/bitchat/android/nostr/GeohashMessageHandler.kt
+4 -1
View File
@@ -78,6 +78,7 @@ class GeohashMessageHandler(
if (isTeleportPresence) return@launch
val senderName = repo.displayNameForNostrPubkeyUI(event.pubkey)
val hasNonce = try { NostrProofOfWork.hasNonce(event) } catch (_: Exception) { false }
val msg = BitchatMessage(
id = event.id,
sender = senderName,
@@ -88,7 +89,9 @@ class GeohashMessageHandler(
senderPeerID = "nostr:${event.pubkey.take(8)}",
mentions = null,
channel = "#$subscribedGeohash",
powDifficulty = try { NostrProofOfWork.calculateDifficulty(event.id).takeIf { it > 0 } } catch (_: Exception) { null }
powDifficulty = try {
if (hasNonce) NostrProofOfWork.calculateDifficulty(event.id).takeIf { it > 0 } else null
} catch (_: Exception) { null }
)
withContext(Dispatchers.Main) { messageManager.addChannelMessage("geo:$subscribedGeohash", msg) }
} catch (e: Exception) {
app/src/main/java/com/bitchat/android/nostr/NostrProofOfWork.kt
+6
View File
@@ -54,6 +54,12 @@ object NostrProofOfWork {
fun validateDifficulty(event: NostrEvent, minimumDifficulty: Int): Boolean {
if (minimumDifficulty <= 0) return true
// Require explicit nonce tag to recognize PoW per NIP-13 intent
if (!hasNonce(event)) {
Log.w(TAG, "Event ${event.id.take(16)}... missing nonce tag; treating as no PoW")
return false
}
val actualDifficulty = calculateDifficulty(event.id)
val committedDifficulty = getCommittedDifficulty(event)
app/src/main/java/com/bitchat/android/ui/GeohashViewModel.kt
+14 -6
View File
@@ -99,14 +99,22 @@ class GeohashViewModel(
powDifficulty = if (pow.enabled) pow.difficulty else null
)
messageManager.addChannelMessage("geo:${channel.geohash}", localMsg)
if (pow.enabled && pow.difficulty > 0) {
val startedMining = pow.enabled && pow.difficulty > 0
if (startedMining) {
com.bitchat.android.ui.PoWMiningTracker.startMiningMessage(tempId)
}
val identity = NostrIdentityBridge.deriveIdentity(forGeohash = channel.geohash, context = getApplication())
val teleported = state.isTeleported.value ?: false
val event = NostrProtocol.createEphemeralGeohashEvent(content, channel.geohash, identity, nickname, teleported)
val relayManager = NostrRelayManager.getInstance(getApplication())
relayManager.sendEventToGeohash(event, channel.geohash, includeDefaults = false, nRelays = 5)
try {
val identity = NostrIdentityBridge.deriveIdentity(forGeohash = channel.geohash, context = getApplication())
val teleported = state.isTeleported.value ?: false
val event = NostrProtocol.createEphemeralGeohashEvent(content, channel.geohash, identity, nickname, teleported)
val relayManager = NostrRelayManager.getInstance(getApplication())
relayManager.sendEventToGeohash(event, channel.geohash, includeDefaults = false, nRelays = 5)
} finally {
// Ensure we stop the per-message mining animation regardless of success/failure
if (startedMining) {
com.bitchat.android.ui.PoWMiningTracker.stopMiningMessage(tempId)
}
}
} catch (e: Exception) {
Log.e(TAG, "Failed to send geohash message: ${e.message}")
}