diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index e11cee1..5d96b3b 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,6 +1,6 @@
 object Versions {
     val kotlin = "1.9.23"
-    val lightningKmp = "1.6.2-FEECREDIT-7"
+    val lightningKmp = "1.7.0-FEECREDIT-8"
     val sqlDelight = "2.0.1"
     val okio = "3.8.0"
     val clikt = "4.2.2"
diff --git a/src/commonMain/kotlin/fr/acinq/lightning/bin/Api.kt b/src/commonMain/kotlin/fr/acinq/lightning/bin/Api.kt
index 885b9c9..d31254f 100644
--- a/src/commonMain/kotlin/fr/acinq/lightning/bin/Api.kt
+++ b/src/commonMain/kotlin/fr/acinq/lightning/bin/Api.kt
@@ -97,6 +97,7 @@ class Api(private val nodeParams: NodeParams, private val peer: Peer, private va
                         nodeId = nodeParams.nodeId,
                         channels = peer.channels.values.map { Channel.from(it) },
                         chain = nodeParams.chain.name.lowercase(),
+                        blockHeight = peer.currentTipFlow.value,
                         version = BuildVersions.phoenixdVersion
                     )
                     call.respond(info)
diff --git a/src/commonMain/kotlin/fr/acinq/lightning/bin/db/payments/IncomingOriginType.kt b/src/commonMain/kotlin/fr/acinq/lightning/bin/db/payments/IncomingOriginType.kt
index 3650a11..f856362 100644
--- a/src/commonMain/kotlin/fr/acinq/lightning/bin/db/payments/IncomingOriginType.kt
+++ b/src/commonMain/kotlin/fr/acinq/lightning/bin/db/payments/IncomingOriginType.kt
@@ -36,7 +36,6 @@ import kotlinx.serialization.json.Json
 
 
 enum class IncomingOriginTypeVersion {
-    KEYSEND_V0,
     INVOICE_V0,
     SWAPIN_V0,
     ONCHAIN_V0,
@@ -44,12 +43,6 @@ enum class IncomingOriginTypeVersion {
 
 sealed class IncomingOriginData {
 
-    sealed class KeySend : IncomingOriginData() {
-        @Serializable
-        @SerialName("KEYSEND_V0")
-        object V0 : KeySend()
-    }
-
     sealed class Invoice : IncomingOriginData() {
         @Serializable
         data class V0(val paymentRequest: String) : Invoice()
@@ -68,20 +61,15 @@ sealed class IncomingOriginData {
     companion object {
         fun deserialize(typeVersion: IncomingOriginTypeVersion, blob: ByteArray): IncomingPayment.Origin = decodeBlob(blob) { json, format ->
             when (typeVersion) {
-                IncomingOriginTypeVersion.KEYSEND_V0 -> IncomingPayment.Origin.KeySend
                 IncomingOriginTypeVersion.INVOICE_V0 -> format.decodeFromString<Invoice.V0>(json).let { IncomingPayment.Origin.Invoice(Bolt11Invoice.read(it.paymentRequest).get()) }
                 IncomingOriginTypeVersion.SWAPIN_V0 -> format.decodeFromString<SwapIn.V0>(json).let { IncomingPayment.Origin.SwapIn(it.address) }
-                IncomingOriginTypeVersion.ONCHAIN_V0 -> format.decodeFromString<OnChain.V0>(json).let {
-                    IncomingPayment.Origin.OnChain(TxId(it.txId), it.outpoints.toSet())
-                }
+                IncomingOriginTypeVersion.ONCHAIN_V0 -> format.decodeFromString<OnChain.V0>(json).let { IncomingPayment.Origin.OnChain(TxId(it.txId), it.outpoints.toSet()) }
             }
         }
     }
 }
 
 fun IncomingPayment.Origin.mapToDb(): Pair<IncomingOriginTypeVersion, ByteArray> = when (this) {
-    is IncomingPayment.Origin.KeySend -> IncomingOriginTypeVersion.KEYSEND_V0 to
-            Json.encodeToString(IncomingOriginData.KeySend.V0).toByteArray(Charsets.UTF_8)
     is IncomingPayment.Origin.Invoice -> IncomingOriginTypeVersion.INVOICE_V0 to
             Json.encodeToString(IncomingOriginData.Invoice.V0(paymentRequest.write())).toByteArray(Charsets.UTF_8)
     is IncomingPayment.Origin.SwapIn -> IncomingOriginTypeVersion.SWAPIN_V0 to
diff --git a/src/commonMain/kotlin/fr/acinq/lightning/bin/json/JsonSerializers.kt b/src/commonMain/kotlin/fr/acinq/lightning/bin/json/JsonSerializers.kt
index a7ddf43..95a4802 100644
--- a/src/commonMain/kotlin/fr/acinq/lightning/bin/json/JsonSerializers.kt
+++ b/src/commonMain/kotlin/fr/acinq/lightning/bin/json/JsonSerializers.kt
@@ -61,6 +61,7 @@ sealed class ApiType {
         val nodeId: PublicKey,
         val channels: List<Channel>,
         val chain: String,
+        val blockHeight: Int?,
         val version: String
     )