refactor: restore 10s sync intervals for regtest

Author: ovitrif

app/src/main/java/to/bitkit/androidServices/LightningNodeService.kt

@@ -63,9 +63,7 @@ class LightningNodeService : Service() {
         super.onCreate()
         startForeground(ID_NOTIFICATION_NODE, createNotification())
         setupService()
-        lifecycleObserver = AppLifecycleObserver().also {
-            ProcessLifecycleOwner.get().lifecycle.addObserver(it)
-        }
+        lifecycleObserver = AppLifecycleObserver().also { ProcessLifecycleOwner.get().lifecycle.addObserver(it) }
     }
 
     private fun setupService() {
@@ -116,9 +114,7 @@ class LightningNodeService : Service() {
         val pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE)
 
         // Create stop action that will close both service and app
-        val stopIntent = Intent(this, LightningNodeService::class.java).apply {
-            action = ACTION_STOP_SERVICE_AND_APP
-        }
+        val stopIntent = Intent(this, LightningNodeService::class.java).apply { action = ACTION_STOP_SERVICE_AND_APP }
         val stopPendingIntent = PendingIntent.getService(this, 0, stopIntent, PendingIntent.FLAG_IMMUTABLE)
 
         return NotificationCompat.Builder(this, CHANNEL_ID_NODE)
@@ -128,11 +124,7 @@ class LightningNodeService : Service() {
             .setColor(ContextCompat.getColor(this, R.color.brand))
             .setContentIntent(pendingIntent)
             .setOngoing(true)
-            .addAction(
-                R.drawable.ic_x,
-                getString(R.string.notification__service__stop),
-                stopPendingIntent
-            )
+            .addAction(R.drawable.ic_x, getString(R.string.notification__service__stop), stopPendingIntent)
             .build()
     }
 
@@ -192,8 +184,8 @@ class LightningNodeService : Service() {
     }
 
     companion object {
-        const val CHANNEL_ID_NODE = "bitkit_notification_channel_node"
         const val TAG = "LightningNodeService"
+        const val CHANNEL_ID_NODE = "bitkit_notification_channel_node"
         const val ACTION_STOP_SERVICE_AND_APP = "to.bitkit.androidServices.action.STOP_SERVICE_AND_APP"
     }
 }

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

@@ -26,11 +26,7 @@ internal object Env {
 
     val ldkLogLevel = LogLevel.TRACE
 
-    val syncIntervals = RuntimeSyncIntervals(
-        onchainWalletSyncIntervalSecs = 80_uL, // ldk-node default
-        lightningWalletSyncIntervalSecs = 30_uL, // ldk-node default
-        feeRateCacheUpdateIntervalSecs = 600_uL, // ldk-node default (10 min)
-    )
+    val syncIntervals = if (network == Network.REGTEST) SyncIntervals.REGTEST else SyncIntervals.DEFAULT
 
     val trustedLnPeers
         get() = when (network) {
@@ -226,3 +222,16 @@ private object ElectrumServers {
 
     const val TESTNET = "ssl://electrum.blockstream.info:60002"
 }
+
+private object SyncIntervals {
+    val DEFAULT = RuntimeSyncIntervals(
+        onchainWalletSyncIntervalSecs = 80_uL,
+        lightningWalletSyncIntervalSecs = 30_uL,
+        feeRateCacheUpdateIntervalSecs = 600_uL, // 10 min
+    )
+    val REGTEST = RuntimeSyncIntervals(
+        onchainWalletSyncIntervalSecs = 10_uL,
+        lightningWalletSyncIntervalSecs = 10_uL,
+        feeRateCacheUpdateIntervalSecs = 10_uL,
+    )
+}

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

@@ -0,0 +1,10 @@
+package to.bitkit.ext
+
+import org.lightningdevkit.ldknode.BackgroundSyncConfig
+import org.lightningdevkit.ldknode.RuntimeSyncIntervals
+
+fun RuntimeSyncIntervals.toBackgroundSyncConfig(): BackgroundSyncConfig = BackgroundSyncConfig(
+    onchainWalletSyncIntervalSecs = onchainWalletSyncIntervalSecs,
+    lightningWalletSyncIntervalSecs = lightningWalletSyncIntervalSecs,
+    feeRateCacheUpdateIntervalSecs = feeRateCacheUpdateIntervalSecs,
+)

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

@@ -14,7 +14,6 @@ import kotlinx.coroutines.withTimeout
 import kotlinx.serialization.Serializable
 import org.lightningdevkit.ldknode.Address
 import org.lightningdevkit.ldknode.AnchorChannelsConfig
-import org.lightningdevkit.ldknode.BackgroundSyncConfig
 import org.lightningdevkit.ldknode.BalanceDetails
 import org.lightningdevkit.ldknode.Bolt11Invoice
 import org.lightningdevkit.ldknode.Bolt11InvoiceDescription
@@ -49,6 +48,7 @@ import to.bitkit.ext.totalNextOutboundHtlcLimitSats
 import to.bitkit.ext.uByteList
 import to.bitkit.ext.uri
 import to.bitkit.models.OpenChannelResult
+import to.bitkit.ext.toBackgroundSyncConfig
 import to.bitkit.utils.LdkError
 import to.bitkit.utils.LdkLogWriter
 import to.bitkit.utils.Logger
@@ -193,11 +193,7 @@ class LightningService @Inject constructor(
         setChainSourceElectrum(
             serverUrl = serverUrl,
             config = ElectrumSyncConfig(
-                BackgroundSyncConfig(
-                    onchainWalletSyncIntervalSecs = Env.syncIntervals.onchainWalletSyncIntervalSecs,
-                    lightningWalletSyncIntervalSecs = Env.syncIntervals.lightningWalletSyncIntervalSecs,
-                    feeRateCacheUpdateIntervalSecs = Env.syncIntervals.feeRateCacheUpdateIntervalSecs,
-                ),
+                backgroundSyncConfig = Env.syncIntervals.toBackgroundSyncConfig(),
             ),
         )
     }