chore: update ldk-node to v0.7.0-rc.1

Author: ovitrif

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

@@ -24,7 +24,6 @@ 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
@@ -118,43 +117,32 @@ class LightningService @Inject constructor(
         customRgsServerUrl: String?,
         config: Config,
     ): Node = ServiceQueue.LDK.background {
-        val nodeEntropy = NodeEntropy.fromBip39Mnemonic(
-            mnemonic = keychain.loadString(Keychain.Key.BIP39_MNEMONIC.name) ?: throw ServiceError.MnemonicNotFound,
-            passphrase = keychain.loadString(Keychain.Key.BIP39_PASSPHRASE.name),
-        )
-
         val builder = Builder.fromConfig(config).apply {
             setCustomLogger(LdkLogWriter())
             configureChainSource(customServerUrl)
             configureGossipSource(customRgsServerUrl)
+            setEntropyBip39Mnemonic(
+                mnemonic = keychain.loadString(Keychain.Key.BIP39_MNEMONIC.name) ?: throw ServiceError.MnemonicNotFound,
+                passphrase = keychain.loadString(Keychain.Key.BIP39_PASSPHRASE.name),
+            )
         }
         try {
             val vssStoreId = vssStoreIdProvider.getVssStoreId(walletIndex)
-            val lnurlAuthServerUrl = Env.lnurlAuthServerUrl
             val vssUrl = Env.vssServerUrl
-            Logger.verbose("Building ldk-node with vssUrl: '$vssUrl'")
-            Logger.verbose("Building ldk-node with lnurlAuthServerUrl: '$lnurlAuthServerUrl'")
+            val lnurlAuthServerUrl = Env.lnurlAuthServerUrl
+            val fixedHeaders = emptyMap<String, String>()
+            Logger.verbose(
+                "Building ldk-node with \n\t vssUrl: '$vssUrl'\n\t lnurlAuthServerUrl: '$lnurlAuthServerUrl'"
+            )
             if (lnurlAuthServerUrl.isNotEmpty()) {
-                builder.buildWithVssStore(
-                    vssUrl = vssUrl,
-                    storeId = vssStoreId,
-                    lnurlAuthServerUrl = lnurlAuthServerUrl,
-                    fixedHeaders = emptyMap(),
-                    nodeEntropy = nodeEntropy,
-                )
+                builder.buildWithVssStore(vssUrl, vssStoreId, lnurlAuthServerUrl, fixedHeaders)
             } else {
-                builder.buildWithVssStoreAndFixedHeaders(
-                    vssUrl = vssUrl,
-                    storeId = vssStoreId,
-                    fixedHeaders = emptyMap(),
-                    nodeEntropy = nodeEntropy,
-                )
+                builder.buildWithVssStoreAndFixedHeaders(vssUrl, vssStoreId, fixedHeaders)
             }
         } catch (e: BuildException) {
             throw LdkError(e)
         } finally {
-            // cleanup sensitive data
-            nodeEntropy.destroy()
+            // TODO: cleanup sensitive data after implementing a `SecureString` value holder for Keychain return values
         }
     }
 

gradle/libs.versions.toml

@@ -58,8 +58,8 @@ ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "k
 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.7.0" } # upstream
-#ldk-node-android = { module = "org.lightningdevkit:ldk-node-android", version = "0.7.0" } # local
-ldk-node-android = { module = "com.github.synonymdev:ldk-node", version = "v0.7.0" } # fork
+#ldk-node-android = { module = "org.lightningdevkit:ldk-node-android", version = "0.7.0-rc.1" } # local
+ldk-node-android = { module = "com.github.synonymdev:ldk-node", version = "v0.7.0-rc.1" } # 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" }