Migrate to ldk-node#4

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
ovitrif merged 9 commits into from
Jul 26, 2024
Merged

Migrate to ldk-node #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
92787d6
feat: Migrate to ldk-node
ovitrif Jul 24, 2024
d02f35b
feat: Bitcoin service
ovitrif Jul 24, 2024
7119313
feat: Channels and Payments via ldk-node
ovitrif Jul 25, 2024
ac98f90
feat: Async Channel and Payment ops
ovitrif Jul 25, 2024
e69be71
chore: Update and cleanup deps
ovitrif Jul 25, 2024
910917c
feat: wake2pay + multithreading + working payments + ui revamp
ovitrif Jul 25, 2024
5948bca
feat: Theme base setup
ovitrif Jul 26, 2024
afe5838
feat: Silent error on startup
ovitrif Jul 26, 2024
0050ec6
feat: Regtest server url + structured log tags
ovitrif Jul 26, 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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,4 @@
local.properties

# Secrets
google-services.json
google-services.json
28 changes: 12 additions & 16 deletions app/build.gradle.kts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,34 +68,30 @@ android {
}

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

// BDK & LDK
implementation("org.bitcoindevkit:bdk-android:0.30.0")
implementation(fileTree("libs") { include("*.aar") })
// implementation("org.lightningdevkit:ldk-node-jvm:0.3.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.0")
implementation("androidx.activity:activity-compose:1.9.1")

// Firebase
implementation(platform("com.google.firebase:firebase-bom:33.1.2"))
implementation("com.google.firebase:firebase-messaging")
implementation("com.google.firebase:firebase-analytics")

// Lifecycle
val lifecycleVersion = "2.8.3"
val lifecycleVersion = "2.8.4"
// ViewModel
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
// ViewModel utilities for Compose
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion")
// LiveData
implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")
// Lifecycles only (without ViewModel or LiveData)
implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
// Lifecycle utilities for Compose
implementation("androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion")
// Saved state module for ViewModel
implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:$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

// Compose Navigation
val composeNavigationVersion = "2.7.7"
Expand All@@ -121,7 +117,7 @@ dependencies {
// 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-beta05")
implementation("androidx.compose.material:material-icons-extended:1.7.0-beta06")

// Ktor
val ktorVersion = "2.3.8"
Expand All@@ -142,4 +138,4 @@ dependencies {

// Other
implementation("com.google.guava:guava:31.1-android") // for ByteArray.toHex()+
}
}
Empty file addedapp/libs/.gitkeep
View file
Open in desktop
Empty file.
Binary file removedapp/libs/LDK-release.aar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@
</activity>

<service
android:name=".fcm.MessagingService"
android:name=".fcm.FcmService"
android:exported="false">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT" />
Expand DownExpand Up@@ -63,4 +63,4 @@
android:name="com.google.firebase.messaging.default_notification_channel_id"
android:value="@string/app_notifications_channel_id" />
</application>
</manifest>
</manifest>
79 changes: 72 additions & 7 deletions app/src/main/java/to/bitkit/Constants.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,76 @@
package to.bitkit

import org.bitcoindevkit.Network
import android.util.Log
import to.bitkit.Tag.LDK
import kotlin.io.path.Path
import org.bitcoindevkit.Network as BdkNetwork
import org.lightningdevkit.ldknode.Network as LdkNetwork

internal const val _DEV = "_DEV"
internal const val _FCM = "_FCM"
internal const val _LDK = "_LDK"
internal const val _BDK = "_BDK"
object Tag {
internal const val FCM = "FCM"
internal const val LDK = "LDK"
internal const val BDK = "BDK"
internal const val DEV = "DEV"
internal const val APP = "APP"
}

internal val BDK_NETWORK = Network.REGTEST
internal val LDK_NETWORK get() = org.ldk.enums.Network.LDKNetwork_Regtest
internal const val HOST = "10.0.2.2"
internal const val REST = "https://electrs-regtest.synonym.to"
internal const val SEED = "universe more push obey later jazz huge buzz magnet team muscle robust"
internal val PEER = LnPeer(
nodeId = "02faf2d1f5dc153e8931d8444c4439e46a81cb7eeadba8562e7fec3690c261ce87",
host = HOST,
port = "9736",
)

internal object Env {
val isDebug = BuildConfig.DEBUG

object LdkStorage {
lateinit var path: String

fun init(base: String): String {
require(base.isNotEmpty()) { "Base path for LDK storage cannot be empty" }
return Path(base, Network.ldk.name.lowercase(), "ldk")
.toFile()
// .also {
// if (!it.mkdirs()) throw Error("Cannot create LDK data directory")
// }
.absolutePath
.also {
path = it
Log.d(LDK, "Storage path: $it")
}
}
}

object Network {
val ldk: LdkNetwork = LdkNetwork.REGTEST
val bdk = BdkNetwork.REGTEST
}

val trustedLnPeers = listOf(
PEER,
)

val ldkRgsServerUrl: String?
get() = when (Network.ldk) {
LdkNetwork.BITCOIN -> "https://rapidsync.lightningdevkit.org/snapshot/"
else -> null
}
}

data class LnPeer(
val nodeId: String,
val host: String,
val port: String,
) {
constructor(nodeId: String, address: String) : this(
nodeId,
address.substringBefore(":"),
address.substringAfter(":"),
)

fun address() = "$host:$port"
override fun toString() = "$nodeId@${address()}"
}
65 changes: 1 addition & 64 deletions app/src/main/java/to/bitkit/LauncherActivity.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,16 +2,11 @@ package to.bitkit

import android.content.Intent
import android.os.Bundle
import android.util.Log
import androidx.appcompat.app.AppCompatActivity
import to.bitkit.bdk.Bdk
import to.bitkit.ldk.Ldk
import to.bitkit.ldk.init
import to.bitkit.ldk.ldkDir
import to.bitkit.ldk.warmupNode
import to.bitkit.ui.MainActivity
import to.bitkit.ui.initNotificationChannel
import to.bitkit.ui.logFcmToken
import java.io.File

class LauncherActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
Expand All@@ -22,61 +17,3 @@ class LauncherActivity : AppCompatActivity() {
startActivity(Intent(this, MainActivity::class.java))
}
}

internal fun warmupNode(absolutePath: String): Boolean {
initDataDir(absolutePath)

val latestBlockHeight = Bdk.getHeight()
val latestBlockHash = Bdk.getBlockHash(latestBlockHeight)

val channelManagerFile = File("$ldkDir/channel-manager.bin")
val serializedChannelManager = channelManagerFile
.takeIf { it.exists() }
?.absoluteFile?.readBytes()

val serializedChannelMonitors = readChannelMonitorFromDisk()

return Ldk.init(
Bdk.getLdkEntropy(),
latestBlockHeight.toInt(),
latestBlockHash,
serializedChannelManager,
serializedChannelMonitors,
)
}

private fun initDataDir(absolutePath: String) {
ldkDir = "$absolutePath/bitkit"
val dir = File(ldkDir)
if (!dir.exists()) {
dir.mkdir()
}

// Initialize the LDK data directory if necessary.
ldkDir += "/ldk-data"
val ldkDirPath = File(ldkDir)
if (!ldkDirPath.exists()) {
ldkDirPath.mkdir()
Log.d(_LDK, "Ldk dir: $ldkDirPath")
}
}

private fun readChannelMonitorFromDisk(): Array<ByteArray> {
val channelMonitorDirectory = File("$ldkDir/channels/")
if (channelMonitorDirectory.isDirectory) {
val files = channelMonitorDirectory.list()
if (files.isNullOrEmpty()) {
return emptyArray()
}

val channelMonitorList = mutableListOf<ByteArray>()
files.forEach {
channelMonitorList.add(File("${channelMonitorDirectory}/${it}").readBytes())
}
return channelMonitorList.toTypedArray()
}

channelMonitorDirectory.mkdir()
Log.d(_LDK, "New channels dir: $channelMonitorDirectory")
return emptyArray()
}
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 to ldk-node#4

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

ovitrif
merged 9 commits into

from

Jul 26, 2024
 Merged


Migrate to ldk-node
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
92787d6

feat: Migrate to ldk-node


ovitrif Jul 24, 2024
d02f35b

feat: Bitcoin service


ovitrif Jul 24, 2024
7119313

feat: Channels and Payments via ldk-node


ovitrif Jul 25, 2024
ac98f90

feat: Async Channel and Payment ops


ovitrif Jul 25, 2024
e69be71

chore: Update and cleanup deps


ovitrif Jul 25, 2024
910917c

