Merge branch 'master' into feat/ldk-routing-fees

Author: ovitrif

.github/workflows/e2e.yml

@@ -64,6 +64,16 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
 
+    strategy:
+      fail-fast: false
+      matrix:
+        shard:
+          - { name: onboarding_backup_numberpad, grep: "@onboarding|@backup|@numberpad" }
+          - { name: onchain_receive_widgets, grep: "@onchain|@receive|@widgets" }
+          - { name: settings, grep: "@settings" }
+
+    name: e2e-tests - ${{ matrix.shard.name }}
+
     steps:
       - name: Show selected E2E branch
         env:
@@ -125,7 +135,7 @@ jobs:
           sudo bash -c "while [ ! -f docker/lnd/data/chain/bitcoin/regtest/admin.macaroon ]; do sleep 1; done"
           sudo chmod -R 777 docker/lnd
 
-      - name: Run E2E Tests
+      - name: Run E2E Tests (${{ matrix.shard.name }})
         uses: reactivecircus/android-emulator-runner@v2
         with:
           profile: pixel_6
@@ -134,17 +144,17 @@ jobs:
           avd-name: Pixel_6
           force-avd-creation: false
           emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -camera-front none
-          script: cd bitkit-e2e-tests && ./ci_run_android.sh
+          script: cd bitkit-e2e-tests && ./ci_run_android.sh --mochaOpts.grep "${{ matrix.shard.grep }}"
         env:
           RECORD_VIDEO: true
 
-      - name: Upload E2E Artifacts
+      - name: Upload E2E Artifacts (${{ matrix.shard.name }})
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: e2e-artifacts_${{ github.run_number }}
+          name: e2e-artifacts_${{ matrix.shard.name }}_${{ github.run_number }}
           path: bitkit-e2e-tests/artifacts/
 
-      - name: Dump docker logs on failure
+      - name: Dump docker logs on failure (${{ matrix.shard.name }})
         if: failure()
         uses: jwalton/gh-docker-logs@v2

app/src/main/java/to/bitkit/data/backup/VssBackupClient.kt

@@ -29,28 +29,31 @@ class VssBackupClient @Inject constructor(
     suspend fun setup() = withContext(bgDispatcher) {
         try {
             withTimeout(30.seconds) {
-                val vssServerUrl = Env.vssServerUrl
-                Logger.verbose("VSS client setting up…", context = TAG)
-                if (Env.lnurlAuthSeverUrl.isNotEmpty()) {
+                Logger.debug("VSS client setting up…", context = TAG)
+                val vssUrl = Env.vssServerUrl
+                val lnurlAuthServerUrl = Env.lnurlAuthServerUrl
+                Logger.verbose("Building VSS client with vssUrl: '$vssUrl'")
+                Logger.verbose("Building VSS client with lnurlAuthServerUrl: '$lnurlAuthServerUrl'")
+                if (lnurlAuthServerUrl.isNotEmpty()) {
                     val mnemonic = keychain.loadString(Keychain.Key.BIP39_MNEMONIC.name)
                         ?: throw ServiceError.MnemonicNotFound
                     val passphrase = keychain.loadString(Keychain.Key.BIP39_PASSPHRASE.name)
 
                     vssNewClientWithLnurlAuth(
-                        baseUrl = vssServerUrl,
+                        baseUrl = vssUrl,
                         storeId = vssStoreIdProvider.getVssStoreId(),
                         mnemonic = mnemonic,
                         passphrase = passphrase,
-                        lnurlAuthServerUrl = Env.lnurlAuthSeverUrl,
+                        lnurlAuthServerUrl = lnurlAuthServerUrl,
                     )
                 } else {
                     vssNewClient(
-                        baseUrl = vssServerUrl,
+                        baseUrl = vssUrl,
                         storeId = vssStoreIdProvider.getVssStoreId(),
                     )
                 }
                 isSetup.complete(Unit)
-                Logger.info("VSS client setup with server: '$vssServerUrl'", context = TAG)
+                Logger.info("VSS client setup with server: '$vssUrl'", context = TAG)
             }
         } catch (e: Throwable) {
             isSetup.completeExceptionally(e)

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

@@ -39,15 +39,15 @@ internal object Env {
 
     val vssServerUrl
         get() = when (network) {
-            Network.BITCOIN -> TODO("VSS not implemented for mainnet")
+            Network.BITCOIN -> TODO("VSS server not implemented for mainnet")
             // Network.REGTEST -> "http://localhost:5050/vss"
-            // Network.REGTEST -> "https://bitkit.stag0.blocktank.to/vss_rs_auth"
-            else -> "https://bitkit.stag0.blocktank.to/vss_rs/"
+            else -> "https://bitkit.stag0.blocktank.to/vss_rs_auth"
         }
 
-    val lnurlAuthSeverUrl = when (network) {
+    val lnurlAuthServerUrl = when (network) {
+        Network.BITCOIN -> TODO("LNURL-auth server not implemented for mainnet")
         // Network.REGTEST -> "http://localhost:5005/auth"
-        else -> "" // TODO implement LNURL-auth Server for other networks
+        else -> "https://bitkit.stag0.blocktank.to/lnurl_auth/auth"
     }
 
     val vssStoreIdPrefix get() = "bitkit_v1_${network.name.lowercase()}"

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

@@ -363,15 +363,15 @@ class ActivityRepo @Inject constructor(
                             when (activity.v1.txType) {
                                 PaymentType.RECEIVED -> {
                                     // TODO Temporary solution while whe ldk-node doesn't return the address directly
-                                    Logger.debug("Fetching data for txId: ${activity.v1.txId}", context = TAG)
+                                    Logger.verbose("Fetching data for txId: ${activity.v1.txId}", context = TAG)
                                     runCatching {
                                         addressChecker.getTransaction(activity.v1.txId)
                                     }.onSuccess { txDetails ->
-                                        Logger.debug("Tx detail fetched with success: $txDetails", context = TAG)
+                                        Logger.verbose("Tx detail fetched with success: $txDetails", context = TAG)
                                         txDetails.vout.map { vOut ->
                                             async {
                                                 vOut.scriptpubkey_address?.let {
-                                                    Logger.debug("Extracted address: $it", context = TAG)
+                                                    Logger.verbose("Extracted address: $it", context = TAG)
                                                     db.tagMetadataDao().searchByAddress(it)
                                                 }?.let { tagMetadata ->
                                                     Logger.debug("Tags metadata found! $tagMetadata", context = TAG)