Support taproot channels (#758)

This commit upgrades lightning-kmp to v1.11.0, which brings taproot
channels to Phoenix. It also updates kotlin and cleans up legacy code.

Notably, the tools for the legacy channel data backup have been
removed, and the import-channel-data helper can be removed.

The spend-from-channel-address screen has been disabled. The
import-channel-data screen is obsolete and has been removed.

* Use abstract payerKey and payerNote in offer metadata

See ACINQ/lightning-kmp#821

Also limit the description input to 64 chars for Bolt12 offers
as the description + payer note cannot exceed 64 chars.

---------

Co-authored-by: Robbie Hanson <[email protected]>

Author: dpad85

build.gradle.kts

@@ -19,6 +19,7 @@ allprojects {
         google()
         mavenCentral()
         maven("https://oss.sonatype.org/content/repositories/snapshots")
+        maven("https://central.sonatype.com/repository/maven-snapshots")
     }
 }
 

gradle/libs.versions.toml

@@ -1,11 +1,12 @@
 [versions]
-lightningkmp = "1.10.8"
-secp256k1 = "0.19.0" # keep in check with lightning-kmp secp version
+lightningkmp = "1.11.0"
+secp256k1 = "0.21.0" # keep in check with lightning-kmp secp version
 
 kotlin = "2.2.10"
 ktor = "3.1.0"
 sqldelight = "2.1.0"
 okio = "3.15.0"
+serialization = "1.9.0" # keep in check with lightning-kmp serialization version
 
 # iOS
 skie = "0.10.6"

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/components/CalendarView.kt

@@ -35,11 +35,13 @@ import fr.acinq.phoenix.android.components.dialogs.Dialog
 import fr.acinq.phoenix.android.utils.converters.DateFormatter.toAbsoluteDateString
 import fr.acinq.phoenix.android.utils.mutedBgColor
 import kotlinx.datetime.*
+import kotlin.time.ExperimentalTime
 
 /**
  * Calendar component to pick a day. [onDateSelected] returns the timestamp in millis at the
  * **start** of day.
  */
