Improve swap-in protocol with taproot and musig2

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 
 allprojects {
     group = "fr.acinq.lightning"
-    version = "1.6-SNAPSHOT"
+    version = "1.6-SWAPIN2-SNAPSHOT"
 
     repositories {
         // using the local maven repository with Kotlin Multi Platform can lead to build errors that are hard to diagnose.
@@ -27,8 +27,8 @@ val currentOs = org.gradle.internal.os.OperatingSystem.current()
 
 kotlin {
 
-    val bitcoinKmpVersion = "0.16.0" // when upgrading bitcoin-kmp, keep secpJniJvmVersion in sync!
-    val secpJniJvmVersion = "0.13.0"
+    val bitcoinKmpVersion = "0.17.0-MUSIG2-SNAPSHOT" // when upgrading bitcoin-kmp, keep secpJniJvmVersion in sync!
+    val secpJniJvmVersion = "0.14.0-MUSIG2-SNAPSHOT"
 
     val serializationVersion = "1.6.2"
     val coroutineVersion = "1.7.3"
@@ -138,6 +138,11 @@ kotlin {
             languageSettings.optIn("kotlin.ExperimentalStdlibApi")
         }
     }
+
+    configurations.all {
+        // do not cache changing (i.e. SNAPSHOT) dependencies
+        resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS)
+    }
 
     targets.all {
         compilations.all {

publishing/lightning-kmp-snapshot-deploy.sh

@@ -21,9 +21,9 @@ mvn deploy:deploy-file -DrepositoryId=ossrh -Durl=https://oss.sonatype.org/conte
   -Djavadoc=$ARTIFACT_ID_BASE-$VERSION-javadoc.jar
 popd
 pushd .
-for i in iosarm64 iosx64 jvm linuxx64; do
+for i in iosarm64 iossimulatorarm64 iosx64 jvm linuxx64; do
   cd fr/acinq/lightning/lightning-kmp-$i/$VERSION
-  if [ $i == iosarm64 ] || [ $i == iosx64 ]; then
+  if [ $i == iosarm64 ] || [ $i == iossimulatorarm64 ] || [ $i == iosx64 ]; then
     mvn deploy:deploy-file -DrepositoryId=ossrh -Durl=https://oss.sonatype.org/content/repositories/snapshots/ \
       -DpomFile=$ARTIFACT_ID_BASE-$i-$VERSION.pom \
       -Dfile=$ARTIFACT_ID_BASE-$i-$VERSION.klib \

src/commonMain/kotlin/fr/acinq/lightning/blockchain/electrum/ElectrumMiniWallet.kt

@@ -167,17 +167,9 @@ class ElectrumMiniWallet(
         }
 
         fun computeScriptHash(bitcoinAddress: String): ByteVector32? {
-            return when (val result = Bitcoin.addressToPublicKeyScript(chainHash, bitcoinAddress)) {
-                is AddressToPublicKeyScriptResult.Failure -> {
-                    logger.error { "cannot subscribe to $bitcoinAddress ($result)" }
-                    null
-                }
-
-                is AddressToPublicKeyScriptResult.Success -> {
-                    val pubkeyScript = ByteVector(Script.write(result.script))
-                    return ElectrumClient.computeScriptHash(pubkeyScript)
-                }
-            }
+            return Bitcoin.addressToPublicKeyScript(chainHash, bitcoinAddress)
+                .map { ElectrumClient.computeScriptHash(Script.write(it).byteVector()) }
+                .right
         }
 
         job = launch {

src/commonMain/kotlin/fr/acinq/lightning/channel/states/Channel.kt

@@ -113,7 +113,7 @@ sealed class ChannelState {
                     // this code is only executed for the first transition to Closing, so there can only be one transaction here
                     val closingTx = newState.mutualClosePublished.first()
                     val finalAmount = closingTx.toLocalOutput?.amount ?: 0.sat
-                    val address = closingTx.toLocalOutput?.publicKeyScript?.let { Bitcoin.addressFromPublicKeyScript(staticParams.nodeParams.chainHash, it.toByteArray()).result } ?: "unknown"
+                    val address = closingTx.toLocalOutput?.publicKeyScript?.let { Bitcoin.addressFromPublicKeyScript(staticParams.nodeParams.chainHash, it.toByteArray()).right } ?: "unknown"
                     listOf(
                         ChannelAction.Storage.StoreOutgoingPayment.ViaClose(
                             amount = finalAmount,
@@ -142,7 +142,7 @@ sealed class ChannelState {
                     val address = Bitcoin.addressFromPublicKeyScript(
                         chainHash = staticParams.nodeParams.chainHash,
                         pubkeyScript = oldState.commitments.params.localParams.defaultFinalScriptPubKey.toByteArray() // force close always send to the default script
-                    ).result ?: "unknown"
+                    ).right ?: "unknown"
                     listOf(
                         ChannelAction.Storage.StoreOutgoingPayment.ViaClose(
                             amount = channelBalance.truncateToSatoshi(),

src/commonMain/kotlin/fr/acinq/lightning/channel/states/Normal.kt

@@ -475,6 +475,7 @@ data class Normal(
                                     targetFeerate = cmd.message.feerate
                                 )
                                 val session = InteractiveTxSession(
+                                    staticParams.remoteNodeId,
                                     channelKeys(),
                                     keyManager.swapInOnChainWallet,
                                     fundingParams,
@@ -557,6 +558,7 @@ data class Normal(
                                         is Either.Right -> {
                                             // The splice initiator always sends the first interactive-tx message.
                                             val (interactiveTxSession, interactiveTxAction) = InteractiveTxSession(
+                                                staticParams.remoteNodeId,
                                                 channelKeys(),
                                                 keyManager.swapInOnChainWallet,
                                                 fundingParams,
@@ -603,6 +605,7 @@ data class Normal(
                                 is InteractiveTxSessionAction.SignSharedTx -> {
                                     val parentCommitment = commitments.active.first()
                                     val signingSession = InteractiveTxSigningSession.create(
+                                        interactiveTxSession,
                                         keyManager,
                                         commitments.params,
                                         spliceStatus.spliceSession.fundingParams,
@@ -880,7 +883,7 @@ data class Normal(
                 ChannelAction.Storage.StoreOutgoingPayment.ViaSpliceOut(
                     amount = txOut.amount,
                     miningFees = action.fundingTx.sharedTx.tx.localFees.truncateToSatoshi(),
-                    address = Bitcoin.addressFromPublicKeyScript(staticParams.nodeParams.chainHash, txOut.publicKeyScript.toByteArray()).result ?: "unknown",
+                    address = Bitcoin.addressFromPublicKeyScript(staticParams.nodeParams.chainHash, txOut.publicKeyScript.toByteArray()).right ?: "unknown",
                     txId = action.fundingTx.txId
                 )
             })

src/commonMain/kotlin/fr/acinq/lightning/channel/states/WaitForAcceptChannel.kt

@@ -59,7 +59,7 @@ data class WaitForAcceptChannel(
                                 }
                                 is Either.Right -> {
                                     // The channel initiator always sends the first interactive-tx message.
-                                    val (interactiveTxSession, interactiveTxAction) = InteractiveTxSession(channelKeys, keyManager.swapInOnChainWallet, fundingParams, 0.msat, 0.msat, emptySet(), fundingContributions.value).send()
+                                    val (interactiveTxSession, interactiveTxAction) = InteractiveTxSession(staticParams.remoteNodeId,  channelKeys, keyManager.swapInOnChainWallet, fundingParams, 0.msat, 0.msat, emptySet(), fundingContributions.value).send()
                                     when (interactiveTxAction) {
                                         is InteractiveTxSessionAction.SendMessage -> {
                                             val nextState = WaitForFundingCreated(

src/commonMain/kotlin/fr/acinq/lightning/channel/states/WaitForFundingConfirmed.kt

@@ -107,7 +107,7 @@ data class WaitForFundingConfirmed(
                                         addAll(latestFundingTx.sharedTx.tx.localInputs.map { Either.Left(it) })
                                         addAll(latestFundingTx.sharedTx.tx.localOutputs.map { Either.Right(it) })
                                     }
-                                    val session = InteractiveTxSession(channelKeys(), keyManager.swapInOnChainWallet, fundingParams, SharedFundingInputBalances(0.msat, 0.msat, 0.msat), toSend, previousFundingTxs.map { it.sharedTx }, commitments.latest.localCommit.spec.htlcs)
+                                    val session = InteractiveTxSession(staticParams.remoteNodeId, channelKeys(), keyManager.swapInOnChainWallet, fundingParams, SharedFundingInputBalances(0.msat, 0.msat, 0.msat), toSend, previousFundingTxs.map { it.sharedTx }, commitments.latest.localCommit.spec.htlcs)
                                     val nextState = [email protected](rbfStatus = RbfStatus.InProgress(session))
                                     Pair(nextState, listOf(ChannelAction.Message.Send(TxAckRbf(channelId, fundingParams.localContribution))))
                                 }
@@ -142,7 +142,7 @@ data class WaitForFundingConfirmed(
                                 Pair([email protected](rbfStatus = RbfStatus.RbfAborted), listOf(ChannelAction.Message.Send(TxAbort(channelId, ChannelFundingError(channelId).message))))
                             }
                             is Either.Right -> {
-                                val (session, action) = InteractiveTxSession(channelKeys(), keyManager.swapInOnChainWallet, fundingParams, 0.msat, 0.msat, emptySet(), contributions.value, previousFundingTxs.map { it.sharedTx }).send()
+                                val (session, action) = InteractiveTxSession(staticParams.remoteNodeId, channelKeys(), keyManager.swapInOnChainWallet, fundingParams, 0.msat, 0.msat, emptySet(), contributions.value, previousFundingTxs.map { it.sharedTx }).send()
                                 when (action) {
                                     is InteractiveTxSessionAction.SendMessage -> {
                                         val nextState = [email protected](rbfStatus = RbfStatus.InProgress(session))
@@ -169,6 +169,7 @@ data class WaitForFundingConfirmed(
                             is InteractiveTxSessionAction.SignSharedTx -> {
                                 val replacedCommitment = commitments.latest
                                 val signingSession = InteractiveTxSigningSession.create(
+                                    rbfSession1,
                                     keyManager,
                                     commitments.params,
                                     rbfSession1.fundingParams,

src/commonMain/kotlin/fr/acinq/lightning/channel/states/WaitForFundingCreated.kt

@@ -55,6 +55,7 @@ data class WaitForFundingCreated(
                         is InteractiveTxSessionAction.SignSharedTx -> {
                             val channelParams = ChannelParams(channelId, channelConfig, channelFeatures, localParams, remoteParams, channelFlags)
                             val signingSession = InteractiveTxSigningSession.create(
+                                interactiveTxSession1,
                                 keyManager,
                                 channelParams,
                                 interactiveTxSession.fundingParams,

src/commonMain/kotlin/fr/acinq/lightning/channel/states/WaitForOpenChannel.kt

@@ -86,7 +86,7 @@ data class WaitForOpenChannel(
                                     Pair(Aborted, listOf(ChannelAction.Message.Send(Error(temporaryChannelId, ChannelFundingError(temporaryChannelId).message))))
                                 }
                                 is Either.Right -> {
-                                    val interactiveTxSession = InteractiveTxSession(channelKeys, keyManager.swapInOnChainWallet, fundingParams, 0.msat, 0.msat, emptySet(), fundingContributions.value)
+                                    val interactiveTxSession = InteractiveTxSession(staticParams.remoteNodeId, channelKeys, keyManager.swapInOnChainWallet, fundingParams, 0.msat, 0.msat, emptySet(), fundingContributions.value)
                                     val nextState = WaitForFundingCreated(
                                         localParams,
                                         remoteParams,