Skip to content

Follow-up to #236 #237

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

Open
pm47 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Follow-up to #236 #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53a9418
better handling of initial events
pm47 Jul 10, 2026
67d1a5b
fixup: display swap-in fees in sat
pm47 Jul 10, 2026
d1be273
use lightning-kmp 1.13.0
pm47 Jul 10, 2026
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 gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kotlinx-io = "0.9.0"
clikt = "5.1.0"
ktor = "3.4.1"
sqldelight = "2.2.1"
lightningkmp = "1.12.1-SNAPSHOT"
lightningkmp = "1.13.0"
kermit-io = "2.0.8"

# test dependencies
Expand Down
14 changes: 8 additions & 6 deletions src/commonMain/kotlin/fr/acinq/phoenixd/Phoenixd.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,8 +352,9 @@ class Phoenixd : CliktCommand() {

val listeners = scope.launch {
launch {
// drop initial CLOSED event
peer.connectionState.dropWhile { it is Connection.CLOSED }.collect {
peer.connectionState
.dropWhile { it is Connection.CLOSED } // drop initial CLOSED event
.collect {
when (it) {
Connection.ESTABLISHING -> consoleLog(yellow("connecting to lightning peer..."))
Connection.ESTABLISHED -> consoleLog(yellow("connected to lightning peer"))
Expand All @@ -364,7 +365,7 @@ class Phoenixd : CliktCommand() {
if (blockchainClient is ElectrumClient) {
launch {
blockchainClient.connectionStatus
.drop(1) // we drop the initial value which a disconnection event
.dropWhile { it is ElectrumConnectionStatus.Closed } // drop initial CLOSED event
.collect {
when (it) {
is ElectrumConnectionStatus.Connecting -> consoleLog(yellow("connecting to electrum server ${it.serverAddress.host}:${it.serverAddress.port}..."))
Expand All @@ -384,7 +385,8 @@ class Phoenixd : CliktCommand() {
currentBlockHeight = currentBlockHeight,
swapInParams = peer.walletParams.swapInParams
)
}.drop(1)
}
.dropWhile { it == WalletState(emptyMap()) } // drop the initial event
.map { wallet -> Triple(wallet.unconfirmed.balance, wallet.weaklyConfirmed.balance, wallet.deeplyConfirmed.balance) }
.distinctUntilChanged()
.collect { (unconfirmedBalance, weaklyConfirmedBalance, deeplyConfirmedBalance) -> consoleLog("swap-in wallet: unconfirmed=$unconfirmedBalance weaklyConfirmed=$weaklyConfirmedBalance deeplyConfirmed=$deeplyConfirmedBalance") }
Expand All @@ -404,7 +406,7 @@ class Phoenixd : CliktCommand() {
consoleLog("received lightning payment: ${payment.amount.truncateToSatoshi()} ($type${if (fee > 0.sat) " fee=$fee" else ""})")
}
is OnChainIncomingPayment -> {
consoleLog("received on-chain payment: ${payment.amount.truncateToSatoshi()} (fee=${payment.fees})")
consoleLog("received on-chain payment: ${payment.amount.truncateToSatoshi()} (fee=${payment.fees.truncateToSatoshi()})")
}
else -> {}
}
Expand Down Expand Up @@ -452,7 +454,7 @@ class Phoenixd : CliktCommand() {
}
launch {
peer.feeCreditFlow
.drop(1) // we drop the initial value which is 0 msat
.dropWhile { it == 0.msat } // we drop the initial value which is 0 msat
.collect { feeCredit -> consoleLog("fee credit: ${feeCredit.truncateToSatoshi()}") }
}
}
Expand Down