fix: don't block receive lightning payments for existing channels even with the user is geoblocked

Author: jvsena42

app/src/main/java/to/bitkit/repositories/BlocktankRepo.kt

@@ -201,7 +201,7 @@ class BlocktankRepo @Inject constructor(
         description: String = Env.DEFAULT_INVOICE_MESSAGE,
     ): Result<IcJitEntry> = withContext(bgDispatcher) {
         try {
-            if (coreService.checkGeoBlock().first) throw ServiceError.GeoBlocked
+            if (coreService.isGeoBlocked()) throw ServiceError.GeoBlocked
             val nodeId = lightningService.nodeId ?: throw ServiceError.NodeNotStarted
             val lspBalance = getDefaultLspBalance(clientBalance = amountSats)
             val channelSizeSat = amountSats + lspBalance
@@ -230,7 +230,7 @@ class BlocktankRepo @Inject constructor(
         channelExpiryWeeks: UInt = DEFAULT_CHANNEL_EXPIRY_WEEKS,
     ): Result<IBtOrder> = withContext(bgDispatcher) {
         try {
-            if (coreService.checkGeoBlock().first) throw ServiceError.GeoBlocked
+            if (coreService.isGeoBlocked()) throw ServiceError.GeoBlocked
 
             val options = defaultCreateOrderOptions(clientBalanceSat = spendingBalanceSats)
 

app/src/main/java/to/bitkit/repositories/LightningRepo.kt

@@ -37,7 +37,6 @@ import org.lightningdevkit.ldknode.PaymentDetails
 import org.lightningdevkit.ldknode.PaymentId
 import org.lightningdevkit.ldknode.PeerDetails
 import org.lightningdevkit.ldknode.SpendableUtxo
-import org.lightningdevkit.ldknode.TransactionDetails
 import org.lightningdevkit.ldknode.Txid
 import to.bitkit.data.CacheStore
 import to.bitkit.data.SettingsStore
@@ -283,9 +282,8 @@ class LightningRepo @Inject constructor(
     }
 
     suspend fun updateGeoBlockState() = withContext(bgDispatcher) {
-        val (isGeoBlocked, shouldBlockLightning) = coreService.checkGeoBlock()
         _lightningState.update {
-            it.copy(isGeoBlocked = isGeoBlocked, shouldBlockLightningReceive = shouldBlockLightning)
+            it.copy(isGeoBlocked = coreService.isGeoBlocked())
         }
     }
 
@@ -355,7 +353,8 @@ class LightningRepo @Inject constructor(
     private fun handleLdkEvent(event: Event) {
         when (event) {
             is Event.ChannelPending,
-            is Event.ChannelReady -> scope.launch {
+            is Event.ChannelReady,
+            -> scope.launch {
                 refreshChannelCache()
             }
 
@@ -560,10 +559,6 @@ class LightningRepo @Inject constructor(
         expirySeconds: UInt = 86_400u,
     ): Result<String> = executeWhenNodeRunning("Create invoice") {
         updateGeoBlockState()
-        if (lightningState.value.shouldBlockLightningReceive) {
-            return@executeWhenNodeRunning Result.failure(ServiceError.GeoBlocked)
-        }
-
         val invoice = lightningService.receive(amountSats, description, expirySeconds)
         Result.success(invoice)
     }
@@ -1016,7 +1011,6 @@ data class LightningState(
     val channels: List<ChannelDetails> = emptyList(),
     val balances: BalanceDetails? = null,
     val isSyncingWallet: Boolean = false,
-    val shouldBlockLightningReceive: Boolean = false,
     val isGeoBlocked: Boolean = false,
 ) {
     fun block(): BestBlock? = nodeStatus?.currentBestBlock

app/src/main/java/to/bitkit/repositories/WalletRepo.kt

@@ -121,9 +121,8 @@ class WalletRepo @Inject constructor(
             emptyList()
         }
 
-        val (_, shouldBlockLightningReceive) = coreService.checkGeoBlock()
         _walletState.update {
-            it.copy(receiveOnSpendingBalance = !shouldBlockLightningReceive)
+            it.copy(isGeoBlocked = coreService.isGeoBlocked())
         }
         clearBip21State(clearTags = false)
         refreshAddressIfNeeded()
@@ -429,16 +428,6 @@ class WalletRepo @Inject constructor(
         }
     }
 
-    suspend fun toggleReceiveOnSpendingBalance(): Result<Unit> = withContext(bgDispatcher) {
-        if (!_walletState.value.receiveOnSpendingBalance && coreService.checkGeoBlock().second) {
-            return@withContext Result.failure(ServiceError.GeoBlocked)
-        }
-
-        _walletState.update { it.copy(receiveOnSpendingBalance = !it.receiveOnSpendingBalance) }
-
-        return@withContext Result.success(Unit)
-    }
-
     // Payment ID management
     private suspend fun paymentHash(): String? = withContext(bgDispatcher) {
         val bolt11 = getBolt11()
@@ -553,7 +542,7 @@ class WalletRepo @Inject constructor(
             setBip21Description(description)
 
             val canReceive = lightningRepo.canReceive()
-            if (canReceive && _walletState.value.receiveOnSpendingBalance) {
+            if (canReceive) {
                 lightningRepo.createInvoice(amountSats, description).onSuccess {
                     setBolt11(it)
                 }
@@ -575,9 +564,7 @@ class WalletRepo @Inject constructor(
 
     suspend fun shouldRequestAdditionalLiquidity(): Result<Boolean> = withContext(bgDispatcher) {
         return@withContext try {
-            if (!_walletState.value.receiveOnSpendingBalance) return@withContext Result.success(false)
-
-            if (coreService.checkGeoBlock().first) return@withContext Result.success(false)
+            if (coreService.isGeoBlocked()) return@withContext Result.success(false)
 
             val channels = lightningRepo.lightningState.value.channels
             if (channels.filterOpen().isEmpty()) return@withContext Result.success(false)
@@ -617,7 +604,7 @@ data class WalletState(
     val bip21AmountSats: ULong? = null,
     val bip21Description: String = "",
     val selectedTags: List<String> = listOf(),
-    val receiveOnSpendingBalance: Boolean = true,
+    val isGeoBlocked: Boolean = false,
     val walletExists: Boolean = false,
 )
 

app/src/main/java/to/bitkit/services/CoreService.kt

@@ -135,7 +135,7 @@ class CoreService @Inject constructor(
     }
 
     @Suppress("KotlinConstantConditions")
-    private suspend fun isGeoBlocked(): Boolean {
+    suspend fun isGeoBlocked(): Boolean {
         if (!Env.isGeoblockingEnabled) {
             Logger.verbose("Geoblocking disabled via build config", context = "GeoCheck")
             return false
@@ -171,20 +171,6 @@ class CoreService @Inject constructor(
         }
     }
 
-    /**
-     * This method checks if the device is in a is geo blocked region and if lightning features should be blocked
-     * @return pair of `isGeoBlocked` to `shouldBlockLightningReceive`
-     * */
-    suspend fun checkGeoBlock(): Pair<Boolean, Boolean> {
-        val geoBlocked = isGeoBlocked()
-        val shouldBlockLightningReceive = when {
-            lightningService.hasExternalPeers() -> !lightningService.canReceive()
-            else -> geoBlocked
-        }
-
-        return Pair(geoBlocked, shouldBlockLightningReceive)
-    }
-
     suspend fun wipeData(): Result<Unit> = ServiceQueue.CORE.background {
         runCatching {
             val result = wipeAllDatabases()
@@ -1182,6 +1168,7 @@ class ActivityService(
                 // a closed channel's funding UTXO
                 findClosedChannelForTransaction(txid, transactionDetails)
             }
+
             PaymentDirection.OUTBOUND -> {
                 // Check if this transaction is a channel open by checking if it's
                 // the funding transaction for an open channel

app/src/main/java/to/bitkit/services/LightningService.kt

@@ -739,6 +739,7 @@ class LightningService @Inject constructor(
 /**
  * TODO remove, replace all usages with [FeeRate.fromSatPerVbUnchecked]
  * */
+@Deprecated("replace all usages with [FeeRate.fromSatPerVbUnchecked]")
 private fun convertVByteToKwu(satsPerVByte: UInt): FeeRate {
     // 1 vbyte = 4 weight units, so 1 sats/vbyte = 250 sats/kwu
     val satPerKwu = satsPerVByte.toULong() * 250u

app/src/main/java/to/bitkit/viewmodels/WalletViewModel.kt

@@ -85,7 +85,6 @@ class WalletViewModel @Inject constructor(
                         bip21AmountSats = state.bip21AmountSats,
                         bip21Description = state.bip21Description,
                         selectedTags = state.selectedTags,
-                        receiveOnSpendingBalance = state.receiveOnSpendingBalance,
                     )
                 }
                 if (state.walletExists && restoreState == RestoreState.InProgress.Wallet) {
@@ -306,7 +305,6 @@ data class MainUiState(
     val peers: List<PeerDetails> = emptyList(),
     val channels: List<ChannelDetails> = emptyList(),
     val isRefreshing: Boolean = false,
-    val receiveOnSpendingBalance: Boolean = true,
     val bip21AmountSats: ULong? = null,
     val bip21Description: String = "",
     val selectedTags: List<String> = listOf(),