Update bitcoin-kmp (taproot tweak refactor) (#842)

We also update secp256k1-kmp (android build update).

Author: sstone

gradle/libs.versions.toml

@@ -4,8 +4,8 @@ kotlinx-coroutines = "1.10.2"
 kotlinx-datetime = "0.7.1"
 kotlinx-serialization = "1.9.0"
 ktor = "3.3.0"
-bitcoinkmp = "0.28.1" # when upgrading bitcoin-kmp, keep secpjnijvm in sync!
-secpjnijvm = "0.21.0"
+bitcoinkmp = "0.29.0" # when upgrading bitcoin-kmp, keep secpjnijvm in sync!
+secpjnijvm = "0.22.0"
 kermit = "2.0.8"
 slf4j = "2.0.17"
 

modules/core/src/commonMain/kotlin/fr/acinq/lightning/transactions/Transactions.kt

@@ -141,7 +141,7 @@ object Transactions {
          * @param scriptTree_opt the script tree must be known if there is one, even when spending via the key path.
          */
         data class TaprootKeyPath(val internalKey: XonlyPublicKey, val scriptTree_opt: ScriptTree?) : RedeemInfo() {
-            override val pubkeyScript: ByteVector = Script.write(Script.pay2tr(internalKey, scriptTree_opt)).byteVector()
+            override val pubkeyScript: ByteVector = Script.write(Script.pay2tr(internalKey, scriptTree_opt?.let { Crypto.TaprootTweak.ScriptPathTweak(it.hash()) } ?: Crypto.TaprootTweak.KeyPathTweak)).byteVector()
         }
 
         /**

modules/core/src/commonMain/kotlin/fr/acinq/lightning/wire/OfferTypes.kt

@@ -1100,7 +1100,7 @@ object OfferTypes {
     fun signSchnorr(tag: ByteVector, msg: ByteVector32, key: PrivateKey): ByteVector64 {
         val h = ByteVector32(hash(tag.toByteArray(), msg.toByteArray()))
         // NB: we don't add auxiliary random data to keep signatures deterministic.
-        return Crypto.signSchnorr(h, key, Crypto.SchnorrTweak.NoTweak)
+        return Crypto.signSchnorr(h, key, null)
     }
 
     fun verifySchnorr(tag: ByteVector, msg: ByteVector32, signature: ByteVector64, publicKey: PublicKey): Boolean {

modules/core/src/commonTest/kotlin/fr/acinq/lightning/channel/HelpersTestsCommon.kt

@@ -57,7 +57,7 @@ class HelpersTestsCommon : LightningTestSuite() {
             TxOut(539.sat, Script.pay2sh(Hex.decode("0000000000000000000000000000000000000000"))),
             TxOut(293.sat, Script.pay2wpkh(randomKey().publicKey())),
             TxOut(329.sat, Script.pay2wsh(Hex.decode("0000000000000000000000000000000000000000"))),
-            TxOut(353.sat, Script.pay2tr(randomKey().publicKey().xOnly())),
+            TxOut(353.sat, Script.pay2tr(randomKey().publicKey().xOnly(), Crypto.TaprootTweak.KeyPathTweak)),
         )
         outputsBelowDust.forEach { assertTrue(it.amount < Transactions.dustLimit(it.publicKeyScript)) }
 
@@ -66,7 +66,7 @@ class HelpersTestsCommon : LightningTestSuite() {
             TxOut(540.sat, Script.pay2sh(Hex.decode("0000000000000000000000000000000000000000"))),
             TxOut(294.sat, Script.pay2wpkh(randomKey().publicKey())),
             TxOut(330.sat, Script.pay2wsh(Hex.decode("0000000000000000000000000000000000000000"))),
-            TxOut(354.sat, Script.pay2tr(randomKey().publicKey().xOnly())),
+            TxOut(354.sat, Script.pay2tr(randomKey().publicKey().xOnly(), Crypto.TaprootTweak.KeyPathTweak)),
             TxOut(0.sat, listOf(OP_RETURN, OP_PUSHDATA(Hex.decode("deadbeef")))),
         )
         outputsAboveDust.forEach { assertTrue(it.amount >= Transactions.dustLimit(it.publicKeyScript)) }
@@ -79,7 +79,7 @@ class HelpersTestsCommon : LightningTestSuite() {
             Script.write(Script.pay2sh(Hex.decode("deadbeef"))).byteVector(),
             Script.write(Script.pay2wpkh(randomKey().publicKey())).byteVector(),
             Script.write(Script.pay2wsh(Hex.decode("deadbeef"))).byteVector(),
-            Script.write(Script.pay2tr(randomKey().publicKey().xOnly())).byteVector(),
+            Script.write(Script.pay2tr(randomKey().publicKey().xOnly(), Crypto.TaprootTweak.KeyPathTweak)).byteVector(),
             Script.write(listOf(OP_RETURN, OP_PUSHDATA(Hex.decode("deadbeefdeadbeef")))).byteVector(),
         )
         validScripts.forEach { assertTrue(isValidFinalScriptPubkey(it, allowAnySegwit = true, allowOpReturn = true)) }