update to latest secp-zkp API interface

Author: jgriffiths

src/elements.c

@@ -614,7 +614,7 @@ int wally_asset_pak_whitelistproof(
     }
 
     if (secp256k1_whitelist_sign(ctx, &sig, online_secp_keys, offline_secp_keys, num_keys,
-                                 &pubkey, online_priv_key, summed_key, key_index, NULL, NULL) &&
+                                 &pubkey, online_priv_key, summed_key, key_index) &&
         secp256k1_whitelist_verify(ctx, &sig, online_secp_keys, offline_secp_keys, num_keys, &pubkey) &&
         secp256k1_whitelist_signature_serialize(ctx, bytes_out, &sig_size, &sig)) {
         ret = WALLY_OK;

src/wrap_js/src/combined.c

@@ -26,13 +26,17 @@
 #include "wif.c"
 #include "wordlist.c"
 #undef PACKAGE
+#undef PACKAGE_BUGREPORT
 #undef PACKAGE_NAME
 #undef PACKAGE_STRING
 #undef PACKAGE_TARNAME
+#undef PACKAGE_URL
 #undef PACKAGE_VERSION
 #undef VERSION
 #undef SECP256K1_BUILD
 #include "src/secp256k1/src/secp256k1.c"
+#include "src/secp256k1/src/precomputed_ecmult_gen.c"
+#include "src/secp256k1/src/precomputed_ecmult.c"
 #include "ccan/ccan/crypto/sha256/sha256.c"
 
 void wally_silence_unused_warnings(void)
@@ -41,15 +45,16 @@ void wally_silence_unused_warnings(void)
     assert_bip32_assumptions();
     assert_bip38_assumptions();
     assert_tx_assumptions();
+    secp256k1_fe_get_bounds(NULL, 0);
     secp256k1_fe_inv_var(NULL, NULL);
     secp256k1_ge_set_all_gej_var(NULL, NULL, 0);
     secp256k1_gej_has_quad_y_var(NULL);
     secp256k1_ge_is_valid_var(NULL);
     secp256k1_ge_set_infinity(NULL);
-    secp256k1_ec_commit_verify(NULL, NULL, NULL, NULL, NULL, 0);
-    secp256k1_ecmult_multi_var(NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
-    secp256k1_ecmult_strauss_batch_single(NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
-    secp256k1_ecmult_pippenger_batch_single(NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
+    secp256k1_ec_commit_verify(NULL, NULL, NULL, NULL, 0);
+    secp256k1_ecmult_multi_var(NULL, NULL, NULL, NULL, NULL, NULL, 0);
+    secp256k1_ecmult_strauss_batch_single(NULL, NULL, NULL, NULL, NULL, NULL, 0);
+    secp256k1_ecmult_pippenger_batch_single(NULL, NULL, NULL, NULL, NULL, NULL, 0);
     secp256k1_pippenger_scratch_size(0, 0);
     secp256k1_scalar_chacha20(NULL, NULL, NULL, 0);
     secp256k1_sha256_initialize_tagged(NULL, NULL, 0);

tools/msvc/build.bat

@@ -21,4 +21,4 @@ if "%ELEMENTS_BUILD%" == "elements" (
 REM Compile everything (wally, ccan, libsecp256k) in one lump.
 REM Define USE_ECMULT_STATIC_PRECOMPUTATION  to pick up the
 REM ecmult_static_context.h file generated previously
-cl /utf-8 /DUSE_ECMULT_STATIC_PRECOMPUTATION /DECMULT_WINDOW_SIZE=16 /DWALLY_CORE_BUILD %ELEMENTS_OPT% /DHAVE_CONFIG_H /DSECP256K1_BUILD /I%LIBWALLY_DIR%\src\wrap_js\windows_config /I%LIBWALLY_DIR% /I%LIBWALLY_DIR%\src /I%LIBWALLY_DIR%\include /I%LIBWALLY_DIR%\src\ccan /I%LIBWALLY_DIR%\src\ccan\base64 /I%LIBWALLY_DIR%\src\secp256k1 /Zi /LD src/aes.c src/anti_exfil.c src/base58.c src/base64.c src/bech32.c src/bip32.c src/bip38.c src/bip39.c src/blech32.c src/ecdh.c src/elements.c src/hex.c src/hmac.c src/internal.c src/mnemonic.c src/pbkdf2.c src/psbt.c src/script.c src/scrypt.c src/sign.c src/symmetric.c src/transaction.c src/wif.c src/wordlist.c src/ccan/ccan/crypto/ripemd160/ripemd160.c src/ccan/ccan/crypto/sha256/sha256.c src/ccan/ccan/crypto/sha512/sha512.c src/ccan/ccan/base64/base64_.c src\ccan\ccan\str\hex\hex_.c src/secp256k1/src/secp256k1.c /Fewally.dll
+cl /utf-8 /DUSE_ECMULT_STATIC_PRECOMPUTATION /DECMULT_WINDOW_SIZE=16 /DWALLY_CORE_BUILD %ELEMENTS_OPT% /DHAVE_CONFIG_H /DSECP256K1_BUILD /I%LIBWALLY_DIR%\src\wrap_js\windows_config /I%LIBWALLY_DIR% /I%LIBWALLY_DIR%\src /I%LIBWALLY_DIR%\include /I%LIBWALLY_DIR%\src\ccan /I%LIBWALLY_DIR%\src\ccan\base64 /I%LIBWALLY_DIR%\src\secp256k1 /Zi /LD src/aes.c src/anti_exfil.c src/base58.c src/base64.c src/bech32.c src/bip32.c src/bip38.c src/bip39.c src/blech32.c src/ecdh.c src/elements.c src/hex.c src/hmac.c src/internal.c src/mnemonic.c src/pbkdf2.c src/psbt.c src/script.c src/scrypt.c src/sign.c src/symmetric.c src/transaction.c src/wif.c src/wordlist.c src/ccan/ccan/crypto/ripemd160/ripemd160.c src/ccan/ccan/crypto/sha256/sha256.c src/ccan/ccan/crypto/sha512/sha512.c src/ccan/ccan/base64/base64_.c src\ccan\ccan\str\hex\hex_.c src/secp256k1/src/secp256k1.c src/secp256k1/src/precomputed_ecmult_gen.c src/secp256k1/src/precomputed_ecmult.c /Fewally.dll