Merge branch 'master' into feat/pending-balance

Author: ovitrif

.github/workflows/e2e.yml

@@ -46,6 +46,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CHATWOOT_API: ${{ secrets.CHATWOOT_API }}
           E2E: true
+          GEO: false
         run: ./gradlew assembleDevDebug
 
       - name: Rename APK
@@ -73,7 +74,7 @@ jobs:
           - { name: settings, grep: "@settings" }
           - { name: send, grep: "@send" }
           - { name: lightning_security, grep: "@lightning|@security" }
-          - { name: lnurl, grep: "@lnurl" }
+          - { name: lnurl_transfer, grep: "@lnurl|@transfer" }
 
     name: e2e-tests - ${{ matrix.shard.name }}
 

README.md

@@ -87,6 +87,14 @@ Simply pass `E2E=true` as environment variable and build any flavor.
 E2E=true ./gradlew assembleDevRelease
 ```
 
+#### Disable Geoblocking Checks
+
+By default, geoblocking checks via API are enabled. To disable at build time, use the `GEO` environment variable:
+
+```sh
+GEO=false E2E=true ./gradlew assembleDevRelease
+```
+
 ### Build for Release
 
 **Prerequisites**  

app/build.gradle.kts

@@ -48,6 +48,7 @@ android {
             useSupportLibrary = true
         }
         buildConfigField("boolean", "E2E", System.getenv("E2E")?.toBoolean()?.toString() ?: "false")
+        buildConfigField("boolean", "GEO", System.getenv("GEO")?.toBoolean()?.toString() ?: "true")
     }
 
     flavorDimensions += "network"

app/src/androidTest/java/to/bitkit/services/BlocktankTest.kt

@@ -82,11 +82,11 @@ class BlocktankTest {
     }
 
     @Test
-    fun testCreateCjitOrder() = runBlocking {
+    fun testCreateCjitEntry() = runBlocking {
         // Test creating a CJIT order
         val channelSizeSat = 100_000uL // 100k sats
         val invoiceSat = 10_000uL // 10k sats for the invoice
-        val invoiceDescription = "Test CJIT order"
+        val invoiceDescription = "Test CJIT"
         val nodeId = "03e7156ae33b0a208d0744199163177e909e80176e55d97a2f221ede0f934dd9ad" // Example node ID
         val channelExpiryWeeks = 6u
         val options = CreateCjitOptions(source = "bitkit", discountCode = null)
@@ -122,7 +122,7 @@ class BlocktankTest {
         )
 
         // Test getting CJIT entries
-        val entries = service.blocktank.cjitOrders(
+        val entries = service.blocktank.cjitEntries(
             entryIds = listOf(cjitEntry.id),
             filter = null,
             refresh = true

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

@@ -15,6 +15,7 @@ import kotlin.io.path.Path
 internal object Env {
     val isDebug = BuildConfig.DEBUG
     const val isE2eTest = BuildConfig.E2E
+    const val isGeoblockingEnabled = BuildConfig.GEO
     val network = Network.valueOf(BuildConfig.NETWORK)
     val walletSyncIntervalSecs = 10_uL // TODO review
     val platform = "Android ${Build.VERSION.RELEASE} (API ${Build.VERSION.SDK_INT})"

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

@@ -148,8 +148,8 @@ class WakeNodeWorker @AssistedInject constructor(
                         val sats = channel.amountOnClose
                         self.bestAttemptContent?.title = "Received ⚡ $sats sats"
 
-                        val cjitOrder = channel.let { blocktankRepo.getCjitOrder(it) }
-                        if (cjitOrder != null) {
+                        val cjitEntry = channel.let { blocktankRepo.getCjitEntry(it) }
+                        if (cjitEntry != null) {
                             val amount = channel.amountOnClose.toLong()
 
                             // Save for UI to pick up
@@ -161,7 +161,7 @@ class WakeNodeWorker @AssistedInject constructor(
                                     sats = amount,
                                 )
                             )
-                            activityRepo.insertActivityFromChannel(cjitOrder = cjitOrder, channel = channel)
+                            activityRepo.insertActivityFromCjit(cjitEntry = cjitEntry, channel = channel)
                         }
                     }
                 } else if (self.notificationType == orderPaymentConfirmed) {

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

@@ -469,17 +469,17 @@ class ActivityRepo @Inject constructor(
     }
 
     /**
-     * Inserts a new activity
+     * Inserts a new activity for a fulfilled (channel ready) cjit channel order
      */
-    suspend fun insertActivityFromChannel(
-        cjitOrder: IcJitEntry?,
+    suspend fun insertActivityFromCjit(
+        cjitEntry: IcJitEntry?,
         channel: ChannelDetails,
     ): Result<Unit> = withContext(bgDispatcher) {
         runCatching {
-            requireNotNull(cjitOrder)
+            requireNotNull(cjitEntry)
 
             val amount = channel.amountOnClose
-            val now = nowTimestamp().toEpochMilli().toULong()
+            val now = nowTimestamp().epochSecond.toULong()
 
             return@withContext insertActivity(
                 Activity.Lightning(
@@ -489,7 +489,7 @@ class ActivityRepo @Inject constructor(
                         status = PaymentState.SUCCEEDED,
                         value = amount,
                         fee = 0U,
-                        invoice = cjitOrder.invoice.request,
+                        invoice = cjitEntry.invoice.request,
                         message = "",
                         timestamp = now,
                         preimage = null,

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

@@ -98,7 +98,7 @@ class BlocktankRepo @Inject constructor(
         }
     }
 
-    suspend fun getCjitOrder(channel: ChannelDetails): IcJitEntry? = withContext(bgDispatcher) {
+    suspend fun getCjitEntry(channel: ChannelDetails): IcJitEntry? = withContext(bgDispatcher) {
         return@withContext _blocktankState.value.cjitEntries.firstOrNull { order ->
             order.channelSizeSat == channel.channelValueSats &&
                 order.lspNode.pubkey == channel.counterpartyNodeId
@@ -132,7 +132,7 @@ class BlocktankRepo @Inject constructor(
 
             // Sync instantly from cache
             val cachedOrders = coreService.blocktank.orders(refresh = false)
-            val cachedCjitEntries = coreService.blocktank.cjitOrders(refresh = false)
+            val cachedCjitEntries = coreService.blocktank.cjitEntries(refresh = false)
             _blocktankState.update { state ->
                 state.copy(
                     orders = cachedOrders,
@@ -143,7 +143,7 @@ class BlocktankRepo @Inject constructor(
 
             // Then refresh from server
             val orders = coreService.blocktank.orders(refresh = true)
-            val cjitEntries = coreService.blocktank.cjitOrders(refresh = true)
+            val cjitEntries = coreService.blocktank.cjitEntries(refresh = true)
             _blocktankState.update { state ->
                 state.copy(
                     orders = orders,

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

@@ -109,7 +109,13 @@ class CoreService @Inject constructor(
         }
     }
 
+    @Suppress("KotlinConstantConditions")
     private suspend fun isGeoBlocked(): Boolean {
+        if (!Env.isGeoblockingEnabled) {
+            Logger.verbose("Geoblocking disabled via build config", context = "GeoCheck")
+            return false
+        }
+
         return ServiceQueue.CORE.background {
             runCatching {
                 Logger.verbose("Checking geo status…", context = "GeoCheck")
@@ -584,7 +590,7 @@ class BlocktankService(
         }
     }
 
-    suspend fun cjitOrders(
+    suspend fun cjitEntries(
         entryIds: List<String>? = null,
         filter: CJitStateEnum? = null,
         refresh: Boolean = true,

app/src/main/java/to/bitkit/ui/screens/transfer/SavingsProgressScreen.kt

@@ -20,6 +20,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -98,7 +99,9 @@ private fun Content(
     onCloseClick: () -> Unit = {},
 ) {
     val inProgress = progressState == SavingsProgressState.PROGRESS
-    ScreenColumn {
+    ScreenColumn(
+        modifier = Modifier.testTag(if (inProgress) "TransferSettingUp" else "TransferSuccess")
+    ) {
         AppTopBar(
             titleText = when (progressState) {
                 SavingsProgressState.PROGRESS -> stringResource(R.string.lightning__transfer__nav_title)
@@ -182,6 +185,7 @@ private fun Content(
                 PrimaryButton(
                     text = stringResource(R.string.common__ok),
                     onClick = onContinueClick,
+                    modifier = Modifier.testTag("TransferSuccess-button")
                 )
             }
             Spacer(modifier = Modifier.height(16.dp))