Fixup: der2compact() and compac2der() methods have been removed, signInputCompact() has been added

Author: sstone

src/main/scala/fr/acinq/bitcoin/scalacompat/Crypto.scala

@@ -240,10 +240,6 @@ object Crypto {
 
   def isDefinedHashTypeSignature(sig: ByteVector): Boolean = bitcoin.Crypto.isDefinedHashTypeSignature(sig.toArray)
 
-  def compact2der(signature: ByteVector64): ByteVector = bitcoin.Crypto.compact2der(signature)
-
-  def der2compact(signature: ByteVector): ByteVector64 = bitcoin.Crypto.der2compact(signature.toArray)
-
   /**
    * @param data      data
    * @param signature signature

src/main/scala/fr/acinq/bitcoin/scalacompat/Transaction.scala

@@ -282,7 +282,7 @@ object Transaction extends BtcSerializer[Transaction] {
    * @param amount               amount of the output claimed by this tx input
    * @param signatureVersion     signature version (1: segwit, 0: pre-segwit)
    * @param privateKey           private key
-   * @return the encoded signature of this tx for this specific tx input
+   * @return the encoded signature (DER + sighash byte) of this tx for this specific tx input
    */
   def signInput(tx: Transaction, inputIndex: Int, previousOutputScript: ByteVector, sighashType: Int, amount: Satoshi, signatureVersion: Int, privateKey: PrivateKey): ByteVector = {
     tx.signInput(inputIndex, previousOutputScript, sighashType, amount, signatureVersion, privateKey)
@@ -298,7 +298,7 @@ object Transaction extends BtcSerializer[Transaction] {
    * @param amount               amount of the output claimed by this tx input
    * @param signatureVersion     signature version (1: segwit, 0: pre-segwit)
    * @param privateKey           private key
-   * @return the encoded signature of this tx for this specific tx input
+   * @return the encoded signature (DER + sighash byte) of this tx for this specific tx input
    */
   def signInput(tx: Transaction, inputIndex: Int, previousOutputScript: Seq[ScriptElt], sighashType: Int, amount: Satoshi, signatureVersion: Int, privateKey: PrivateKey): ByteVector =
     signInput(tx, inputIndex, Script.write(previousOutputScript), sighashType, amount, signatureVersion, privateKey)
@@ -484,6 +484,36 @@ case class Transaction(version: Long, txIn: Seq[TxIn], txOut: Seq[TxOut], lockTi
     scala2kmp(this).hashForSigningTaprootScriptPath(inputIndex, inputs.map(scala2kmp).asJava, sighashType, scala2kmp(tapleaf), annex_opt.map(scala2kmp).orNull)
   }
 
+  /**
+   * sign a tx input
+   *
+   * @param inputIndex           index of the tx input that is being processed
+   * @param previousOutputScript public key script of the output claimed by this tx input
+   * @param sighashType          signature hash type, which will be appended to the signature
+   * @param amount               amount of the output claimed by this tx input
+   * @param signatureVersion     signature version (1: segwit, 0: pre-segwit)
+   * @param privateKey           private key
+   * @return the encoded signature of this tx for this specific tx input in compact 64 bytes format
+   */
+  def signInputCompact(inputIndex: Int, previousOutputScript: ByteVector, sighashType: Int, amount: Satoshi, signatureVersion: Int, privateKey: PrivateKey): ByteVector64 = {
+    scala2kmp(this).signInputCompact(inputIndex, scala2kmp(previousOutputScript), sighashType, amount, signatureVersion, privateKey.priv)
+  }
+
+  /**
+   * sign a tx input
+   *
+   * @param inputIndex           index of the tx input that is being processed
+   * @param previousOutputScript public key script of the output claimed by this tx input
+   * @param sighashType          signature hash type, which will be appended to the signature
+   * @param amount               amount of the output claimed by this tx input
+   * @param signatureVersion     signature version (1: segwit, 0: pre-segwit)
+   * @param privateKey           private key
+   * @return the encoded signature of this tx for this specific tx input in compact 64 bytes format
+   */
+  def signInputCompact(inputIndex: Int, previousOutputScript: Seq[ScriptElt], sighashType: Int, amount: Satoshi, signatureVersion: Int, privateKey: PrivateKey): ByteVector64 =
+    signInputCompact(inputIndex, Script.write(previousOutputScript), sighashType, amount, signatureVersion, privateKey)
+
+
   /**
    * sign a tx input
    *

src/test/scala/fr/acinq/bitcoin/scalacompat/CryptoSpec.scala

@@ -3,6 +3,7 @@ package fr.acinq.bitcoin.scalacompat
 import fr.acinq.bitcoin.Base58.Prefix
 import fr.acinq.bitcoin.scalacompat.Crypto._
 import fr.acinq.bitcoin.{Base58, Base58Check}
+import fr.acinq.secp256k1.Secp256k1
 import org.scalatest.FlatSpec
 import scodec.bits._
 
@@ -157,7 +158,7 @@ class CryptoSpec extends FlatSpec {
 
     dataset.map {
       case (k, m, s) =>
-        val sig: ByteVector = Crypto.compact2der(Crypto.sign(Crypto.sha256(ByteVector.view(m.getBytes("UTF-8"))), PrivateKey(k)))
+        val sig: ByteVector = ByteVector.view(Secp256k1.get().compact2der(Crypto.sign(Crypto.sha256(ByteVector.view(m.getBytes("UTF-8"))), PrivateKey(k)).toArray))
         assert(sig == s)
     }
   }

src/test/scala/fr/acinq/bitcoin/scalacompat/SegwitSpec.scala

@@ -2,6 +2,7 @@ package fr.acinq.bitcoin.scalacompat
 
 import fr.acinq.bitcoin.scalacompat.Crypto.PrivateKey
 import fr.acinq.bitcoin.{Base58, Base58Check, ScriptFlags, SigHash, SigVersion}
+import fr.acinq.secp256k1.Secp256k1
 import org.scalatest.FunSuite
 import scodec.bits._
 
@@ -30,7 +31,8 @@ class SegwitSpec extends FunSuite {
     val priv = PrivateKey(hex"619c335025c7f4012e556c2a58b2506e30b8511b53ade95ea316fd8c3286feb901")
     val pub = priv.publicKey
     val sig = hex"304402203609e17b84f6a7d30c80bfa610b5b4542f32a8a0d5447a12fb1366d7f01cc44a0220573a954c4518331561406f90300e8f3358f51928d43c212a8caed02de67eebee"
-    assert(Crypto.verifySignature(hash, Crypto.der2compact(sig), pub))
+    val compact = ByteVector64(ByteVector(Secp256k1.get().der2compact(sig.toArray)))
+    assert(Crypto.verifySignature(hash, ByteVector64(compact), pub))
 
     val sigScript = hex"4830450221008b9d1dc26ba6a9cb62127b02742fa9d754cd3bebf337f7a55d114c8e5cdd30be022040529b194ba3f9281a99f2b1c0a19c0489bc22ede944ccf4ecbab4cc618ef3ed01"
     val tx1 = tx.updateSigScript(0, sigScript)