Use secp256k1 0.7.0

Most significant change is that deprecated secp256k1_ec_privkey_<operation> methods have been removed, we now use secp256k1_ec_seckey_<operation>.
Our own API does not change.

Author: sstone

build.gradle.kts

@@ -23,7 +23,7 @@ buildscript {
 
 allprojects {
     group = "fr.acinq.secp256k1"
-    version = "0.18.0"
+    version = "0.19.0-SNAPSHOT"
 
     repositories {
         google()

jni/c/headers/java/fr_acinq_secp256k1_Secp256k1CFunctions.h

@@ -316,10 +316,10 @@ JNIEXPORT jint JNICALL Java_fr_acinq_secp256k1_Secp256k1CFunctions_secp256k1_1ec
 
 /*
  * Class:     fr_acinq_bitcoin_Secp256k1Bindings
- * Method:    secp256k1_ec_privkey_negate
+ * Method:    secp256k1_ec_seckey_negate
  * Signature: (J[B)[B
  */
-JNIEXPORT jbyteArray JNICALL Java_fr_acinq_secp256k1_Secp256k1CFunctions_secp256k1_1ec_1privkey_1negate(JNIEnv *penv, jclass clazz, jlong jctx, jbyteArray jseckey)
+JNIEXPORT jbyteArray JNICALL Java_fr_acinq_secp256k1_Secp256k1CFunctions_secp256k1_1ec_1seckey_1negate(JNIEnv *penv, jclass clazz, jlong jctx, jbyteArray jseckey)
 {
   secp256k1_context *ctx = (secp256k1_context *)jctx;
   jbyte *seckey;
@@ -376,10 +376,10 @@ JNIEXPORT jbyteArray JNICALL Java_fr_acinq_secp256k1_Secp256k1CFunctions_secp256
 
 /*
  * Class:     fr_acinq_bitcoin_Secp256k1Bindings
- * Method:    secp256k1_ec_privkey_tweak_add
+ * Method:    secp256k1_ec_seckey_tweak_add
  * Signature: (J[B[B)[B
  */
-JNIEXPORT jbyteArray JNICALL Java_fr_acinq_secp256k1_Secp256k1CFunctions_secp256k1_1ec_1privkey_1tweak_1add(JNIEnv *penv, jclass clazz, jlong jctx, jbyteArray jseckey, jbyteArray jtweak)
+JNIEXPORT jbyteArray JNICALL Java_fr_acinq_secp256k1_Secp256k1CFunctions_secp256k1_1ec_1seckey_1tweak_1add(JNIEnv *penv, jclass clazz, jlong jctx, jbyteArray jseckey, jbyteArray jtweak)
 {
   secp256k1_context *ctx = (secp256k1_context *)jctx;
   jbyte *seckey, *tweak;
@@ -448,10 +448,10 @@ JNIEXPORT jbyteArray JNICALL Java_fr_acinq_secp256k1_Secp256k1CFunctions_secp256
 
 /*
  * Class:     fr_acinq_bitcoin_Secp256k1Bindings
- * Method:    secp256k1_ec_privkey_tweak_mul
+ * Method:    secp256k1_ec_seckey_tweak_mul
  * Signature: (J[B[B)[B
  */
-JNIEXPORT jbyteArray JNICALL Java_fr_acinq_secp256k1_Secp256k1CFunctions_secp256k1_1ec_1privkey_1tweak_1mul(JNIEnv *penv, jclass clazz, jlong jctx, jbyteArray jseckey, jbyteArray jtweak)
+JNIEXPORT jbyteArray JNICALL Java_fr_acinq_secp256k1_Secp256k1CFunctions_secp256k1_1ec_1seckey_1tweak_1mul(JNIEnv *penv, jclass clazz, jlong jctx, jbyteArray jseckey, jbyteArray jtweak)
 {
   secp256k1_context *ctx = (secp256k1_context *)jctx;
   jbyte *seckey, *tweak;

jni/c/src/fr_acinq_secp256k1_Secp256k1CFunctions.c

@@ -65,15 +65,15 @@ public class Secp256k1CFunctions {
 
     public static native int secp256k1_ecdsa_signature_normalize(long ctx, byte[] sigin, byte[] sigout);
 
-    public static native byte[] secp256k1_ec_privkey_negate(long ctx, byte[] privkey);
+    public static native byte[] secp256k1_ec_seckey_negate(long ctx, byte[] privkey);
 
     public static native byte[] secp256k1_ec_pubkey_negate(long ctx, byte[] pubkey);
 
-    public static native byte[] secp256k1_ec_privkey_tweak_add(long ctx, byte[] seckey, byte[] tweak);
+    public static native byte[] secp256k1_ec_seckey_tweak_add(long ctx, byte[] seckey, byte[] tweak);
 
     public static native byte[] secp256k1_ec_pubkey_tweak_add(long ctx, byte[] pubkey, byte[] tweak);
 
-    public static native byte[] secp256k1_ec_privkey_tweak_mul(long ctx, byte[] seckey, byte[] tweak);
+    public static native byte[] secp256k1_ec_seckey_tweak_mul(long ctx, byte[] seckey, byte[] tweak);
 
     public static native byte[] secp256k1_ec_pubkey_tweak_mul(long ctx, byte[] pubkey, byte[] tweak);
 

jni/src/main/java/fr/acinq/secp256k1/Secp256k1CFunctions.java

@@ -45,15 +45,15 @@ public object NativeSecp256k1 : Secp256k1 {
     }
 
     override fun privKeyNegate(privkey: ByteArray): ByteArray {
-        return Secp256k1CFunctions.secp256k1_ec_privkey_negate(Secp256k1Context.getContext(), privkey)
+        return Secp256k1CFunctions.secp256k1_ec_seckey_negate(Secp256k1Context.getContext(), privkey)
     }
 
     override fun privKeyTweakAdd(privkey: ByteArray, tweak: ByteArray): ByteArray {
-        return Secp256k1CFunctions.secp256k1_ec_privkey_tweak_add(Secp256k1Context.getContext(), privkey, tweak)
+        return Secp256k1CFunctions.secp256k1_ec_seckey_tweak_add(Secp256k1Context.getContext(), privkey, tweak)
     }
 
     override fun privKeyTweakMul(privkey: ByteArray, tweak: ByteArray): ByteArray {
-        return Secp256k1CFunctions.secp256k1_ec_privkey_tweak_mul(Secp256k1Context.getContext(), privkey, tweak)
+        return Secp256k1CFunctions.secp256k1_ec_seckey_tweak_mul(Secp256k1Context.getContext(), privkey, tweak)
     }
 
     override fun pubKeyNegate(pubkey: ByteArray): ByteArray {

jni/src/main/kotlin/fr/acinq/secp256k1/NativeSecp256k1.kt

@@ -175,7 +175,7 @@ public object Secp256k1Native : Secp256k1 {
             val multiplied = privkey.copyOf()
             val natMul = toNat(multiplied)
             val natTweak = toNat(tweak)
-            secp256k1_ec_privkey_tweak_mul(ctx, natMul, natTweak).requireSuccess("secp256k1_ec_privkey_tweak_mul() failed")
+            secp256k1_ec_seckey_tweak_mul(ctx, natMul, natTweak).requireSuccess("secp256k1_ec_seckey_tweak_mul() failed")
             return multiplied
         }
     }