Skip to content

Commit 1e4dd83

Browse files
committed
fix: restore paykit invoice expiry
1 parent 774f154 commit 1e4dd83

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import kotlinx.serialization.json.Json
1414
import to.bitkit.data.SettingsData
1515
import to.bitkit.data.SettingsStore
1616
import to.bitkit.di.IoDispatcher
17-
import to.bitkit.env.Defaults
1817
import to.bitkit.env.Env
1918
import to.bitkit.ext.toHex
2019
import to.bitkit.models.PubkyPublicKeyFormat
@@ -27,8 +26,8 @@ import java.util.Locale
2726
import javax.inject.Inject
2827
import javax.inject.Singleton
2928
import kotlin.time.Clock
29+
import kotlin.time.Duration.Companion.hours
3030
import kotlin.time.Duration.Companion.minutes
31-
import kotlin.time.Duration.Companion.seconds
3231
import kotlin.time.ExperimentalTime
3332
import to.bitkit.di.json as appJson
3433

@@ -70,7 +69,7 @@ class PublicPaykitRepo @Inject constructor(
7069
)
7170

7271
private val managedMethodIds = MethodId.entries.filter { it.isBitkitManaged }
73-
private val publicBolt11Expiry = Defaults.bolt11InvoiceExpirySeconds.toInt().seconds
72+
private val publicBolt11Expiry = 24.hours
7473
private val publicBolt11RefreshWindow = 30.minutes
7574

7675
fun parseEndpoint(methodId: String, endpointData: String): Endpoint? {
@@ -276,7 +275,7 @@ class PublicPaykitRepo @Inject constructor(
276275
val bolt11 = lightningRepo.createInvoice(
277276
amountSats = null,
278277
description = "",
279-
expirySeconds = Defaults.bolt11InvoiceExpirySeconds,
278+
expirySeconds = publicBolt11Expiry.inWholeSeconds.toUInt(),
280279
).getOrThrow()
281280
val invoice = (coreService.decode(bolt11) as Scanner.Lightning).invoice
282281
val expiresAtMillis = clock.now().plus(publicBolt11Expiry).toEpochMilliseconds()

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import org.mockito.kotlin.verify
1515
import org.mockito.kotlin.whenever
1616
import to.bitkit.data.SettingsData
1717
import to.bitkit.data.SettingsStore
18-
import to.bitkit.env.Defaults
1918
import to.bitkit.services.CoreService
2019
import to.bitkit.test.BaseUnitTest
2120
import kotlin.test.assertEquals
@@ -31,7 +30,7 @@ import kotlin.time.Instant
3130
class PublicPaykitRepoTest : BaseUnitTest() {
3231
companion object {
3332
private const val NOW_MILLIS = 1_000L
34-
private const val PUBLIC_BOLT11_EXPIRY_SECONDS = Defaults.bolt11InvoiceExpirySeconds
33+
private const val PUBLIC_BOLT11_EXPIRY_SECONDS = 86_400u
3534
}
3635

3736
private val pubkyRepo = mock<PubkyRepo>()

0 commit comments

Comments
 (0)