feat: ldk-node serializable types

app/src/main/java/to/bitkit/env/Env.kt

@@ -3,10 +3,11 @@ package to.bitkit.env
 import android.os.Build
 import org.lightningdevkit.ldknode.LogLevel
 import org.lightningdevkit.ldknode.Network
+import org.lightningdevkit.ldknode.PeerDetails
 import to.bitkit.BuildConfig
 import to.bitkit.ext.ensureDir
+import to.bitkit.ext.parse
 import to.bitkit.models.BlocktankNotificationType
-import to.bitkit.models.LnPeer
 import to.bitkit.utils.Logger
 import java.io.File
 import kotlin.io.path.Path
@@ -24,8 +25,8 @@ internal object Env {
     // TODO: remove this to load from BT API instead
     val trustedLnPeers
         get() = when (network) {
-            Network.REGTEST -> listOf(Peers.btStaging)
-            Network.TESTNET -> listOf(Peers.btStaging)
+            Network.REGTEST -> listOf(Peers.staging)
+            Network.TESTNET -> listOf(Peers.staging)
             else -> TODO("Not yet implemented")
         }
 
@@ -143,10 +144,8 @@ internal object Env {
     }
 
     object Peers {
-        val btStaging = LnPeer(
-            nodeId = "028a8910b0048630d4eb17af25668cdd7ea6f2d8ae20956e7a06e2ae46ebcb69fc",
-            address = "34.65.86.104:9400",
-        )
+        val staging =
+            PeerDetails.parse("028a8910b0048630d4eb17af25668cdd7ea6f2d8ae20956e7a06e2ae46ebcb69fc@34.65.86.104:9400")
     }
 
     object ElectrumServers {

app/src/main/java/to/bitkit/ext/LightningBalance.kt

@@ -1,6 +1,6 @@
 package to.bitkit.ext
 
-import to.bitkit.models.LightningBalance
+import org.lightningdevkit.ldknode.LightningBalance
 
 fun LightningBalance.amountSats(): ULong {
     return when (this) {

app/src/main/java/to/bitkit/ext/PeerDetails.kt

@@ -0,0 +1,37 @@
+package to.bitkit.ext
+
+import org.lightningdevkit.ldknode.PeerDetails
+
+val PeerDetails.host get() = address.substringBefore(":")
+
+val PeerDetails.port get() = address.substringAfter(":")
+
+val PeerDetails.uri get() = "$nodeId@$address"
+
+fun PeerDetails.Companion.parse(uri: String): PeerDetails {
+    val parts = uri.split("@")
+    require(parts.size == 2) { "Invalid uri format, expected: '<nodeId>@<host>:<port>', got: '$uri'" }
+
+    val nodeId = parts[0]
+
+    val addressParts = parts[1].split(":")
+    require(addressParts.size == 2) { "Invalid uri format, expected: '<nodeId>@<host>:<port>', got: '$uri'" }
+
+    val host = addressParts[0]
+    val port = addressParts[1]
+    val address = "$host:$port"
+
+    return PeerDetails(
+        nodeId = nodeId,
+        address = address,
+        isConnected = false,
+        isPersisted = false,
+    )
+}
+
+fun PeerDetails.Companion.from(nodeId: String, host: String, port: String) = PeerDetails(
+    nodeId = nodeId,
+    address = "$host:$port",
+    isConnected = false,
+    isPersisted = false,
+)

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

@@ -37,6 +37,7 @@ import to.bitkit.utils.Logger
 import to.bitkit.utils.withPerformanceLogging
 import kotlin.time.Duration.Companion.minutes
 
+@Suppress("LongParameterList")
 @HiltWorker
 class WakeNodeWorker @AssistedInject constructor(
     @Assisted private val appContext: Context,
@@ -120,75 +121,16 @@ class WakeNodeWorker @AssistedInject constructor(
         val showDetails = settingsStore.data.first().showNotificationDetails
         val openBitkitMessage = "Open Bitkit to see details"
         when (event) {
-            is Event.PaymentReceived -> {
-                bestAttemptContent?.title = "Payment Received"
-                val sats = event.amountMsat / 1000u
-                // Save for UI to pick up
-                NewTransactionSheetDetails.save(
-                    appContext,
-                    NewTransactionSheetDetails(
-                        type = NewTransactionSheetType.LIGHTNING,
-                        direction = NewTransactionSheetDirection.RECEIVED,
-                        paymentHashOrTxId = event.paymentHash,
-                        sats = sats.toLong(),
-                    )
-                )
-                val content = if (showDetails) "$BITCOIN_SYMBOL $sats" else openBitkitMessage
-                bestAttemptContent?.body = content
-                if (self.notificationType == incomingHtlc) {
-                    self.deliver()
-                }
-            }
+            is Event.PaymentReceived -> onPaymentReceived(event, showDetails, openBitkitMessage)
 
             is Event.ChannelPending -> {
                 self.bestAttemptContent?.title = "Channel Opened"
                 self.bestAttemptContent?.body = "Pending"
                 // Don't deliver, give a chance for channelReady event to update the content if it's a turbo channel
             }
 
-            is Event.ChannelReady -> {
-                if (self.notificationType == cjitPaymentArrived) {
-                    self.bestAttemptContent?.title = "Payment received"
-                    self.bestAttemptContent?.body = "Via new channel"
-
-                    lightningRepo.getChannels()?.find { it.channelId == event.channelId }?.let { channel ->
-                        val sats = channel.amountOnClose
-                        val content = if (showDetails) "$BITCOIN_SYMBOL $sats" else openBitkitMessage
-                        self.bestAttemptContent?.title = content
-                        val cjitEntry = channel.let { blocktankRepo.getCjitEntry(it) }
-                        if (cjitEntry != null) {
-                            // Save for UI to pick up
-                            NewTransactionSheetDetails.save(
-                                appContext,
-                                NewTransactionSheetDetails(
-                                    type = NewTransactionSheetType.LIGHTNING,
-                                    direction = NewTransactionSheetDirection.RECEIVED,
-                                    sats = sats.toLong(),
-                                )
-                            )
-                            activityRepo.insertActivityFromCjit(cjitEntry = cjitEntry, channel = channel)
-                        }
-                    }
-                } else if (self.notificationType == orderPaymentConfirmed) {
-                    self.bestAttemptContent?.title = "Channel opened"
-                    self.bestAttemptContent?.body = "Ready to send"
-                }
-                self.deliver()
-            }
-
-            is Event.ChannelClosed -> {
-                self.bestAttemptContent?.title = "Channel closed"
-                self.bestAttemptContent?.body = "Reason: ${event.reason}"
-
-                if (self.notificationType == mutualClose) {
-                    self.bestAttemptContent?.body = "Balance moved from spending to savings"
-                } else if (self.notificationType == orderPaymentConfirmed) {
-                    self.bestAttemptContent?.title = "Channel failed to open in the background"
-                    self.bestAttemptContent?.body = "Please try again"
-                }
-
-                self.deliver()
-            }
+            is Event.ChannelReady -> onChannelReady(event, showDetails, openBitkitMessage)
+            is Event.ChannelClosed -> onChannelClosed(event)
 
             is Event.PaymentSuccessful -> Unit
             is Event.PaymentClaimable -> Unit
@@ -205,6 +147,78 @@ class WakeNodeWorker @AssistedInject constructor(
         }
     }
 
+    private suspend fun onChannelClosed(event: Event.ChannelClosed) {
+        self.bestAttemptContent?.title = "Channel closed"
+        self.bestAttemptContent?.body = "Reason: ${event.reason}"
+
+        if (self.notificationType == mutualClose) {
+            self.bestAttemptContent?.body = "Balance moved from spending to savings"
+        } else if (self.notificationType == orderPaymentConfirmed) {
+            self.bestAttemptContent?.title = "Channel failed to open in the background"
+            self.bestAttemptContent?.body = "Please try again"
+        }
+
+        self.deliver()
+    }
+
+    private suspend fun onPaymentReceived(
+        event: Event.PaymentReceived,
+        showDetails: Boolean,
+        openBitkitMessage: String,
+    ) {
+        bestAttemptContent?.title = "Payment Received"
+        val sats = event.amountMsat / 1000u
+        // Save for UI to pick up
+        NewTransactionSheetDetails.save(
+            appContext,
+            NewTransactionSheetDetails(
+                type = NewTransactionSheetType.LIGHTNING,
+                direction = NewTransactionSheetDirection.RECEIVED,
+                paymentHashOrTxId = event.paymentHash,
+                sats = sats.toLong(),
+            )
+        )
+        val content = if (showDetails) "$BITCOIN_SYMBOL $sats" else openBitkitMessage
+        bestAttemptContent?.body = content
+        if (self.notificationType == incomingHtlc) {
+            self.deliver()
+        }
+    }
+
+    private suspend fun onChannelReady(
+        event: Event.ChannelReady,
+        showDetails: Boolean,
+        openBitkitMessage: String,
+    ) {
+        if (self.notificationType == cjitPaymentArrived) {
+            self.bestAttemptContent?.title = "Payment received"
+            self.bestAttemptContent?.body = "Via new channel"
+
+            lightningRepo.getChannels()?.find { it.channelId == event.channelId }?.let { channel ->
+                val sats = channel.amountOnClose
+                val content = if (showDetails) "$BITCOIN_SYMBOL $sats" else openBitkitMessage
+                self.bestAttemptContent?.title = content
+                val cjitEntry = channel.let { blocktankRepo.getCjitEntry(it) }
+                if (cjitEntry != null) {
+                    // Save for UI to pick up
+                    NewTransactionSheetDetails.save(
+                        appContext,
+                        NewTransactionSheetDetails(
+                            type = NewTransactionSheetType.LIGHTNING,
+                            direction = NewTransactionSheetDirection.RECEIVED,
+                            sats = sats.toLong(),
+                        )
+                    )
+                    activityRepo.insertActivityFromCjit(cjitEntry = cjitEntry, channel = channel)
+                }
+            }
+        } else if (self.notificationType == orderPaymentConfirmed) {
+            self.bestAttemptContent?.title = "Channel opened"
+            self.bestAttemptContent?.body = "Ready to send"
+        }
+        self.deliver()
+    }
+
     private suspend fun deliver() {
         lightningRepo.stop()