Match against all commitment formats explicitly

Author: sstone

eclair-core/src/main/scala/fr/acinq/eclair/channel/Helpers.scala

@@ -381,7 +381,7 @@ object Helpers {
         val fundingScript = Taproot.musig2FundingScript(fundingPubkey1, fundingPubkey2)
         val fundingTxOut = TxOut(fundingSatoshis, fundingScript)
         InputInfo.TaprootInput(OutPoint(fundingTxId, fundingTxOutputIndex), fundingTxOut, Taproot.musig2Aggregate(fundingPubkey1, fundingPubkey2), None, ByteVector32.Zeroes)
-      case _ =>
+      case DefaultCommitmentFormat | _: AnchorOutputsCommitmentFormat =>
         val fundingScript = multiSig2of2(fundingPubkey1, fundingPubkey2)
         val fundingTxOut = TxOut(fundingSatoshis, pay2wsh(fundingScript))
         InputInfo.SegwitInput(OutPoint(fundingTxId, fundingTxOutputIndex), fundingTxOut, write(fundingScript))

eclair-core/src/main/scala/fr/acinq/eclair/channel/fsm/Channel.scala

@@ -48,7 +48,7 @@ import fr.acinq.eclair.io.Peer.LiquidityPurchaseSigned
 import fr.acinq.eclair.payment.relay.Relayer
 import fr.acinq.eclair.payment.{Bolt11Invoice, PaymentSettlingOnChain}
 import fr.acinq.eclair.router.Announcements
-import fr.acinq.eclair.transactions.Transactions.ClosingTx
+import fr.acinq.eclair.transactions.Transactions.{AnchorOutputsCommitmentFormat, ClosingTx, DefaultCommitmentFormat, SimpleTaprootChannelCommitmentFormat}
 import fr.acinq.eclair.transactions._
 import fr.acinq.eclair.wire.protocol._
 
@@ -2152,7 +2152,7 @@ class Channel(val nodeParams: NodeParams, val wallet: OnChainChannelFunder with
 
     case Event(c: CMD_BUMP_FORCE_CLOSE_FEE, d: DATA_CLOSING) =>
       d.commitments.params.commitmentFormat match {
-        case _: Transactions.AnchorOutputsCommitmentFormat =>
+        case SimpleTaprootChannelCommitmentFormat | _: Transactions.AnchorOutputsCommitmentFormat =>
           val lcp1 = d.localCommitPublished.map(lcp => Closing.LocalClose.claimAnchors(keyManager, d.commitments.latest, lcp, c.confirmationTarget))
           val rcp1 = d.remoteCommitPublished.map(rcp => Closing.RemoteClose.claimAnchors(keyManager, d.commitments.latest, rcp, c.confirmationTarget))
           val nrcp1 = d.nextRemoteCommitPublished.map(nrcp => Closing.RemoteClose.claimAnchors(keyManager, d.commitments.latest, nrcp, c.confirmationTarget))
@@ -2174,7 +2174,7 @@ class Channel(val nodeParams: NodeParams, val wallet: OnChainChannelFunder with
             c.replyTo ! RES_FAILURE(c, CommandUnavailableInThisState(d.channelId, "rbf-force-close", stateName))
             stay()
           }
-        case _ =>
+        case DefaultCommitmentFormat =>
           log.warning("cannot bump force-close fees, channel is not using anchor outputs")
           c.replyTo ! RES_FAILURE(c, CommandUnavailableInThisState(d.channelId, "rbf-force-close", stateName))
           stay()

eclair-core/src/main/scala/fr/acinq/eclair/transactions/Transactions.scala

@@ -142,7 +142,7 @@ object Transactions {
     /** Sighash flags to use when signing the transaction. */
     def sighash(txOwner: TxOwner, commitmentFormat: CommitmentFormat): Int = commitmentFormat match {
       case SimpleTaprootChannelCommitmentFormat => SIGHASH_DEFAULT
-      case _ => SIGHASH_ALL
+      case DefaultCommitmentFormat | _:AnchorOutputsCommitmentFormat => SIGHASH_ALL
     }
 
     def sign(key: PrivateKey, txOwner: TxOwner, commitmentFormat: CommitmentFormat): ByteVector64 = {
@@ -567,7 +567,7 @@ object Transactions {
           outputs.append(CommitmentOutputLink(
             TxOut(htlc.add.amountMsat.truncateToSatoshi, pay2tr(localRevocationPubkey.xOnly, Some(offeredHtlcTree))), localRevocationPubkey.xOnly, offeredHtlcTree, OutHtlc(htlc)
           ))
-        case _ =>
+        case DefaultCommitmentFormat | _: AnchorOutputsCommitmentFormat =>
           val redeemScript = htlcOffered(localHtlcPubkey, remoteHtlcPubkey, localRevocationPubkey, ripemd160(htlc.add.paymentHash.bytes), commitmentFormat)
           outputs.append(CommitmentOutputLink(TxOut(htlc.add.amountMsat.truncateToSatoshi, pay2wsh(redeemScript)), redeemScript, OutHtlc(htlc)))
       }
@@ -580,7 +580,7 @@ object Transactions {
           outputs.append(CommitmentOutputLink(
             TxOut(htlc.add.amountMsat.truncateToSatoshi, pay2tr(localRevocationPubkey.xOnly, Some(receivedHtlcTree))), localRevocationPubkey.xOnly, receivedHtlcTree, InHtlc(htlc)
           ))
-        case _ =>
+        case DefaultCommitmentFormat | _: AnchorOutputsCommitmentFormat =>
           val redeemScript = htlcReceived(localHtlcPubkey, remoteHtlcPubkey, localRevocationPubkey, ripemd160(htlc.add.paymentHash.bytes), htlc.add.cltvExpiry, commitmentFormat)
           outputs.append(CommitmentOutputLink(TxOut(htlc.add.amountMsat.truncateToSatoshi, pay2wsh(redeemScript)), redeemScript, InHtlc(htlc)))
       }
@@ -597,16 +597,16 @@ object Transactions {
     if (toLocalAmount >= localDustLimit) {
       commitmentFormat match {
         case SimpleTaprootChannelCommitmentFormat =>
-        val toLocalScriptTree = Scripts.Taproot.toLocalScriptTree(localRevocationPubkey, toLocalDelay, localDelayedPaymentPubkey)
-        outputs.append(CommitmentOutputLink(
-          TxOut(toLocalAmount, pay2tr(XonlyPublicKey(NUMS_POINT), Some(toLocalScriptTree))),
-          NUMS_POINT.xOnly, toLocalScriptTree,
-          ToLocal))
-        case _ =>
-        outputs.append(CommitmentOutputLink(
-          TxOut(toLocalAmount, pay2wsh(toLocalDelayed(localRevocationPubkey, toLocalDelay, localDelayedPaymentPubkey))),
-          toLocalDelayed(localRevocationPubkey, toLocalDelay, localDelayedPaymentPubkey),
-          ToLocal))
+          val toLocalScriptTree = Scripts.Taproot.toLocalScriptTree(localRevocationPubkey, toLocalDelay, localDelayedPaymentPubkey)
+          outputs.append(CommitmentOutputLink(
+            TxOut(toLocalAmount, pay2tr(XonlyPublicKey(NUMS_POINT), Some(toLocalScriptTree))),
+            NUMS_POINT.xOnly, toLocalScriptTree,
+            ToLocal))
+        case DefaultCommitmentFormat | _: AnchorOutputsCommitmentFormat =>
+          outputs.append(CommitmentOutputLink(
+            TxOut(toLocalAmount, pay2wsh(toLocalDelayed(localRevocationPubkey, toLocalDelay, localDelayedPaymentPubkey))),
+            toLocalDelayed(localRevocationPubkey, toLocalDelay, localDelayedPaymentPubkey),
+            ToLocal))
       }
     }
 
@@ -1182,7 +1182,7 @@ object Transactions {
 
   def makeHtlcPenaltyTx(commitTx: Transaction, htlcOutputIndex: Int, internalKey: XonlyPublicKey, scriptTree: ScriptTree, localDustLimit: Satoshi, localFinalScriptPubKey: ByteVector, feeratePerKw: FeeratePerKw): Either[TxGenerationSkipped, HtlcPenaltyTx] = {
     import KotlinUtils._
-    
+
     val input = InputInfo.TaprootInput(OutPoint(commitTx, htlcOutputIndex), commitTx.txOut(htlcOutputIndex), internalKey, Some(scriptTree), scriptTree.hash())
     // unsigned transaction
     val tx = Transaction(

eclair-core/src/test/scala/fr/acinq/eclair/transactions/TransactionsSpec.scala

@@ -741,7 +741,7 @@ class TransactionsSpec extends AnyFunSuite with Logging {
   }
 
   test("generate valid commitment and htlc transactions (simple taproot channels)") {
-    val commitmentFormat = SimpleTaprootChannelCommitmentFormat
+    val commitmentFormat: CommitmentFormat = SimpleTaprootChannelCommitmentFormat
     val finalPubKeyScript = Script.write(Script.pay2wpkh(PrivateKey(randomBytes32()).publicKey))
     // funding tx sends to musig2 aggregate of local and remote funding keys
     val fundingTx = Transaction(version = 2, txIn = Nil, txOut = TxOut(Btc(1), Script.pay2tr(Taproot.musig2Aggregate(localFundingPriv.publicKey, remoteFundingPriv.publicKey), None)) :: Nil, lockTime = 0)
@@ -779,7 +779,7 @@ class TransactionsSpec extends AnyFunSuite with Logging {
             sig <- Musig2.aggregateTaprootSignatures(Seq(localPartialSig, remotePartialSig), txInfo.tx, 0, Seq(fundingOutput), publicKeys, publicNonces, None)
           } yield sig
           Transactions.addAggregatedSignature(txInfo, sig)
-        case _ =>
+        case DefaultCommitmentFormat | _: AnchorOutputsCommitmentFormat =>
           val localSig = txInfo.sign(localPaymentPriv, TxOwner.Local, commitmentFormat)
           val remoteSig = txInfo.sign(remotePaymentPriv, TxOwner.Remote, commitmentFormat)
           Transactions.addSigs(txInfo, localFundingPriv.publicKey, remoteFundingPriv.publicKey, localSig, remoteSig)
@@ -820,7 +820,7 @@ class TransactionsSpec extends AnyFunSuite with Logging {
       // local spends local anchor
       val anchorKey = commitmentFormat match {
         case SimpleTaprootChannelCommitmentFormat => localDelayedPaymentPriv
-        case _ => localFundingPriv
+        case DefaultCommitmentFormat | _: AnchorOutputsCommitmentFormat => localFundingPriv
       }
       val Right(claimAnchorOutputTx) = makeClaimLocalAnchorOutputTx(commitTx.tx, anchorKey.publicKey, ConfirmationTarget.Absolute(BlockHeight(0)))
       assert(checkSpendable(claimAnchorOutputTx).isFailure)
@@ -832,7 +832,7 @@ class TransactionsSpec extends AnyFunSuite with Logging {
       // remote spends remote anchor
       val anchorKey = commitmentFormat match {
         case SimpleTaprootChannelCommitmentFormat => remotePaymentPriv
-        case _ => remoteFundingPriv
+        case DefaultCommitmentFormat | _: AnchorOutputsCommitmentFormat => remoteFundingPriv
       }
       val Right(claimAnchorOutputTx) = makeClaimLocalAnchorOutputTx(commitTx.tx, anchorKey.publicKey, ConfirmationTarget.Absolute(BlockHeight(0)))
       assert(checkSpendable(claimAnchorOutputTx).isFailure)
@@ -955,7 +955,7 @@ class TransactionsSpec extends AnyFunSuite with Logging {
         case SimpleTaprootChannelCommitmentFormat =>
           val scriptTree = Taproot.offeredHtlcScriptTree(localHtlcPriv.publicKey, remoteHtlcPriv.publicKey, htlc1.paymentHash)
           makeHtlcPenaltyTx(commitTx.tx, htlcOutputIndex, localRevocationPriv.publicKey.xOnly, scriptTree, localDustLimit, finalPubKeyScript, feeratePerKw)
-        case _ =>
+        case DefaultCommitmentFormat | _: AnchorOutputsCommitmentFormat =>
           val script = Script.write(Scripts.htlcOffered(localHtlcPriv.publicKey, remoteHtlcPriv.publicKey, localRevocationPriv.publicKey, Crypto.ripemd160(htlc1.paymentHash), commitmentFormat))
           makeHtlcPenaltyTx(commitTx.tx, htlcOutputIndex, script, localDustLimit, finalPubKeyScript, feeratePerKw)
       }
@@ -973,7 +973,7 @@ class TransactionsSpec extends AnyFunSuite with Logging {
           case SimpleTaprootChannelCommitmentFormat =>
             val scriptTree = Taproot.receivedHtlcScriptTree(localHtlcPriv.publicKey, remoteHtlcPriv.publicKey, htlc.paymentHash, htlc.cltvExpiry)
             makeHtlcPenaltyTx(commitTx.tx, htlcOutputIndex, localRevocationPriv.publicKey.xOnly, scriptTree, localDustLimit, finalPubKeyScript, feeratePerKw)
-          case _ =>
+          case DefaultCommitmentFormat | _: AnchorOutputsCommitmentFormat =>
             val script = Script.write(Scripts.htlcReceived(localHtlcPriv.publicKey, remoteHtlcPriv.publicKey, localRevocationPriv.publicKey, Crypto.ripemd160(htlc.paymentHash), htlc.cltvExpiry, commitmentFormat))
             makeHtlcPenaltyTx(commitTx.tx, htlcOutputIndex, script, localDustLimit, finalPubKeyScript, feeratePerKw)
         }