feat: support RN app migration #561

ben-kaufman · 2025-12-29T17:54:45Z

This PR adds support for migrating an existing React Native Bitkit into the Bitkit native app.
The migration passes:

Balances
Channels
Activities
Settings
Widgets
Tags and notes
Closed Channels

It also adds support for restoring a wallet created in RN app which was later deleted. Ie. create wallet in RN, use it, delete the app, install native, recover using mnemonic.

What's still needed:

New design for the loading screen and success toast of migration

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

Copilot

Pull request overview

This PR implements migration support for transitioning users from the React Native Bitkit app to the native Android version. The migration preserves critical wallet data including balances, channels, activities, settings, widgets, and tags/notes while maintaining a recovery path if issues occur.

Key changes:

Adds comprehensive RN data migration logic handling MMKV storage, keychain data, and LDK channel state
Implements migration loading UI with timeout protection and error handling
Coordinates migration flow across wallet initialization, node startup, and data synchronization phases

Reviewed changes

Copilot reviewed 12 out of 12 changed files in this pull request and generated 9 comments.

Show a summary per file

File	Description
gradle/libs.versions.toml	Updates ldk-node-android dependency to v0.7.0-rc.2
app/build.gradle.kts	Bumps version code from 17 to 160
MigrationService.kt	Core migration service handling RN data extraction, decryption, and native app data transformation
MmkvParser.kt	Binary parser for React Native MMKV storage format
MigrationLoadingScreen.kt	Loading screen UI displayed during migration process
WalletViewModel.kt	Orchestrates migration check and execution during wallet initialization
AppViewModel.kt	Handles migration completion, sync coordination, and timeout management
MainActivity.kt	Integrates migration loading screen into app navigation flow
LightningService.kt	Adds channel migration support to LDK node setup
LightningRepo.kt	Extends node start/setup to accept channel migration data and adds restart capability
CoreService.kt	Adds method to mark all unseen activities as seen during migration
ActivityRepo.kt	Exposes payment sync and bulk activity marking methods for migration

app/build.gradle.kts

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

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

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

app/src/main/java/to/bitkit/ui/screens/MigrationLoadingScreen.kt

jvsena42 · 2025-12-30T17:58:45Z

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

        walletIndex: Int,
        customServerUrl: String? = null,
        customRgsServerUrl: String? = null,
+        channelMigration: org.lightningdevkit.ldknode.ChannelDataMigration? = null,


could add org.lightningdevkit.ldknode to imports

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

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