+@OptIn(ExperimentalTime::class)
 @Composable
 fun CalendarView(
     label: String,

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/navigation/NavGraphSettingsChannels.kt

@@ -24,7 +24,6 @@ import fr.acinq.phoenix.android.AppViewModel
 import fr.acinq.phoenix.android.settings.MutualCloseView
 import fr.acinq.phoenix.android.settings.channels.ChannelDetailsView
 import fr.acinq.phoenix.android.settings.channels.ChannelsView
-import fr.acinq.phoenix.android.settings.channels.ImportChannelsData
 import fr.acinq.phoenix.android.settings.channels.SpendFromChannelAddress
 
 fun NavGraphBuilder.channelsNavGraph(navController: NavController, appViewModel: AppViewModel) {
@@ -56,12 +55,8 @@ fun NavGraphBuilder.channelsNavGraph(navController: NavController, appViewModel:
         ChannelDetailsView(business = business, onBackClick = { navController.popBackStack() }, channelId = channelId)
     }
 
-    businessComposable(Screen.BusinessNavGraph.ImportChannelsData.route, appViewModel) { _, _, business ->
-        ImportChannelsData(business = business, onBackClick = { navController.popBackStack() })
-    }
-
     businessComposable(Screen.BusinessNavGraph.SpendChannelAddress.route, appViewModel) { _, _, business ->
-        SpendFromChannelAddress(business = business, onBackClick = { navController.popBackStack() })
+        // SpendFromChannelAddress(business = business, onBackClick = { navController.popBackStack() })
     }
 
     businessComposable(Screen.BusinessNavGraph.MutualClose.route, appViewModel) { _, walletId, business ->

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/details/PaymentLine.kt

@@ -31,8 +31,6 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/details/PaymentTechnicalView.kt

@@ -160,7 +160,7 @@ fun Bolt11InvoiceSection(
         TechnicalRowAmount(label = stringResource(id = R.string.paymentdetails_invoice_requested_label), amount = it, rateThen = originalFiatRate)
     }
     (invoice.description ?: invoice.descriptionHash?.toHex())?.takeIf { it.isNotBlank() }?.let {
-        TechnicalRowSelectable(label = stringResource(id = R.string.paymentdetails_bolt11_description_label), value = it)
+        TechnicalRowWithCopy(label = stringResource(id = R.string.paymentdetails_bolt11_description_label), value = it)
     }
     TechnicalRowWithCopy(label = stringResource(id = R.string.paymentdetails_payment_hash_label), value = invoice.paymentHash.toHex())
     preimage?.let { TechnicalRowWithCopy(label = stringResource(id = R.string.paymentdetails_preimage_label), value = preimage.toHex(), helpMessage = stringResource(id = R.string.paymentdetails_preimage_help)) }
@@ -178,13 +178,13 @@ fun Bolt12InvoiceSection(
         TechnicalRowAmount(label = stringResource(id = R.string.paymentdetails_invoice_requested_label), amount = it, rateThen = originalFiatRate)
     }
     invoice.description?.takeIf { it.isNotBlank() }?.let {
-        TechnicalRowSelectable(label = stringResource(id = R.string.paymentdetails_bolt11_description_label), value = it)
+        TechnicalRowWithCopy(label = stringResource(id = R.string.paymentdetails_bolt11_description_label), value = it)
     }
     TechnicalRow(label = stringResource(id = R.string.paymentdetails_payerkey_label)) {
         Text(text = payerKey.toHex())
         val nodeParamsManager = LocalBusiness.current?.nodeParamsManager
         val offerPayerKey by produceState<PrivateKey?>(initialValue = null, key1 = nodeParamsManager) {
-            value = nodeParamsManager?.defaultOffer()?.payerKey
+            value = nodeParamsManager?.defaultOffer()?.privateKey
         }
         if (offerPayerKey != null && payerKey == offerPayerKey) {
             Spacer(modifier = Modifier.heightIn(4.dp))

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/details/splash/SplashIncomingBolt12.kt

@@ -33,7 +33,6 @@ import fr.acinq.bitcoin.PublicKey
 import fr.acinq.lightning.db.Bolt12IncomingPayment
 import fr.acinq.lightning.utils.UUID
 import fr.acinq.phoenix.PhoenixBusiness
-import fr.acinq.phoenix.android.LocalBusiness
 import fr.acinq.phoenix.android.R
 import fr.acinq.phoenix.android.components.layouts.SplashLabelRow
 import fr.acinq.phoenix.android.components.contact.ContactCompactView

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/details/technical/TechnicalIncomingBolt12.kt

@@ -30,6 +30,7 @@ import fr.acinq.phoenix.android.payments.details.TechnicalRowWithCopy
 import fr.acinq.phoenix.android.payments.details.TimestampSection
 import fr.acinq.phoenix.android.utils.converters.MSatDisplayPolicy
 import fr.acinq.phoenix.data.ExchangeRate
+import fr.acinq.phoenix.utils.extensions.description
 
 @Composable
 fun TechnicalIncomingBolt12(
@@ -75,10 +76,13 @@ fun IncomingBolt12Details(
         amount = metadata.amount,
         rateThen = originalFiatRate
     )
+    metadata.description?.let { description ->
+        TechnicalRowWithCopy(label = stringResource(id = R.string.paymentdetails_bolt12_description_label), value = description)
+    }
     TechnicalRowWithCopy(label = stringResource(id = R.string.paymentdetails_payment_hash_label), value = metadata.paymentHash.toHex())
     TechnicalRowWithCopy(label = stringResource(id = R.string.paymentdetails_preimage_label), value = metadata.preimage.toHex())
     TechnicalRowWithCopy(label = stringResource(id = R.string.paymentdetails_offer_metadata_label), value = metadata.encode().toHex())
-    if (metadata is OfferPaymentMetadata.V1) {
-        TechnicalRowSelectable(label = stringResource(id = R.string.paymentdetails_payerkey_label), value = metadata.payerKey.toHex())
+    metadata.payerKey?.let { payerKey ->
+        TechnicalRowSelectable(label = stringResource(id = R.string.paymentdetails_payerkey_label), value = payerKey.toHex())
     }
 }

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/history/PaymentsHistoryView.kt

@@ -52,15 +52,18 @@ import fr.acinq.phoenix.android.utils.logger
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.map
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 import kotlinx.datetime.Month
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.daysUntil
 import kotlinx.datetime.toInstant
+import kotlinx.datetime.toJavaDayOfWeek
+import kotlinx.datetime.toJavaMonth
 import kotlinx.datetime.toKotlinLocalDateTime
 import kotlinx.datetime.toLocalDateTime
 import java.time.format.TextStyle
 import java.util.Locale
+import kotlin.time.ExperimentalTime
 
 
 private sealed class PaymentsGroup {
@@ -94,6 +97,7 @@ private sealed class PaymentsGroup {
     }
 }
 
+@OptIn(ExperimentalTime::class)
 @Composable
 fun PaymentsHistoryView(
     onBackClick: () -> Unit,
@@ -111,7 +115,7 @@ fun PaymentsHistoryView(
 
     val groupedPayments = remember(payments) {
         val timezone = TimeZone.currentSystemDefault()
-        val (todaysDayOfWeek, today) = java.time.LocalDate.now().atTime(23, 59, 59).toKotlinLocalDateTime().let { it.dayOfWeek to it.toInstant(timezone) }
+        val (todaysDayOfWeek, today) = java.time.LocalDate.now().atTime(23, 59, 59).toKotlinLocalDateTime().let { it.dayOfWeek.toJavaDayOfWeek() to it.toInstant(timezone) }
         payments.values.groupBy {
             val paymentInstant = Instant.fromEpochMilliseconds(it.payment.createdAt)
             val daysElapsed = paymentInstant.daysUntil(today, timezone)
@@ -189,7 +193,7 @@ fun PaymentsHistoryView(
                                         PaymentsGroup.Yesterday -> stringResource(id = R.string.payments_history_yesterday)
                                         PaymentsGroup.ThisWeek -> stringResource(id = R.string.payments_history_thisweek)
                                         PaymentsGroup.LastWeek -> stringResource(id = R.string.payments_history_lastweek)
-                                        is PaymentsGroup.Other -> "${header.month.getDisplayName(TextStyle.FULL, Locale.getDefault()).uppercase()} ${header.year}"
+                                        is PaymentsGroup.Other -> "${header.month.toJavaMonth().getDisplayName(TextStyle.FULL, Locale.getDefault()).uppercase()} ${header.year}"
                                     },
                                 )
                                 Spacer(modifier = Modifier.height(8.dp))

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/receive/ReceiveLightningView.kt

@@ -383,7 +383,7 @@ private fun EditInvoiceView(
                 onTextChange = onDescriptionChange,
                 staticLabel = stringResource(id = R.string.receive_lightning_edit_desc_label),
                 placeholder = { Text(text = stringResource(id = R.string.receive_lightning_edit_desc_placeholder), maxLines = 2, overflow = TextOverflow.Ellipsis) },
-                maxChars = 140,
+                maxChars = if (isReusable) 64 else 140,
                 minLines = 2,
                 maxLines = Int.MAX_VALUE,
                 modifier = Modifier.fillMaxWidth(),