feat: wake2pay + multithreading + working payments + ui revamp


ovitrif Jul 25, 2024
5948bca

feat: Theme base setup


ovitrif Jul 26, 2024
afe5838

feat: Silent error on startup


ovitrif Jul 26, 2024
0050ec6

feat: Regtest server url + structured log tags


ovitrif Jul 26, 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


2 changes: 1 addition & 1 deletion
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,4 @@
local.properties

# Secrets
google-services.json
google-services.json

28 changes: 12 additions & 16 deletions
app/build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,34 +68,30 @@ android {
}

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

 // BDK & LDK
 implementation("org.bitcoindevkit:bdk-android:0.30.0")
 implementation(fileTree("libs") { include("*.aar") })
 // implementation("org.lightningdevkit:ldk-node-jvm:0.3.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.0")
 implementation("androidx.activity:activity-compose:1.9.1")

 // Firebase
 implementation(platform("com.google.firebase:firebase-bom:33.1.2"))
 implementation("com.google.firebase:firebase-messaging")
 implementation("com.google.firebase:firebase-analytics")

 // Lifecycle
 val lifecycleVersion = "2.8.3"
 val lifecycleVersion = "2.8.4"
 // ViewModel
 implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
 // ViewModel utilities for Compose
 implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion")
 // LiveData
 implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")
 // Lifecycles only (without ViewModel or LiveData)
 implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
 // Lifecycle utilities for Compose
 implementation("androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion")
 // Saved state module for ViewModel
 implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:$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

 // Compose Navigation
 val composeNavigationVersion = "2.7.7"
Expand All@@ -121,7 +117,7 @@ dependencies {
 // 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-beta05")
 implementation("androidx.compose.material:material-icons-extended:1.7.0-beta06")

 // Ktor
 val ktorVersion = "2.3.8"
Expand All@@ -142,4 +138,4 @@ dependencies {

 // Other
 implementation("com.google.guava:guava:31.1-android") // for ByteArray.toHex()+
}
}
Empty file addedapp/libs/.gitkeep

View file


Open in desktop


Empty file.

Binary file removedapp/libs/LDK-release.aar

View file


Open in desktop


Binary file not shown.


4 changes: 2 additions & 2 deletions
app/src/main/AndroidManifest.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@
 </activity>

 <service
 android:name=".fcm.MessagingService"
 android:name=".fcm.FcmService"
 android:exported="false">
 <intent-filter>
 <action android:name="com.google.firebase.MESSAGING_EVENT" />
Expand DownExpand Up@@ -63,4 +63,4 @@
 android:name="com.google.firebase.messaging.default_notification_channel_id"
 android:value="@string/app_notifications_channel_id" />
 </application>
</manifest>
</manifest>

79 changes: 72 additions & 7 deletions
app/src/main/java/to/bitkit/Constants.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,76 @@
package to.bitkit

import org.bitcoindevkit.Network
import android.util.Log
import to.bitkit.Tag.LDK
import kotlin.io.path.Path
import org.bitcoindevkit.Network as BdkNetwork
import org.lightningdevkit.ldknode.Network as LdkNetwork

internal const val _DEV = "_DEV"
internal const val _FCM = "_FCM"
internal const val _LDK = "_LDK"
internal const val _BDK = "_BDK"
object Tag {
 internal const val FCM = "FCM"
 internal const val LDK = "LDK"
 internal const val BDK = "BDK"
 internal const val DEV = "DEV"
 internal const val APP = "APP"
}

internal val BDK_NETWORK = Network.REGTEST
internal val LDK_NETWORK get() = org.ldk.enums.Network.LDKNetwork_Regtest
internal const val HOST = "10.0.2.2"
internal const val REST = "https://electrs-regtest.synonym.to"
internal const val SEED = "universe more push obey later jazz huge buzz magnet team muscle robust"
internal val PEER = LnPeer(
 nodeId = "02faf2d1f5dc153e8931d8444c4439e46a81cb7eeadba8562e7fec3690c261ce87",
 host = HOST,
 port = "9736",
)

internal object Env {
 val isDebug = BuildConfig.DEBUG

 object LdkStorage {
 lateinit var path: String

 fun init(base: String): String {
 require(base.isNotEmpty()) { "Base path for LDK storage cannot be empty" }
 return Path(base, Network.ldk.name.lowercase(), "ldk")
 .toFile()
 // .also {
 // if (!it.mkdirs()) throw Error("Cannot create LDK data directory")
 // }
 .absolutePath
 .also {
 path = it
 Log.d(LDK, "Storage path: $it")
 }
 }
 }

 object Network {
 val ldk: LdkNetwork = LdkNetwork.REGTEST
 val bdk = BdkNetwork.REGTEST
 }

 val trustedLnPeers = listOf(
 PEER,
 )

 val ldkRgsServerUrl: String?
 get() = when (Network.ldk) {
 LdkNetwork.BITCOIN -> "https://rapidsync.lightningdevkit.org/snapshot/"
 else -> null
 }
}

data class LnPeer(
 val nodeId: String,
 val host: String,
 val port: String,
) {
 constructor(nodeId: String, address: String) : this(
 nodeId,
 address.substringBefore(":"),
 address.substringAfter(":"),
 )

 fun address() = "$host:$port"
 override fun toString() = "$nodeId@${address()}"
}

65 changes: 1 addition & 64 deletions
app/src/main/java/to/bitkit/LauncherActivity.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,16 +2,11 @@ package to.bitkit

import android.content.Intent
import android.os.Bundle
import android.util.Log
import androidx.appcompat.app.AppCompatActivity
import to.bitkit.bdk.Bdk
import to.bitkit.ldk.Ldk
import to.bitkit.ldk.init
import to.bitkit.ldk.ldkDir
import to.bitkit.ldk.warmupNode
import to.bitkit.ui.MainActivity
import to.bitkit.ui.initNotificationChannel
import to.bitkit.ui.logFcmToken
import java.io.File

class LauncherActivity : AppCompatActivity() {
 override fun onCreate(savedInstanceState: Bundle?) {
Expand All@@ -22,61 +17,3 @@ class LauncherActivity : AppCompatActivity() {
 startActivity(Intent(this, MainActivity::class.java))
 }
}

internal fun warmupNode(absolutePath: String): Boolean {
 initDataDir(absolutePath)

 val latestBlockHeight = Bdk.getHeight()
 val latestBlockHash = Bdk.getBlockHash(latestBlockHeight)

 val channelManagerFile = File("$ldkDir/channel-manager.bin")
 val serializedChannelManager = channelManagerFile
 .takeIf { it.exists() }
 ?.absoluteFile?.readBytes()

 val serializedChannelMonitors = readChannelMonitorFromDisk()

 return Ldk.init(
 Bdk.getLdkEntropy(),
 latestBlockHeight.toInt(),
 latestBlockHash,
 serializedChannelManager,
 serializedChannelMonitors,
 )
}

private fun initDataDir(absolutePath: String) {
 ldkDir = "$absolutePath/bitkit"
 val dir = File(ldkDir)
 if (!dir.exists()) {
 dir.mkdir()
 }

 // Initialize the LDK data directory if necessary.
 ldkDir += "/ldk-data"
 val ldkDirPath = File(ldkDir)
 if (!ldkDirPath.exists()) {
 ldkDirPath.mkdir()
 Log.d(_LDK, "Ldk dir: $ldkDirPath")
 }
}

private fun readChannelMonitorFromDisk(): Array<ByteArray> {
 val channelMonitorDirectory = File("$ldkDir/channels/")
 if (channelMonitorDirectory.isDirectory) {
 val files = channelMonitorDirectory.list()
 if (files.isNullOrEmpty()) {
 return emptyArray()
 }

 val channelMonitorList = mutableListOf<ByteArray>()
 files.forEach {
 channelMonitorList.add(File("${channelMonitorDirectory}/${it}").readBytes())
 }
 return channelMonitorList.toTypedArray()
 }

 channelMonitorDirectory.mkdir()
 Log.d(_LDK, "New channels dir: $channelMonitorDirectory")
 return emptyArray()
}
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 to ldk-node#4

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

ovitrif
merged 9 commits into

from

Jul 26, 2024
 Merged


Migrate to ldk-node
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
92787d6

feat: Migrate to ldk-node


ovitrif Jul 24, 2024
d02f35b

feat: Bitcoin service


ovitrif Jul 24, 2024
7119313

feat: Channels and Payments via ldk-node


ovitrif Jul 25, 2024
ac98f90

feat: Async Channel and Payment ops


ovitrif Jul 25, 2024
e69be71

chore: Update and cleanup deps


ovitrif Jul 25, 2024
910917c

feat: wake2pay + multithreading + working payments + ui revamp


ovitrif Jul 25, 2024
5948bca

feat: Theme base setup


ovitrif Jul 26, 2024
afe5838

feat: Silent error on startup


ovitrif Jul 26, 2024
0050ec6

feat: Regtest server url + structured log tags


ovitrif Jul 26, 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


2 changes: 1 addition & 1 deletion
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,4 @@
local.properties

# Secrets
google-services.json
google-services.json

28 changes: 12 additions & 16 deletions
app/build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,34 +68,30 @@ android {
}

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

