Merge pull request #536 from synonymdev/mainnet

feat: Setup mainnet config

Author: ovitrif

.idea/codeStyles/Project.xml

@@ -45,6 +45,7 @@ GEO=false E2E=true ./gradlew assembleDevRelease
 ## Architecture Overview
 
 ### Tech Stack
+
 - **Language**: Kotlin
 - **UI Framework**: Jetpack Compose with Material3
 - **Architecture**: MVVM with Hilt dependency injection
@@ -57,6 +58,7 @@ GEO=false E2E=true ./gradlew assembleDevRelease
 - **Storage**: DataStore with json files
 
 ### Project Structure
+
 - **app/src/main/java/to/bitkit/**
   - **App.kt**: Application class with Hilt setup
   - **ui/**: All UI components
@@ -75,34 +77,42 @@ GEO=false E2E=true ./gradlew assembleDevRelease
   - **usecases/**: Domain layer: use cases
 
 ### Key Architecture Patterns
+
 1. **Single Activity Architecture**: MainActivity hosts all screens via Compose Navigation
 2. **Repository Pattern**: Repositories abstract data sources from ViewModels
 3. **Service Layer**: Core business logic in services (LightningService, WalletService)
 4. **Reactive State Management**: ViewModels expose UI state via StateFlow
 5. **Coroutine-based Async**: All async operations use Kotlin coroutines
 
 ### Build Variants
+
 - **dev**: Regtest network for development
 - **tnet**: Testnet network
 - **mainnet**: Production (currently commented out)
 
 ## Common Pitfalls
 
 ### ❌ DON'T
+
 ```kotlin
 GlobalScope.launch { }                          // Use viewModelScope
 val result = nullable!!.doSomething()           // Use safe calls
 Text("Send Payment")                            // Use string resources
 class Service(@Inject val vm: ViewModel)        // Never inject VMs
+
 suspend fun getData() = runBlocking { }         // Use withContext
 ```
 
 ### ✅ DO
+
 ```kotlin
 viewModelScope.launch { }
 val result = nullable?.doSomething() ?: default
 Text(stringResource(R.string.send_payment))
-class Service { fun process(data: Data) }
+class Service {
+  fun process(data: Data)
+}
+
 suspend fun getData() = withContext(Dispatchers.IO) { }
 ```
 
@@ -117,29 +127,32 @@ suspend fun getData() = withContext(Dispatchers.IO) { }
 ## Common Patterns
 
 ### ViewModel State
+
 ```kotlin
 private val _uiState = MutableStateFlow(InitialState)
 val uiState: StateFlow<UiState> = _uiState.asStateFlow()
 
 fun updateState(action: Action) {
-    viewModelScope.launch {
-        _uiState.update { it.copy(/* fields */) }
-    }
+  viewModelScope.launch {
+    _uiState.update { it.copy(/* fields */) }
+  }
 }
 ```
 
 ### Repository
+
 ```kotlin
 suspend fun getData(): Result<Data> = withContext(Dispatchers.IO) {
-    runCatching {
-        Result.success(apiService.fetchData())
-    }.onFailure { e ->
-        Logger.error("Failed", e = e, context = TAG)
-    }
+  runCatching {
+    Result.success(apiService.fetchData())
+  }.onFailure { e ->
+    Logger.error("Failed", e = e, context = TAG)
+  }
 }
 ```
 
 ### Rules
+
 - USE coding rules from `.cursor/default.rules.mdc`
 - ALWAYS run `./gradlew compileDevDebugKotlin` after code changes to verify code compiles
 - ALWAYS run `./gradlew testDevDebugUnitTest` after code changes to verify tests succeed and fix accordingly
@@ -150,7 +163,7 @@ suspend fun getData(): Result<Data> = withContext(Dispatchers.IO) {
 - USE `git diff HEAD sourceFilePath` to diff an uncommitted file against the last commit
 - ALWAYS check existing code patterns before implementing new features
 - USE existing extensions and utilities rather than creating new ones
-- ALWAYS consider applying YAGNI (You Aren't Gonna Need It) principle for new code 
+- ALWAYS consider applying YAGNI (You Aren't Gonna Need It) principle for new code
 - ALWAYS reuse existing constants
 - ALWAYS ensure a method exist before calling it
 - ALWAYS remove unused code after refactors
@@ -161,6 +174,7 @@ suspend fun getData(): Result<Data> = withContext(Dispatchers.IO) {
 - ALWAYS pass the TAG as context to `Logger` calls, e.g. `Logger.debug("message", context = TAG)`
 - ALWAYS use the Result API instead of try-catch
 - NEVER wrap methods returning `Result<T>` in try-catch
+- PREFER to use `it` instead of explicit named parameters in lambdas e.g. `fn().onSuccess { log(it) }.onFailure { log(it) }`
 - NEVER inject ViewModels as dependencies - Only android activities and composable functions can use viewmodels
 - NEVER hardcode strings and always preserve string resources
 - ALWAYS localize in ViewModels using injected `@ApplicationContext`, e.g. `context.getString()`
@@ -179,15 +193,19 @@ suspend fun getData(): Result<Data> = withContext(Dispatchers.IO) {
 - ALWAYS split screen composables into parent accepting viewmodel + inner private child accepting state and callbacks `Content()`
 - ALWAYS name lambda parameters in a composable function using present tense, NEVER use past tense
 - ALWAYS list 3 suggested commit messages after implementation work
-- NEVER use `wheneverBlocking` when in an unit test where you're using expression body and already wrapping the test with a `= test {}` lambda.
+- NEVER use `wheneverBlocking` in unit test expression body functions wrapped in a `= test {}` lambda
+- ALWAYS wrap unit tests `setUp` methods mocking suspending calls with `runBlocking`, e.g `setUp() = runBlocking { }`
 - ALWAYS add business logic to Repository layer via methods returning `Result<T>` and use it in ViewModels
 - ALWAYS use services to wrap RUST code exposed via bindings
 - ALWAYS order upstream architectural data flow this way: `UI -> ViewModel -> Repository -> RUST` and vice-versa for downstream
-- ALWAYS add new string string resources in alphabetical order in `strings.xml` 
+- ALWAYS add new localizable string string resources in alphabetical order in `strings.xml`
+- NEVER add string resources for strings used only in dev settings screens and previews and never localize acronyms
 - ALWAYS use template in `.github/pull_request_template.md` for PR descriptions
 - ALWAYS wrap `ULong` numbers with `USat` in arithmetic operations, to guard against overflows
+- PREFER to use one-liners with `run { }` when applicable, e.g. `override fun someCall(value: String) = run { this.value = value }`
 
 ### Architecture Guidelines
+
 - Use `LightningNodeService` to manage background notifications while the node is running
 - Use `LightningService` to wrap node's RUST APIs and manage the inner lifecycle of the node
 - Use `LightningRepo` to defining the business logic for the node operations, usually delegating to `LightningService`

AGENTS.md

@@ -15,7 +15,13 @@ This repository contains a **new native Android app** which is **not ready for p
 
 ### Prerequisites
 
-#### 1. Download `google-services.json` to `app/` from FCM Console.
+#### 1. Firebase Configuration
+
+Download `google-services.json` from the Firebase Console for each build flavor:
+- **Dev/Testnet**: Place in `app/` (default location)
+- **Mainnet**: Place in `app/src/mainnet/google-services.json`
+
+> **Note**: Each flavor requires its own Firebase project configuration. The mainnet flavor will fail to build without its dedicated `google-services.json` file.
 
 #### 2. GitHub Packages setup
 
@@ -100,6 +106,17 @@ The build config supports building 3 different apps for the 3 bitcoin networks (
 - `mainnet` flavour = mainnet
 - `tnet` flavour = testnet
 
+### Build for Mainnet
+
+To build the mainnet flavor:
+
+```sh
+./gradlew assembleMainnetDebug   # debug build
+./gradlew assembleMainnetRelease # release build (requires signing config)
+```
+
+> **Important**: Ensure `app/src/mainnet/google-services.json` exists before building. See [Firebase Configuration](#1-firebase-configuration).
+
 ### Build for E2E Testing
 
 Simply pass `E2E=true` as environment variable and build any flavor.

README.md

@@ -66,14 +66,14 @@ android {
             manifestPlaceholders["app_icon"] = "@mipmap/ic_launcher_regtest"
             manifestPlaceholders["app_icon_round"] = "@mipmap/ic_launcher_regtest_round"
         }
-        // create("mainnet") {
-        //     dimension = "network"
-        //     applicationIdSuffix = ""
-        //     buildConfigField("String", "NETWORK", "\"BITCOIN\"")
-        //     resValue("string", "app_name", "Bitkit")
-        //     manifestPlaceholders["app_icon"] = "@mipmap/ic_launcher_orange"
-        //     manifestPlaceholders["app_icon_round"] = "@mipmap/ic_launcher_orange_round"
-        // }
+        create("mainnet") {
+            dimension = "network"
+            applicationIdSuffix = ""
+            buildConfigField("String", "NETWORK", "\"BITCOIN\"")
+            resValue("string", "app_name", "Bitkit")
+            manifestPlaceholders["app_icon"] = "@mipmap/ic_launcher_orange"
+            manifestPlaceholders["app_icon_round"] = "@mipmap/ic_launcher_orange_round"
+        }
         create("tnet") {
             dimension = "network"
             applicationIdSuffix = ".tnet"

app/build.gradle.kts

@@ -33,31 +33,17 @@ internal open class App : Application(), Configuration.Provider {
     }
 }
 
-// region currentActivity
 class CurrentActivity : ActivityLifecycleCallbacks {
     var value: Activity? = null
         private set
 
     override fun onActivityCreated(activity: Activity, bundle: Bundle?) = Unit
-
-    override fun onActivityStarted(activity: Activity) {
-        this.value = activity
-    }
-
-    override fun onActivityResumed(activity: Activity) {
-        this.value = activity
-    }
-
-    override fun onActivityPaused(activity: Activity) = Unit
-
-    override fun onActivityStopped(activity: Activity) {
-        if (this.value == activity) this.value = null
-    }
-
+    override fun onActivityStarted(activity: Activity) = run { this.value = activity }
+    override fun onActivityResumed(activity: Activity) = run { this.value = activity }
+    override fun onActivityPaused(activity: Activity) = clearIfCurrent(activity)
+    override fun onActivityStopped(activity: Activity) = clearIfCurrent(activity)
     override fun onActivitySaveInstanceState(activity: Activity, bundle: Bundle) = Unit
+    override fun onActivityDestroyed(activity: Activity) = clearIfCurrent(activity)
 
-    override fun onActivityDestroyed(activity: Activity) {
-        if (this.value == activity) this.value = null
-    }
+    private fun clearIfCurrent(activity: Activity) = run { if (this.value == activity) this.value = null }
 }
-// endregion

app/src/main/java/to/bitkit/App.kt

@@ -23,6 +23,7 @@ import to.bitkit.models.NewTransactionSheetDetails
 import to.bitkit.models.NotificationDetails
 import to.bitkit.repositories.LightningRepo
 import to.bitkit.repositories.WalletRepo
+import to.bitkit.ui.ID_NOTIFICATION_NODE
 import to.bitkit.ui.MainActivity
 import to.bitkit.ui.pushNotification
 import to.bitkit.utils.Logger
@@ -52,7 +53,7 @@ class LightningNodeService : Service() {
 
     override fun onCreate() {
         super.onCreate()
-        startForeground(NOTIFICATION_ID, createNotification())
+        startForeground(ID_NOTIFICATION_NODE, createNotification())
         setupService()
     }
 
@@ -65,7 +66,7 @@ class LightningNodeService : Service() {
                 }
             ).onSuccess {
                 val notification = createNotification()
-                startForeground(NOTIFICATION_ID, notification)
+                startForeground(ID_NOTIFICATION_NODE, notification)
 
                 walletRepo.setWalletExistsState()
                 walletRepo.refreshBip21()
@@ -78,17 +79,22 @@ class LightningNodeService : Service() {
         if (event !is Event.PaymentReceived && event !is Event.OnchainTransactionReceived) return
         val command = NotifyPaymentReceived.Command.from(event, includeNotification = true) ?: return
 
-        notifyPaymentReceivedHandler(command).onSuccess { result ->
-            if (result !is NotifyPaymentReceived.Result.ShowNotification) return
-            showPaymentNotification(result.sheet, result.notification)
+        notifyPaymentReceivedHandler(command).onSuccess {
+            Logger.debug("Payment notification result: $it", context = TAG)
+            if (it !is NotifyPaymentReceived.Result.ShowNotification) return
+            showPaymentNotification(it.sheet, it.notification)
         }
     }
 
     private fun showPaymentNotification(
         sheet: NewTransactionSheetDetails,
         notification: NotificationDetails,
     ) {
-        if (App.currentActivity?.value != null) return
+        if (App.currentActivity?.value != null) {
+            Logger.debug("Skipping payment notification: activity is active", context = TAG)
+            return
+        }
+        Logger.debug("Showing payment notification: ${notification.title}", context = TAG)
         serviceScope.launch { cacheStore.setBackgroundReceive(sheet) }
         pushNotification(notification.title, notification.body)
     }
@@ -99,23 +105,13 @@ class LightningNodeService : Service() {
         val notificationIntent = Intent(this, MainActivity::class.java).apply {
             flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
         }
-        val pendingIntent = PendingIntent.getActivity(
-            this,
-            0,
-            notificationIntent,
-            PendingIntent.FLAG_IMMUTABLE
-        )
+        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 stopPendingIntent = PendingIntent.getService(
-            this,
-            0,
-            stopIntent,
-            PendingIntent.FLAG_IMMUTABLE
-        )
+        val stopPendingIntent = PendingIntent.getService(this, 0, stopIntent, PendingIntent.FLAG_IMMUTABLE)
 
         return NotificationCompat.Builder(this, CHANNEL_ID_NODE)
             .setContentTitle(getString(R.string.app_name))
@@ -130,7 +126,6 @@ class LightningNodeService : Service() {
             .build()
     }
 
-    // Update the onStartCommand method
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         Logger.debug("onStartCommand", context = TAG)
         when (intent?.action) {
@@ -159,7 +154,6 @@ class LightningNodeService : Service() {
     override fun onBind(intent: Intent?): IBinder? = null
 
     companion object {
-        private const val NOTIFICATION_ID = 1
         const val CHANNEL_ID_NODE = "bitkit_notification_channel_node"
         const val TAG = "LightningNodeService"
         const val ACTION_STOP_SERVICE_AND_APP = "to.bitkit.androidServices.action.STOP_SERVICE_AND_APP"

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

@@ -117,7 +117,7 @@ data class SettingsData(
     val balanceWarningTimes: Int = 0,
     val coinSelectAuto: Boolean = true,
     val coinSelectPreference: CoinSelectionPreference = CoinSelectionPreference.BranchAndBound,
-    val electrumServer: String = Env.defaultElectrumServer,
+    val electrumServer: String = Env.electrumServerUrl,
     val rgsServerUrl: String? = Env.ldkRgsServerUrl,
 )