Merge branch 'master' into mainnet

dpad85 · dpad85 · commit c30d72e8830e · 2025-09-24T18:10:22.000+02:00
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-lightningkmp = "1.10.7"
-secp256k1 = "0.18.0" # keep in check with lightning-kmp secp version
+lightningkmp = "1.10.8"
+secp256k1 = "0.19.0" # keep in check with lightning-kmp secp version
 
 kotlin = "2.1.10"
 ktor = "3.1.0"
diff --git a/phoenix-android/build.gradle.kts b/phoenix-android/build.gradle.kts
@@ -26,8 +26,8 @@ android {
         applicationId = "fr.acinq.phoenix.mainnet"
         minSdk = 26
         targetSdk = 35
-        versionCode = 108
-        versionName = "2.6.5"
+        versionCode = 109
+        versionName = gitCommitHash()
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/send/cpfp/CpfpView.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/send/cpfp/CpfpView.kt
@@ -66,7 +66,8 @@ fun CpfpView(
     val vm = viewModel<CpfpViewModel>(factory = CpfpViewModel.Factory(peerManager))
     val mempoolFeerate by business.appConfigurationManager.mempoolFeerate.collectAsState()
 
-    var feerate by remember { mutableStateOf(mempoolFeerate?.halfHour?.feerate ?: 10.sat) }
+    val recommendedFeerate by peerManager.recommendedFeerateFlow.collectAsState()
+    var feerate by remember { mutableStateOf(recommendedFeerate.feerate) }
 
     Column(
         modifier = Modifier.padding(horizontal = 24.dp),
diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/send/spliceout/SpliceOutView.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/send/spliceout/SpliceOutView.kt
@@ -29,7 +29,6 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
@@ -72,12 +71,13 @@ fun SendSpliceOutView(
     val keyboardManager = LocalSoftwareKeyboardController.current
 
     val peerManager = business.peerManager
+    val recommendedFeerate by peerManager.recommendedFeerateFlow.collectAsState()
     val mempoolFeerate by business.appConfigurationManager.mempoolFeerate.collectAsState()
     val balance = business.balanceManager.balance.collectAsState(null).value
     val mayDoPayments by business.peerManager.mayDoPayments.collectAsState()
     val vm = viewModel<SpliceOutViewModel>(factory = SpliceOutViewModel.Factory(peerManager, business.chain))
 
-    var feerate by remember { mutableStateOf(mempoolFeerate?.halfHour?.feerate ?: 3.sat) }
+    var feerate by remember { mutableStateOf(recommendedFeerate.feerate) }
     var amount by remember { mutableStateOf(requestedAmount) }
     var amountErrorMessage by remember { mutableStateOf("") }
 
diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/settings/MutualCloseView.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/settings/MutualCloseView.kt
@@ -94,7 +94,8 @@ fun MutualCloseView(
     var address by remember { mutableStateOf("") }
     var addressErrorMessage by remember { mutableStateOf<String?>(null) }
     val mempoolFeerate by business.appConfigurationManager.mempoolFeerate.collectAsState()
-    var feerate by remember { mutableStateOf(mempoolFeerate?.halfHour?.feerate ?: 3.sat) }
+    val recommendedFeerate by business.peerManager.recommendedFeerateFlow.collectAsState()
+    var feerate by remember { mutableStateOf(recommendedFeerate.feerate) }
 
     var showScannerView by remember { mutableStateOf(false) }
     var showConfirmationDialog by remember { mutableStateOf(false) }
diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/settings/fees/LiquidityPolicyView.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/settings/fees/LiquidityPolicyView.kt
@@ -212,7 +212,6 @@ private fun EditMaxFee(
                         )
                     }
                 }
-
             }
             Spacer(Modifier.width(12.dp))
             InlineSatoshiInput(
diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/settings/walletinfo/FinalWalletRefundView.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/settings/walletinfo/FinalWalletRefundView.kt
@@ -152,7 +152,8 @@ private fun ColumnScope.AvailableForRefund(
     val mempoolFeerate by business.appConfigurationManager.mempoolFeerate.collectAsState()
 
     var address by remember { mutableStateOf("") }
-    var feerate by remember { mutableStateOf(mempoolFeerate?.halfHour?.feerate ?: 3.sat) }
+    val recommendedFeerate by business.peerManager.recommendedFeerateFlow.collectAsState()
+    var feerate by remember { mutableStateOf(recommendedFeerate.feerate) }
 
     var showScannerView by remember { mutableStateOf(false) }
 
diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/settings/walletinfo/SwapInRefundView.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/settings/walletinfo/SwapInRefundView.kt
@@ -112,7 +112,8 @@ private fun AvailableForRefundView(
     var showScannerView by remember { mutableStateOf(false) }
 
     val mempoolFeerate by business.appConfigurationManager.mempoolFeerate.collectAsState()
-    var feerate by remember { mutableStateOf(mempoolFeerate?.halfHour?.feerate ?: 3.sat) }
+    val recommendedFeerate by peerManager.recommendedFeerateFlow.collectAsState()
+    var feerate by remember { mutableStateOf(recommendedFeerate.feerate) }
 
     if (showScannerView) {
         SwapInRefundScanner(
diff --git a/phoenix-ios/phoenix-ios.xcodeproj/project.pbxproj b/phoenix-ios/phoenix-ios.xcodeproj/project.pbxproj
@@ -2519,7 +2519,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Green";
 				CODE_SIGN_ENTITLEMENTS = "phoenix-ios/Phoenix.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 94;
+				CURRENT_PROJECT_VERSION = 95;
 				DEVELOPMENT_ASSET_PATHS = "\"phoenix-ios/Preview Content\"";
 				DEVELOPMENT_TEAM = XD77LN4376;
 				ENABLE_PREVIEWS = YES;
@@ -2543,7 +2543,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Green";
 				CODE_SIGN_ENTITLEMENTS = "phoenix-ios/Phoenix.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 94;
+				CURRENT_PROJECT_VERSION = 95;
 				DEVELOPMENT_ASSET_PATHS = "\"phoenix-ios/Preview Content\"";
 				DEVELOPMENT_TEAM = XD77LN4376;
 				ENABLE_PREVIEWS = YES;
@@ -2641,7 +2641,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_ENTITLEMENTS = "phoenix-notifySrvExt/phoenix-notifySrvExt.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 94;
+				CURRENT_PROJECT_VERSION = 95;
 				DEVELOPMENT_TEAM = XD77LN4376;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "phoenix-notifySrvExt/Info.plist";
@@ -2668,7 +2668,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_ENTITLEMENTS = "phoenix-notifySrvExt/phoenix-notifySrvExt.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 94;
+				CURRENT_PROJECT_VERSION = 95;
 				DEVELOPMENT_TEAM = XD77LN4376;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "phoenix-notifySrvExt/Info.plist";
diff --git a/phoenix-shared/src/commonMain/kotlin/fr.acinq.phoenix/managers/PeerManager.kt b/phoenix-shared/src/commonMain/kotlin/fr.acinq.phoenix/managers/PeerManager.kt
@@ -1,7 +1,6 @@
 package fr.acinq.phoenix.managers
 
 import fr.acinq.bitcoin.ByteVector32
-import fr.acinq.bitcoin.Crypto
 import fr.acinq.lightning.CltvExpiryDelta
 import fr.acinq.lightning.DefaultSwapInParams
 import fr.acinq.lightning.InvoiceDefaultRoutingFees
@@ -18,6 +17,7 @@ import fr.acinq.lightning.blockchain.electrum.IElectrumClient
 import fr.acinq.lightning.blockchain.electrum.SwapInManager
 import fr.acinq.lightning.blockchain.electrum.SwapInWallet
 import fr.acinq.lightning.blockchain.electrum.WalletState
+import fr.acinq.lightning.blockchain.fee.FeeratePerByte
 import fr.acinq.lightning.channel.states.ChannelStateWithCommitments
 import fr.acinq.lightning.channel.states.Normal
 import fr.acinq.lightning.channel.states.Offline
@@ -28,8 +28,6 @@ import fr.acinq.lightning.payment.LiquidityPolicy
 import fr.acinq.lightning.utils.Connection
 import fr.acinq.lightning.utils.msat
 import fr.acinq.lightning.utils.sat
-import fr.acinq.lightning.wire.InitTlv
-import fr.acinq.lightning.wire.TlvStream
 import fr.acinq.phoenix.PhoenixBusiness
 import fr.acinq.phoenix.data.LocalChannelInfo
 import fr.acinq.phoenix.utils.extensions.isTerminated
@@ -126,6 +124,23 @@ class PeerManager(
         initialValue = null,
     )
 
+    /**
+     * Provides a recommended fee rate for various user operations in the app (e.g., splice-out, simple close, cpfp).
+     * Returns the mempool.space half-hour estimation if available, falls back to the peer funding feerate if not, and worst case, returns a static base value of 3s/vb.
+     */
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val recommendedFeerateFlow = peerState.filterNotNull().flatMapLatest { peer ->
+        combine(configurationManager.mempoolFeerate, peer.peerFeeratesFlow) { mempoolFeerate, peerFeerates ->
+            mempoolFeerate?.halfHour
+                ?: peerFeerates?.fundingFeerate?.let { FeeratePerByte(it) }
+                ?: FeeratePerByte(3.sat)
+        }
+    }.stateIn(
+        scope = this,
+        started = SharingStarted.Eagerly,
+        initialValue = FeeratePerByte(3.sat)
+    )
+
     @OptIn(ExperimentalCoroutinesApi::class)
     val swapInNextTimeout = swapInWallet.filterNotNull().mapLatest { it.nextTimeout }
 

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,6 @@ private fun EditMaxFee(`
`212`	`212`	`)`
`213`	`213`	`}`
`214`	`214`	`}`
`215`		`-`
`216`	`215`	`}`
`217`	`216`	`Spacer(Modifier.width(12.dp))`
`218`	`217`	`InlineSatoshiInput(`