 // BDK & LDK
 implementation("org.bitcoindevkit:bdk-android:0.30.0")
 implementation(fileTree("libs") { include("*.aar") })
 // implementation("org.lightningdevkit:ldk-node-jvm:0.3.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.0")
 implementation("androidx.activity:activity-compose:1.9.1")

 // Firebase
 implementation(platform("com.google.firebase:firebase-bom:33.1.2"))
 implementation("com.google.firebase:firebase-messaging")
 implementation("com.google.firebase:firebase-analytics")

 // Lifecycle
 val lifecycleVersion = "2.8.3"
 val lifecycleVersion = "2.8.4"
 // ViewModel
 implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
 // ViewModel utilities for Compose
 implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion")
 // LiveData
 implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")
 // Lifecycles only (without ViewModel or LiveData)
 implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
 // Lifecycle utilities for Compose
 implementation("androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion")
 // Saved state module for ViewModel
 implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:$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

 // Compose Navigation
 val composeNavigationVersion = "2.7.7"
Expand All@@ -121,7 +117,7 @@ dependencies {
 // 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-beta05")
 implementation("androidx.compose.material:material-icons-extended:1.7.0-beta06")

 // Ktor
 val ktorVersion = "2.3.8"
Expand All@@ -142,4 +138,4 @@ dependencies {

 // Other
 implementation("com.google.guava:guava:31.1-android") // for ByteArray.toHex()+
}
}
Empty file addedapp/libs/.gitkeep

View file


Open in desktop


Empty file.

Binary file removedapp/libs/LDK-release.aar

View file


Open in desktop


Binary file not shown.


4 changes: 2 additions & 2 deletions
app/src/main/AndroidManifest.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@
 </activity>

 <service
 android:name=".fcm.MessagingService"
 android:name=".fcm.FcmService"
 android:exported="false">
 <intent-filter>
 <action android:name="com.google.firebase.MESSAGING_EVENT" />
Expand DownExpand Up@@ -63,4 +63,4 @@
 android:name="com.google.firebase.messaging.default_notification_channel_id"
 android:value="@string/app_notifications_channel_id" />
 </application>
</manifest>
</manifest>

79 changes: 72 additions & 7 deletions
app/src/main/java/to/bitkit/Constants.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,76 @@
package to.bitkit

import org.bitcoindevkit.Network
import android.util.Log
import to.bitkit.Tag.LDK
import kotlin.io.path.Path
import org.bitcoindevkit.Network as BdkNetwork
import org.lightningdevkit.ldknode.Network as LdkNetwork

internal const val _DEV = "_DEV"
internal const val _FCM = "_FCM"
internal const val _LDK = "_LDK"
internal const val _BDK = "_BDK"
object Tag {
 internal const val FCM = "FCM"
 internal const val LDK = "LDK"
 internal const val BDK = "BDK"
 internal const val DEV = "DEV"
 internal const val APP = "APP"
}

internal val BDK_NETWORK = Network.REGTEST
internal val LDK_NETWORK get() = org.ldk.enums.Network.LDKNetwork_Regtest
internal const val HOST = "10.0.2.2"
internal const val REST = "https://electrs-regtest.synonym.to"
internal const val SEED = "universe more push obey later jazz huge buzz magnet team muscle robust"
internal val PEER = LnPeer(
 nodeId = "02faf2d1f5dc153e8931d8444c4439e46a81cb7eeadba8562e7fec3690c261ce87",
 host = HOST,
 port = "9736",
)

internal object Env {
 val isDebug = BuildConfig.DEBUG

 object LdkStorage {
 lateinit var path: String

 fun init(base: String): String {
 require(base.isNotEmpty()) { "Base path for LDK storage cannot be empty" }
 return Path(base, Network.ldk.name.lowercase(), "ldk")
 .toFile()
 // .also {
 // if (!it.mkdirs()) throw Error("Cannot create LDK data directory")
 // }
 .absolutePath
 .also {
 path = it
 Log.d(LDK, "Storage path: $it")
 }
 }
 }

 object Network {
 val ldk: LdkNetwork = LdkNetwork.REGTEST
 val bdk = BdkNetwork.REGTEST
 }

 val trustedLnPeers = listOf(
 PEER,
 )

 val ldkRgsServerUrl: String?
 get() = when (Network.ldk) {
 LdkNetwork.BITCOIN -> "https://rapidsync.lightningdevkit.org/snapshot/"
 else -> null
 }
}

data class LnPeer(
 val nodeId: String,
 val host: String,
 val port: String,
) {
 constructor(nodeId: String, address: String) : this(
 nodeId,
 address.substringBefore(":"),
 address.substringAfter(":"),
 )

 fun address() = "$host:$port"
 override fun toString() = "$nodeId@${address()}"
}

65 changes: 1 addition & 64 deletions
app/src/main/java/to/bitkit/LauncherActivity.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,16 +2,11 @@ package to.bitkit

import android.content.Intent
import android.os.Bundle
import android.util.Log
import androidx.appcompat.app.AppCompatActivity
import to.bitkit.bdk.Bdk
import to.bitkit.ldk.Ldk
import to.bitkit.ldk.init
import to.bitkit.ldk.ldkDir
import to.bitkit.ldk.warmupNode
import to.bitkit.ui.MainActivity
import to.bitkit.ui.initNotificationChannel
import to.bitkit.ui.logFcmToken
import java.io.File

class LauncherActivity : AppCompatActivity() {
 override fun onCreate(savedInstanceState: Bundle?) {
Expand All@@ -22,61 +17,3 @@ class LauncherActivity : AppCompatActivity() {
 startActivity(Intent(this, MainActivity::class.java))
 }
}

internal fun warmupNode(absolutePath: String): Boolean {
 initDataDir(absolutePath)

 val latestBlockHeight = Bdk.getHeight()
 val latestBlockHash = Bdk.getBlockHash(latestBlockHeight)

 val channelManagerFile = File("$ldkDir/channel-manager.bin")
 val serializedChannelManager = channelManagerFile
 .takeIf { it.exists() }
 ?.absoluteFile?.readBytes()

 val serializedChannelMonitors = readChannelMonitorFromDisk()

 return Ldk.init(
 Bdk.getLdkEntropy(),
 latestBlockHeight.toInt(),
 latestBlockHash,
 serializedChannelManager,
 serializedChannelMonitors,
 )
}

private fun initDataDir(absolutePath: String) {
 ldkDir = "$absolutePath/bitkit"
 val dir = File(ldkDir)
 if (!dir.exists()) {
 dir.mkdir()
 }

 // Initialize the LDK data directory if necessary.
 ldkDir += "/ldk-data"
 val ldkDirPath = File(ldkDir)
 if (!ldkDirPath.exists()) {
 ldkDirPath.mkdir()
 Log.d(_LDK, "Ldk dir: $ldkDirPath")
 }
}

private fun readChannelMonitorFromDisk(): Array<ByteArray> {
 val channelMonitorDirectory = File("$ldkDir/channels/")
 if (channelMonitorDirectory.isDirectory) {
 val files = channelMonitorDirectory.list()
 if (files.isNullOrEmpty()) {
 return emptyArray()
 }

 val channelMonitorList = mutableListOf<ByteArray>()
 files.forEach {
 channelMonitorList.add(File("${channelMonitorDirectory}/${it}").readBytes())
 }
 return channelMonitorList.toTypedArray()
 }

 channelMonitorDirectory.mkdir()
 Log.d(_LDK, "New channels dir: $channelMonitorDirectory")
 return emptyArray()
}
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 to ldk-node#4

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

ovitrif
merged 9 commits into

from

Jul 26, 2024
 Merged


Migrate to ldk-node
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
92787d6

feat: Migrate to ldk-node


ovitrif Jul 24, 2024
d02f35b

feat: Bitcoin service


ovitrif Jul 24, 2024
7119313

feat: Channels and Payments via ldk-node


ovitrif Jul 25, 2024
ac98f90

feat: Async Channel and Payment ops


ovitrif Jul 25, 2024
e69be71

chore: Update and cleanup deps


ovitrif Jul 25, 2024
910917c

feat: wake2pay + multithreading + working payments + ui revamp


ovitrif Jul 25, 2024
5948bca

feat: Theme base setup


ovitrif Jul 26, 2024
afe5838

feat: Silent error on startup


ovitrif Jul 26, 2024
0050ec6

feat: Regtest server url + structured log tags


ovitrif Jul 26, 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


2 changes: 1 addition & 1 deletion
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,4 @@
local.properties

# Secrets
google-services.json
google-services.json

28 changes: 12 additions & 16 deletions
app/build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,34 +68,30 @@ android {
}

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