+            val bitkitFiles = rnBackupClient.listFiles(fileGroup = "bitkit")?.list ?: emptyList()
+            retrieveAndApplyBitkitBackups(bitkitFiles)
+            markMigrationCompleted()
+        } catch (e: Exception) {


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

+            )
+
+            var latestTimestamp: ULong? = null
+            for (label in labels) {


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

+        val mnemonicBytes = mnemonic.toByteArray(Charsets.UTF_8)
+        val salt = ("mnemonic" + (passphrase ?: "")).toByteArray(Charsets.UTF_8)
+        val generator = PKCS5S2ParametersGenerator(SHA512Digest())
+        generator.init(mnemonicBytes, salt, 2048)


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

+        val salt = ("mnemonic" + (passphrase ?: "")).toByteArray(Charsets.UTF_8)
+        val generator = PKCS5S2ParametersGenerator(SHA512Digest())
+        generator.init(mnemonicBytes, salt, 2048)
+        return (generator.generateDerivedParameters(512) as KeyParameter).key


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

+        _restoreState.update { RestoreState.InProgress.Metadata }
+        try {
+            restoreFromMostRecentBackup()
+        } catch (e: Exception) {


jvsena42 · 2025-12-31T11:52:02Z

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

+import javax.inject.Singleton

+private val Context.rnMigrationDataStore:
+    androidx.datastore.core.DataStore<androidx.datastore.preferences.core.Preferences> by preferencesDataStore(


import androidx.datastore.core.

jvsena42 · 2025-12-31T11:55:06Z

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

+        val words = mnemonic.split(" ").filter { it.isNotBlank() }
+        if (words.size != MNEMONIC_WORD_COUNT_12 && words.size != MNEMONIC_WORD_COUNT_24) {
+            throw to.bitkit.utils.AppError(
+                "Recovery phrase format is invalid. Please use your 12 or 24 word recovery phrase to restore manually."
+            )
+        }
+
+        keychain.saveString(Keychain.Key.BIP39_MNEMONIC.name, mnemonic)
+    }


could validate the mnemonics phrase too instead of just the count

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

jvsena42 · 2025-12-31T12:48:02Z

app/build.gradle.kts

        minSdk = 28
        targetSdk = 36
-        versionCode = 17
+        versionCode = 160


the last version of RN is 161, so should be 162 here

jvsena42 · 2025-12-31T12:55:26Z

Failed restoring the channels on local migration, I'll try again, just in case

Native data

Build variant: mainDebug

versionCode = 162

        create("mainnet") {
            dimension = "network"
            applicationIdSuffix = ""
            buildConfigField("String", "NETWORK", "\"REGTEST\"")
            resValue("string", "app_name", "Bitkit")
            manifestPlaceholders["app_icon"] = "@mipmap/ic_launcher_orange"
            manifestPlaceholders["app_icon_round"] = "@mipmap/ic_launcher_orange_round"
        }

RN data
versionCode = 161
network = regtest

logs.txt

jvsena42 · 2025-12-31T13:27:50Z

Failed restoring the channels on local migration, I'll try again, just in case

Native data

Build variant: mainDebug

versionCode = 162

       create("mainnet") {
           dimension = "network"
           applicationIdSuffix = ""
           buildConfigField("String", "NETWORK", "\"REGTEST\"")
           resValue("string", "app_name", "Bitkit")
           manifestPlaceholders["app_icon"] = "@mipmap/ic_launcher_orange"
           manifestPlaceholders["app_icon_round"] = "@mipmap/ic_launcher_orange_round"
       }

RN data versionCode = 161 network = regtest

logs.txt

Second attempt, still failed. also noticed that the PIN was not imported

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

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

+        )
+    }
+
+    private suspend fun completeMigration() {


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

 import to.bitkit.repositories.SyncSource
 import to.bitkit.repositories.WalletRepo
+import to.bitkit.services.MigrationService
+import to.bitkit.services.PendingChannelMigration


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

+    companion object {
+        private const val TAG = "WalletViewModel"
+        private val RESTORE_WAIT_TIMEOUT = 30.seconds
+        private const val NODE_RESTART_DELAY_MS = 500L


jvsena42 · 2025-12-31T18:12:37Z

Tested:

On RN

Create a fresh wallet
Open a channel
Send and receive lightning
Open a second channel
Enable PIN

On Android

Install the app with the RN installed
Migration triggered ✅
Channels restored ✅
Activities and balance restored ✅
Pin restored ✅
Disabled and re-enabled pin ✅

From the warnings, the PR needs a cleanup. After that I'll do a last review

ben-kaufman requested review from jvsena42 and ovitrif December 29, 2025 17:54

github-advanced-security bot found potential problems Dec 29, 2025

View reviewed changes

app/src/main/java/to/bitkit/viewmodels/WalletViewModel.kt Fixed Show fixed Hide fixed

jvsena42 requested a review from Copilot December 29, 2025 17:58

feat: support RN app migration

8c82b68

Copilot AI reviewed Dec 29, 2025

View reviewed changes

ben-kaufman force-pushed the feat/rn-migration branch from 781737a to 8c82b68 Compare December 29, 2025 18:00

Fix comments

db68175

ben-kaufman force-pushed the feat/rn-migration branch from b30f0d8 to db68175 Compare December 29, 2025 18:16

Add migration flags reset on wipe app

5594163

jvsena42 reviewed Dec 30, 2025

View reviewed changes

app/src/main/java/to/bitkit/services/CoreService.kt Show resolved Hide resolved

ben-kaufman added 2 commits December 30, 2025 22:04

feat: support restore from RN app

e4a2271

Merge branch 'master' into feat/rn-migration

29903db

github-advanced-security bot found potential problems Dec 31, 2025

View reviewed changes

jvsena42 reviewed Dec 31, 2025

View reviewed changes

app/src/main/java/to/bitkit/services/MigrationService.kt Show resolved Hide resolved

jvsena42 reviewed Dec 31, 2025

View reviewed changes

Fixes

971f29c

github-advanced-security bot found potential problems Dec 31, 2025

View reviewed changes

app/src/main/java/to/bitkit/services/MigrationService.kt Fixed Show fixed Hide fixed

app/src/main/java/to/bitkit/services/MigrationService.kt Fixed Show fixed Hide fixed

ben-kaufman added 2 commits December 31, 2025 10:20

Update MigrationService.kt

2fbe604

Fix channels sync on migration

bb8de2a

github-advanced-security bot found potential problems Dec 31, 2025

View reviewed changes

feat: support RN app migration #561

Are you sure you want to change the base?

feat: support RN app migration #561

Uh oh!

Conversation

ben-kaufman commented Dec 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jvsena42 Dec 30, 2025

Choose a reason for hiding this comment

Uh oh!

ben-kaufman Dec 31, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Check warning

Check warning

Check warning

Check warning

Check warning

jvsena42 Dec 31, 2025

Choose a reason for hiding this comment

Uh oh!

ben-kaufman Dec 31, 2025

Choose a reason for hiding this comment

Uh oh!

jvsena42 Dec 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ben-kaufman Dec 31, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jvsena42 Dec 31, 2025

Choose a reason for hiding this comment

Uh oh!

ben-kaufman Dec 31, 2025

Choose a reason for hiding this comment

Uh oh!

jvsena42 commented Dec 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jvsena42 commented Dec 31, 2025

Uh oh!

Uh oh!

Uh oh!

Check warning

Check warning

Check warning

jvsena42 commented Dec 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

ben-kaufman commented Dec 29, 2025 •

edited

Loading

jvsena42 Dec 31, 2025 •

edited

Loading

jvsena42 commented Dec 31, 2025 •

edited

Loading

jvsena42 commented Dec 31, 2025 •

edited

Loading