Migrate to ldk-node

.gitignore

@@ -9,4 +9,4 @@
 local.properties
 
 # Secrets
-google-services.json
+google-services.json

app/build.gradle.kts

@@ -68,34 +68,30 @@ android {
 }
 
 dependencies {
+    implementation(fileTree("libs") { include("*.aar") })
+
     // BDK & LDK
     implementation("org.bitcoindevkit:bdk-android:0.30.0")
-    implementation(fileTree("libs") { include("*.aar") })
-    // implementation("org.lightningdevkit:ldk-node-jvm:0.3.0")
+    implementation("org.lightningdevkit:ldk-node-android:0.3.0")
 
     implementation("androidx.core:core-ktx:1.13.1")
     implementation("androidx.appcompat:appcompat:1.7.0")
-    implementation("androidx.activity:activity-compose:1.9.0")
+    implementation("androidx.activity:activity-compose:1.9.1")
 
     // Firebase
     implementation(platform("com.google.firebase:firebase-bom:33.1.2"))
     implementation("com.google.firebase:firebase-messaging")
     implementation("com.google.firebase:firebase-analytics")
 
     // Lifecycle
-    val lifecycleVersion = "2.8.3"
+    val lifecycleVersion = "2.8.4"
     // ViewModel
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
-    // ViewModel utilities for Compose
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion")
-    // LiveData
-    implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")
-    // Lifecycles only (without ViewModel or LiveData)
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
-    // Lifecycle utilities for Compose
-    implementation("androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion")
-    // Saved state module for ViewModel
-    implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycleVersion")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion") // ViewModel utils for Compose
+    implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion") // LiveData
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") // Lifecycles wo ViewModel/LiveData
+    implementation("androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion") // Lifecycle utils for Compose
+    implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycleVersion") // Saved state for ViewModel
 
     // Compose Navigation
     val composeNavigationVersion = "2.7.7"
@@ -121,7 +117,7 @@ dependencies {
     // Material Design
     implementation("com.google.android.material:material:1.12.0")
     implementation("androidx.compose.material3:material3:1.2.1")
-    implementation("androidx.compose.material:material-icons-extended:1.7.0-beta05")
+    implementation("androidx.compose.material:material-icons-extended:1.7.0-beta06")
 
     // Ktor
     val ktorVersion = "2.3.8"
@@ -142,4 +138,4 @@ dependencies {
 
     // Other
     implementation("com.google.guava:guava:31.1-android") // for ByteArray.toHex()+
-}
+}

app/src/main/AndroidManifest.xml

@@ -33,7 +33,7 @@
         </activity>
 
         <service
-            android:name=".fcm.MessagingService"
+            android:name=".fcm.FcmService"
             android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
@@ -63,4 +63,4 @@
             android:name="com.google.firebase.messaging.default_notification_channel_id"
             android:value="@string/app_notifications_channel_id" />
     </application>
-</manifest>
+</manifest>

app/src/main/java/to/bitkit/Constants.kt

@@ -1,11 +1,76 @@
 package to.bitkit
 
-import org.bitcoindevkit.Network
+import android.util.Log
+import to.bitkit.Tag.LDK
+import kotlin.io.path.Path
+import org.bitcoindevkit.Network as BdkNetwork
+import org.lightningdevkit.ldknode.Network as LdkNetwork
 
-internal const val _DEV = "_DEV"
-internal const val _FCM = "_FCM"
-internal const val _LDK = "_LDK"
-internal const val _BDK = "_BDK"
+object Tag {
+    internal const val FCM = "FCM"
+    internal const val LDK = "LDK"
+    internal const val BDK = "BDK"
+    internal const val DEV = "DEV"
+    internal const val APP = "APP"
+}
 