 // BDK & LDK
 implementation("org.bitcoindevkit:bdk-android:0.30.0")
 implementation(fileTree("libs") { include("*.aar") })
 // implementation("org.lightningdevkit:ldk-node-jvm:0.3.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.0")
 implementation("androidx.activity:activity-compose:1.9.1")

 // Firebase
 implementation(platform("com.google.firebase:firebase-bom:33.1.2"))
 implementation("com.google.firebase:firebase-messaging")
 implementation("com.google.firebase:firebase-analytics")

 // Lifecycle
 val lifecycleVersion = "2.8.3"
 val lifecycleVersion = "2.8.4"
 // ViewModel
 implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
 // ViewModel utilities for Compose
 implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion")
 // LiveData
 implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")
 // Lifecycles only (without ViewModel or LiveData)
 implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
 // Lifecycle utilities for Compose
 implementation("androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion")
 // Saved state module for ViewModel
 implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:$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

 // Compose Navigation
 val composeNavigationVersion = "2.7.7"
Expand All@@ -121,7 +117,7 @@ dependencies {
 // 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-beta05")
 implementation("androidx.compose.material:material-icons-extended:1.7.0-beta06")

 // Ktor
 val ktorVersion = "2.3.8"
Expand All@@ -142,4 +138,4 @@ dependencies {

 // Other
 implementation("com.google.guava:guava:31.1-android") // for ByteArray.toHex()+
}
}
Empty file addedapp/libs/.gitkeep

View file


Open in desktop


Empty file.

Binary file removedapp/libs/LDK-release.aar

View file


Open in desktop


Binary file not shown.


4 changes: 2 additions & 2 deletions
app/src/main/AndroidManifest.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@
 </activity>

 <service
 android:name=".fcm.MessagingService"
 android:name=".fcm.FcmService"
 android:exported="false">
 <intent-filter>
 <action android:name="com.google.firebase.MESSAGING_EVENT" />
Expand DownExpand Up@@ -63,4 +63,4 @@
 android:name="com.google.firebase.messaging.default_notification_channel_id"
 android:value="@string/app_notifications_channel_id" />
 </application>
</manifest>
</manifest>

79 changes: 72 additions & 7 deletions
app/src/main/java/to/bitkit/Constants.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,76 @@
package to.bitkit

import org.bitcoindevkit.Network
import android.util.Log
import to.bitkit.Tag.LDK
import kotlin.io.path.Path
import org.bitcoindevkit.Network as BdkNetwork
import org.lightningdevkit.ldknode.Network as LdkNetwork

internal const val _DEV = "_DEV"
internal const val _FCM = "_FCM"
internal const val _LDK = "_LDK"
internal const val _BDK = "_BDK"
object Tag {
 internal const val FCM = "FCM"
 internal const val LDK = "LDK"
 internal const val BDK = "BDK"
 internal const val DEV = "DEV"
 internal const val APP = "APP"
}

internal val BDK_NETWORK = Network.REGTEST
internal val LDK_NETWORK get() = org.ldk.enums.Network.LDKNetwork_Regtest
internal const val HOST = "10.0.2.2"
internal const val REST = "https://electrs-regtest.synonym.to"
internal const val SEED = "universe more push obey later jazz huge buzz magnet team muscle robust"
internal val PEER = LnPeer(
 nodeId = "02faf2d1f5dc153e8931d8444c4439e46a81cb7eeadba8562e7fec3690c261ce87",
 host = HOST,
 port = "9736",
)

internal object Env {
 val isDebug = BuildConfig.DEBUG

 object LdkStorage {
 lateinit var path: String

 fun init(base: String): String {
 require(base.isNotEmpty()) { "Base path for LDK storage cannot be empty" }
 return Path(base, Network.ldk.name.lowercase(), "ldk")
 .toFile()
 // .also {
 // if (!it.mkdirs()) throw Error("Cannot create LDK data directory")
 // }
 .absolutePath
 .also {
 path = it
 Log.d(LDK, "Storage path: $it")
 }
 }
 }

 object Network {
 val ldk: LdkNetwork = LdkNetwork.REGTEST
 val bdk = BdkNetwork.REGTEST
 }

 val trustedLnPeers = listOf(
 PEER,
 )

 val ldkRgsServerUrl: String?
 get() = when (Network.ldk) {
 LdkNetwork.BITCOIN -> "https://rapidsync.lightningdevkit.org/snapshot/"
 else -> null
 }
}

data class LnPeer(
 val nodeId: String,
 val host: String,
 val port: String,
) {
 constructor(nodeId: String, address: String) : this(
 nodeId,
 address.substringBefore(":"),
 address.substringAfter(":"),
 )

 fun address() = "$host:$port"
 override fun toString() = "$nodeId@${address()}"
}

65 changes: 1 addition & 64 deletions
app/src/main/java/to/bitkit/LauncherActivity.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,16 +2,11 @@ package to.bitkit

import android.content.Intent
import android.os.Bundle
import android.util.Log
import androidx.appcompat.app.AppCompatActivity
import to.bitkit.bdk.Bdk
import to.bitkit.ldk.Ldk
import to.bitkit.ldk.init
import to.bitkit.ldk.ldkDir
import to.bitkit.ldk.warmupNode
import to.bitkit.ui.MainActivity
import to.bitkit.ui.initNotificationChannel
import to.bitkit.ui.logFcmToken
import java.io.File

class LauncherActivity : AppCompatActivity() {
 override fun onCreate(savedInstanceState: Bundle?) {
Expand All@@ -22,61 +17,3 @@ class LauncherActivity : AppCompatActivity() {
 startActivity(Intent(this, MainActivity::class.java))
 }
}

internal fun warmupNode(absolutePath: String): Boolean {
 initDataDir(absolutePath)

 val latestBlockHeight = Bdk.getHeight()
 val latestBlockHash = Bdk.getBlockHash(latestBlockHeight)

 val channelManagerFile = File("$ldkDir/channel-manager.bin")
 val serializedChannelManager = channelManagerFile
 .takeIf { it.exists() }
 ?.absoluteFile?.readBytes()

 val serializedChannelMonitors = readChannelMonitorFromDisk()

 return Ldk.init(
 Bdk.getLdkEntropy(),
 latestBlockHeight.toInt(),
 latestBlockHash,
 serializedChannelManager,
 serializedChannelMonitors,
 )
}

private fun initDataDir(absolutePath: String) {
 ldkDir = "$absolutePath/bitkit"
 val dir = File(ldkDir)
 if (!dir.exists()) {
 dir.mkdir()
 }

 // Initialize the LDK data directory if necessary.
 ldkDir += "/ldk-data"
 val ldkDirPath = File(ldkDir)
 if (!ldkDirPath.exists()) {
 ldkDirPath.mkdir()
 Log.d(_LDK, "Ldk dir: $ldkDirPath")
 }
}

private fun readChannelMonitorFromDisk(): Array<ByteArray> {
 val channelMonitorDirectory = File("$ldkDir/channels/")
 if (channelMonitorDirectory.isDirectory) {
 val files = channelMonitorDirectory.list()
 if (files.isNullOrEmpty()) {
 return emptyArray()
 }

 val channelMonitorList = mutableListOf<ByteArray>()
 files.forEach {
 channelMonitorList.add(File("${channelMonitorDirectory}/${it}").readBytes())
 }
 return channelMonitorList.toTypedArray()
 }

 channelMonitorDirectory.mkdir()
 Log.d(_LDK, "New channels dir: $channelMonitorDirectory")
 return emptyArray()
}
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 to ldk-node#4

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

ovitrif
merged 9 commits into

from

Jul 26, 2024
 Merged


Migrate to ldk-node
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
92787d6

feat: Migrate to ldk-node


ovitrif Jul 24, 2024
d02f35b

feat: Bitcoin service


ovitrif Jul 24, 2024
7119313

feat: Channels and Payments via ldk-node


ovitrif Jul 25, 2024
ac98f90

feat: Async Channel and Payment ops


ovitrif Jul 25, 2024
e69be71

chore: Update and cleanup deps


ovitrif Jul 25, 2024
910917c

feat: wake2pay + multithreading + working payments + ui revamp


ovitrif Jul 25, 2024
5948bca

feat: Theme base setup


ovitrif Jul 26, 2024
afe5838

feat: Silent error on startup


ovitrif Jul 26, 2024
0050ec6

feat: Regtest server url + structured log tags


ovitrif Jul 26, 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


2 changes: 1 addition & 1 deletion
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,4 @@
local.properties

# Secrets
google-services.json
google-services.json

28 changes: 12 additions & 16 deletions
app/build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,34 +68,30 @@ android {
}

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

