Migrate channels from LDK to ldk-node#6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jasonvdb merged 5 commits into from
Aug 14, 2024
Merged

Migrate channels from LDK to ldk-node #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
84b9024
feat: Remote peer
ovitrif Jul 26, 2024
cbabbf6
chore: Use Version Catalog
ovitrif Jul 29, 2024
fda1066
chore: Setup app DB with room
ovitrif Jul 30, 2024
4697078
feat: Migrate LDK channel manager and monitors
ovitrif Aug 10, 2024
447e26d
feat: LDK migration fix and test
ovitrif Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,7 @@ indent_size = 4
[*.md]
max_line_length = off
trim_trailing_whitespace = false

[*.json]
max_line_length = off
indent_size = 2
155 changes: 75 additions & 80 deletions app/build.gradle.kts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
plugins {
id("com.android.application")
id("kotlin-android")
id("org.jetbrains.kotlin.plugin.serialization")
id("com.google.devtools.ksp")
id("com.google.dagger.hilt.android")
id("com.google.gms.google-services")
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.serialization)
alias(libs.plugins.ksp)
alias(libs.plugins.hilt.android)
alias(libs.plugins.google.services)
alias(libs.plugins.room)
}

android {
namespace = "to.bitkit"
compileSdk = 34
ndkVersion = "26.1.10909125"

ndkVersion = "26.1.10909125" // probably required by LDK bindings? - safer to keep it for now.
defaultConfig {
applicationId = "to.bitkit"
minSdk = 28
targetSdk = 34
versionCode = 1
versionName = "1.0"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

vectorDrawables {
useSupportLibrary = true
}
Expand All@@ -36,7 +33,7 @@ android {
buildTypes {
debug {
signingConfig = signingConfigs.getByName("debug")
// applicationIdSuffix = ".dev"
applicationIdSuffix = ".dev"
}
release {
isMinifyEnabled = false
Expand All@@ -47,17 +44,18 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}
buildFeatures {
buildConfig = true
compose = true
}
composeOptions {
// https://developer.android.com/jetpack/androidx/releases/compose-kotlin#pre-release_kotlin_compatibility
kotlinCompilerExtensionVersion = "1.5.14"
}
packaging {
Expand All@@ -66,76 +64,73 @@ android {
}
}
}

dependencies {
implementation(fileTree("libs") { include("*.aar") })

// BDK & LDK
implementation("org.bitcoindevkit:bdk-android:0.30.0")
implementation("org.lightningdevkit:ldk-node-android:0.3.0")

implementation("androidx.core:core-ktx:1.13.1")
implementation("androidx.appcompat:appcompat:1.7.0")
implementation("androidx.activity:activity-compose:1.9.1")

implementation(libs.core.ktx)
implementation(libs.appcompat)
implementation(libs.activity.compose)
implementation(libs.material)
// BDK + LDK
implementation(libs.bdk.android)
implementation(libs.ldk.node.android)
// Firebase
implementation(platform("com.google.firebase:firebase-bom:33.1.2"))
implementation("com.google.firebase:firebase-messaging")
implementation("com.google.firebase:firebase-analytics")

implementation(platform(libs.firebase.bom))
implementation(libs.firebase.messaging)
implementation(libs.firebase.analytics)
// Lifecycle
val lifecycleVersion = "2.8.4"
// ViewModel
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion") // ViewModel utils for Compose
implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion") // LiveData
implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") // Lifecycles wo ViewModel/LiveData
implementation("androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion") // Lifecycle utils for Compose
implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycleVersion") // Saved state for ViewModel

implementation(libs.lifecycle.viewmodel.ktx)
implementation(libs.lifecycle.viewmodel.compose) // ViewModel utils for Compose
implementation(libs.lifecycle.livedata.ktx) // LiveData
implementation(libs.lifecycle.runtime.ktx) // Lifecycles wo ViewModel/LiveData
implementation(libs.lifecycle.runtime.compose) // Lifecycle utils for Compose
implementation(libs.lifecycle.viewmodel.savedstate) // Saved state for ViewModel
// Compose
implementation(platform(libs.compose.bom))
androidTestImplementation(platform(libs.compose.bom))
implementation(libs.material3)
implementation(libs.material.icons.extended)
implementation(libs.ui.tooling.preview)
debugImplementation(libs.ui.tooling)
debugImplementation(libs.ui.test.manifest)
androidTestImplementation(libs.ui.test.junit4)
// Compose Navigation
val composeNavigationVersion = "2.7.7"
implementation("androidx.navigation:navigation-compose:$composeNavigationVersion")
androidTestImplementation("androidx.navigation:navigation-testing:$composeNavigationVersion")
implementation("androidx.hilt:hilt-navigation-compose:1.2.0")

// Compose Tooling for Android Studio Preview
val composeToolingVersion = "1.6.8"
implementation("androidx.compose.ui:ui-tooling-preview:$composeToolingVersion")
debugImplementation("androidx.compose.ui:ui-tooling:$composeToolingVersion")

// Dagger-Hilt
val hiltVersion = "2.51.1"
implementation("com.google.dagger:hilt-android:$hiltVersion")
ksp("com.google.dagger:hilt-android-compiler:$hiltVersion")
ksp("androidx.hilt:hilt-compiler:1.2.0")

implementation(libs.navigation.compose)
androidTestImplementation(libs.navigation.testing)
implementation(libs.hilt.navigation.compose)
// Hilt - DI
implementation(libs.hilt.android)
ksp(libs.hilt.android.compiler)
ksp(libs.hilt.compiler)
// WorkManager
implementation("androidx.hilt:hilt-work:1.2.0")
implementation("androidx.work:work-runtime-ktx:2.9.0")

// Material Design
implementation("com.google.android.material:material:1.12.0")
implementation("androidx.compose.material3:material3:1.2.1")
implementation("androidx.compose.material:material-icons-extended:1.7.0-beta06")

// Ktor
val ktorVersion = "2.3.8"
implementation("io.ktor:ktor-client-core:$ktorVersion")
implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
implementation("io.ktor:ktor-client-cio:$ktorVersion")
implementation("io.ktor:ktor-client-logging:$ktorVersion")
implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
implementation("ch.qos.logback:logback-classic:1.2.11")

// Testing
debugImplementation("androidx.compose.ui:ui-test-manifest:1.6.8")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.2.1")
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.6.8")

implementation(libs.hilt.work)
implementation(libs.work.runtime.ktx)
// Ktor - Networking
implementation(libs.ktor.client.core)
implementation(libs.ktor.client.okhttp)
implementation(libs.ktor.client.cio)
implementation(libs.ktor.client.logging)
implementation(libs.ktor.client.content.negotiation)
implementation(libs.ktor.serialization.kotlinx.json)
debugImplementation(libs.slf4j.simple)
// Room - DB
implementation(libs.room.ktx)
implementation(libs.room.runtime)
ksp(libs.room.compiler)
testImplementation(libs.room.testing)
// Test + Debug
androidTestImplementation(libs.espresso.core)
androidTestImplementation(libs.junit.ext)
androidTestImplementation(libs.kotlin.test.junit)
testImplementation(libs.junit)
testImplementation(libs.kotlin.test.junit)
// Other
implementation("com.google.guava:guava:31.1-android") // for ByteArray.toHex()+
implementation(libs.guava) // for ByteArray.toHex()+
}
ksp {
// cool but strict: https://developer.android.com/jetpack/androidx/releases/room#2.6.0
// arg("room.generateKotlin", "true")
}
// https://developer.android.com/jetpack/androidx/releases/room#gradle-plugin
room {
schemaDirectory("$projectDir/schemas")
}
Binary file addedapp/libs/LDK-release.aar
View file
Open in desktop
Binary file not shown.
34 changes: 34 additions & 0 deletions app/schemas/to.bitkit.data.AppDb/1.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
{
"formatVersion": 1,
"database": {
"version": 1,
"identityHash": "ea0d5b36d92a5a3fb1523c3064686f7d",
"entities": [
{
"tableName": "config",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`walletIndex` INTEGER NOT NULL, PRIMARY KEY(`walletIndex`))",
"fields": [
{
"fieldPath": "walletIndex",
"columnName": "walletIndex",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": false,
"columnNames": [
"walletIndex"
]
},
"indices": [],
"foreignKeys": []
}
],
"views": [],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ea0d5b36d92a5a3fb1523c3064686f7d')"
]
}
}
Binary file addedapp/src/androidTest/assets/ldk-backup/manager.bin
View file
Open in desktop
Binary file not shown.
Binary file addedapp/src/androidTest/assets/ldk-backup/monitor.bin
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions app/src/androidTest/assets/ldk-backup/seed.bin
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
n� ��J�L��m��Κ��L&����ǥ�4��~�
22 changes: 0 additions & 22 deletions app/src/androidTest/java/to/bitkit/ExampleInstrumentedTest.kt
View file
Open in desktop

This file was deleted.

38 changes: 38 additions & 0 deletions app/src/androidTest/java/to/bitkit/LdkMigrationTest.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
package to.bitkit

import android.content.Context
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import org.junit.Test
import org.junit.runner.RunWith
import to.bitkit.ext.readAsset
import to.bitkit.ldk.LightningService
import to.bitkit.ldk.MigrationService
import kotlin.test.assertTrue

@RunWith(AndroidJUnit4::class)
class LdkMigrationTest {
private val mnemonic = "pool curve feature leader elite dilemma exile toast smile couch crane public"

private val context: Context by lazy { InstrumentationRegistry.getInstrumentation().context }
private val appContext: Context by lazy { InstrumentationRegistry.getInstrumentation().targetContext }

@Test
fun nodeShouldStartFromBackupAfterMigration() {
val seed = context.readAsset("ldk-backup/seed.bin")
val manager = context.readAsset("ldk-backup/manager.bin")
val monitor = context.readAsset("ldk-backup/monitor.bin")

MigrationService(appContext).migrate(seed, manager, listOf(monitor))

with(LightningService()) {
init(mnemonic)
start()

assertTrue { nodeId == "02cd08b7b375e4263849121f9f0ffb2732a0b88d0fb74487575ac539b374f45a55" }
assertTrue { channels.isNotEmpty() }

stop()
}
}
}
2 changes: 2 additions & 0 deletions app/src/main/java/to/bitkit/App.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ internal class App : Application(), Configuration.Provider {
override fun onCreate() {
super.onCreate()
currentActivity = CurrentActivity().also { registerActivityLifecycleCallbacks(it) }

Env.LdkStorage.init(filesDir.absolutePath)
}

override fun onTerminate() {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Migrate channels from LDK to ldk-node#6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Jasonvdb
merged 5 commits into

from

Aug 14, 2024
 Merged


Migrate channels from LDK to ldk-node
#6
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
84b9024

feat: Remote peer


ovitrif Jul 26, 2024
cbabbf6

chore: Use Version Catalog


ovitrif Jul 29, 2024
fda1066

chore: Setup app DB with room


ovitrif Jul 30, 2024
4697078

feat: Migrate LDK channel manager and monitors


ovitrif Aug 10, 2024
447e26d

feat: LDK migration fix and test


ovitrif Aug 12, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
.editorconfig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,7 @@ indent_size = 4
[*.md]
max_line_length = off
trim_trailing_whitespace = false

[*.json]
max_line_length = off
indent_size = 2

155 changes: 75 additions & 80 deletions
app/build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
plugins {
 id("com.android.application")
 id("kotlin-android")
 id("org.jetbrains.kotlin.plugin.serialization")
 id("com.google.devtools.ksp")
 id("com.google.dagger.hilt.android")
 id("com.google.gms.google-services")
 alias(libs.plugins.android.application)
 alias(libs.plugins.kotlin.android)
 alias(libs.plugins.kotlin.serialization)
 alias(libs.plugins.ksp)
 alias(libs.plugins.hilt.android)
 alias(libs.plugins.google.services)
 alias(libs.plugins.room)
}

android {
 namespace = "to.bitkit"
 compileSdk = 34
 ndkVersion = "26.1.10909125"

 ndkVersion = "26.1.10909125" // probably required by LDK bindings? - safer to keep it for now.
 defaultConfig {
 applicationId = "to.bitkit"
 minSdk = 28
 targetSdk = 34
 versionCode = 1
 versionName = "1.0"

 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

 vectorDrawables {
 useSupportLibrary = true
 }
Expand All@@ -36,7 +33,7 @@ android {
 buildTypes {
 debug {
 signingConfig = signingConfigs.getByName("debug")
// applicationIdSuffix = ".dev"
 applicationIdSuffix = ".dev"
 }
 release {
 isMinifyEnabled = false
Expand All@@ -47,17 +44,18 @@ android {
 }
 }
 compileOptions {
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 sourceCompatibility = JavaVersion.VERSION_11
 targetCompatibility = JavaVersion.VERSION_11
 }
 kotlinOptions {
 jvmTarget = "1.8"
 jvmTarget = "11"
 }
 buildFeatures {
 buildConfig = true
 compose = true
 }
 composeOptions {
 // https://developer.android.com/jetpack/androidx/releases/compose-kotlin#pre-release_kotlin_compatibility
 kotlinCompilerExtensionVersion = "1.5.14"
 }
 packaging {
Expand All@@ -66,76 +64,73 @@ android {
 }
 }
}

dependencies {
 implementation(fileTree("libs") { include("*.aar") })

 // BDK & LDK
 implementation("org.bitcoindevkit:bdk-android:0.30.0")
 implementation("org.lightningdevkit:ldk-node-android:0.3.0")

 implementation("androidx.core:core-ktx:1.13.1")
 implementation("androidx.appcompat:appcompat:1.7.0")
 implementation("androidx.activity:activity-compose:1.9.1")

 implementation(libs.core.ktx)
 implementation(libs.appcompat)
 implementation(libs.activity.compose)
 implementation(libs.material)
 // BDK + LDK
 implementation(libs.bdk.android)
 implementation(libs.ldk.node.android)
 // Firebase
 implementation(platform("com.google.firebase:firebase-bom:33.1.2"))
 implementation("com.google.firebase:firebase-messaging")
 implementation("com.google.firebase:firebase-analytics")

 implementation(platform(libs.firebase.bom))
 implementation(libs.firebase.messaging)
 implementation(libs.firebase.analytics)
 // Lifecycle
 val lifecycleVersion = "2.8.4"
 // ViewModel
 implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
 implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion") // ViewModel utils for Compose
 implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion") // LiveData
 implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") // Lifecycles wo ViewModel/LiveData
 implementation("androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion") // Lifecycle utils for Compose
 implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycleVersion") // Saved state for ViewModel

 implementation(libs.lifecycle.viewmodel.ktx)
 implementation(libs.lifecycle.viewmodel.compose) // ViewModel utils for Compose
 implementation(libs.lifecycle.livedata.ktx) // LiveData
 implementation(libs.lifecycle.runtime.ktx) // Lifecycles wo ViewModel/LiveData
 implementation(libs.lifecycle.runtime.compose) // Lifecycle utils for Compose
 implementation(libs.lifecycle.viewmodel.savedstate) // Saved state for ViewModel
 // Compose
 implementation(platform(libs.compose.bom))
 androidTestImplementation(platform(libs.compose.bom))
 implementation(libs.material3)
 implementation(libs.material.icons.extended)
 implementation(libs.ui.tooling.preview)
 debugImplementation(libs.ui.tooling)
 debugImplementation(libs.ui.test.manifest)
 androidTestImplementation(libs.ui.test.junit4)
 // Compose Navigation
 val composeNavigationVersion = "2.7.7"
 implementation("androidx.navigation:navigation-compose:$composeNavigationVersion")
 androidTestImplementation("androidx.navigation:navigation-testing:$composeNavigationVersion")
 implementation("androidx.hilt:hilt-navigation-compose:1.2.0")

 // Compose Tooling for Android Studio Preview
 val composeToolingVersion = "1.6.8"
 implementation("androidx.compose.ui:ui-tooling-preview:$composeToolingVersion")
 debugImplementation("androidx.compose.ui:ui-tooling:$composeToolingVersion")

 // Dagger-Hilt
 val hiltVersion = "2.51.1"
 implementation("com.google.dagger:hilt-android:$hiltVersion")
 ksp("com.google.dagger:hilt-android-compiler:$hiltVersion")
 ksp("androidx.hilt:hilt-compiler:1.2.0")

 implementation(libs.navigation.compose)
 androidTestImplementation(libs.navigation.testing)
 implementation(libs.hilt.navigation.compose)
 // Hilt - DI
 implementation(libs.hilt.android)
 ksp(libs.hilt.android.compiler)
 ksp(libs.hilt.compiler)
 // WorkManager
 implementation("androidx.hilt:hilt-work:1.2.0")
 implementation("androidx.work:work-runtime-ktx:2.9.0")

 // Material Design
 implementation("com.google.android.material:material:1.12.0")
 implementation("androidx.compose.material3:material3:1.2.1")
 implementation("androidx.compose.material:material-icons-extended:1.7.0-beta06")

 // Ktor
 val ktorVersion = "2.3.8"
 implementation("io.ktor:ktor-client-core:$ktorVersion")
 implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
 implementation("io.ktor:ktor-client-cio:$ktorVersion")
 implementation("io.ktor:ktor-client-logging:$ktorVersion")
 implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
 implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
 implementation("ch.qos.logback:logback-classic:1.2.11")

 // Testing
 debugImplementation("androidx.compose.ui:ui-test-manifest:1.6.8")
 testImplementation("junit:junit:4.13.2")
 androidTestImplementation("androidx.test.ext:junit:1.2.1")
 androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
 androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.6.8")

 implementation(libs.hilt.work)
 implementation(libs.work.runtime.ktx)
 // Ktor - Networking
 implementation(libs.ktor.client.core)
 implementation(libs.ktor.client.okhttp)
 implementation(libs.ktor.client.cio)
 implementation(libs.ktor.client.logging)
 implementation(libs.ktor.client.content.negotiation)
 implementation(libs.ktor.serialization.kotlinx.json)
 debugImplementation(libs.slf4j.simple)
 // Room - DB
 implementation(libs.room.ktx)
 implementation(libs.room.runtime)
 ksp(libs.room.compiler)
 testImplementation(libs.room.testing)
 // Test + Debug
 androidTestImplementation(libs.espresso.core)
 androidTestImplementation(libs.junit.ext)
 androidTestImplementation(libs.kotlin.test.junit)
 testImplementation(libs.junit)
 testImplementation(libs.kotlin.test.junit)
 // Other
 implementation("com.google.guava:guava:31.1-android") // for ByteArray.toHex()+
 implementation(libs.guava) // for ByteArray.toHex()+
}
ksp {
 // cool but strict: https://developer.android.com/jetpack/androidx/releases/room#2.6.0
 // arg("room.generateKotlin", "true")
}
// https://developer.android.com/jetpack/androidx/releases/room#gradle-plugin
room {
 schemaDirectory("$projectDir/schemas")
}
Binary file addedapp/libs/LDK-release.aar

View file


Open in desktop


Binary file not shown.


34 changes: 34 additions & 0 deletions
app/schemas/to.bitkit.data.AppDb/1.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
{
 "formatVersion": 1,
 "database": {
 "version": 1,
 "identityHash": "ea0d5b36d92a5a3fb1523c3064686f7d",
 "entities": [
 {
 "tableName": "config",
 "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`walletIndex` INTEGER NOT NULL, PRIMARY KEY(`walletIndex`))",
 "fields": [
 {
 "fieldPath": "walletIndex",
 "columnName": "walletIndex",
 "affinity": "INTEGER",
 "notNull": true
 }
 ],
 "primaryKey": {
 "autoGenerate": false,
 "columnNames": [
 "walletIndex"
 ]
 },
 "indices": [],
 "foreignKeys": []
 }
 ],
 "views": [],
 "setupQueries": [
 "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
 "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ea0d5b36d92a5a3fb1523c3064686f7d')"
 ]
 }
}
Binary file addedapp/src/androidTest/assets/ldk-backup/manager.bin

View file


Open in desktop


Binary file not shown.

Binary file addedapp/src/androidTest/assets/ldk-backup/monitor.bin

View file


Open in desktop


Binary file not shown.


1 change: 1 addition & 0 deletions
app/src/androidTest/assets/ldk-backup/seed.bin

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
n���J�L��m��Κ��L&����ǥ�4��~�

22 changes: 0 additions & 22 deletions
app/src/androidTest/java/to/bitkit/ExampleInstrumentedTest.kt

View file


Open in desktop


This file was deleted.


38 changes: 38 additions & 0 deletions
app/src/androidTest/java/to/bitkit/LdkMigrationTest.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
package to.bitkit

import android.content.Context
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import org.junit.Test
import org.junit.runner.RunWith
import to.bitkit.ext.readAsset
import to.bitkit.ldk.LightningService
import to.bitkit.ldk.MigrationService
import kotlin.test.assertTrue

@RunWith(AndroidJUnit4::class)
class LdkMigrationTest {
 private val mnemonic = "pool curve feature leader elite dilemma exile toast smile couch crane public"

 private val context: Context by lazy { InstrumentationRegistry.getInstrumentation().context }
 private val appContext: Context by lazy { InstrumentationRegistry.getInstrumentation().targetContext }

 @Test
 fun nodeShouldStartFromBackupAfterMigration() {
 val seed = context.readAsset("ldk-backup/seed.bin")
 val manager = context.readAsset("ldk-backup/manager.bin")
 val monitor = context.readAsset("ldk-backup/monitor.bin")

 MigrationService(appContext).migrate(seed, manager, listOf(monitor))

 with(LightningService()) {
 init(mnemonic)
 start()

 assertTrue { nodeId == "02cd08b7b375e4263849121f9f0ffb2732a0b88d0fb74487575ac539b374f45a55" }
 assertTrue { channels.isNotEmpty() }

 stop()
 }
 }
}

2 changes: 2 additions & 0 deletions
app/src/main/java/to/bitkit/App.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ internal class App : Application(), Configuration.Provider {
 override fun onCreate() {
 super.onCreate()
 currentActivity = CurrentActivity().also { registerActivityLifecycleCallbacks(it) }

 Env.LdkStorage.init(filesDir.absolutePath)
 }

 override fun onTerminate() {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Migrate channels from LDK to ldk-node#6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Jasonvdb
merged 5 commits into

from

Aug 14, 2024
 Merged


Migrate channels from LDK to ldk-node
#6
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
84b9024

feat: Remote peer


ovitrif Jul 26, 2024
cbabbf6

chore: Use Version Catalog


ovitrif Jul 29, 2024
fda1066

chore: Setup app DB with room


ovitrif Jul 30, 2024
4697078

feat: Migrate LDK channel manager and monitors


ovitrif Aug 10, 2024
447e26d

feat: LDK migration fix and test


ovitrif Aug 12, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
.editorconfig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,7 @@ indent_size = 4
[*.md]
max_line_length = off
trim_trailing_whitespace = false

[*.json]
max_line_length = off
indent_size = 2

155 changes: 75 additions & 80 deletions
app/build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
plugins {
 id("com.android.application")
 id("kotlin-android")
 id("org.jetbrains.kotlin.plugin.serialization")
 id("com.google.devtools.ksp")
 id("com.google.dagger.hilt.android")
 id("com.google.gms.google-services")
 alias(libs.plugins.android.application)
 alias(libs.plugins.kotlin.android)
 alias(libs.plugins.kotlin.serialization)
 alias(libs.plugins.ksp)
 alias(libs.plugins.hilt.android)
 alias(libs.plugins.google.services)
 alias(libs.plugins.room)
}

android {
 namespace = "to.bitkit"
 compileSdk = 34
 ndkVersion = "26.1.10909125"

 ndkVersion = "26.1.10909125" // probably required by LDK bindings? - safer to keep it for now.
 defaultConfig {
 applicationId = "to.bitkit"
 minSdk = 28
 targetSdk = 34
 versionCode = 1
 versionName = "1.0"

 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

 vectorDrawables {
 useSupportLibrary = true
 }
Expand All@@ -36,7 +33,7 @@ android {
 buildTypes {
 debug {
 signingConfig = signingConfigs.getByName("debug")
// applicationIdSuffix = ".dev"
 applicationIdSuffix = ".dev"
 }
 release {
 isMinifyEnabled = false
Expand All@@ -47,17 +44,18 @@ android {
 }
 }
 compileOptions {
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 sourceCompatibility = JavaVersion.VERSION_11
 targetCompatibility = JavaVersion.VERSION_11
 }
 kotlinOptions {
 jvmTarget = "1.8"
 jvmTarget = "11"
 }
 buildFeatures {
 buildConfig = true
 compose = true
 }
 composeOptions {
 // https://developer.android.com/jetpack/androidx/releases/compose-kotlin#pre-release_kotlin_compatibility
 kotlinCompilerExtensionVersion = "1.5.14"
 }
 packaging {
Expand All@@ -66,76 +64,73 @@ android {
 }
 }
}

dependencies {
 implementation(fileTree("libs") { include("*.aar") })

 // BDK & LDK
 implementation("org.bitcoindevkit:bdk-android:0.30.0")
 implementation("org.lightningdevkit:ldk-node-android:0.3.0")

 implementation("androidx.core:core-ktx:1.13.1")
 implementation("androidx.appcompat:appcompat:1.7.0")
 implementation("androidx.activity:activity-compose:1.9.1")

 implementation(libs.core.ktx)
 implementation(libs.appcompat)
 implementation(libs.activity.compose)
 implementation(libs.material)
 // BDK + LDK
 implementation(libs.bdk.android)
 implementation(libs.ldk.node.android)
 // Firebase
 implementation(platform("com.google.firebase:firebase-bom:33.1.2"))
 implementation("com.google.firebase:firebase-messaging")
 implementation("com.google.firebase:firebase-analytics")

 implementation(platform(libs.firebase.bom))
 implementation(libs.firebase.messaging)
 implementation(libs.firebase.analytics)
 // Lifecycle
 val lifecycleVersion = "2.8.4"
 // ViewModel
 implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
 implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion") // ViewModel utils for Compose
 implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion") // LiveData
 implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") // Lifecycles wo ViewModel/LiveData
 implementation("androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion") // Lifecycle utils for Compose
 implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycleVersion") // Saved state for ViewModel

 implementation(libs.lifecycle.viewmodel.ktx)
 implementation(libs.lifecycle.viewmodel.compose) // ViewModel utils for Compose
 implementation(libs.lifecycle.livedata.ktx) // LiveData
 implementation(libs.lifecycle.runtime.ktx) // Lifecycles wo ViewModel/LiveData
 implementation(libs.lifecycle.runtime.compose) // Lifecycle utils for Compose
 implementation(libs.lifecycle.viewmodel.savedstate) // Saved state for ViewModel
 // Compose
 implementation(platform(libs.compose.bom))
 androidTestImplementation(platform(libs.compose.bom))
 implementation(libs.material3)
 implementation(libs.material.icons.extended)
 implementation(libs.ui.tooling.preview)
 debugImplementation(libs.ui.tooling)
 debugImplementation(libs.ui.test.manifest)
 androidTestImplementation(libs.ui.test.junit4)
 // Compose Navigation
 val composeNavigationVersion = "2.7.7"
 implementation("androidx.navigation:navigation-compose:$composeNavigationVersion")
 androidTestImplementation("androidx.navigation:navigation-testing:$composeNavigationVersion")
 implementation("androidx.hilt:hilt-navigation-compose:1.2.0")

 // Compose Tooling for Android Studio Preview
 val composeToolingVersion = "1.6.8"
 implementation("androidx.compose.ui:ui-tooling-preview:$composeToolingVersion")
 debugImplementation("androidx.compose.ui:ui-tooling:$composeToolingVersion")

 // Dagger-Hilt
 val hiltVersion = "2.51.1"
 implementation("com.google.dagger:hilt-android:$hiltVersion")
 ksp("com.google.dagger:hilt-android-compiler:$hiltVersion")
 ksp("androidx.hilt:hilt-compiler:1.2.0")

 implementation(libs.navigation.compose)
 androidTestImplementation(libs.navigation.testing)
 implementation(libs.hilt.navigation.compose)
 // Hilt - DI
 implementation(libs.hilt.android)
 ksp(libs.hilt.android.compiler)
 ksp(libs.hilt.compiler)
 // WorkManager
 implementation("androidx.hilt:hilt-work:1.2.0")
 implementation("androidx.work:work-runtime-ktx:2.9.0")

 // Material Design
 implementation("com.google.android.material:material:1.12.0")
 implementation("androidx.compose.material3:material3:1.2.1")
 implementation("androidx.compose.material:material-icons-extended:1.7.0-beta06")

 // Ktor
 val ktorVersion = "2.3.8"
 implementation("io.ktor:ktor-client-core:$ktorVersion")
 implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
 implementation("io.ktor:ktor-client-cio:$ktorVersion")
 implementation("io.ktor:ktor-client-logging:$ktorVersion")
 implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
 implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
 implementation("ch.qos.logback:logback-classic:1.2.11")

 // Testing
 debugImplementation("androidx.compose.ui:ui-test-manifest:1.6.8")
 testImplementation("junit:junit:4.13.2")
 androidTestImplementation("androidx.test.ext:junit:1.2.1")
 androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
 androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.6.8")

 implementation(libs.hilt.work)
 implementation(libs.work.runtime.ktx)
 // Ktor - Networking
 implementation(libs.ktor.client.core)
 implementation(libs.ktor.client.okhttp)
 implementation(libs.ktor.client.cio)
 implementation(libs.ktor.client.logging)
 implementation(libs.ktor.client.content.negotiation)
 implementation(libs.ktor.serialization.kotlinx.json)
 debugImplementation(libs.slf4j.simple)
 // Room - DB
 implementation(libs.room.ktx)
 implementation(libs.room.runtime)
 ksp(libs.room.compiler)
 testImplementation(libs.room.testing)
 // Test + Debug
 androidTestImplementation(libs.espresso.core)
 androidTestImplementation(libs.junit.ext)
 androidTestImplementation(libs.kotlin.test.junit)
 testImplementation(libs.junit)
 testImplementation(libs.kotlin.test.junit)
 // Other
 implementation("com.google.guava:guava:31.1-android") // for ByteArray.toHex()+
 implementation(libs.guava) // for ByteArray.toHex()+
}
ksp {
 // cool but strict: https://developer.android.com/jetpack/androidx/releases/room#2.6.0
 // arg("room.generateKotlin", "true")
}
// https://developer.android.com/jetpack/androidx/releases/room#gradle-plugin
room {
 schemaDirectory("$projectDir/schemas")
}
Binary file addedapp/libs/LDK-release.aar

View file


Open in desktop


Binary file not shown.


34 changes: 34 additions & 0 deletions
app/schemas/to.bitkit.data.AppDb/1.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
{
 "formatVersion": 1,
 "database": {
 "version": 1,
 "identityHash": "ea0d5b36d92a5a3fb1523c3064686f7d",
 "entities": [
 {
 "tableName": "config",
 "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`walletIndex` INTEGER NOT NULL, PRIMARY KEY(`walletIndex`))",
 "fields": [
 {
 "fieldPath": "walletIndex",
 "columnName": "walletIndex",
 "affinity": "INTEGER",
 "notNull": true
 }
 ],
 "primaryKey": {
 "autoGenerate": false,
 "columnNames": [
 "walletIndex"
 ]
 },
 "indices": [],
 "foreignKeys": []
 }
 ],
 "views": [],
 "setupQueries": [
 "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
 "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ea0d5b36d92a5a3fb1523c3064686f7d')"
 ]
 }
}
Binary file addedapp/src/androidTest/assets/ldk-backup/manager.bin

View file


Open in desktop


Binary file not shown.

Binary file addedapp/src/androidTest/assets/ldk-backup/monitor.bin

View file


Open in desktop


Binary file not shown.


1 change: 1 addition & 0 deletions
app/src/androidTest/assets/ldk-backup/seed.bin

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
n���J�L��m��Κ��L&����ǥ�4��~�

22 changes: 0 additions & 22 deletions
app/src/androidTest/java/to/bitkit/ExampleInstrumentedTest.kt

View file


Open in desktop


This file was deleted.


38 changes: 38 additions & 0 deletions
app/src/androidTest/java/to/bitkit/LdkMigrationTest.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
package to.bitkit

import android.content.Context
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import org.junit.Test
import org.junit.runner.RunWith
import to.bitkit.ext.readAsset
import to.bitkit.ldk.LightningService
import to.bitkit.ldk.MigrationService
import kotlin.test.assertTrue

@RunWith(AndroidJUnit4::class)
class LdkMigrationTest {
 private val mnemonic = "pool curve feature leader elite dilemma exile toast smile couch crane public"

 private val context: Context by lazy { InstrumentationRegistry.getInstrumentation().context }
 private val appContext: Context by lazy { InstrumentationRegistry.getInstrumentation().targetContext }

 @Test
 fun nodeShouldStartFromBackupAfterMigration() {
 val seed = context.readAsset("ldk-backup/seed.bin")
 val manager = context.readAsset("ldk-backup/manager.bin")
 val monitor = context.readAsset("ldk-backup/monitor.bin")

 MigrationService(appContext).migrate(seed, manager, listOf(monitor))

 with(LightningService()) {
 init(mnemonic)
 start()

 assertTrue { nodeId == "02cd08b7b375e4263849121f9f0ffb2732a0b88d0fb74487575ac539b374f45a55" }
 assertTrue { channels.isNotEmpty() }

 stop()
 }
 }
}

2 changes: 2 additions & 0 deletions
app/src/main/java/to/bitkit/App.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ internal class App : Application(), Configuration.Provider {
 override fun onCreate() {
 super.onCreate()
 currentActivity = CurrentActivity().also { registerActivityLifecycleCallbacks(it) }

 Env.LdkStorage.init(filesDir.absolutePath)
 }

 override fun onTerminate() {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Migrate channels from LDK to ldk-node#6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Jasonvdb
merged 5 commits into

from

Aug 14, 2024
 Merged


Migrate channels from LDK to ldk-node
#6
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
84b9024

feat: Remote peer


ovitrif Jul 26, 2024
cbabbf6

chore: Use Version Catalog


ovitrif Jul 29, 2024
fda1066

chore: Setup app DB with room


ovitrif Jul 30, 2024
4697078

feat: Migrate LDK channel manager and monitors


ovitrif Aug 10, 2024
447e26d

feat: LDK migration fix and test


ovitrif Aug 12, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
.editorconfig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,7 @@ indent_size = 4
[*.md]
max_line_length = off
trim_trailing_whitespace = false

[*.json]
max_line_length = off
indent_size = 2

155 changes: 75 additions & 80 deletions
app/build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
plugins {
 id("com.android.application")
 id("kotlin-android")
 id("org.jetbrains.kotlin.plugin.serialization")
 id("com.google.devtools.ksp")
 id("com.google.dagger.hilt.android")
 id("com.google.gms.google-services")
 alias(libs.plugins.android.application)
 alias(libs.plugins.kotlin.android)
 alias(libs.plugins.kotlin.serialization)
 alias(libs.plugins.ksp)
 alias(libs.plugins.hilt.android)
 alias(libs.plugins.google.services)
 alias(libs.plugins.room)
}

android {
 namespace = "to.bitkit"
 compileSdk = 34
 ndkVersion = "26.1.10909125"

 ndkVersion = "26.1.10909125" // probably required by LDK bindings? - safer to keep it for now.
 defaultConfig {
 applicationId = "to.bitkit"
 minSdk = 28
 targetSdk = 34
 versionCode = 1
 versionName = "1.0"

 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

 vectorDrawables {
 useSupportLibrary = true
 }
Expand All@@ -36,7 +33,7 @@ android {
 buildTypes {
 debug {
 signingConfig = signingConfigs.getByName("debug")
// applicationIdSuffix = ".dev"
 applicationIdSuffix = ".dev"
 }
 release {
 isMinifyEnabled = false
Expand All@@ -47,17 +44,18 @@ android {
 }
 }
 compileOptions {
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 sourceCompatibility = JavaVersion.VERSION_11
 targetCompatibility = JavaVersion.VERSION_11
 }
 kotlinOptions {
 jvmTarget = "1.8"
 jvmTarget = "11"
 }
 buildFeatures {
 buildConfig = true
 compose = true
 }
 composeOptions {
 // https://developer.android.com/jetpack/androidx/releases/compose-kotlin#pre-release_kotlin_compatibility
 kotlinCompilerExtensionVersion = "1.5.14"
 }
 packaging {
Expand All@@ -66,76 +64,73 @@ android {
 }
 }
}

dependencies {
 implementation(fileTree("libs") { include("*.aar") })

 // BDK & LDK
 implementation("org.bitcoindevkit:bdk-android:0.30.0")
 implementation("org.lightningdevkit:ldk-node-android:0.3.0")

 implementation("androidx.core:core-ktx:1.13.1")
 implementation("androidx.appcompat:appcompat:1.7.0")
 implementation("androidx.activity:activity-compose:1.9.1")

 implementation(libs.core.ktx)
 implementation(libs.appcompat)
 implementation(libs.activity.compose)
 implementation(libs.material)
 // BDK + LDK
 implementation(libs.bdk.android)
 implementation(libs.ldk.node.android)
 // Firebase
 implementation(platform("com.google.firebase:firebase-bom:33.1.2"))
 implementation("com.google.firebase:firebase-messaging")
 implementation("com.google.firebase:firebase-analytics")

 implementation(platform(libs.firebase.bom))
 implementation(libs.firebase.messaging)
 implementation(libs.firebase.analytics)
 // Lifecycle
 val lifecycleVersion = "2.8.4"
 // ViewModel
 implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
 implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion") // ViewModel utils for Compose
 implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion") // LiveData
 implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") // Lifecycles wo ViewModel/LiveData
 implementation("androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion") // Lifecycle utils for Compose
 implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycleVersion") // Saved state for ViewModel

 implementation(libs.lifecycle.viewmodel.ktx)
 implementation(libs.lifecycle.viewmodel.compose) // ViewModel utils for Compose
 implementation(libs.lifecycle.livedata.ktx) // LiveData
 implementation(libs.lifecycle.runtime.ktx) // Lifecycles wo ViewModel/LiveData
 implementation(libs.lifecycle.runtime.compose) // Lifecycle utils for Compose
 implementation(libs.lifecycle.viewmodel.savedstate) // Saved state for ViewModel
 // Compose
 implementation(platform(libs.compose.bom))
 androidTestImplementation(platform(libs.compose.bom))
 implementation(libs.material3)
 implementation(libs.material.icons.extended)
 implementation(libs.ui.tooling.preview)
 debugImplementation(libs.ui.tooling)
 debugImplementation(libs.ui.test.manifest)
 androidTestImplementation(libs.ui.test.junit4)
 // Compose Navigation
 val composeNavigationVersion = "2.7.7"
 implementation("androidx.navigation:navigation-compose:$composeNavigationVersion")
 androidTestImplementation("androidx.navigation:navigation-testing:$composeNavigationVersion")
 implementation("androidx.hilt:hilt-navigation-compose:1.2.0")

 // Compose Tooling for Android Studio Preview
 val composeToolingVersion = "1.6.8"
 implementation("androidx.compose.ui:ui-tooling-preview:$composeToolingVersion")
 debugImplementation("androidx.compose.ui:ui-tooling:$composeToolingVersion")

 // Dagger-Hilt
 val hiltVersion = "2.51.1"
 implementation("com.google.dagger:hilt-android:$hiltVersion")
 ksp("com.google.dagger:hilt-android-compiler:$hiltVersion")
 ksp("androidx.hilt:hilt-compiler:1.2.0")

 implementation(libs.navigation.compose)
 androidTestImplementation(libs.navigation.testing)
 implementation(libs.hilt.navigation.compose)
 // Hilt - DI
 implementation(libs.hilt.android)
 ksp(libs.hilt.android.compiler)
 ksp(libs.hilt.compiler)
 // WorkManager
 implementation("androidx.hilt:hilt-work:1.2.0")
 implementation("androidx.work:work-runtime-ktx:2.9.0")

 // Material Design
 implementation("com.google.android.material:material:1.12.0")
 implementation("androidx.compose.material3:material3:1.2.1")
 implementation("androidx.compose.material:material-icons-extended:1.7.0-beta06")

 // Ktor
 val ktorVersion = "2.3.8"
 implementation("io.ktor:ktor-client-core:$ktorVersion")
 implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
 implementation("io.ktor:ktor-client-cio:$ktorVersion")
 implementation("io.ktor:ktor-client-logging:$ktorVersion")
 implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
 implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
 implementation("ch.qos.logback:logback-classic:1.2.11")

 // Testing
 debugImplementation("androidx.compose.ui:ui-test-manifest:1.6.8")
 testImplementation("junit:junit:4.13.2")
 androidTestImplementation("androidx.test.ext:junit:1.2.1")
 androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
 androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.6.8")

 implementation(libs.hilt.work)
 implementation(libs.work.runtime.ktx)
 // Ktor - Networking
 implementation(libs.ktor.client.core)
 implementation(libs.ktor.client.okhttp)
 implementation(libs.ktor.client.cio)
 implementation(libs.ktor.client.logging)
 implementation(libs.ktor.client.content.negotiation)
 implementation(libs.ktor.serialization.kotlinx.json)
 debugImplementation(libs.slf4j.simple)
 // Room - DB
 implementation(libs.room.ktx)
 implementation(libs.room.runtime)
 ksp(libs.room.compiler)
 testImplementation(libs.room.testing)
 // Test + Debug
 androidTestImplementation(libs.espresso.core)
 androidTestImplementation(libs.junit.ext)
 androidTestImplementation(libs.kotlin.test.junit)
 testImplementation(libs.junit)
 testImplementation(libs.kotlin.test.junit)
 // Other
 implementation("com.google.guava:guava:31.1-android") // for ByteArray.toHex()+
 implementation(libs.guava) // for ByteArray.toHex()+
}
ksp {
 // cool but strict: https://developer.android.com/jetpack/androidx/releases/room#2.6.0
 // arg("room.generateKotlin", "true")
}
// https://developer.android.com/jetpack/androidx/releases/room#gradle-plugin
room {
 schemaDirectory("$projectDir/schemas")
}
Binary file addedapp/libs/LDK-release.aar

View file


Open in desktop


Binary file not shown.


34 changes: 34 additions & 0 deletions
app/schemas/to.bitkit.data.AppDb/1.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
{
 "formatVersion": 1,
 "database": {
 "version": 1,
 "identityHash": "ea0d5b36d92a5a3fb1523c3064686f7d",
 "entities": [
 {
 "tableName": "config",
 "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`walletIndex` INTEGER NOT NULL, PRIMARY KEY(`walletIndex`))",
 "fields": [
 {
 "fieldPath": "walletIndex",
 "columnName": "walletIndex",
 "affinity": "INTEGER",
 "notNull": true
 }
 ],
 "primaryKey": {
 "autoGenerate": false,
 "columnNames": [
 "walletIndex"
 ]
 },
 "indices": [],
 "foreignKeys": []
 }
 ],
 "views": [],
 "setupQueries": [
 "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
 "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ea0d5b36d92a5a3fb1523c3064686f7d')"
 ]
 }
}
Binary file addedapp/src/androidTest/assets/ldk-backup/manager.bin

View file


Open in desktop


Binary file not shown.

Binary file addedapp/src/androidTest/assets/ldk-backup/monitor.bin

View file


Open in desktop


Binary file not shown.


1 change: 1 addition & 0 deletions
app/src/androidTest/assets/ldk-backup/seed.bin

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
n���J�L��m��Κ��L&����ǥ�4��~�

22 changes: 0 additions & 22 deletions
app/src/androidTest/java/to/bitkit/ExampleInstrumentedTest.kt

View file


Open in desktop


This file was deleted.


38 changes: 38 additions & 0 deletions
app/src/androidTest/java/to/bitkit/LdkMigrationTest.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
package to.bitkit

import android.content.Context
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import org.junit.Test
import org.junit.runner.RunWith
import to.bitkit.ext.readAsset
import to.bitkit.ldk.LightningService
import to.bitkit.ldk.MigrationService
import kotlin.test.assertTrue

@RunWith(AndroidJUnit4::class)
class LdkMigrationTest {
 private val mnemonic = "pool curve feature leader elite dilemma exile toast smile couch crane public"

 private val context: Context by lazy { InstrumentationRegistry.getInstrumentation().context }
 private val appContext: Context by lazy { InstrumentationRegistry.getInstrumentation().targetContext }

 @Test
 fun nodeShouldStartFromBackupAfterMigration() {
 val seed = context.readAsset("ldk-backup/seed.bin")
 val manager = context.readAsset("ldk-backup/manager.bin")
 val monitor = context.readAsset("ldk-backup/monitor.bin")

 MigrationService(appContext).migrate(seed, manager, listOf(monitor))

 with(LightningService()) {
 init(mnemonic)
 start()

 assertTrue { nodeId == "02cd08b7b375e4263849121f9f0ffb2732a0b88d0fb74487575ac539b374f45a55" }
 assertTrue { channels.isNotEmpty() }

 stop()
 }
 }
}

2 changes: 2 additions & 0 deletions
app/src/main/java/to/bitkit/App.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ internal class App : Application(), Configuration.Provider {
 override fun onCreate() {
 super.onCreate()
 currentActivity = CurrentActivity().also { registerActivityLifecycleCallbacks(it) }

 Env.LdkStorage.init(filesDir.absolutePath)
 }

 override fun onTerminate() {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Migrate channels from LDK to ldk-node#6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Jasonvdb
merged 5 commits into

from

Aug 14, 2024
 Merged


Migrate channels from LDK to ldk-node
#6
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
84b9024

feat: Remote peer


ovitrif Jul 26, 2024
cbabbf6

chore: Use Version Catalog


ovitrif Jul 29, 2024
fda1066

chore: Setup app DB with room


ovitrif Jul 30, 2024
4697078

feat: Migrate LDK channel manager and monitors


ovitrif Aug 10, 2024
447e26d

feat: LDK migration fix and test


ovitrif Aug 12, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
.editorconfig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,7 @@ indent_size = 4
[*.md]
max_line_length = off
trim_trailing_whitespace = false

[*.json]
max_line_length = off
indent_size = 2

155 changes: 75 additions & 80 deletions
app/build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
plugins {
 id("com.android.application")
 id("kotlin-android")
 id("org.jetbrains.kotlin.plugin.serialization")
 id("com.google.devtools.ksp")
 id("com.google.dagger.hilt.android")
 id("com.google.gms.google-services")
 alias(libs.plugins.android.application)
 alias(libs.plugins.kotlin.android)
 alias(libs.plugins.kotlin.serialization)
 alias(libs.plugins.ksp)
 alias(libs.plugins.hilt.android)
 alias(libs.plugins.google.services)
 alias(libs.plugins.room)
}

android {
 namespace = "to.bitkit"
 compileSdk = 34
 ndkVersion = "26.1.10909125"

 ndkVersion = "26.1.10909125" // probably required by LDK bindings? - safer to keep it for now.
 defaultConfig {
 applicationId = "to.bitkit"
 minSdk = 28
 targetSdk = 34
 versionCode = 1
 versionName = "1.0"

 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

 vectorDrawables {
 useSupportLibrary = true
 }
Expand All@@ -36,7 +33,7 @@ android {
 buildTypes {
 debug {
 signingConfig = signingConfigs.getByName("debug")
// applicationIdSuffix = ".dev"
 applicationIdSuffix = ".dev"
 }
 release {
 isMinifyEnabled = false
Expand All@@ -47,17 +44,18 @@ android {
 }
 }
 compileOptions {
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 sourceCompatibility = JavaVersion.VERSION_11
 targetCompatibility = JavaVersion.VERSION_11
 }
 kotlinOptions {
 jvmTarget = "1.8"
 jvmTarget = "11"
 }
 buildFeatures {
 buildConfig = true
 compose = true
 }
 composeOptions {
 // https://developer.android.com/jetpack/androidx/releases/compose-kotlin#pre-release_kotlin_compatibility
 kotlinCompilerExtensionVersion = "1.5.14"
 }
 packaging {
Expand All@@ -66,76 +64,73 @@ android {
 }
 }
}

dependencies {
 implementation(fileTree("libs") { include("*.aar") })

 // BDK & LDK
 implementation("org.bitcoindevkit:bdk-android:0.30.0")
 implementation("org.lightningdevkit:ldk-node-android:0.3.0")

 implementation("androidx.core:core-ktx:1.13.1")
 implementation("androidx.appcompat:appcompat:1.7.0")
 implementation("androidx.activity:activity-compose:1.9.1")

 implementation(libs.core.ktx)
 implementation(libs.appcompat)
 implementation(libs.activity.compose)
 implementation(libs.material)
 // BDK + LDK
 implementation(libs.bdk.android)
 implementation(libs.ldk.node.android)
 // Firebase
 implementation(platform("com.google.firebase:firebase-bom:33.1.2"))
 implementation("com.google.firebase:firebase-messaging")
 implementation("com.google.firebase:firebase-analytics")

 implementation(platform(libs.firebase.bom))
 implementation(libs.firebase.messaging)
 implementation(libs.firebase.analytics)
 // Lifecycle
 val lifecycleVersion = "2.8.4"
 // ViewModel
 implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
 implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion") // ViewModel utils for Compose
 implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion") // LiveData
 implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") // Lifecycles wo ViewModel/LiveData
 implementation("androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion") // Lifecycle utils for Compose
 implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycleVersion") // Saved state for ViewModel

 implementation(libs.lifecycle.viewmodel.ktx)
 implementation(libs.lifecycle.viewmodel.compose) // ViewModel utils for Compose
 implementation(libs.lifecycle.livedata.ktx) // LiveData
 implementation(libs.lifecycle.runtime.ktx) // Lifecycles wo ViewModel/LiveData
 implementation(libs.lifecycle.runtime.compose) // Lifecycle utils for Compose
 implementation(libs.lifecycle.viewmodel.savedstate) // Saved state for ViewModel
 // Compose
 implementation(platform(libs.compose.bom))
 androidTestImplementation(platform(libs.compose.bom))
 implementation(libs.material3)
 implementation(libs.material.icons.extended)
 implementation(libs.ui.tooling.preview)
 debugImplementation(libs.ui.tooling)
 debugImplementation(libs.ui.test.manifest)
 androidTestImplementation(libs.ui.test.junit4)
 // Compose Navigation
 val composeNavigationVersion = "2.7.7"
 implementation("androidx.navigation:navigation-compose:$composeNavigationVersion")
 androidTestImplementation("androidx.navigation:navigation-testing:$composeNavigationVersion")
 implementation("androidx.hilt:hilt-navigation-compose:1.2.0")

 // Compose Tooling for Android Studio Preview
 val composeToolingVersion = "1.6.8"
 implementation("androidx.compose.ui:ui-tooling-preview:$composeToolingVersion")
 debugImplementation("androidx.compose.ui:ui-tooling:$composeToolingVersion")

 // Dagger-Hilt
 val hiltVersion = "2.51.1"
 implementation("com.google.dagger:hilt-android:$hiltVersion")
 ksp("com.google.dagger:hilt-android-compiler:$hiltVersion")
 ksp("androidx.hilt:hilt-compiler:1.2.0")

 implementation(libs.navigation.compose)
 androidTestImplementation(libs.navigation.testing)
 implementation(libs.hilt.navigation.compose)
 // Hilt - DI
 implementation(libs.hilt.android)
 ksp(libs.hilt.android.compiler)
 ksp(libs.hilt.compiler)
 // WorkManager
 implementation("androidx.hilt:hilt-work:1.2.0")
 implementation("androidx.work:work-runtime-ktx:2.9.0")

 // Material Design
 implementation("com.google.android.material:material:1.12.0")
 implementation("androidx.compose.material3:material3:1.2.1")
 implementation("androidx.compose.material:material-icons-extended:1.7.0-beta06")

 // Ktor
 val ktorVersion = "2.3.8"
 implementation("io.ktor:ktor-client-core:$ktorVersion")
 implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
 implementation("io.ktor:ktor-client-cio:$ktorVersion")
 implementation("io.ktor:ktor-client-logging:$ktorVersion")
 implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
 implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
 implementation("ch.qos.logback:logback-classic:1.2.11")

 // Testing
 debugImplementation("androidx.compose.ui:ui-test-manifest:1.6.8")
 testImplementation("junit:junit:4.13.2")
 androidTestImplementation("androidx.test.ext:junit:1.2.1")
 androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
 androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.6.8")

 implementation(libs.hilt.work)
 implementation(libs.work.runtime.ktx)
 // Ktor - Networking
 implementation(libs.ktor.client.core)
 implementation(libs.ktor.client.okhttp)
 implementation(libs.ktor.client.cio)
 implementation(libs.ktor.client.logging)
 implementation(libs.ktor.client.content.negotiation)
 implementation(libs.ktor.serialization.kotlinx.json)
 debugImplementation(libs.slf4j.simple)
 // Room - DB
 implementation(libs.room.ktx)
 implementation(libs.room.runtime)
 ksp(libs.room.compiler)
 testImplementation(libs.room.testing)
 // Test + Debug
 androidTestImplementation(libs.espresso.core)
 androidTestImplementation(libs.junit.ext)
 androidTestImplementation(libs.kotlin.test.junit)
 testImplementation(libs.junit)
 testImplementation(libs.kotlin.test.junit)
 // Other
 implementation("com.google.guava:guava:31.1-android") // for ByteArray.toHex()+
 implementation(libs.guava) // for ByteArray.toHex()+
}
ksp {
 // cool but strict: https://developer.android.com/jetpack/androidx/releases/room#2.6.0
 // arg("room.generateKotlin", "true")
}
// https://developer.android.com/jetpack/androidx/releases/room#gradle-plugin
room {
 schemaDirectory("$projectDir/schemas")
}
Binary file addedapp/libs/LDK-release.aar

View file


Open in desktop


Binary file not shown.


34 changes: 34 additions & 0 deletions
app/schemas/to.bitkit.data.AppDb/1.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
{
 "formatVersion": 1,
 "database": {
 "version": 1,
 "identityHash": "ea0d5b36d92a5a3fb1523c3064686f7d",
 "entities": [
 {
 "tableName": "config",
 "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`walletIndex` INTEGER NOT NULL, PRIMARY KEY(`walletIndex`))",
 "fields": [
 {
 "fieldPath": "walletIndex",
 "columnName": "walletIndex",
 "affinity": "INTEGER",
 "notNull": true
 }
 ],
 "primaryKey": {
 "autoGenerate": false,
 "columnNames": [
 "walletIndex"
 ]
 },
 "indices": [],
 "foreignKeys": []
 }
 ],
 "views": [],
 "setupQueries": [
 "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
 "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ea0d5b36d92a5a3fb1523c3064686f7d')"
 ]
 }
}
Binary file addedapp/src/androidTest/assets/ldk-backup/manager.bin

View file


Open in desktop


Binary file not shown.

Binary file addedapp/src/androidTest/assets/ldk-backup/monitor.bin

View file


Open in desktop


Binary file not shown.


1 change: 1 addition & 0 deletions
app/src/androidTest/assets/ldk-backup/seed.bin

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
n���J�L��m��Κ��L&����ǥ�4��~�

22 changes: 0 additions & 22 deletions
app/src/androidTest/java/to/bitkit/ExampleInstrumentedTest.kt

View file


Open in desktop


This file was deleted.


38 changes: 38 additions & 0 deletions
app/src/androidTest/java/to/bitkit/LdkMigrationTest.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
package to.bitkit

import android.content.Context
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import org.junit.Test
import org.junit.runner.RunWith
import to.bitkit.ext.readAsset
import to.bitkit.ldk.LightningService
import to.bitkit.ldk.MigrationService
import kotlin.test.assertTrue

@RunWith(AndroidJUnit4::class)
class LdkMigrationTest {
 private val mnemonic = "pool curve feature leader elite dilemma exile toast smile couch crane public"

 private val context: Context by lazy { InstrumentationRegistry.getInstrumentation().context }
 private val appContext: Context by lazy { InstrumentationRegistry.getInstrumentation().targetContext }

 @Test
 fun nodeShouldStartFromBackupAfterMigration() {
 val seed = context.readAsset("ldk-backup/seed.bin")
 val manager = context.readAsset("ldk-backup/manager.bin")
 val monitor = context.readAsset("ldk-backup/monitor.bin")

 MigrationService(appContext).migrate(seed, manager, listOf(monitor))

 with(LightningService()) {
 init(mnemonic)
 start()

 assertTrue { nodeId == "02cd08b7b375e4263849121f9f0ffb2732a0b88d0fb74487575ac539b374f45a55" }
 assertTrue { channels.isNotEmpty() }

 stop()
 }
 }
}

2 changes: 2 additions & 0 deletions
app/src/main/java/to/bitkit/App.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ internal class App : Application(), Configuration.Provider {
 override fun onCreate() {
 super.onCreate()
 currentActivity = CurrentActivity().also { registerActivityLifecycleCallbacks(it) }

 Env.LdkStorage.init(filesDir.absolutePath)
 }

 override fun onTerminate() {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Migrate channels from LDK to ldk-node#6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Jasonvdb
merged 5 commits into

from

Aug 14, 2024
 Merged


Migrate channels from LDK to ldk-node
#6
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
84b9024

feat: Remote peer


ovitrif Jul 26, 2024
cbabbf6

chore: Use Version Catalog


ovitrif Jul 29, 2024
fda1066

chore: Setup app DB with room


ovitrif Jul 30, 2024
4697078

feat: Migrate LDK channel manager and monitors


ovitrif Aug 10, 2024
447e26d

feat: LDK migration fix and test


ovitrif Aug 12, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
.editorconfig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,7 @@ indent_size = 4
[*.md]
max_line_length = off
trim_trailing_whitespace = false

[*.json]
max_line_length = off
indent_size = 2

155 changes: 75 additions & 80 deletions
app/build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
plugins {
 id("com.android.application")
 id("kotlin-android")
 id("org.jetbrains.kotlin.plugin.serialization")
 id("com.google.devtools.ksp")
 id("com.google.dagger.hilt.android")
 id("com.google.gms.google-services")
 alias(libs.plugins.android.application)
 alias(libs.plugins.kotlin.android)
 alias(libs.plugins.kotlin.serialization)
 alias(libs.plugins.ksp)
 alias(libs.plugins.hilt.android)
 alias(libs.plugins.google.services)
 alias(libs.plugins.room)
}

android {
 namespace = "to.bitkit"
 compileSdk = 34
 ndkVersion = "26.1.10909125"

 ndkVersion = "26.1.10909125" // probably required by LDK bindings? - safer to keep it for now.
 defaultConfig {
 applicationId = "to.bitkit"
 minSdk = 28
 targetSdk = 34
 versionCode = 1
 versionName = "1.0"

 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

 vectorDrawables {
 useSupportLibrary = true
 }
Expand All@@ -36,7 +33,7 @@ android {
 buildTypes {
 debug {
 signingConfig = signingConfigs.getByName("debug")
// applicationIdSuffix = ".dev"
 applicationIdSuffix = ".dev"
 }
 release {
 isMinifyEnabled = false
Expand All@@ -47,17 +44,18 @@ android {
 }
 }
 compileOptions {
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 sourceCompatibility = JavaVersion.VERSION_11
 targetCompatibility = JavaVersion.VERSION_11
 }
 kotlinOptions {
 jvmTarget = "1.8"
 jvmTarget = "11"
 }
 buildFeatures {
 buildConfig = true
 compose = true
 }
 composeOptions {
 // https://developer.android.com/jetpack/androidx/releases/compose-kotlin#pre-release_kotlin_compatibility
 kotlinCompilerExtensionVersion = "1.5.14"
 }
 packaging {
Expand All@@ -66,76 +64,73 @@ android {
 }
 }
}

dependencies {
 implementation(fileTree("libs") { include("*.aar") })

 // BDK & LDK
 implementation("org.bitcoindevkit:bdk-android:0.30.0")
 implementation("org.lightningdevkit:ldk-node-android:0.3.0")

 implementation("androidx.core:core-ktx:1.13.1")
 implementation("androidx.appcompat:appcompat:1.7.0")
 implementation("androidx.activity:activity-compose:1.9.1")

 implementation(libs.core.ktx)
 implementation(libs.appcompat)
 implementation(libs.activity.compose)
 implementation(libs.material)
 // BDK + LDK
 implementation(libs.bdk.android)
 implementation(libs.ldk.node.android)
 // Firebase
 implementation(platform("com.google.firebase:firebase-bom:33.1.2"))
 implementation("com.google.firebase:firebase-messaging")
 implementation("com.google.firebase:firebase-analytics")

 implementation(platform(libs.firebase.bom))
 implementation(libs.firebase.messaging)
 implementation(libs.firebase.analytics)
 // Lifecycle
 val lifecycleVersion = "2.8.4"
 // ViewModel
 implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
 implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion") // ViewModel utils for Compose
 implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion") // LiveData
 implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") // Lifecycles wo ViewModel/LiveData
 implementation("androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion") // Lifecycle utils for Compose
 implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycleVersion") // Saved state for ViewModel

 implementation(libs.lifecycle.viewmodel.ktx)
 implementation(libs.lifecycle.viewmodel.compose) // ViewModel utils for Compose
 implementation(libs.lifecycle.livedata.ktx) // LiveData
 implementation(libs.lifecycle.runtime.ktx) // Lifecycles wo ViewModel/LiveData
 implementation(libs.lifecycle.runtime.compose) // Lifecycle utils for Compose
 implementation(libs.lifecycle.viewmodel.savedstate) // Saved state for ViewModel
 // Compose
 implementation(platform(libs.compose.bom))
 androidTestImplementation(platform(libs.compose.bom))
 implementation(libs.material3)
 implementation(libs.material.icons.extended)
 implementation(libs.ui.tooling.preview)
 debugImplementation(libs.ui.tooling)
 debugImplementation(libs.ui.test.manifest)
 androidTestImplementation(libs.ui.test.junit4)
 // Compose Navigation
 val composeNavigationVersion = "2.7.7"
 implementation("androidx.navigation:navigation-compose:$composeNavigationVersion")
 androidTestImplementation("androidx.navigation:navigation-testing:$composeNavigationVersion")
 implementation("androidx.hilt:hilt-navigation-compose:1.2.0")

 // Compose Tooling for Android Studio Preview
 val composeToolingVersion = "1.6.8"
 implementation("androidx.compose.ui:ui-tooling-preview:$composeToolingVersion")
 debugImplementation("androidx.compose.ui:ui-tooling:$composeToolingVersion")

 // Dagger-Hilt
 val hiltVersion = "2.51.1"
 implementation("com.google.dagger:hilt-android:$hiltVersion")
 ksp("com.google.dagger:hilt-android-compiler:$hiltVersion")
 ksp("androidx.hilt:hilt-compiler:1.2.0")

 implementation(libs.navigation.compose)
 androidTestImplementation(libs.navigation.testing)
 implementation(libs.hilt.navigation.compose)
 // Hilt - DI
 implementation(libs.hilt.android)
 ksp(libs.hilt.android.compiler)
 ksp(libs.hilt.compiler)
 // WorkManager
 implementation("androidx.hilt:hilt-work:1.2.0")
 implementation("androidx.work:work-runtime-ktx:2.9.0")

 // Material Design
 implementation("com.google.android.material:material:1.12.0")
 implementation("androidx.compose.material3:material3:1.2.1")
 implementation("androidx.compose.material:material-icons-extended:1.7.0-beta06")

 // Ktor
 val ktorVersion = "2.3.8"
 implementation("io.ktor:ktor-client-core:$ktorVersion")
 implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
 implementation("io.ktor:ktor-client-cio:$ktorVersion")
 implementation("io.ktor:ktor-client-logging:$ktorVersion")
 implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
 implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
 implementation("ch.qos.logback:logback-classic:1.2.11")

 // Testing
 debugImplementation("androidx.compose.ui:ui-test-manifest:1.6.8")
 testImplementation("junit:junit:4.13.2")
 androidTestImplementation("androidx.test.ext:junit:1.2.1")
 androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
 androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.6.8")

 implementation(libs.hilt.work)
 implementation(libs.work.runtime.ktx)
 // Ktor - Networking
 implementation(libs.ktor.client.core)
 implementation(libs.ktor.client.okhttp)
 implementation(libs.ktor.client.cio)
 implementation(libs.ktor.client.logging)
 implementation(libs.ktor.client.content.negotiation)
 implementation(libs.ktor.serialization.kotlinx.json)
 debugImplementation(libs.slf4j.simple)
 // Room - DB
 implementation(libs.room.ktx)
 implementation(libs.room.runtime)
 ksp(libs.room.compiler)
 testImplementation(libs.room.testing)
 // Test + Debug
 androidTestImplementation(libs.espresso.core)
 androidTestImplementation(libs.junit.ext)
 androidTestImplementation(libs.kotlin.test.junit)
 testImplementation(libs.junit)
 testImplementation(libs.kotlin.test.junit)
 // Other
 implementation("com.google.guava:guava:31.1-android") // for ByteArray.toHex()+
 implementation(libs.guava) // for ByteArray.toHex()+
}
ksp {
 // cool but strict: https://developer.android.com/jetpack/androidx/releases/room#2.6.0
 // arg("room.generateKotlin", "true")
}
// https://developer.android.com/jetpack/androidx/releases/room#gradle-plugin
room {
 schemaDirectory("$projectDir/schemas")
}
Binary file addedapp/libs/LDK-release.aar

View file


Open in desktop


Binary file not shown.


34 changes: 34 additions & 0 deletions
app/schemas/to.bitkit.data.AppDb/1.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
{
 "formatVersion": 1,
 "database": {
 "version": 1,
 "identityHash": "ea0d5b36d92a5a3fb1523c3064686f7d",
 "entities": [
 {
 "tableName": "config",
 "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`walletIndex` INTEGER NOT NULL, PRIMARY KEY(`walletIndex`))",
 "fields": [
 {
 "fieldPath": "walletIndex",
 "columnName": "walletIndex",
 "affinity": "INTEGER",
 "notNull": true
 }
 ],
 "primaryKey": {
 "autoGenerate": false,
 "columnNames": [
 "walletIndex"
 ]
 },
 "indices": [],
 "foreignKeys": []
 }
 ],
 "views": [],
 "setupQueries": [
 "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
 "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ea0d5b36d92a5a3fb1523c3064686f7d')"
 ]
 }
}
Binary file addedapp/src/androidTest/assets/ldk-backup/manager.bin

View file


Open in desktop


Binary file not shown.

Binary file addedapp/src/androidTest/assets/ldk-backup/monitor.bin

View file


Open in desktop


Binary file not shown.


1 change: 1 addition & 0 deletions
app/src/androidTest/assets/ldk-backup/seed.bin

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
n���J�L��m��Κ��L&����ǥ�4��~�

22 changes: 0 additions & 22 deletions
app/src/androidTest/java/to/bitkit/ExampleInstrumentedTest.kt

View file


Open in desktop


This file was deleted.


38 changes: 38 additions & 0 deletions
app/src/androidTest/java/to/bitkit/LdkMigrationTest.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
package to.bitkit

import android.content.Context
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import org.junit.Test
import org.junit.runner.RunWith
import to.bitkit.ext.readAsset
import to.bitkit.ldk.LightningService
import to.bitkit.ldk.MigrationService
import kotlin.test.assertTrue

@RunWith(AndroidJUnit4::class)
class LdkMigrationTest {
 private val mnemonic = "pool curve feature leader elite dilemma exile toast smile couch crane public"

 private val context: Context by lazy { InstrumentationRegistry.getInstrumentation().context }
 private val appContext: Context by lazy { InstrumentationRegistry.getInstrumentation().targetContext }

 @Test
 fun nodeShouldStartFromBackupAfterMigration() {
 val seed = context.readAsset("ldk-backup/seed.bin")
 val manager = context.readAsset("ldk-backup/manager.bin")
 val monitor = context.readAsset("ldk-backup/monitor.bin")

 MigrationService(appContext).migrate(seed, manager, listOf(monitor))

 with(LightningService()) {
 init(mnemonic)
 start()

 assertTrue { nodeId == "02cd08b7b375e4263849121f9f0ffb2732a0b88d0fb74487575ac539b374f45a55" }
 assertTrue { channels.isNotEmpty() }

 stop()
 }
 }
}

2 changes: 2 additions & 0 deletions
app/src/main/java/to/bitkit/App.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ internal class App : Application(), Configuration.Provider {
 override fun onCreate() {
 super.onCreate()
 currentActivity = CurrentActivity().also { registerActivityLifecycleCallbacks(it) }

 Env.LdkStorage.init(filesDir.absolutePath)
 }

 override fun onTerminate() {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Migrate channels from LDK to ldk-node#6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Jasonvdb
merged 5 commits into

from

Aug 14, 2024
 Merged


Migrate channels from LDK to ldk-node
#6
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
84b9024

feat: Remote peer


ovitrif Jul 26, 2024
cbabbf6

chore: Use Version Catalog


ovitrif Jul 29, 2024
fda1066

chore: Setup app DB with room


ovitrif Jul 30, 2024
4697078

feat: Migrate LDK channel manager and monitors


ovitrif Aug 10, 2024
447e26d

feat: LDK migration fix and test


ovitrif Aug 12, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
.editorconfig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,7 @@ indent_size = 4
[*.md]
max_line_length = off
trim_trailing_whitespace = false

[*.json]
max_line_length = off
indent_size = 2

155 changes: 75 additions & 80 deletions
app/build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
plugins {
 id("com.android.application")
 id("kotlin-android")
 id("org.jetbrains.kotlin.plugin.serialization")
 id("com.google.devtools.ksp")
 id("com.google.dagger.hilt.android")
 id("com.google.gms.google-services")
 alias(libs.plugins.android.application)
 alias(libs.plugins.kotlin.android)
 alias(libs.plugins.kotlin.serialization)
 alias(libs.plugins.ksp)
 alias(libs.plugins.hilt.android)
 alias(libs.plugins.google.services)
 alias(libs.plugins.room)
}

android {
 namespace = "to.bitkit"
 compileSdk = 34
 ndkVersion = "26.1.10909125"

 ndkVersion = "26.1.10909125" // probably required by LDK bindings? - safer to keep it for now.
 defaultConfig {
 applicationId = "to.bitkit"
 minSdk = 28
 targetSdk = 34
 versionCode = 1
 versionName = "1.0"

 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

 vectorDrawables {
 useSupportLibrary = true
 }
Expand All@@ -36,7 +33,7 @@ android {
 buildTypes {
 debug {
 signingConfig = signingConfigs.getByName("debug")
// applicationIdSuffix = ".dev"
 applicationIdSuffix = ".dev"
 }
 release {
 isMinifyEnabled = false
Expand All@@ -47,17 +44,18 @@ android {
 }
 }
 compileOptions {
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 sourceCompatibility = JavaVersion.VERSION_11
 targetCompatibility = JavaVersion.VERSION_11
 }
 kotlinOptions {
 jvmTarget = "1.8"
 jvmTarget = "11"
 }
 buildFeatures {
 buildConfig = true
 compose = true
 }
 composeOptions {
 // https://developer.android.com/jetpack/androidx/releases/compose-kotlin#pre-release_kotlin_compatibility
 kotlinCompilerExtensionVersion = "1.5.14"
 }
 packaging {
Expand All@@ -66,76 +64,73 @@ android {
 }
 }
}

dependencies {
 implementation(fileTree("libs") { include("*.aar") })

 // BDK & LDK
 implementation("org.bitcoindevkit:bdk-android:0.30.0")
 implementation("org.lightningdevkit:ldk-node-android:0.3.0")

 implementation("androidx.core:core-ktx:1.13.1")
 implementation("androidx.appcompat:appcompat:1.7.0")
 implementation("androidx.activity:activity-compose:1.9.1")

 implementation(libs.core.ktx)
 implementation(libs.appcompat)
 implementation(libs.activity.compose)
 implementation(libs.material)
 // BDK + LDK
 implementation(libs.bdk.android)
 implementation(libs.ldk.node.android)
 // Firebase
 implementation(platform("com.google.firebase:firebase-bom:33.1.2"))
 implementation("com.google.firebase:firebase-messaging")
 implementation("com.google.firebase:firebase-analytics")

 implementation(platform(libs.firebase.bom))
 implementation(libs.firebase.messaging)
 implementation(libs.firebase.analytics)
 // Lifecycle
 val lifecycleVersion = "2.8.4"
 // ViewModel
 implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
 implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion") // ViewModel utils for Compose
 implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion") // LiveData
 implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") // Lifecycles wo ViewModel/LiveData
 implementation("androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion") // Lifecycle utils for Compose
 implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycleVersion") // Saved state for ViewModel

 implementation(libs.lifecycle.viewmodel.ktx)
 implementation(libs.lifecycle.viewmodel.compose) // ViewModel utils for Compose
 implementation(libs.lifecycle.livedata.ktx) // LiveData
 implementation(libs.lifecycle.runtime.ktx) // Lifecycles wo ViewModel/LiveData
 implementation(libs.lifecycle.runtime.compose) // Lifecycle utils for Compose
 implementation(libs.lifecycle.viewmodel.savedstate) // Saved state for ViewModel
 // Compose
 implementation(platform(libs.compose.bom))
 androidTestImplementation(platform(libs.compose.bom))
 implementation(libs.material3)
 implementation(libs.material.icons.extended)
 implementation(libs.ui.tooling.preview)
 debugImplementation(libs.ui.tooling)
 debugImplementation(libs.ui.test.manifest)
 androidTestImplementation(libs.ui.test.junit4)
 // Compose Navigation
 val composeNavigationVersion = "2.7.7"
 implementation("androidx.navigation:navigation-compose:$composeNavigationVersion")
 androidTestImplementation("androidx.navigation:navigation-testing:$composeNavigationVersion")
 implementation("androidx.hilt:hilt-navigation-compose:1.2.0")

 // Compose Tooling for Android Studio Preview
 val composeToolingVersion = "1.6.8"
 implementation("androidx.compose.ui:ui-tooling-preview:$composeToolingVersion")
 debugImplementation("androidx.compose.ui:ui-tooling:$composeToolingVersion")

 // Dagger-Hilt
 val hiltVersion = "2.51.1"
 implementation("com.google.dagger:hilt-android:$hiltVersion")
 ksp("com.google.dagger:hilt-android-compiler:$hiltVersion")
 ksp("androidx.hilt:hilt-compiler:1.2.0")

 implementation(libs.navigation.compose)
 androidTestImplementation(libs.navigation.testing)
 implementation(libs.hilt.navigation.compose)
 // Hilt - DI
 implementation(libs.hilt.android)
 ksp(libs.hilt.android.compiler)
 ksp(libs.hilt.compiler)
 // WorkManager
 implementation("androidx.hilt:hilt-work:1.2.0")
 implementation("androidx.work:work-runtime-ktx:2.9.0")

 // Material Design
 implementation("com.google.android.material:material:1.12.0")
 implementation("androidx.compose.material3:material3:1.2.1")
 implementation("androidx.compose.material:material-icons-extended:1.7.0-beta06")

 // Ktor
 val ktorVersion = "2.3.8"
 implementation("io.ktor:ktor-client-core:$ktorVersion")
 implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
 implementation("io.ktor:ktor-client-cio:$ktorVersion")
 implementation("io.ktor:ktor-client-logging:$ktorVersion")
 implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
 implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
 implementation("ch.qos.logback:logback-classic:1.2.11")

 // Testing
 debugImplementation("androidx.compose.ui:ui-test-manifest:1.6.8")
 testImplementation("junit:junit:4.13.2")
 androidTestImplementation("androidx.test.ext:junit:1.2.1")
 androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
 androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.6.8")

 implementation(libs.hilt.work)
 implementation(libs.work.runtime.ktx)
 // Ktor - Networking
 implementation(libs.ktor.client.core)
 implementation(libs.ktor.client.okhttp)
 implementation(libs.ktor.client.cio)
 implementation(libs.ktor.client.logging)
 implementation(libs.ktor.client.content.negotiation)
 implementation(libs.ktor.serialization.kotlinx.json)
 debugImplementation(libs.slf4j.simple)
 // Room - DB
 implementation(libs.room.ktx)
 implementation(libs.room.runtime)
 ksp(libs.room.compiler)
 testImplementation(libs.room.testing)
 // Test + Debug
 androidTestImplementation(libs.espresso.core)
 androidTestImplementation(libs.junit.ext)
 androidTestImplementation(libs.kotlin.test.junit)
 testImplementation(libs.junit)
 testImplementation(libs.kotlin.test.junit)
 // Other
 implementation("com.google.guava:guava:31.1-android") // for ByteArray.toHex()+
 implementation(libs.guava) // for ByteArray.toHex()+
}
ksp {
 // cool but strict: https://developer.android.com/jetpack/androidx/releases/room#2.6.0
 // arg("room.generateKotlin", "true")
}
// https://developer.android.com/jetpack/androidx/releases/room#gradle-plugin
room {
 schemaDirectory("$projectDir/schemas")
}
Binary file addedapp/libs/LDK-release.aar

View file


Open in desktop


Binary file not shown.


34 changes: 34 additions & 0 deletions
app/schemas/to.bitkit.data.AppDb/1.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
{
 "formatVersion": 1,
 "database": {
 "version": 1,
 "identityHash": "ea0d5b36d92a5a3fb1523c3064686f7d",
 "entities": [
 {
 "tableName": "config",
 "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`walletIndex` INTEGER NOT NULL, PRIMARY KEY(`walletIndex`))",
 "fields": [
 {
 "fieldPath": "walletIndex",
 "columnName": "walletIndex",
 "affinity": "INTEGER",
 "notNull": true
 }
 ],
 "primaryKey": {
 "autoGenerate": false,
 "columnNames": [
 "walletIndex"
 ]
 },
 "indices": [],
 "foreignKeys": []
 }
 ],
 "views": [],
 "setupQueries": [
 "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
 "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ea0d5b36d92a5a3fb1523c3064686f7d')"
 ]
 }
}
Binary file addedapp/src/androidTest/assets/ldk-backup/manager.bin

View file


Open in desktop


Binary file not shown.

Binary file addedapp/src/androidTest/assets/ldk-backup/monitor.bin

View file


Open in desktop


Binary file not shown.


1 change: 1 addition & 0 deletions
app/src/androidTest/assets/ldk-backup/seed.bin

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
n���J�L��m��Κ��L&����ǥ�4��~�

22 changes: 0 additions & 22 deletions
app/src/androidTest/java/to/bitkit/ExampleInstrumentedTest.kt

View file


Open in desktop


This file was deleted.


38 changes: 38 additions & 0 deletions
app/src/androidTest/java/to/bitkit/LdkMigrationTest.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
package to.bitkit

import android.content.Context
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import org.junit.Test
import org.junit.runner.RunWith
import to.bitkit.ext.readAsset
import to.bitkit.ldk.LightningService
import to.bitkit.ldk.MigrationService
import kotlin.test.assertTrue

@RunWith(AndroidJUnit4::class)
class LdkMigrationTest {
 private val mnemonic = "pool curve feature leader elite dilemma exile toast smile couch crane public"

 private val context: Context by lazy { InstrumentationRegistry.getInstrumentation().context }
 private val appContext: Context by lazy { InstrumentationRegistry.getInstrumentation().targetContext }

 @Test
 fun nodeShouldStartFromBackupAfterMigration() {
 val seed = context.readAsset("ldk-backup/seed.bin")
 val manager = context.readAsset("ldk-backup/manager.bin")
 val monitor = context.readAsset("ldk-backup/monitor.bin")

 MigrationService(appContext).migrate(seed, manager, listOf(monitor))

 with(LightningService()) {
 init(mnemonic)
 start()

 assertTrue { nodeId == "02cd08b7b375e4263849121f9f0ffb2732a0b88d0fb74487575ac539b374f45a55" }
 assertTrue { channels.isNotEmpty() }

 stop()
 }
 }
}

2 changes: 2 additions & 0 deletions
app/src/main/java/to/bitkit/App.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ internal class App : Application(), Configuration.Provider {
 override fun onCreate() {
 super.onCreate()
 currentActivity = CurrentActivity().also { registerActivityLifecycleCallbacks(it) }

 Env.LdkStorage.init(filesDir.absolutePath)
 }

 override fun onTerminate() {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Migrate channels from LDK to ldk-node#6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Jasonvdb
merged 5 commits into

from

Aug 14, 2024
 Merged


Migrate channels from LDK to ldk-node
#6
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
84b9024

feat: Remote peer


ovitrif Jul 26, 2024
cbabbf6

chore: Use Version Catalog


ovitrif Jul 29, 2024
fda1066

chore: Setup app DB with room


ovitrif Jul 30, 2024
4697078

feat: Migrate LDK channel manager and monitors


ovitrif Aug 10, 2024
447e26d

feat: LDK migration fix and test


ovitrif Aug 12, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
.editorconfig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,7 @@ indent_size = 4
[*.md]
max_line_length = off
trim_trailing_whitespace = false

[*.json]
max_line_length = off
indent_size = 2

155 changes: 75 additions & 80 deletions
app/build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
plugins {
 id("com.android.application")
 id("kotlin-android")
 id("org.jetbrains.kotlin.plugin.serialization")
 id("com.google.devtools.ksp")
 id("com.google.dagger.hilt.android")
 id("com.google.gms.google-services")
 alias(libs.plugins.android.application)
 alias(libs.plugins.kotlin.android)
 alias(libs.plugins.kotlin.serialization)
 alias(libs.plugins.ksp)
 alias(libs.plugins.hilt.android)
 alias(libs.plugins.google.services)
 alias(libs.plugins.room)
}

android {
 namespace = "to.bitkit"
 compileSdk = 34
 ndkVersion = "26.1.10909125"

 ndkVersion = "26.1.10909125" // probably required by LDK bindings? - safer to keep it for now.
 defaultConfig {
 applicationId = "to.bitkit"
 minSdk = 28
 targetSdk = 34
 versionCode = 1
 versionName = "1.0"

 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

 vectorDrawables {
 useSupportLibrary = true
 }
Expand All@@ -36,7 +33,7 @@ android {
 buildTypes {
 debug {
 signingConfig = signingConfigs.getByName("debug")
// applicationIdSuffix = ".dev"
 applicationIdSuffix = ".dev"
 }
 release {
 isMinifyEnabled = false
Expand All@@ -47,17 +44,18 @@ android {
 }
 }
 compileOptions {
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 sourceCompatibility = JavaVersion.VERSION_11
 targetCompatibility = JavaVersion.VERSION_11
 }
 kotlinOptions {
 jvmTarget = "1.8"
 jvmTarget = "11"
 }
 buildFeatures {
 buildConfig = true
 compose = true
 }
 composeOptions {
 // https://developer.android.com/jetpack/androidx/releases/compose-kotlin#pre-release_kotlin_compatibility
 kotlinCompilerExtensionVersion = "1.5.14"
 }
 packaging {
Expand All@@ -66,76 +64,73 @@ android {
 }
 }
}

dependencies {
 implementation(fileTree("libs") { include("*.aar") })

 // BDK & LDK
 implementation("org.bitcoindevkit:bdk-android:0.30.0")
 implementation("org.lightningdevkit:ldk-node-android:0.3.0")

 implementation("androidx.core:core-ktx:1.13.1")
 implementation("androidx.appcompat:appcompat:1.7.0")
 implementation("androidx.activity:activity-compose:1.9.1")

 implementation(libs.core.ktx)
 implementation(libs.appcompat)
 implementation(libs.activity.compose)
 implementation(libs.material)
 // BDK + LDK
 implementation(libs.bdk.android)
 implementation(libs.ldk.node.android)
 // Firebase
 implementation(platform("com.google.firebase:firebase-bom:33.1.2"))
 implementation("com.google.firebase:firebase-messaging")
 implementation("com.google.firebase:firebase-analytics")

 implementation(platform(libs.firebase.bom))
 implementation(libs.firebase.messaging)
 implementation(libs.firebase.analytics)
 // Lifecycle
 val lifecycleVersion = "2.8.4"
 // ViewModel
 implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
 implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion") // ViewModel utils for Compose
 implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion") // LiveData
 implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") // Lifecycles wo ViewModel/LiveData
 implementation("androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion") // Lifecycle utils for Compose
 implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycleVersion") // Saved state for ViewModel

 implementation(libs.lifecycle.viewmodel.ktx)
 implementation(libs.lifecycle.viewmodel.compose) // ViewModel utils for Compose
 implementation(libs.lifecycle.livedata.ktx) // LiveData
 implementation(libs.lifecycle.runtime.ktx) // Lifecycles wo ViewModel/LiveData
 implementation(libs.lifecycle.runtime.compose) // Lifecycle utils for Compose
 implementation(libs.lifecycle.viewmodel.savedstate) // Saved state for ViewModel
 // Compose
 implementation(platform(libs.compose.bom))
 androidTestImplementation(platform(libs.compose.bom))
 implementation(libs.material3)
 implementation(libs.material.icons.extended)
 implementation(libs.ui.tooling.preview)
 debugImplementation(libs.ui.tooling)
 debugImplementation(libs.ui.test.manifest)
 androidTestImplementation(libs.ui.test.junit4)
 // Compose Navigation
 val composeNavigationVersion = "2.7.7"
 implementation("androidx.navigation:navigation-compose:$composeNavigationVersion")
 androidTestImplementation("androidx.navigation:navigation-testing:$composeNavigationVersion")
 implementation("androidx.hilt:hilt-navigation-compose:1.2.0")

 // Compose Tooling for Android Studio Preview
 val composeToolingVersion = "1.6.8"
 implementation("androidx.compose.ui:ui-tooling-preview:$composeToolingVersion")
 debugImplementation("androidx.compose.ui:ui-tooling:$composeToolingVersion")

 // Dagger-Hilt
 val hiltVersion = "2.51.1"
 implementation("com.google.dagger:hilt-android:$hiltVersion")
 ksp("com.google.dagger:hilt-android-compiler:$hiltVersion")
 ksp("androidx.hilt:hilt-compiler:1.2.0")

 implementation(libs.navigation.compose)
 androidTestImplementation(libs.navigation.testing)
 implementation(libs.hilt.navigation.compose)
 // Hilt - DI
 implementation(libs.hilt.android)
 ksp(libs.hilt.android.compiler)
 ksp(libs.hilt.compiler)
 // WorkManager
 implementation("androidx.hilt:hilt-work:1.2.0")
 implementation("androidx.work:work-runtime-ktx:2.9.0")

 // Material Design
 implementation("com.google.android.material:material:1.12.0")
 implementation("androidx.compose.material3:material3:1.2.1")
 implementation("androidx.compose.material:material-icons-extended:1.7.0-beta06")

 // Ktor
 val ktorVersion = "2.3.8"
 implementation("io.ktor:ktor-client-core:$ktorVersion")
 implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
 implementation("io.ktor:ktor-client-cio:$ktorVersion")
 implementation("io.ktor:ktor-client-logging:$ktorVersion")
 implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
 implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
 implementation("ch.qos.logback:logback-classic:1.2.11")

 // Testing
 debugImplementation("androidx.compose.ui:ui-test-manifest:1.6.8")
 testImplementation("junit:junit:4.13.2")
 androidTestImplementation("androidx.test.ext:junit:1.2.1")
 androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
 androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.6.8")

 implementation(libs.hilt.work)
 implementation(libs.work.runtime.ktx)
 // Ktor - Networking
 implementation(libs.ktor.client.core)
 implementation(libs.ktor.client.okhttp)
 implementation(libs.ktor.client.cio)
 implementation(libs.ktor.client.logging)
 implementation(libs.ktor.client.content.negotiation)
 implementation(libs.ktor.serialization.kotlinx.json)
 debugImplementation(libs.slf4j.simple)
 // Room - DB
 implementation(libs.room.ktx)
 implementation(libs.room.runtime)
 ksp(libs.room.compiler)
 testImplementation(libs.room.testing)
 // Test + Debug
 androidTestImplementation(libs.espresso.core)
 androidTestImplementation(libs.junit.ext)
 androidTestImplementation(libs.kotlin.test.junit)
 testImplementation(libs.junit)
 testImplementation(libs.kotlin.test.junit)
 // Other
 implementation("com.google.guava:guava:31.1-android") // for ByteArray.toHex()+
 implementation(libs.guava) // for ByteArray.toHex()+
}
ksp {
 // cool but strict: https://developer.android.com/jetpack/androidx/releases/room#2.6.0
 // arg("room.generateKotlin", "true")
}
// https://developer.android.com/jetpack/androidx/releases/room#gradle-plugin
room {
 schemaDirectory("$projectDir/schemas")
}
Binary file addedapp/libs/LDK-release.aar

View file


Open in desktop


Binary file not shown.


34 changes: 34 additions & 0 deletions
app/schemas/to.bitkit.data.AppDb/1.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
{
 "formatVersion": 1,
 "database": {
 "version": 1,
 "identityHash": "ea0d5b36d92a5a3fb1523c3064686f7d",
 "entities": [
 {
 "tableName": "config",
 "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`walletIndex` INTEGER NOT NULL, PRIMARY KEY(`walletIndex`))",
 "fields": [
 {
 "fieldPath": "walletIndex",
 "columnName": "walletIndex",
 "affinity": "INTEGER",
 "notNull": true
 }
 ],
 "primaryKey": {
 "autoGenerate": false,
 "columnNames": [
 "walletIndex"
 ]
 },
 "indices": [],
 "foreignKeys": []
 }
 ],
 "views": [],
 "setupQueries": [
 "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
 "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ea0d5b36d92a5a3fb1523c3064686f7d')"
 ]
 }
}
Binary file addedapp/src/androidTest/assets/ldk-backup/manager.bin

View file


Open in desktop


Binary file not shown.

Binary file addedapp/src/androidTest/assets/ldk-backup/monitor.bin

View file


Open in desktop


Binary file not shown.


1 change: 1 addition & 0 deletions
app/src/androidTest/assets/ldk-backup/seed.bin

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
n���J�L��m��Κ��L&����ǥ�4��~�

22 changes: 0 additions & 22 deletions
app/src/androidTest/java/to/bitkit/ExampleInstrumentedTest.kt

View file


Open in desktop


This file was deleted.


38 changes: 38 additions & 0 deletions
app/src/androidTest/java/to/bitkit/LdkMigrationTest.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
package to.bitkit

import android.content.Context
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import org.junit.Test
import org.junit.runner.RunWith
import to.bitkit.ext.readAsset
import to.bitkit.ldk.LightningService
import to.bitkit.ldk.MigrationService
import kotlin.test.assertTrue

@RunWith(AndroidJUnit4::class)
class LdkMigrationTest {
 private val mnemonic = "pool curve feature leader elite dilemma exile toast smile couch crane public"

 private val context: Context by lazy { InstrumentationRegistry.getInstrumentation().context }
 private val appContext: Context by lazy { InstrumentationRegistry.getInstrumentation().targetContext }

 @Test
 fun nodeShouldStartFromBackupAfterMigration() {
 val seed = context.readAsset("ldk-backup/seed.bin")
 val manager = context.readAsset("ldk-backup/manager.bin")
 val monitor = context.readAsset("ldk-backup/monitor.bin")

 MigrationService(appContext).migrate(seed, manager, listOf(monitor))

 with(LightningService()) {
 init(mnemonic)
 start()

 assertTrue { nodeId == "02cd08b7b375e4263849121f9f0ffb2732a0b88d0fb74487575ac539b374f45a55" }
 assertTrue { channels.isNotEmpty() }

 stop()
 }
 }
}

2 changes: 2 additions & 0 deletions
app/src/main/java/to/bitkit/App.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@ internal class App : Application(), Configuration.Provider {
 override fun onCreate() {
 super.onCreate()
 currentActivity = CurrentActivity().also { registerActivityLifecycleCallbacks(it) }

 Env.LdkStorage.init(filesDir.absolutePath)
 }

 override fun onTerminate() {
Expand Down
Loading