ci: Update for libsecp256k1-zkp API changes

Author: gwillen

src/blindpsbt.cpp

@@ -248,7 +248,7 @@ bool SubtractScalars(uint256& a, const uint256& b)
     }
 
     uint256 sub(b);
-    if (secp256k1_ec_privkey_negate(secp256k1_blind_context, sub.begin()) != 1) return false;
+    if (secp256k1_ec_seckey_negate(secp256k1_blind_context, sub.begin()) != 1) return false;
 
     // If a is 0, then the result of this subtraction is the negation of b (i.e. sub)
     if (a.IsNull()) {
@@ -257,7 +257,7 @@ bool SubtractScalars(uint256& a, const uint256& b)
     }
 
     // Neither a nor b are null, do a = a - b
-    if (secp256k1_ec_privkey_tweak_add(secp256k1_blind_context, a.begin(), sub.begin()) != 1) return false;
+    if (secp256k1_ec_seckey_tweak_add(secp256k1_blind_context, a.begin(), sub.begin()) != 1) return false;
     return true;
 }
 
@@ -278,7 +278,7 @@ bool CalculateScalarOffset(uint256& out, CAmount value, const uint256& asset_bli
     // We need to pack the 8 byte CAmount into a uint256 with the correct padding, so start it at 24 bytes from the front
     WriteBE64(val.begin() + 24, value);
     if (value > 0) {
-        if (secp256k1_ec_privkey_tweak_mul(secp256k1_blind_context, out.begin(), val.begin()) != 1) return false;
+        if (secp256k1_ec_seckey_tweak_mul(secp256k1_blind_context, out.begin(), val.begin()) != 1) return false;
     } else {
         out = value_blinder;
         return true;
@@ -288,12 +288,12 @@ bool CalculateScalarOffset(uint256& out, CAmount value, const uint256& asset_bli
         if (secp256k1_ec_seckey_negate(secp256k1_blind_context, value_negated.begin()) != 1) {
             return false;
         }
-        // Special-case zero, which would otherwise cause `secp256k1_ec_privkey_tweak_add` to fail
+        // Special-case zero, which would otherwise cause `secp256k1_ec_seckey_tweak_add` to fail
         if (value_negated == out) {
             out = uint256{};
             return true;
         }
-        if (secp256k1_ec_privkey_tweak_add(secp256k1_blind_context, out.begin(), value_blinder.begin()) != 1) return false;
+        if (secp256k1_ec_seckey_tweak_add(secp256k1_blind_context, out.begin(), value_blinder.begin()) != 1) return false;
     }
     return true;
 }
@@ -315,12 +315,12 @@ bool ComputeAndAddToScalarOffset(uint256& a, CAmount value, const uint256& asset
         if (secp256k1_ec_seckey_negate(secp256k1_blind_context, scalar_negated.begin()) != 1) {
             return false;
         }
-        // Special-case zero, which would otherwise cause `secp256k1_ec_privkey_tweak_add` to fail
+        // Special-case zero, which would otherwise cause `secp256k1_ec_seckey_tweak_add` to fail
         if (scalar_negated == a) {
             a = uint256{};
         } else {
             // If we have a, then add the scalar to it.
-            if (secp256k1_ec_privkey_tweak_add(secp256k1_blind_context, a.begin(), scalar.begin()) != 1) return false;
+            if (secp256k1_ec_seckey_tweak_add(secp256k1_blind_context, a.begin(), scalar.begin()) != 1) return false;
         }
     }
     return true;

src/key.cpp

@@ -284,7 +284,7 @@ bool CKey::SignSchnorr(const uint256& hash, Span<unsigned char> sig, const uint2
         uint256 tweak = XOnlyPubKey(pubkey_bytes).ComputeTapTweakHash(merkle_root->IsNull() ? nullptr : merkle_root);
         if (!secp256k1_keypair_xonly_tweak_add(GetVerifyContext(), &keypair, tweak.data())) return false;
     }
-    bool ret = secp256k1_schnorrsig_sign(secp256k1_context_sign, sig.data(), hash.data(), &keypair, aux ? (unsigned char*)aux->data() : nullptr);
+    bool ret = secp256k1_schnorrsig_sign32(secp256k1_context_sign, sig.data(), hash.data(), &keypair, aux ? (unsigned char*)aux->data() : nullptr);
     memory_cleanse(&keypair, sizeof(keypair));
     return ret;
 }