 // BDK & LDK
 implementation("org.bitcoindevkit:bdk-android:0.30.0")
 implementation(fileTree("libs") { include("*.aar") })
 // implementation("org.lightningdevkit:ldk-node-jvm:0.3.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.0")
 implementation("androidx.activity:activity-compose:1.9.1")

 // Firebase
 implementation(platform("com.google.firebase:firebase-bom:33.1.2"))
 implementation("com.google.firebase:firebase-messaging")
 implementation("com.google.firebase:firebase-analytics")

 // Lifecycle
 val lifecycleVersion = "2.8.3"
 val lifecycleVersion = "2.8.4"
 // ViewModel
 implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
 // ViewModel utilities for Compose
 implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion")
 // LiveData
 implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")
 // Lifecycles only (without ViewModel or LiveData)
 implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
 // Lifecycle utilities for Compose
 implementation("androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion")
 // Saved state module for ViewModel
 implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:$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

 // Compose Navigation
 val composeNavigationVersion = "2.7.7"
Expand All@@ -121,7 +117,7 @@ dependencies {
 // 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-beta05")
 implementation("androidx.compose.material:material-icons-extended:1.7.0-beta06")

 // Ktor
 val ktorVersion = "2.3.8"
Expand All@@ -142,4 +138,4 @@ dependencies {

 // Other
 implementation("com.google.guava:guava:31.1-android") // for ByteArray.toHex()+
}
}
Empty file addedapp/libs/.gitkeep

View file


Open in desktop


Empty file.

Binary file removedapp/libs/LDK-release.aar

View file


Open in desktop


Binary file not shown.


4 changes: 2 additions & 2 deletions
app/src/main/AndroidManifest.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@
 </activity>

 <service
 android:name=".fcm.MessagingService"
 android:name=".fcm.FcmService"
 android:exported="false">
 <intent-filter>
 <action android:name="com.google.firebase.MESSAGING_EVENT" />
Expand DownExpand Up@@ -63,4 +63,4 @@
 android:name="com.google.firebase.messaging.default_notification_channel_id"
 android:value="@string/app_notifications_channel_id" />
 </application>
</manifest>
</manifest>

79 changes: 72 additions & 7 deletions
app/src/main/java/to/bitkit/Constants.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,76 @@
package to.bitkit

import org.bitcoindevkit.Network
import android.util.Log
import to.bitkit.Tag.LDK
import kotlin.io.path.Path
import org.bitcoindevkit.Network as BdkNetwork
import org.lightningdevkit.ldknode.Network as LdkNetwork

internal const val _DEV = "_DEV"
internal const val _FCM = "_FCM"
internal const val _LDK = "_LDK"
internal const val _BDK = "_BDK"
object Tag {
 internal const val FCM = "FCM"
 internal const val LDK = "LDK"
 internal const val BDK = "BDK"
 internal const val DEV = "DEV"
 internal const val APP = "APP"
}

internal val BDK_NETWORK = Network.REGTEST
internal val LDK_NETWORK get() = org.ldk.enums.Network.LDKNetwork_Regtest
internal const val HOST = "10.0.2.2"
internal const val REST = "https://electrs-regtest.synonym.to"
internal const val SEED = "universe more push obey later jazz huge buzz magnet team muscle robust"
internal val PEER = LnPeer(
 nodeId = "02faf2d1f5dc153e8931d8444c4439e46a81cb7eeadba8562e7fec3690c261ce87",
 host = HOST,
 port = "9736",
)

internal object Env {
 val isDebug = BuildConfig.DEBUG

 object LdkStorage {
 lateinit var path: String

 fun init(base: String): String {
 require(base.isNotEmpty()) { "Base path for LDK storage cannot be empty" }
 return Path(base, Network.ldk.name.lowercase(), "ldk")
 .toFile()
 // .also {
 // if (!it.mkdirs()) throw Error("Cannot create LDK data directory")
 // }
 .absolutePath
 .also {
 path = it
 Log.d(LDK, "Storage path: $it")
 }
 }
 }

 object Network {
 val ldk: LdkNetwork = LdkNetwork.REGTEST
 val bdk = BdkNetwork.REGTEST
 }

 val trustedLnPeers = listOf(
 PEER,
 )

 val ldkRgsServerUrl: String?
 get() = when (Network.ldk) {
 LdkNetwork.BITCOIN -> "https://rapidsync.lightningdevkit.org/snapshot/"
 else -> null
 }
}

data class LnPeer(
 val nodeId: String,
 val host: String,
 val port: String,
) {
 constructor(nodeId: String, address: String) : this(
 nodeId,
 address.substringBefore(":"),
 address.substringAfter(":"),
 )

 fun address() = "$host:$port"
 override fun toString() = "$nodeId@${address()}"
}

65 changes: 1 addition & 64 deletions
app/src/main/java/to/bitkit/LauncherActivity.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,16 +2,11 @@ package to.bitkit

import android.content.Intent
import android.os.Bundle
import android.util.Log
import androidx.appcompat.app.AppCompatActivity
import to.bitkit.bdk.Bdk
import to.bitkit.ldk.Ldk
import to.bitkit.ldk.init
import to.bitkit.ldk.ldkDir
import to.bitkit.ldk.warmupNode
import to.bitkit.ui.MainActivity
import to.bitkit.ui.initNotificationChannel
import to.bitkit.ui.logFcmToken
import java.io.File

class LauncherActivity : AppCompatActivity() {
 override fun onCreate(savedInstanceState: Bundle?) {
Expand All@@ -22,61 +17,3 @@ class LauncherActivity : AppCompatActivity() {
 startActivity(Intent(this, MainActivity::class.java))
 }
}

internal fun warmupNode(absolutePath: String): Boolean {
 initDataDir(absolutePath)

 val latestBlockHeight = Bdk.getHeight()
 val latestBlockHash = Bdk.getBlockHash(latestBlockHeight)

 val channelManagerFile = File("$ldkDir/channel-manager.bin")
 val serializedChannelManager = channelManagerFile
 .takeIf { it.exists() }
 ?.absoluteFile?.readBytes()

 val serializedChannelMonitors = readChannelMonitorFromDisk()

 return Ldk.init(
 Bdk.getLdkEntropy(),
 latestBlockHeight.toInt(),
 latestBlockHash,
 serializedChannelManager,
 serializedChannelMonitors,
 )
}

private fun initDataDir(absolutePath: String) {
 ldkDir = "$absolutePath/bitkit"
 val dir = File(ldkDir)
 if (!dir.exists()) {
 dir.mkdir()
 }

 // Initialize the LDK data directory if necessary.
 ldkDir += "/ldk-data"
 val ldkDirPath = File(ldkDir)
 if (!ldkDirPath.exists()) {
 ldkDirPath.mkdir()
 Log.d(_LDK, "Ldk dir: $ldkDirPath")
 }
}

private fun readChannelMonitorFromDisk(): Array<ByteArray> {
 val channelMonitorDirectory = File("$ldkDir/channels/")
 if (channelMonitorDirectory.isDirectory) {
 val files = channelMonitorDirectory.list()
 if (files.isNullOrEmpty()) {
 return emptyArray()
 }

 val channelMonitorList = mutableListOf<ByteArray>()
 files.forEach {
 channelMonitorList.add(File("${channelMonitorDirectory}/${it}").readBytes())
 }
 return channelMonitorList.toTypedArray()
 }

 channelMonitorDirectory.mkdir()
 Log.d(_LDK, "New channels dir: $channelMonitorDirectory")
 return emptyArray()
}
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 to ldk-node#4

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

ovitrif
merged 9 commits into

from

Jul 26, 2024
 Merged


Migrate to ldk-node
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
92787d6

feat: Migrate to ldk-node


ovitrif Jul 24, 2024
d02f35b

feat: Bitcoin service


ovitrif Jul 24, 2024
7119313

feat: Channels and Payments via ldk-node


ovitrif Jul 25, 2024
ac98f90

feat: Async Channel and Payment ops


ovitrif Jul 25, 2024
e69be71

chore: Update and cleanup deps


ovitrif Jul 25, 2024
910917c

feat: wake2pay + multithreading + working payments + ui revamp


ovitrif Jul 25, 2024
5948bca

feat: Theme base setup


ovitrif Jul 26, 2024
afe5838

feat: Silent error on startup


ovitrif Jul 26, 2024
0050ec6

feat: Regtest server url + structured log tags


ovitrif Jul 26, 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


2 changes: 1 addition & 1 deletion
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,4 @@
local.properties

# Secrets
google-services.json
google-services.json

28 changes: 12 additions & 16 deletions
app/build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,34 +68,30 @@ android {
}

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

 // BDK & LDK
 implementation("org.bitcoindevkit:bdk-android:0.30.0")
 implementation(fileTree("libs") { include("*.aar") })
 // implementation("org.lightningdevkit:ldk-node-jvm:0.3.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.0")
 implementation("androidx.activity:activity-compose:1.9.1")

 // Firebase
 implementation(platform("com.google.firebase:firebase-bom:33.1.2"))
 implementation("com.google.firebase:firebase-messaging")
 implementation("com.google.firebase:firebase-analytics")

 // Lifecycle
 val lifecycleVersion = "2.8.3"
 val lifecycleVersion = "2.8.4"
 // ViewModel
 implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
 // ViewModel utilities for Compose
 implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion")
 // LiveData
 implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")
 // Lifecycles only (without ViewModel or LiveData)
 implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
 // Lifecycle utilities for Compose
 implementation("androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion")
 // Saved state module for ViewModel
 implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:$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

 // Compose Navigation
 val composeNavigationVersion = "2.7.7"
Expand All@@ -121,7 +117,7 @@ dependencies {
 // 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-beta05")
 implementation("androidx.compose.material:material-icons-extended:1.7.0-beta06")

 // Ktor
 val ktorVersion = "2.3.8"
Expand All@@ -142,4 +138,4 @@ dependencies {

 // Other
 implementation("com.google.guava:guava:31.1-android") // for ByteArray.toHex()+
}
}
Empty file addedapp/libs/.gitkeep

View file


Open in desktop


Empty file.

Binary file removedapp/libs/LDK-release.aar

View file


Open in desktop


Binary file not shown.


4 changes: 2 additions & 2 deletions
app/src/main/AndroidManifest.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@
 </activity>

 <service
 android:name=".fcm.MessagingService"
 android:name=".fcm.FcmService"
 android:exported="false">
 <intent-filter>
 <action android:name="com.google.firebase.MESSAGING_EVENT" />
Expand DownExpand Up@@ -63,4 +63,4 @@
 android:name="com.google.firebase.messaging.default_notification_channel_id"
 android:value="@string/app_notifications_channel_id" />
 </application>
</manifest>
</manifest>

79 changes: 72 additions & 7 deletions
app/src/main/java/to/bitkit/Constants.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,76 @@
package to.bitkit

import org.bitcoindevkit.Network
import android.util.Log
import to.bitkit.Tag.LDK
import kotlin.io.path.Path
import org.bitcoindevkit.Network as BdkNetwork
import org.lightningdevkit.ldknode.Network as LdkNetwork

internal const val _DEV = "_DEV"
internal const val _FCM = "_FCM"
internal const val _LDK = "_LDK"
internal const val _BDK = "_BDK"
object Tag {
 internal const val FCM = "FCM"
 internal const val LDK = "LDK"
 internal const val BDK = "BDK"
 internal const val DEV = "DEV"
 internal const val APP = "APP"
}

internal val BDK_NETWORK = Network.REGTEST
internal val LDK_NETWORK get() = org.ldk.enums.Network.LDKNetwork_Regtest
internal const val HOST = "10.0.2.2"
internal const val REST = "https://electrs-regtest.synonym.to"
internal const val SEED = "universe more push obey later jazz huge buzz magnet team muscle robust"
internal val PEER = LnPeer(
 nodeId = "02faf2d1f5dc153e8931d8444c4439e46a81cb7eeadba8562e7fec3690c261ce87",
 host = HOST,
 port = "9736",
)

internal object Env {
 val isDebug = BuildConfig.DEBUG

 object LdkStorage {
 lateinit var path: String

 fun init(base: String): String {
 require(base.isNotEmpty()) { "Base path for LDK storage cannot be empty" }
 return Path(base, Network.ldk.name.lowercase(), "ldk")
 .toFile()
 // .also {
 // if (!it.mkdirs()) throw Error("Cannot create LDK data directory")
 // }
 .absolutePath
 .also {
 path = it
 Log.d(LDK, "Storage path: $it")
 }
 }
 }

 object Network {
 val ldk: LdkNetwork = LdkNetwork.REGTEST
 val bdk = BdkNetwork.REGTEST
 }

 val trustedLnPeers = listOf(
 PEER,
 )

 val ldkRgsServerUrl: String?
 get() = when (Network.ldk) {
 LdkNetwork.BITCOIN -> "https://rapidsync.lightningdevkit.org/snapshot/"
 else -> null
 }
}

data class LnPeer(
 val nodeId: String,
 val host: String,
 val port: String,
) {
 constructor(nodeId: String, address: String) : this(
 nodeId,
 address.substringBefore(":"),
 address.substringAfter(":"),
 )

 fun address() = "$host:$port"
 override fun toString() = "$nodeId@${address()}"
}

65 changes: 1 addition & 64 deletions
app/src/main/java/to/bitkit/LauncherActivity.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,16 +2,11 @@ package to.bitkit

import android.content.Intent
import android.os.Bundle
import android.util.Log
import androidx.appcompat.app.AppCompatActivity
import to.bitkit.bdk.Bdk
import to.bitkit.ldk.Ldk
import to.bitkit.ldk.init
import to.bitkit.ldk.ldkDir
import to.bitkit.ldk.warmupNode
import to.bitkit.ui.MainActivity
import to.bitkit.ui.initNotificationChannel
import to.bitkit.ui.logFcmToken
import java.io.File

class LauncherActivity : AppCompatActivity() {
 override fun onCreate(savedInstanceState: Bundle?) {
Expand All@@ -22,61 +17,3 @@ class LauncherActivity : AppCompatActivity() {
 startActivity(Intent(this, MainActivity::class.java))
 }
}

internal fun warmupNode(absolutePath: String): Boolean {
 initDataDir(absolutePath)

 val latestBlockHeight = Bdk.getHeight()
 val latestBlockHash = Bdk.getBlockHash(latestBlockHeight)

 val channelManagerFile = File("$ldkDir/channel-manager.bin")
 val serializedChannelManager = channelManagerFile
 .takeIf { it.exists() }
 ?.absoluteFile?.readBytes()

 val serializedChannelMonitors = readChannelMonitorFromDisk()

 return Ldk.init(
 Bdk.getLdkEntropy(),
 latestBlockHeight.toInt(),
 latestBlockHash,
 serializedChannelManager,
 serializedChannelMonitors,
 )
}

private fun initDataDir(absolutePath: String) {
 ldkDir = "$absolutePath/bitkit"
 val dir = File(ldkDir)
 if (!dir.exists()) {
 dir.mkdir()
 }

 // Initialize the LDK data directory if necessary.
 ldkDir += "/ldk-data"
 val ldkDirPath = File(ldkDir)
 if (!ldkDirPath.exists()) {
 ldkDirPath.mkdir()
 Log.d(_LDK, "Ldk dir: $ldkDirPath")
 }
}

private fun readChannelMonitorFromDisk(): Array<ByteArray> {
 val channelMonitorDirectory = File("$ldkDir/channels/")
 if (channelMonitorDirectory.isDirectory) {
 val files = channelMonitorDirectory.list()
 if (files.isNullOrEmpty()) {
 return emptyArray()
 }

 val channelMonitorList = mutableListOf<ByteArray>()
 files.forEach {
 channelMonitorList.add(File("${channelMonitorDirectory}/${it}").readBytes())
 }
 return channelMonitorList.toTypedArray()
 }

 channelMonitorDirectory.mkdir()
 Log.d(_LDK, "New channels dir: $channelMonitorDirectory")
 return emptyArray()
}
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 to ldk-node#4

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

ovitrif
merged 9 commits into

from

Jul 26, 2024
 Merged


Migrate to ldk-node
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
92787d6

feat: Migrate to ldk-node


ovitrif Jul 24, 2024
d02f35b

feat: Bitcoin service


ovitrif Jul 24, 2024
7119313

feat: Channels and Payments via ldk-node


ovitrif Jul 25, 2024
ac98f90

feat: Async Channel and Payment ops


ovitrif Jul 25, 2024
e69be71

chore: Update and cleanup deps


ovitrif Jul 25, 2024
910917c

feat: wake2pay + multithreading + working payments + ui revamp


ovitrif Jul 25, 2024
5948bca

feat: Theme base setup


ovitrif Jul 26, 2024
afe5838

feat: Silent error on startup


ovitrif Jul 26, 2024
0050ec6

feat: Regtest server url + structured log tags


ovitrif Jul 26, 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


2 changes: 1 addition & 1 deletion
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,4 @@
local.properties

# Secrets
google-services.json
google-services.json

28 changes: 12 additions & 16 deletions
app/build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,34 +68,30 @@ android {
}

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

 // BDK & LDK
 implementation("org.bitcoindevkit:bdk-android:0.30.0")
 implementation(fileTree("libs") { include("*.aar") })
 // implementation("org.lightningdevkit:ldk-node-jvm:0.3.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.0")
 implementation("androidx.activity:activity-compose:1.9.1")

 // Firebase
 implementation(platform("com.google.firebase:firebase-bom:33.1.2"))
 implementation("com.google.firebase:firebase-messaging")
 implementation("com.google.firebase:firebase-analytics")

 // Lifecycle
 val lifecycleVersion = "2.8.3"
 val lifecycleVersion = "2.8.4"
 // ViewModel
 implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
 // ViewModel utilities for Compose
 implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion")
 // LiveData
 implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")
 // Lifecycles only (without ViewModel or LiveData)
 implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
 // Lifecycle utilities for Compose
 implementation("androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion")
 // Saved state module for ViewModel
 implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:$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

 // Compose Navigation
 val composeNavigationVersion = "2.7.7"
Expand All@@ -121,7 +117,7 @@ dependencies {
 // 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-beta05")
 implementation("androidx.compose.material:material-icons-extended:1.7.0-beta06")

 // Ktor
 val ktorVersion = "2.3.8"
Expand All@@ -142,4 +138,4 @@ dependencies {

 // Other
 implementation("com.google.guava:guava:31.1-android") // for ByteArray.toHex()+
}
}
Empty file addedapp/libs/.gitkeep

View file


Open in desktop


Empty file.

Binary file removedapp/libs/LDK-release.aar

View file


Open in desktop


Binary file not shown.


4 changes: 2 additions & 2 deletions
app/src/main/AndroidManifest.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@
 </activity>

 <service
 android:name=".fcm.MessagingService"
 android:name=".fcm.FcmService"
 android:exported="false">
 <intent-filter>
 <action android:name="com.google.firebase.MESSAGING_EVENT" />
Expand DownExpand Up@@ -63,4 +63,4 @@
 android:name="com.google.firebase.messaging.default_notification_channel_id"
 android:value="@string/app_notifications_channel_id" />
 </application>
</manifest>
</manifest>

79 changes: 72 additions & 7 deletions
app/src/main/java/to/bitkit/Constants.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,76 @@
package to.bitkit

import org.bitcoindevkit.Network
import android.util.Log
import to.bitkit.Tag.LDK
import kotlin.io.path.Path
import org.bitcoindevkit.Network as BdkNetwork
import org.lightningdevkit.ldknode.Network as LdkNetwork

internal const val _DEV = "_DEV"
internal const val _FCM = "_FCM"
internal const val _LDK = "_LDK"
internal const val _BDK = "_BDK"
object Tag {
 internal const val FCM = "FCM"
 internal const val LDK = "LDK"
 internal const val BDK = "BDK"
 internal const val DEV = "DEV"
 internal const val APP = "APP"
}

internal val BDK_NETWORK = Network.REGTEST
internal val LDK_NETWORK get() = org.ldk.enums.Network.LDKNetwork_Regtest
internal const val HOST = "10.0.2.2"
internal const val REST = "https://electrs-regtest.synonym.to"
internal const val SEED = "universe more push obey later jazz huge buzz magnet team muscle robust"
internal val PEER = LnPeer(
 nodeId = "02faf2d1f5dc153e8931d8444c4439e46a81cb7eeadba8562e7fec3690c261ce87",
 host = HOST,
 port = "9736",
)

internal object Env {
 val isDebug = BuildConfig.DEBUG

 object LdkStorage {
 lateinit var path: String

 fun init(base: String): String {
 require(base.isNotEmpty()) { "Base path for LDK storage cannot be empty" }
 return Path(base, Network.ldk.name.lowercase(), "ldk")
 .toFile()
 // .also {
 // if (!it.mkdirs()) throw Error("Cannot create LDK data directory")
 // }
 .absolutePath
 .also {
 path = it
 Log.d(LDK, "Storage path: $it")
 }
 }
 }

 object Network {
 val ldk: LdkNetwork = LdkNetwork.REGTEST
 val bdk = BdkNetwork.REGTEST
 }

 val trustedLnPeers = listOf(
 PEER,
 )

 val ldkRgsServerUrl: String?
 get() = when (Network.ldk) {
 LdkNetwork.BITCOIN -> "https://rapidsync.lightningdevkit.org/snapshot/"
 else -> null
 }
}

data class LnPeer(
 val nodeId: String,
 val host: String,
 val port: String,
) {
 constructor(nodeId: String, address: String) : this(
 nodeId,
 address.substringBefore(":"),
 address.substringAfter(":"),
 )

 fun address() = "$host:$port"
 override fun toString() = "$nodeId@${address()}"
}

65 changes: 1 addition & 64 deletions
app/src/main/java/to/bitkit/LauncherActivity.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,16 +2,11 @@ package to.bitkit

import android.content.Intent
import android.os.Bundle
import android.util.Log
import androidx.appcompat.app.AppCompatActivity
import to.bitkit.bdk.Bdk
import to.bitkit.ldk.Ldk
import to.bitkit.ldk.init
import to.bitkit.ldk.ldkDir
import to.bitkit.ldk.warmupNode
import to.bitkit.ui.MainActivity
import to.bitkit.ui.initNotificationChannel
import to.bitkit.ui.logFcmToken
import java.io.File

class LauncherActivity : AppCompatActivity() {
 override fun onCreate(savedInstanceState: Bundle?) {
Expand All@@ -22,61 +17,3 @@ class LauncherActivity : AppCompatActivity() {
 startActivity(Intent(this, MainActivity::class.java))
 }
}

internal fun warmupNode(absolutePath: String): Boolean {
 initDataDir(absolutePath)

 val latestBlockHeight = Bdk.getHeight()
 val latestBlockHash = Bdk.getBlockHash(latestBlockHeight)

 val channelManagerFile = File("$ldkDir/channel-manager.bin")
 val serializedChannelManager = channelManagerFile
 .takeIf { it.exists() }
 ?.absoluteFile?.readBytes()

 val serializedChannelMonitors = readChannelMonitorFromDisk()

 return Ldk.init(
 Bdk.getLdkEntropy(),
 latestBlockHeight.toInt(),
 latestBlockHash,
 serializedChannelManager,
 serializedChannelMonitors,
 )
}

private fun initDataDir(absolutePath: String) {
 ldkDir = "$absolutePath/bitkit"
 val dir = File(ldkDir)
 if (!dir.exists()) {
 dir.mkdir()
 }

 // Initialize the LDK data directory if necessary.
 ldkDir += "/ldk-data"
 val ldkDirPath = File(ldkDir)
 if (!ldkDirPath.exists()) {
 ldkDirPath.mkdir()
 Log.d(_LDK, "Ldk dir: $ldkDirPath")
 }
}

private fun readChannelMonitorFromDisk(): Array<ByteArray> {
 val channelMonitorDirectory = File("$ldkDir/channels/")
 if (channelMonitorDirectory.isDirectory) {
 val files = channelMonitorDirectory.list()
 if (files.isNullOrEmpty()) {
 return emptyArray()
 }

 val channelMonitorList = mutableListOf<ByteArray>()
 files.forEach {
 channelMonitorList.add(File("${channelMonitorDirectory}/${it}").readBytes())
 }
 return channelMonitorList.toTypedArray()
 }

 channelMonitorDirectory.mkdir()
 Log.d(_LDK, "New channels dir: $channelMonitorDirectory")
 return emptyArray()
}
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 to ldk-node#4

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

ovitrif
merged 9 commits into

from

Jul 26, 2024
 Merged


Migrate to ldk-node
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
92787d6

feat: Migrate to ldk-node


ovitrif Jul 24, 2024
d02f35b

feat: Bitcoin service


ovitrif Jul 24, 2024
7119313

feat: Channels and Payments via ldk-node


ovitrif Jul 25, 2024
ac98f90

feat: Async Channel and Payment ops


ovitrif Jul 25, 2024
e69be71

chore: Update and cleanup deps


ovitrif Jul 25, 2024
910917c

feat: wake2pay + multithreading + working payments + ui revamp


ovitrif Jul 25, 2024
5948bca

feat: Theme base setup


ovitrif Jul 26, 2024
afe5838

feat: Silent error on startup


ovitrif Jul 26, 2024
0050ec6

feat: Regtest server url + structured log tags


ovitrif Jul 26, 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


2 changes: 1 addition & 1 deletion
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,4 @@
local.properties

# Secrets
google-services.json
google-services.json

28 changes: 12 additions & 16 deletions
app/build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,34 +68,30 @@ android {
}

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

 // BDK & LDK
 implementation("org.bitcoindevkit:bdk-android:0.30.0")
 implementation(fileTree("libs") { include("*.aar") })
 // implementation("org.lightningdevkit:ldk-node-jvm:0.3.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.0")
 implementation("androidx.activity:activity-compose:1.9.1")

 // Firebase
 implementation(platform("com.google.firebase:firebase-bom:33.1.2"))
 implementation("com.google.firebase:firebase-messaging")
 implementation("com.google.firebase:firebase-analytics")

 // Lifecycle
 val lifecycleVersion = "2.8.3"
 val lifecycleVersion = "2.8.4"
 // ViewModel
 implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
 // ViewModel utilities for Compose
 implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion")
 // LiveData
 implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")
 // Lifecycles only (without ViewModel or LiveData)
 implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
 // Lifecycle utilities for Compose
 implementation("androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion")
 // Saved state module for ViewModel
 implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:$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

 // Compose Navigation
 val composeNavigationVersion = "2.7.7"
Expand All@@ -121,7 +117,7 @@ dependencies {
 // 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-beta05")
 implementation("androidx.compose.material:material-icons-extended:1.7.0-beta06")

 // Ktor
 val ktorVersion = "2.3.8"
Expand All@@ -142,4 +138,4 @@ dependencies {

 // Other
 implementation("com.google.guava:guava:31.1-android") // for ByteArray.toHex()+
}
}
Empty file addedapp/libs/.gitkeep

View file


Open in desktop


Empty file.

Binary file removedapp/libs/LDK-release.aar

View file


Open in desktop


Binary file not shown.


4 changes: 2 additions & 2 deletions
app/src/main/AndroidManifest.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@
 </activity>

 <service
 android:name=".fcm.MessagingService"
 android:name=".fcm.FcmService"
 android:exported="false">
 <intent-filter>
 <action android:name="com.google.firebase.MESSAGING_EVENT" />
Expand DownExpand Up@@ -63,4 +63,4 @@
 android:name="com.google.firebase.messaging.default_notification_channel_id"
 android:value="@string/app_notifications_channel_id" />
 </application>
</manifest>
</manifest>

79 changes: 72 additions & 7 deletions
app/src/main/java/to/bitkit/Constants.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,76 @@
package to.bitkit

import org.bitcoindevkit.Network
import android.util.Log
import to.bitkit.Tag.LDK
import kotlin.io.path.Path
import org.bitcoindevkit.Network as BdkNetwork
import org.lightningdevkit.ldknode.Network as LdkNetwork

internal const val _DEV = "_DEV"
internal const val _FCM = "_FCM"
internal const val _LDK = "_LDK"
internal const val _BDK = "_BDK"
object Tag {
 internal const val FCM = "FCM"
 internal const val LDK = "LDK"
 internal const val BDK = "BDK"
 internal const val DEV = "DEV"
 internal const val APP = "APP"
}

internal val BDK_NETWORK = Network.REGTEST
internal val LDK_NETWORK get() = org.ldk.enums.Network.LDKNetwork_Regtest
internal const val HOST = "10.0.2.2"
internal const val REST = "https://electrs-regtest.synonym.to"
internal const val SEED = "universe more push obey later jazz huge buzz magnet team muscle robust"
internal val PEER = LnPeer(
 nodeId = "02faf2d1f5dc153e8931d8444c4439e46a81cb7eeadba8562e7fec3690c261ce87",
 host = HOST,
 port = "9736",
)

internal object Env {
 val isDebug = BuildConfig.DEBUG

 object LdkStorage {
 lateinit var path: String

 fun init(base: String): String {
 require(base.isNotEmpty()) { "Base path for LDK storage cannot be empty" }
 return Path(base, Network.ldk.name.lowercase(), "ldk")
 .toFile()
 // .also {
 // if (!it.mkdirs()) throw Error("Cannot create LDK data directory")
 // }
 .absolutePath
 .also {
 path = it
 Log.d(LDK, "Storage path: $it")
 }
 }
 }

 object Network {
 val ldk: LdkNetwork = LdkNetwork.REGTEST
 val bdk = BdkNetwork.REGTEST
 }

 val trustedLnPeers = listOf(
 PEER,
 )

 val ldkRgsServerUrl: String?
 get() = when (Network.ldk) {
 LdkNetwork.BITCOIN -> "https://rapidsync.lightningdevkit.org/snapshot/"
 else -> null
 }
}

data class LnPeer(
 val nodeId: String,
 val host: String,
 val port: String,
) {
 constructor(nodeId: String, address: String) : this(
 nodeId,
 address.substringBefore(":"),
 address.substringAfter(":"),
 )

 fun address() = "$host:$port"
 override fun toString() = "$nodeId@${address()}"
}

65 changes: 1 addition & 64 deletions
app/src/main/java/to/bitkit/LauncherActivity.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,16 +2,11 @@ package to.bitkit

import android.content.Intent
import android.os.Bundle
import android.util.Log
import androidx.appcompat.app.AppCompatActivity
import to.bitkit.bdk.Bdk
import to.bitkit.ldk.Ldk
import to.bitkit.ldk.init
import to.bitkit.ldk.ldkDir
import to.bitkit.ldk.warmupNode
import to.bitkit.ui.MainActivity
import to.bitkit.ui.initNotificationChannel
import to.bitkit.ui.logFcmToken
import java.io.File

class LauncherActivity : AppCompatActivity() {
 override fun onCreate(savedInstanceState: Bundle?) {
Expand All@@ -22,61 +17,3 @@ class LauncherActivity : AppCompatActivity() {
 startActivity(Intent(this, MainActivity::class.java))
 }
}

internal fun warmupNode(absolutePath: String): Boolean {
 initDataDir(absolutePath)

 val latestBlockHeight = Bdk.getHeight()
 val latestBlockHash = Bdk.getBlockHash(latestBlockHeight)

 val channelManagerFile = File("$ldkDir/channel-manager.bin")
 val serializedChannelManager = channelManagerFile
 .takeIf { it.exists() }
 ?.absoluteFile?.readBytes()

 val serializedChannelMonitors = readChannelMonitorFromDisk()

 return Ldk.init(
 Bdk.getLdkEntropy(),
 latestBlockHeight.toInt(),
 latestBlockHash,
 serializedChannelManager,
 serializedChannelMonitors,
 )
}

private fun initDataDir(absolutePath: String) {
 ldkDir = "$absolutePath/bitkit"
 val dir = File(ldkDir)
 if (!dir.exists()) {
 dir.mkdir()
 }

 // Initialize the LDK data directory if necessary.
 ldkDir += "/ldk-data"
 val ldkDirPath = File(ldkDir)
 if (!ldkDirPath.exists()) {
 ldkDirPath.mkdir()
 Log.d(_LDK, "Ldk dir: $ldkDirPath")
 }
}

private fun readChannelMonitorFromDisk(): Array<ByteArray> {
 val channelMonitorDirectory = File("$ldkDir/channels/")
 if (channelMonitorDirectory.isDirectory) {
 val files = channelMonitorDirectory.list()
 if (files.isNullOrEmpty()) {
 return emptyArray()
 }

 val channelMonitorList = mutableListOf<ByteArray>()
 files.forEach {
 channelMonitorList.add(File("${channelMonitorDirectory}/${it}").readBytes())
 }
 return channelMonitorList.toTypedArray()
 }

 channelMonitorDirectory.mkdir()
 Log.d(_LDK, "New channels dir: $channelMonitorDirectory")
 return emptyArray()
}
Loading