fix: align bolt11 expiry

Author: ovitrif

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

@@ -245,6 +245,9 @@ internal object Env {
 
 @Suppress("ConstPropertyName")
 object Defaults {
+    /** Default Bolt11 invoice expiry in seconds. */
+    const val bolt11InvoiceExpirySeconds = 3_600u
+
     /** Recommended transaction base fee in sats */
     const val recommendedBaseFee = 256u
 

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

@@ -41,6 +41,7 @@ import org.lightningdevkit.ldknode.ChannelDetails
 import to.bitkit.async.ServiceQueue
 import to.bitkit.data.CacheStore
 import to.bitkit.di.BgDispatcher
+import to.bitkit.env.Defaults
 import to.bitkit.env.Env
 import to.bitkit.ext.calculateRemoteBalance
 import to.bitkit.ext.nowTimestamp
@@ -462,7 +463,7 @@ class BlocktankRepo @Inject constructor(
         val invoice = lightningRepo.createInvoice(
             amountSats = null,
             description = "blocktank-gift-code:$code",
-            expirySeconds = 3600u,
+            expirySeconds = Defaults.bolt11InvoiceExpirySeconds,
         ).getOrThrow()
 
         Logger.debug("Created invoice for gift code, requesting payment from LSP", context = TAG)

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

@@ -58,6 +58,7 @@ import to.bitkit.data.SettingsStore
 import to.bitkit.data.backup.VssBackupClientLdk
 import to.bitkit.data.keychain.Keychain
 import to.bitkit.di.BgDispatcher
+import to.bitkit.env.Defaults
 import to.bitkit.env.Env
 import to.bitkit.ext.getSatsPerVByteFor
 import to.bitkit.ext.nowTimestamp
@@ -917,7 +918,7 @@ class LightningRepo @Inject constructor(
     suspend fun createInvoice(
         amountSats: ULong? = null,
         description: String,
-        expirySeconds: UInt = 86_400u,
+        expirySeconds: UInt = Defaults.bolt11InvoiceExpirySeconds,
     ): Result<String> = executeWhenNodeRunning("createInvoice") {
         updateGeoBlockState()
         runCatching { lightningService.receive(amountSats, description, expirySeconds) }
@@ -926,7 +927,7 @@ class LightningRepo @Inject constructor(
     suspend fun createInvoiceMsats(
         amountMsats: ULong,
         description: String,
-        expirySeconds: UInt = 86_400u,
+        expirySeconds: UInt = Defaults.bolt11InvoiceExpirySeconds,
     ): Result<String> = executeWhenNodeRunning("createInvoiceMsats") {
         updateGeoBlockState()
         runCatching { lightningService.receiveMsats(amountMsats, description, expirySeconds) }

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

@@ -14,6 +14,7 @@ import kotlinx.serialization.json.Json
 import to.bitkit.data.SettingsData
 import to.bitkit.data.SettingsStore
 import to.bitkit.di.IoDispatcher
+import to.bitkit.env.Defaults
 import to.bitkit.env.Env
 import to.bitkit.ext.toHex
 import to.bitkit.models.PubkyPublicKeyFormat
@@ -27,6 +28,7 @@ import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.time.Clock
 import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Duration.Companion.seconds
 import kotlin.time.ExperimentalTime
 import to.bitkit.di.json as appJson
 
@@ -68,7 +70,7 @@ class PublicPaykitRepo @Inject constructor(
         )
 
         private val managedMethodIds = MethodId.entries.filter { it.isBitkitManaged }
-        private val publicBolt11Expiry = 60.minutes
+        private val publicBolt11Expiry = Defaults.bolt11InvoiceExpirySeconds.toInt().seconds
         private val publicBolt11RefreshWindow = 30.minutes
 
         fun parseEndpoint(methodId: String, endpointData: String): Endpoint? {
@@ -93,7 +95,7 @@ class PublicPaykitRepo @Inject constructor(
         fun serializePayload(value: String): String {
             val trimmedValue = value.trim()
             if (trimmedValue.isEmpty()) throw PublicPaykitError.InvalidPayload
-            return Json.encodeToString(PublishedPaymentEndpointPayload(value = trimmedValue))
+            return Json.encodeToString(PaymentEndpointPayload(value = trimmedValue))
         }
 
         fun paymentRequest(endpoints: List<Endpoint>): String {
@@ -274,7 +276,7 @@ class PublicPaykitRepo @Inject constructor(
         val bolt11 = lightningRepo.createInvoice(
             amountSats = null,
             description = "",
-            expirySeconds = publicBolt11Expiry.inWholeSeconds.toUInt(),
+            expirySeconds = Defaults.bolt11InvoiceExpirySeconds,
         ).getOrThrow()
         val invoice = (coreService.decode(bolt11) as Scanner.Lightning).invoice
         val expiresAtMillis = clock.now().plus(publicBolt11Expiry).toEpochMilliseconds()
@@ -368,8 +370,3 @@ private data class PaymentEndpointPayload(
     val min: String? = null,
     val max: String? = null,
 )
-
-@Serializable
-private data class PublishedPaymentEndpointPayload(
-    val value: String,
-)

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

@@ -46,6 +46,7 @@ import to.bitkit.data.SettingsStore
 import to.bitkit.data.backup.VssStoreIdProvider
 import to.bitkit.data.keychain.Keychain
 import to.bitkit.di.BgDispatcher
+import to.bitkit.env.Defaults
 import to.bitkit.env.Env
 import to.bitkit.ext.totalNextOutboundHtlcLimitSats
 import to.bitkit.ext.uByteList
@@ -592,11 +593,19 @@ class LightningService @Inject constructor(
         return true
     }
 
-    suspend fun receive(sat: ULong? = null, description: String, expirySecs: UInt = 3600u): String {
+    suspend fun receive(
+        sat: ULong? = null,
+        description: String,
+        expirySecs: UInt = Defaults.bolt11InvoiceExpirySeconds,
+    ): String {
         return receiveMsats(amountMsat = sat?.let { it * 1000u }, description = description, expirySecs = expirySecs)
     }
 
-    suspend fun receiveMsats(amountMsat: ULong? = null, description: String, expirySecs: UInt = 3600u): String {
+    suspend fun receiveMsats(
+        amountMsat: ULong? = null,
+        description: String,
+        expirySecs: UInt = Defaults.bolt11InvoiceExpirySeconds,
+    ): String {
         val node = this.node ?: throw ServiceError.NodeNotSetup()
 
         val message = description

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

@@ -2071,7 +2071,7 @@ class AppViewModel @Inject constructor(
                 lightningRepo.createInvoiceMsats(
                     amountMsats = lnurl.data.maxWithdrawable,
                     description = lnurl.data.defaultDescription,
-                    expirySeconds = 3600u,
+                    expirySeconds = Defaults.bolt11InvoiceExpirySeconds,
                 )
             } else {
                 val withdrawAmountSats = _sendUiState.value.amount.coerceAtLeast(
@@ -2081,7 +2081,7 @@ class AppViewModel @Inject constructor(
                 lightningRepo.createInvoice(
                     amountSats = withdrawAmountSats,
                     description = lnurl.data.defaultDescription,
-                    expirySeconds = 3600u,
+                    expirySeconds = Defaults.bolt11InvoiceExpirySeconds,
                 )
             }.getOrNull()
 

app/src/test/java/to/bitkit/repositories/LightningRepoTest.kt

@@ -40,6 +40,7 @@ import to.bitkit.data.SettingsData
 import to.bitkit.data.SettingsStore
 import to.bitkit.data.backup.VssBackupClientLdk
 import to.bitkit.data.keychain.Keychain
+import to.bitkit.env.Defaults
 import to.bitkit.ext.createChannelDetails
 import to.bitkit.ext.of
 import to.bitkit.models.CoinSelectionPreference
@@ -200,11 +201,15 @@ class LightningRepoTest : BaseUnitTest() {
             lightningService.receive(
                 sat = 100uL,
                 description = "test",
-                expirySecs = 3600u
+                expirySecs = Defaults.bolt11InvoiceExpirySeconds,
             )
         ).thenReturn(testInvoice)
 
-        val result = sut.createInvoice(amountSats = 100uL, description = "test", expirySeconds = 3600u)
+        val result = sut.createInvoice(
+            amountSats = 100uL,
+            description = "test",
+            expirySeconds = Defaults.bolt11InvoiceExpirySeconds,
+        )
         assertTrue(result.isSuccess)
         assertEquals(testInvoice, result.getOrNull())
     }

app/src/test/java/to/bitkit/repositories/PublicPaykitRepoTest.kt

@@ -15,6 +15,7 @@ import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 import to.bitkit.data.SettingsData
 import to.bitkit.data.SettingsStore
+import to.bitkit.env.Defaults
 import to.bitkit.services.CoreService
 import to.bitkit.test.BaseUnitTest
 import kotlin.test.assertEquals
@@ -30,7 +31,7 @@ import kotlin.time.Instant
 class PublicPaykitRepoTest : BaseUnitTest() {
     companion object {
         private const val NOW_MILLIS = 1_000L
-        private const val PUBLIC_BOLT11_EXPIRY_SECONDS = 3_600u
+        private const val PUBLIC_BOLT11_EXPIRY_SECONDS = Defaults.bolt11InvoiceExpirySeconds
     }
 
     private val pubkyRepo = mock<PubkyRepo>()