src/secp256k1/src/tests.c

@@ -6259,7 +6259,7 @@ void test_ecdsa_end_to_end(void) {
         ret1 = secp256k1_ec_seckey_tweak_add(ctx, privkey, rnd);
         ret2 = secp256k1_ec_pubkey_tweak_add(ctx, &pubkey, rnd);
         /* Check that privkey alias gives same result */
-        ret3 = secp256k1_ec_privkey_tweak_add(ctx, privkey_tmp, rnd);
+        ret3 = secp256k1_ec_seckey_tweak_add(ctx, privkey_tmp, rnd);
         CHECK(ret1 == ret2);
         CHECK(ret2 == ret3);
         if (ret1 == 0) {

src/wallet/rpcwallet.cpp

@@ -5411,7 +5411,7 @@ bool DerivePubTweak(const std::vector<uint32_t>& vPath, const CPubKey& keyMaster
         if (i == 0) {
             tweakSum = tweak;
         } else {
-            bool ret = secp256k1_ec_privkey_tweak_add(secp256k1_ctx, tweakSum.data(), tweak.data());
+            bool ret = secp256k1_ec_seckey_tweak_add(secp256k1_ctx, tweakSum.data(), tweak.data());
             if (!ret) {
                 return false;
             }
@@ -5877,7 +5877,7 @@ static RPCHelpMan sendtomainchain_pak()
 
     //Create, verify whitelist proof
     secp256k1_whitelist_signature sig;
-    if(secp256k1_whitelist_sign(secp256k1_ctx, &sig, &paklist.OnlineKeys()[0], &paklist.OfflineKeys()[0], paklist.size(), &btcpub_secp, masterOnlineKey.begin(), &tweakSum[0], whitelistindex, NULL, NULL) != 1) {
+    if(secp256k1_whitelist_sign(secp256k1_ctx, &sig, &paklist.OnlineKeys()[0], &paklist.OfflineKeys()[0], paklist.size(), &btcpub_secp, masterOnlineKey.begin(), &tweakSum[0], whitelistindex) != 1) {
         throw JSONRPCError(RPC_WALLET_ERROR, "Pegout authorization proof signing failed");
     }
 
@@ -6991,7 +6991,7 @@ static RPCHelpMan generatepegoutproof()
 
     //Create, verify whitelist proof
     secp256k1_whitelist_signature sig;
-    if(secp256k1_whitelist_sign(secp256k1_ctx, &sig, &paklist.OnlineKeys()[0], &paklist.OfflineKeys()[0], paklist.size(), &btcpubkey, masterOnlineKey.begin(), &sumprivkeybytes[0], whitelistindex, NULL, NULL) != 1)
+    if(secp256k1_whitelist_sign(secp256k1_ctx, &sig, &paklist.OnlineKeys()[0], &paklist.OfflineKeys()[0], paklist.size(), &btcpubkey, masterOnlineKey.begin(), &sumprivkeybytes[0], whitelistindex) != 1)
         throw JSONRPCError(RPC_WALLET_ERROR, "Pegout authorization proof signing failed");
 
     if (secp256k1_whitelist_verify(secp256k1_ctx, &sig, &paklist.OnlineKeys()[0], &paklist.OfflineKeys()[0], paklist.size(), &btcpubkey) != 1)
@@ -7072,7 +7072,7 @@ static RPCHelpMan getpegoutkeys()
     std::vector<unsigned char> pegoutkeybytes(pegoutkey.begin(), pegoutkey.end());
     std::vector<unsigned char> pegoutsubkeybytes(bitcoinkey.begin(), bitcoinkey.end());
 
-    if (!secp256k1_ec_privkey_tweak_add(secp256k1_ctx, &pegoutkeybytes[0], &pegoutsubkeybytes[0]))
+    if (!secp256k1_ec_seckey_tweak_add(secp256k1_ctx, &pegoutkeybytes[0], &pegoutsubkeybytes[0]))
         throw JSONRPCError(RPC_WALLET_ERROR, "Summed key invalid");
 
     CKey sumseckey;