chore: update to ldk-node 0.7.0

Author: ovitrif

app/src/main/java/to/bitkit/fcm/WakeNodeWorker.kt

@@ -144,6 +144,7 @@ class WakeNodeWorker @AssistedInject constructor(
                     self.deliver()
                 }
             }
+            else -> Unit
         }
     }
 

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

@@ -15,6 +15,7 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.lightningdevkit.ldknode.Event
+import org.lightningdevkit.ldknode.WordCount
 import to.bitkit.data.CacheStore
 import to.bitkit.data.SettingsStore
 import to.bitkit.data.keychain.Keychain
@@ -564,7 +565,7 @@ class WalletRepo @Inject constructor(
     }
 
     private fun generateEntropyMnemonic(): String {
-        return org.lightningdevkit.ldknode.generateEntropyMnemonic()
+        return org.lightningdevkit.ldknode.generateEntropyMnemonic(wordCount = WordCount.WORDS12)
     }
 
     private companion object {

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

@@ -26,6 +26,7 @@ import org.lightningdevkit.ldknode.ElectrumSyncConfig
 import org.lightningdevkit.ldknode.Event
 import org.lightningdevkit.ldknode.FeeRate
 import org.lightningdevkit.ldknode.Node
+import org.lightningdevkit.ldknode.NodeEntropy
 import org.lightningdevkit.ldknode.NodeException
 import org.lightningdevkit.ldknode.NodeStatus
 import org.lightningdevkit.ldknode.PaymentDetails
@@ -99,14 +100,13 @@ class LightningService @Inject constructor(
 
             configureChainSource(customServerUrl)
             configureGossipSource(customRgsServerUrl)
-
-            setEntropyBip39Mnemonic(mnemonic, passphrase)
         }
 
         Logger.debug("Building node…")
-
         val vssStoreId = vssStoreIdProvider.getVssStoreId(walletIndex)
 
+        val nodeEntropy = NodeEntropy.fromBip39Mnemonic(mnemonic, passphrase)
+
         ServiceQueue.LDK.background {
             node = try {
                 val lnurlAuthServerUrl = Env.lnurlAuthServerUrl
@@ -119,16 +119,21 @@ class LightningService @Inject constructor(
                         storeId = vssStoreId,
                         lnurlAuthServerUrl = lnurlAuthServerUrl,
                         fixedHeaders = emptyMap(),
+                        nodeEntropy = nodeEntropy,
                     )
                 } else {
                     builder.buildWithVssStoreAndFixedHeaders(
                         vssUrl = vssUrl,
                         storeId = vssStoreId,
                         fixedHeaders = emptyMap(),
+                        nodeEntropy = nodeEntropy,
                     )
                 }
             } catch (e: BuildException) {
                 throw LdkError(e)
+            } finally {
+                // cleanup sensitive data
+                nodeEntropy.destroy()
             }
         }
 
@@ -760,6 +765,8 @@ class LightningService @Inject constructor(
                     "⛔ Channel closed: channelId: $channelId userChannelId: $userChannelId counterpartyNodeId: $counterpartyNodeId reason: $reason"
                 )
             }
+
+            else -> Logger.info("LDK-node event: $event")
         }
     }
     // endregion

app/src/main/java/to/bitkit/ui/NodeInfoScreen.kt

@@ -452,7 +452,6 @@ private fun PreviewDevMode() {
                 nodeLifecycleState = NodeLifecycleState.Running,
                 nodeStatus = NodeStatus(
                     isRunning = true,
-                    isListening = true,
                     currentBestBlock = BestBlock(
                         height = 1000u,
                         blockHash = "0123456789abcDef",
@@ -463,6 +462,7 @@ private fun PreviewDevMode() {
                     latestRgsSnapshotTimestamp = null,
                     latestNodeAnnouncementBroadcastTimestamp = null,
                     latestChannelMonitorArchivalHeight = null,
+                    latestPathfindingScoresSyncTimestamp = null,
                 ),
                 nodeId = "0348a2b7c2d3f4e5a6b7c8d9e0f1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f9",
                 peers = listOf(Env.Peers.staging),

app/src/main/java/to/bitkit/utils/Errors.kt

@@ -46,8 +46,6 @@ class LdkError(private val inner: LdkException) : AppError("Unknown LDK error.")
         class Build(exception: BuildException) : LdkException {
             override val message = when (exception) {
                 is BuildException.InvalidChannelMonitor -> "Invalid channel monitor."
-                is BuildException.InvalidSeedBytes -> "Invalid seed bytes."
-                is BuildException.InvalidSeedFile -> "Invalid seed file."
                 is BuildException.InvalidSystemTime -> "Invalid system time."
                 is BuildException.InvalidListeningAddresses -> "Invalid listening addresses."
                 is BuildException.ReadFailed -> "Read failed."

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

@@ -290,6 +290,9 @@ class AppViewModel @Inject constructor(
                         is Event.PaymentClaimable -> Unit
                         is Event.PaymentFailed -> Unit
                         is Event.PaymentForwarded -> Unit
+                        else -> {
+                            Logger.warn("Unhandled LDK event: $event", context = TAG)
+                        }
                     }
                 }.onFailure { e ->
                     Logger.error("LDK event handler error", e, context = TAG)

gradle/libs.versions.toml

@@ -81,9 +81,9 @@ ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
 ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" }
 ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
 ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
-#ldk-node-android = { module = "org.lightningdevkit:ldk-node-android", version = "0.6.2" } # upstream
-#ldk-node-android = { module = "org.lightningdevkit:ldk-node-android", version = "0.6.2-rc.4" } # local
-ldk-node-android = { module = "com.github.synonymdev:ldk-node", version = "v0.6.2-rc.4" } # fork
+#ldk-node-android = { module = "org.lightningdevkit:ldk-node-android", version = "0.7.0" } # upstream
+ldk-node-android = { module = "org.lightningdevkit:ldk-node-android", version = "v0.7.0" } # local
+#ldk-node-android = { module = "com.github.synonymdev:ldk-node", version = "v0.7.0" } # fork
 lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "lifecycle" }
 lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycle" }
 lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }