fixup! Add high-level helpers for using Musig2 with Taproot

Author: t-bast

src/commonTest/kotlin/fr/acinq/bitcoin/Musig2TestsCommon.kt

@@ -323,11 +323,11 @@ class Musig2TestsCommon {
 
         // the redeem script is just the refund script. it is generated from this policy: and_v(v:pk(user),older(refundDelay))
         // it does not depend upon the user's or server's key, just the user's refund key and the refund delay
-        val redeemScript = listOf(OP_PUSHDATA(userRefundPrivateKey.publicKey().xOnly()), OP_CHECKSIGVERIFY, OP_PUSHDATA(Script.encodeNumber(refundDelay)), OP_CHECKSEQUENCEVERIFY)
+        val redeemScript = listOf(OP_PUSHDATA(userRefundPrivateKey.xOnlyPublicKey()), OP_CHECKSIGVERIFY, OP_PUSHDATA(Script.encodeNumber(refundDelay)), OP_CHECKSEQUENCEVERIFY)
         val scriptTree = ScriptTree.Leaf(0, redeemScript)
 
         // the internal pubkey is the musig2 aggregation of the user's and server's public keys: it does not depend upon the user's refund's key
-        val aggregatedKey = Musig2.keyAgg(listOf(userPrivateKey.publicKey(), serverPrivateKey.publicKey())).xOnly()
+        val aggregatedKey = Musig2.keyAgg(listOf(userPublicKey, serverPublicKey)).xOnly()
         val pubkeyScript = Script.pay2tr(aggregatedKey, scriptTree)
 
         val swapInTx = Transaction(
@@ -366,7 +366,7 @@ class Musig2TestsCommon {
             val tx = Transaction(
                 version = 2,
                 txIn = listOf(TxIn(OutPoint(swapInTx, 0), sequence = refundDelay.toLong())),
-                txOut = listOf(TxOut(Satoshi(10000), Script.pay2wpkh(userPrivateKey.publicKey()))),
+                txOut = listOf(TxOut(Satoshi(10000), Script.pay2wpkh(userPublicKey))),
                 lockTime = 0
             )
             val sig = Crypto.signTaprootScriptPath(userRefundPrivateKey, tx, 0, swapInTx.txOut, SigHash.SIGHASH_DEFAULT, scriptTree.hash())