-internal val BDK_NETWORK = Network.REGTEST
-internal val LDK_NETWORK get() = org.ldk.enums.Network.LDKNetwork_Regtest
+internal const val HOST = "10.0.2.2"
+internal const val REST = "https://electrs-regtest.synonym.to"
+internal const val SEED = "universe more push obey later jazz huge buzz magnet team muscle robust"
+internal val PEER = LnPeer(
+    nodeId = "02faf2d1f5dc153e8931d8444c4439e46a81cb7eeadba8562e7fec3690c261ce87",
+    host = HOST,
+    port = "9736",
+)
+
+internal object Env {
+    val isDebug = BuildConfig.DEBUG
+
+    object LdkStorage {
+        lateinit var path: String
+
+        fun init(base: String): String {
+            require(base.isNotEmpty()) { "Base path for LDK storage cannot be empty" }
+            return Path(base, Network.ldk.name.lowercase(), "ldk")
+                .toFile()
+                // .also {
+                //     if (!it.mkdirs()) throw Error("Cannot create LDK data directory")
+                // }
+                .absolutePath
+                .also {
+                    path = it
+                    Log.d(LDK, "Storage path: $it")
+                }
+        }
+    }
+
+    object Network {
+        val ldk: LdkNetwork = LdkNetwork.REGTEST
+        val bdk = BdkNetwork.REGTEST
+    }
+
+    val trustedLnPeers = listOf(
+        PEER,
+    )
+
+    val ldkRgsServerUrl: String?
+        get() = when (Network.ldk) {
+            LdkNetwork.BITCOIN -> "https://rapidsync.lightningdevkit.org/snapshot/"
+            else -> null
+        }
+}
+
+data class LnPeer(
+    val nodeId: String,
+    val host: String,
+    val port: String,
+) {
+    constructor(nodeId: String, address: String) : this(
+        nodeId,
+        address.substringBefore(":"),
+        address.substringAfter(":"),
+    )
+
+    fun address() = "$host:$port"
+    override fun toString() = "$nodeId@${address()}"
+}

app/src/main/java/to/bitkit/LauncherActivity.kt

@@ -2,16 +2,11 @@ package to.bitkit
 
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
-import to.bitkit.bdk.Bdk
-import to.bitkit.ldk.Ldk
-import to.bitkit.ldk.init
-import to.bitkit.ldk.ldkDir
+import to.bitkit.ldk.warmupNode
 import to.bitkit.ui.MainActivity
 import to.bitkit.ui.initNotificationChannel
 import to.bitkit.ui.logFcmToken
-import java.io.File
 
 class LauncherActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -22,61 +17,3 @@ class LauncherActivity : AppCompatActivity() {
         startActivity(Intent(this, MainActivity::class.java))
     }
 }
-
-internal fun warmupNode(absolutePath: String): Boolean {
-    initDataDir(absolutePath)
-
-    val latestBlockHeight = Bdk.getHeight()
-    val latestBlockHash = Bdk.getBlockHash(latestBlockHeight)
-
-    val channelManagerFile = File("$ldkDir/channel-manager.bin")
-    val serializedChannelManager = channelManagerFile
-        .takeIf { it.exists() }
-        ?.absoluteFile?.readBytes()
-
-    val serializedChannelMonitors = readChannelMonitorFromDisk()
-
-    return Ldk.init(
-        Bdk.getLdkEntropy(),
-        latestBlockHeight.toInt(),
-        latestBlockHash,
-        serializedChannelManager,
-        serializedChannelMonitors,
-    )
-}
-
-private fun initDataDir(absolutePath: String) {
-    ldkDir = "$absolutePath/bitkit"
-    val dir = File(ldkDir)
-    if (!dir.exists()) {
-        dir.mkdir()
-    }
-
-    // Initialize the LDK data directory if necessary.
-    ldkDir += "/ldk-data"
-    val ldkDirPath = File(ldkDir)
-    if (!ldkDirPath.exists()) {
-        ldkDirPath.mkdir()
-        Log.d(_LDK, "Ldk dir: $ldkDirPath")
-    }
-}
-
-private fun readChannelMonitorFromDisk(): Array<ByteArray> {
-    val channelMonitorDirectory = File("$ldkDir/channels/")
-    if (channelMonitorDirectory.isDirectory) {
-        val files = channelMonitorDirectory.list()
-        if (files.isNullOrEmpty()) {
-            return emptyArray()
-        }
-
-        val channelMonitorList = mutableListOf<ByteArray>()
-        files.forEach {
-            channelMonitorList.add(File("${channelMonitorDirectory}/${it}").readBytes())
-        }
-        return channelMonitorList.toTypedArray()
-    }
-
-    channelMonitorDirectory.mkdir()
-    Log.d(_LDK, "New channels dir: $channelMonitorDirectory")
-    return emptyArray()
-}