fix: persist lightning node id to database

Author: angelix

common/src/commonMain/kotlin/com/blockstream/common/data/WalletExtras.kt

@@ -5,7 +5,8 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class WalletExtras(
-    val totalBalanceInFiat: Boolean = false
+    val totalBalanceInFiat: Boolean = false,
+    val lightningNodeId: String? = null
 ) : GreenJson<WalletExtras>() {
     override fun kSerializer() = serializer()
 

common/src/commonMain/kotlin/com/blockstream/common/di/CommonModule.kt

@@ -10,6 +10,7 @@ import com.blockstream.common.usecases.SetPinUseCase
 import com.blockstream.domain.banner.GetBannerUseCase
 import com.blockstream.domain.bitcoinpricehistory.ObserveBitcoinPriceHistory
 import com.blockstream.domain.hardware.VerifyAddressUseCase
+import com.blockstream.domain.lightning.LightningNodeIdUseCase
 import com.blockstream.domain.meld.CreateCryptoQuoteUseCase
 import com.blockstream.domain.meld.CreateCryptoWidgetUseCase
 import com.blockstream.domain.meld.DefaultValuesUseCase
@@ -19,12 +20,17 @@ import com.blockstream.domain.navigation.NavigateToWallet
 import com.blockstream.domain.promo.GetPromoUseCase
 import com.blockstream.green.data.dataModule
 import com.blockstream.green.domain.domainModule
+import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.module
 
 //At some point we'll move this to domain module. 
 val commonModule = module {
     includes(dataModule)
     includes(domainModule)
+    singleOf(::RestoreWalletUseCase)
+    single {
+        LightningNodeIdUseCase(get())
+    }
     single {
         NavigateToWallet(get(), get())
     }
@@ -46,9 +52,6 @@ val commonModule = module {
     single {
         NewWalletUseCase(get(), get(), get(), get(), get(), get(), get())
     }
-    single {
-        RestoreWalletUseCase(get(), get(), get(), get(), get(), get(), get())
-    }
     single {
         CheckRecoveryPhraseUseCase(get())
     }
@@ -62,7 +65,7 @@ val commonModule = module {
         EnableHardwareWatchOnlyUseCase(get(), get())
     }
     single {
-        CreateAccountUseCase(get(), get(), get())
+        CreateAccountUseCase(get(), get(), get(), get())
     }
 
     factory {

common/src/commonMain/kotlin/com/blockstream/common/gdk/GdkSession.kt

@@ -463,6 +463,10 @@ class GdkSession constructor(
     var xPubHashId: String? = null
         private set
 
+    var lightningNodeId: String? = null
+        get() = lightningSdkOrNull?.nodeInfoStateFlow?.value?.id.takeIf { it.isNotBlank() } ?: field
+        private set
+
     var pendingTransactionParams: CreateTransactionParams? = null
     var pendingTransaction: PendingTransaction? = null
 
@@ -766,6 +770,7 @@ class GdkSession constructor(
 
         _isConnectedState.value = false
         xPubHashId = null
+        lightningNodeId = null
 
         authenticationRequired.clear()
 
@@ -1730,6 +1735,8 @@ class GdkSession constructor(
         _isConnectedState.value = true
         xPubHashId = if (isNoBlobWatchOnly && !isHwWatchOnly) loginData.networkHashId else loginData.xpubHashId
 
+        lightningNodeId = wallet?.extras?.lightningNodeId
+
         if (initializeSession) {
             countly.activeWalletStart()
             initializeSessionData(wallet, initNetwork, initAccount)
@@ -3306,9 +3313,14 @@ class GdkSession constructor(
             }
         }
 
-    fun supportId() = allAccounts.value.filter {
-        it.isMultisig && it.pointer == 0L || it.isLightning
-    }.joinToString(",") { "${it.network.bip21Prefix}:${if (it.isLightning) lightningSdk.nodeInfoStateFlow.value.id else it.receivingId}" }
+    fun supportId(): String = (allAccounts.value.filter {
+        it.isMultisig && it.pointer == 0L
+    }.map { "${it.network.bip21Prefix}:${it.receivingId}" } + listOfNotNull(
+        lightning?.bip21Prefix?.let { bip21Prefix ->
+            lightningNodeId?.let { "$bip21Prefix:$it" }
+        }
+
+    )).joinToString(",")
 
     internal fun destroy(disconnect: Boolean = true) {
         if (disconnect) {

common/src/commonMain/kotlin/com/blockstream/common/models/login/LoginViewModel.kt

@@ -60,6 +60,7 @@ import com.blockstream.common.sideeffects.SideEffects
 import com.blockstream.common.usecases.EnableHardwareWatchOnlyUseCase
 import com.blockstream.common.utils.SetupDevelopmentEnv
 import com.blockstream.common.utils.StringHolder
+import com.blockstream.domain.lightning.LightningNodeIdUseCase
 import com.blockstream.green.data.banner.Banner
 import com.blockstream.green.utils.Loggable
 import com.blockstream.ui.events.Event
@@ -158,6 +159,7 @@ class LoginViewModel constructor(
 
     override val isLoginRequired: Boolean = false
 
+    private val lightningNodeIdUseCase: LightningNodeIdUseCase by inject()
     private val enableHardwareWatchOnlyUseCase: EnableHardwareWatchOnlyUseCase by inject()
     private val setupDevelopmentEnv = SetupDevelopmentEnv() // Only for dev env
 
@@ -978,6 +980,8 @@ class LoginViewModel constructor(
                 loginCredentials = loginCredentials
             )
 
+            lightningNodeIdUseCase.invoke(wallet = pair.first, session = session)
+
             if (isWatchOnlyUpgrade) {
                 sessionManager.getWalletSessionOrNull(greenWallet)?.also { woSession ->
                     logger.d { "Upgrade wo session to full" }

common/src/commonMain/kotlin/com/blockstream/common/usecases/CreateAccountUseCase.kt

@@ -18,6 +18,7 @@ import com.blockstream.common.gdk.data.Network
 import com.blockstream.common.gdk.device.DeviceResolver
 import com.blockstream.common.gdk.device.HardwareWalletInteraction
 import com.blockstream.common.gdk.params.SubAccountParams
+import com.blockstream.domain.lightning.LightningNodeIdUseCase
 import com.blockstream.green.utils.Loggable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.IO
@@ -26,7 +27,8 @@ import kotlinx.coroutines.withContext
 class CreateAccountUseCase(
     val database: Database,
     val greenKeystore: GreenKeystore,
-    val countly: CountlyBase
+    val countly: CountlyBase,
+    val lightningNodeIdUseCase: LightningNodeIdUseCase,
 ) : Loggable() {
 
     suspend operator fun invoke(
@@ -96,6 +98,9 @@ class CreateAccountUseCase(
                 }
             }
 
+            // Save Lightning Node Id
+            lightningNodeIdUseCase.invoke(wallet = greenWallet, session = session)
+
             return session.lightningAccount
         } else {
 

common/src/commonMain/kotlin/com/blockstream/common/usecases/RestoreWalletUseCase.kt

@@ -13,6 +13,7 @@ import com.blockstream.common.gdk.params.LoginCredentialsParams
 import com.blockstream.common.managers.SessionManager
 import com.blockstream.common.managers.SettingsManager
 import com.blockstream.common.utils.generateWalletName
+import com.blockstream.domain.lightning.LightningNodeIdUseCase
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.IO
 import kotlinx.coroutines.withContext
@@ -25,6 +26,7 @@ class RestoreWalletUseCase(
     private val settingsManager: SettingsManager,
     private val setPinUseCase: SetPinUseCase,
     private val setBiometricsUseCase: SetBiometricsUseCase,
+    private val lightningNodeIdUseCase: LightningNodeIdUseCase
 ) {
 
     suspend operator fun invoke(
@@ -90,6 +92,8 @@ class RestoreWalletUseCase(
                         encryptedData = encryptedData
                     )
                 )
+
+                lightningNodeIdUseCase.invoke(wallet = wallet, session = session)
             }
 
             sessionManager.upgradeOnBoardingSessionToWallet(wallet)

common/src/commonMain/kotlin/com/blockstream/domain/lightning/LightningNodeIdUseCase.kt

@@ -0,0 +1,21 @@
+package com.blockstream.domain.lightning
+
+import com.blockstream.common.data.GreenWallet
+import com.blockstream.common.data.WalletExtras
+import com.blockstream.common.database.Database
+import com.blockstream.common.extensions.isNotBlank
+import com.blockstream.common.gdk.GdkSession
+import com.blockstream.jade.Loggable
+
+class LightningNodeIdUseCase(private val database: Database) : Loggable() {
+    suspend operator fun invoke(wallet: GreenWallet, session: GdkSession) {
+        val lightningNodeId = session.lightningNodeId
+
+        logger.d { "Lightning NodeId: $lightningNodeId" }
+
+        if (!wallet.isEphemeral && lightningNodeId.isNotBlank() && wallet.extras?.lightningNodeId != lightningNodeId) {
+            wallet.extras = wallet.extras?.copy(lightningNodeId = lightningNodeId) ?: WalletExtras(lightningNodeId = lightningNodeId)
+            database.updateWallet(wallet)
+        }
+    }
+}

gradle/libs.versions.toml

@@ -14,7 +14,7 @@ ktor = "3.2.3"
 phosphorIcon = "1.0.0"
 compose-rebugger = "1.0.1"
 tuulbox-coroutines = "8.0.3"
-android-gradle-plugin = "8.12.1"
+android-gradle-plugin = "8.12.2"
 androidCompileSdk = "36"
 androidTargetSdk = "36"
 androidMinSdk = "24"