Update libsecp256k1 subtree to latest upstream #22448

sipa · 2021-07-14T17:21:53Z

This updates our src/secp256k1 subtree to the lastest upstream master. Notable changes:

New schnorrsig API (schnorrsig API overhaul bitcoin-core/secp256k1#844), which adds support for variable-length messages (not used in BIP341/342 transaction signing, so not relevant for us, but it changes the API, and makes some other simplifications). Some of our call sites had to be adapted.
Don't use asm optimizations for gen_context (gen_context: Don't use any ASM bitcoin-core/secp256k1#965). This fixes guix: libsecp256k1 build failure on aarch64 (M1) #22441.
Various testing/CI improvements

be8d9c2 Merge bitcoin-core/secp256k1#965: gen_context: Don't use any ASM aeece44 gen_context: Don't use any ASM 7688a4f Merge bitcoin-core/secp256k1#963: "Schnorrsig API overhaul" fixups 90e8344 ci: Add C++ test f698caa Use unsigned char consistently for byte arrays b5b8e7b Don't declare constants twice 769528f Don't use string literals for char arrays without NUL termination 2cc3cfa Fix -Wmissing-braces warning in clang 0440945 Merge bitcoin#844: schnorrsig API overhaul ec3aaa5 Merge bitcoin#960: tests_exhaustive: check the result of secp256k1_ecdsa_sign a1ee83c tests_exhaustive: check the result of secp256k1_ecdsa_sign 253f90c Merge bitcoin-core/secp256k1#951: configure: replace AC_PATH_PROG to AC_CHECK_PROG 446d28d Merge bitcoin-core/secp256k1#944: Various improvements related to CFLAGS 0302138 ci: Make compiler warning into errors on CI b924e1e build: Ensure that configure's compile checks default to -O2 7939cd5 build: List *CPPFLAGS before *CFLAGS like on the compiler command line 595e8a3 build: Enable -Wcast-align=strict warning 0725626 build: Use own variable SECP_CFLAGS instead of touching user CFLAGS 4866178 Merge bitcoin-core/secp256k1#955: Add random field multiply/square tests 75ce488 Merge bitcoin-core/secp256k1#959: tests: really test the non-var scalar inverse 41ed139 tests: really test the non-var scalar inverse 5f6ceaf schnorrsig: allow setting MSGLEN != 32 in benchmark fdd06b7 schnorrsig: add tests for sign_custom and varlen msg verification d8d806a schnorrsig: add extra parameter struct for sign_custom a0c3fc1 schnorrsig: allow signing and verification of variable length msgs 5a8e499 Add secp256k1_tagged_sha256 as defined in BIP-340 b6c0b72 schnorrsig: remove noncefp args from sign; add sign_custom function bdf19f1 Add random field multiply/square tests 8ae56e3 Merge bitcoin#879: Avoid passing out-of-bound pointers to 0-size memcpy a4642fa configure: replace AC_PATH_PROG to AC_CHECK_PROG 1758a92 Merge bitcoin#950: ci: Add ppc64le build c58c4ea ci: Add ppc64le build 7973576 Merge bitcoin#662: Add ecmult_gen, ecmult_const and ecmult to benchmark 8f879c2 Fix array size in bench_ecmult 2fe1b50 Add ecmult_gen, ecmult_const and ecmult to benchmark 593e6ba Clean up ecmult_bench to make space for more benchmarks 50f3367 Merge bitcoin#947: ci: Run PRs on merge result even for i686 a35fdd3 ci: Run PRs on merge result even for i686 442cee5 schnorrsig: add algolen argument to nonce_function_hardened df3bfa1 schnorrsig: clarify result of calling nonce_function_bip340 without data 99e8614 README: mention schnorrsig module 3dc8c07 Merge bitcoin#846: ci: Run ASan/LSan and reorganize sanitizer and Valgrind jobs 02dcea1 ci: Make test iterations configurable and tweak for sanitizer builds 489ff5c tests: Treat empty SECP2561_TEST_ITERS as if it was unset fcfcb97 ci: Simplify to use generic wrapper for QEMU, Valgrind, etc de4157f ci: Run ASan/LSan and reorganize sanitizer and Valgrind jobs 399722a Merge bitcoin#941: Clean up git tree 09b3bb8 Clean up git tree bf0ac46 Merge bitcoin#930: Add ARM32/ARM64 CI 202a030 Merge bitcoin#850: add `secp256k1_ec_pubkey_cmp` method 1e78c18 Merge bitcoin-core/secp256k1#940: contrib: Explain explicit header guards 6939487 Merge bitcoin#926: secp256k1.h: clarify that by default arguments must be != NULL 6eceec6 add `secp256k1_xonly_pubkey_cmp` method 0d9561a add `secp256k1_ec_pubkey_cmp` method 22a9ea1 contrib: Explain explicit header guards 6c52ae8 Merge bitcoin#937: Have ge_set_gej_var, gej_double_var and ge_set_all_gej_var initialize all fields of their outputs. 185a6af Merge bitcoin#925: changed include statements without prefix 'include/' 14c9739 tests: Improve secp256k1_ge_set_all_gej_var for some infinity inputs 4a19668 tests: Test secp256k1_ge_set_all_gej_var for all infinity inputs 3c90bdd change local lib headers to be relative for those pointing at "include/" dir 45b6468 Have secp256k1_ge_set_all_gej_var initialize all fields. Previous behaviour would not initialize r->y values in the case where infinity is passed in. Furthermore, the previous behaviour wouldn't initialize anything in the case where all inputs were infinity. 31c0f6d Have secp256k1_gej_double_var initialize all fields. Previous behaviour would not initialize r->x and r->y values in the case where infinity is passed in. dd6c3de Have secp256k1_ge_set_gej_var initialize all fields. Previous behaviour would not initialize r->x and r->y values in the case where infinity is passed in. d0bd269 Merge bitcoin-core/secp256k1#936: Fix gen_context/ASM build on ARM 8bbad7a Add asm build to ARM32 CI 7d65ed5 Add ARM32/ARM64 CI c848352 Makefile.am: Don't pass a variable twice 2161f31 Makefile.am: Honor config when building gen_context 99f47c2 gen_context: Don't use external ASM because it complicates the build 98e0358 Merge bitcoin#933: Avoids a missing brace warning in schnorrsig/tests_impl.h on old compilers 99e2d5b Avoids a missing brace warning in schnorrsig/tests_impl.h on old compilers. 34388af Merge bitcoin#922: Add mingw32-w64/wine CI build 7012a18 Merge bitcoin#928: Define SECP256K1_BUILD in secp256k1.c directly. ed5a199 tests: fopen /dev/urandom in binary mode ae9e648 Define SECP256K1_BUILD in secp256k1.c directly. 4dc37bf Add mingw32-w64/wine CI build 0881633 secp256k1.h: clarify that by default arguments must be != NULL 9570f67 Avoid passing out-of-bound pointers to 0-size memcpy git-subtree-dir: src/secp256k1 git-subtree-split: be8d9c2

jonasnick

utACK 4bf2400ab0d53b5e31c05ffe56db7524c162a2fc

maflcko · 2021-07-14T18:02:57Z

Wouldn't the 4bf2400ab0d53b5e31c05ffe56db7524c162a2fc commit need to be squashed into the merge commit to avoid git bisect build failures?

sipa · 2021-07-14T18:11:37Z

@MarcoFalke I'm not sure that's possible without breaking git-subtree.

maflcko · 2021-07-14T19:26:19Z

Do you have steps to reproduce? I am almost sure I did this in the past and it was working fine. You can try:

git reset --soft HEAD~
git commit --amend
git diff HEAD 4bf2400ab0d53b5e31c05ffe56db7524c162a2fc  # empty
./test/lint/git-subtree-check.sh src/secp256k1  # green

maflcko · 2021-07-14T19:27:15Z

Here is the commit where I did this previously: faaeeb0

hebasto

Tested 4bf2400ab0d53b5e31c05ffe56db7524c162a2fc in hirsute docker container on mac M1 (aarch64) for HOST=x86_64-w64-mingw32.

Can confirm that #22441 is fixed.

The new schnorrsig API requires changing a few arguments.

sipa · 2021-07-14T21:44:46Z

@MarcoFalke Cool, didn't know that'd just work. Pushed.

jonatack

Light ACK e4ffb44 debug built (debian clang 13.0), ran bitcoind node/tests/git-subtree-check.sh, lightly reviewed the diff and API changes

$ ./test/lint/git-subtree-check.sh src/secp256k1 
src/secp256k1 in HEAD currently refers to tree b7f4357396a8a5f073bf628567ef10b2e2edd410
src/secp256k1 in HEAD was last updated in commit c020cbaa5c8e9e61b2b8efd8dc09be743fcd4273 (tree b7f4357396a8a5f073bf628567ef10b2e2edd410)
GOOD

Feel free to ignore the comments below, the edits were for my benefit.

jonatack · 2021-07-15T09:56:53Z

src/pubkey.cpp

    secp256k1_xonly_pubkey pubkey;
    if (!secp256k1_xonly_pubkey_parse(secp256k1_context_verify, &pubkey, m_keydata.data())) return false;
-    return secp256k1_schnorrsig_verify(secp256k1_context_verify, sigbytes.data(), msg.begin(), &pubkey);
+    return secp256k1_schnorrsig_verify(secp256k1_context_verify, sigbytes.data(), msg.begin(), 32, &pubkey);


Suggested change

return secp256k1_schnorrsig_verify(secp256k1_context_verify, sigbytes.data(), msg.begin(), 32, &pubkey);

return secp256k1_schnorrsig_verify(secp256k1_context_verify, sigbytes.data(), msg.begin(), /* msg_len */ 32, &pubkey);

jonatack · 2021-07-15T10:01:07Z

src/key.cpp

        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, secp256k1_nonce_function_bip340, aux ? (void*)aux->data() : nullptr);
+    bool ret = secp256k1_schnorrsig_sign(secp256k1_context_sign, sig.data(), hash.data(), &keypair, aux ? (unsigned char*)aux->data() : nullptr);


Suggested change

bool ret = secp256k1_schnorrsig_sign(secp256k1_context_sign, sig.data(), hash.data(), &keypair, aux ? (unsigned char*)aux->data() : nullptr);

bool ret = secp256k1_schnorrsig_sign(secp256k1_context_sign, sig.data(), hash.data(), &keypair, /* aux_rand32 */ aux ? (unsigned char*)aux->data() : nullptr);

fanquake · 2021-07-16T10:37:01Z

I've done Guix builds on x86_64 (all hosts) and aarch64 (all except aarch64, see #22458), and have confirmed this fixes #22441.

x86_64

cabeca6ce99f73ae8ba7bcdc13fce8adf6ae2f0e643801183c9ad5026d41c9eb  guix-build-e4ffb44716bb/output/aarch64-linux-gnu/SHA256SUMS.part
11232e3f91ab301519a7afcea03c7811200f94e268585adf4a5cbc4a5728d3c4  guix-build-e4ffb44716bb/output/aarch64-linux-gnu/bitcoin-e4ffb44716bb-aarch64-linux-gnu-debug.tar.gz
b6e8aa68580fd0b33f1cd3a0f5230476b2656d0b4d8e814988a3317af6baa812  guix-build-e4ffb44716bb/output/aarch64-linux-gnu/bitcoin-e4ffb44716bb-aarch64-linux-gnu.tar.gz
a9163d4af3e137ea3b82fa4e73361a9a703aae1f79ed84d59282be01c35bec08  guix-build-e4ffb44716bb/output/arm-linux-gnueabihf/SHA256SUMS.part
2a5dcbdc08307574b5ac526a88a12de6e013263b5f8cc9153136df15a079baa9  guix-build-e4ffb44716bb/output/arm-linux-gnueabihf/bitcoin-e4ffb44716bb-arm-linux-gnueabihf-debug.tar.gz
c27a4a9fdff527b9664328ad58d2e8c66cef6e0c66c2f11555f8961c0d5fce4f  guix-build-e4ffb44716bb/output/arm-linux-gnueabihf/bitcoin-e4ffb44716bb-arm-linux-gnueabihf.tar.gz
e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  guix-build-e4ffb44716bb/output/dist-archive/SKIPATTEST.TAG
7e60ba8a81b402504750794122c28686d6806fe31383e13e3aff29129529c03d  guix-build-e4ffb44716bb/output/dist-archive/bitcoin-e4ffb44716bb.tar.gz
3dbf824390c3e949f71e0839d92b3ea5e6e6d86908c3565847b8848a138d59c7  guix-build-e4ffb44716bb/output/powerpc64-linux-gnu/SHA256SUMS.part
ce0a9eb18671d0a01b47a00cae372aeb40eea902b6b72133aee1154bb69ce782  guix-build-e4ffb44716bb/output/powerpc64-linux-gnu/bitcoin-e4ffb44716bb-powerpc64-linux-gnu-debug.tar.gz
93a23b4bd88e40125d98a363e7ad700ad836d204064e49b3d05253c4be739658  guix-build-e4ffb44716bb/output/powerpc64-linux-gnu/bitcoin-e4ffb44716bb-powerpc64-linux-gnu.tar.gz
8e461df488378a7b815dd3e8fabcc5860eaecd81da1cf79f71ebb0c6ee15aef0  guix-build-e4ffb44716bb/output/powerpc64le-linux-gnu/SHA256SUMS.part
e28e847fd2d51cbd30feb298dcd2c895ae2686aaffd476c263af07971a21bc5d  guix-build-e4ffb44716bb/output/powerpc64le-linux-gnu/bitcoin-e4ffb44716bb-powerpc64le-linux-gnu-debug.tar.gz
214afae9336d12f6a3a830d31b71702ce794dff9332ce9d56aaf11df73d3c531  guix-build-e4ffb44716bb/output/powerpc64le-linux-gnu/bitcoin-e4ffb44716bb-powerpc64le-linux-gnu.tar.gz
06add014d790806009dfc9f897f6ca61272fd0ac0a82eed03aaf9618d3308d22  guix-build-e4ffb44716bb/output/riscv64-linux-gnu/SHA256SUMS.part
d387f6d24f3578e09d55500a7873430b2b677035eff9b5c4b29f420178509c3c  guix-build-e4ffb44716bb/output/riscv64-linux-gnu/bitcoin-e4ffb44716bb-riscv64-linux-gnu-debug.tar.gz
44e41494ae3a9cf9bea7bcd80bb5911a4ded21027711774c7dd227aa16b66fd5  guix-build-e4ffb44716bb/output/riscv64-linux-gnu/bitcoin-e4ffb44716bb-riscv64-linux-gnu.tar.gz
561a8249dad97cf5852a5be2556f3265c29f430c4146d79208255127663ce43c  guix-build-e4ffb44716bb/output/x86_64-apple-darwin18/SHA256SUMS.part
f5d064ebd62f2b688b82aafa19666f366a69a3879c90356e49a6a8d697a7a0bd  guix-build-e4ffb44716bb/output/x86_64-apple-darwin18/bitcoin-e4ffb44716bb-osx-unsigned.dmg
b0cf350b3c23fe9557581d341ee8ea89caf2a25784b68762ede6884c44c5ed90  guix-build-e4ffb44716bb/output/x86_64-apple-darwin18/bitcoin-e4ffb44716bb-osx-unsigned.tar.gz
7e7c7059932df60b77df5ecce0d02469111c72f1406905e0331bee568ae9ecf5  guix-build-e4ffb44716bb/output/x86_64-apple-darwin18/bitcoin-e4ffb44716bb-osx64.tar.gz
3c3d21b6fd398d51670b2927b4a3a899efb14f4e9049f4e3c747e8dacbd449d8  guix-build-e4ffb44716bb/output/x86_64-linux-gnu/SHA256SUMS.part
a5f0011f7b26c89bcb35882dc1a4caa608fa03b526895e7fc15e8791123e1f3e  guix-build-e4ffb44716bb/output/x86_64-linux-gnu/bitcoin-e4ffb44716bb-x86_64-linux-gnu-debug.tar.gz
f620652dbddf467e6b8013a18861e4b0d159a503a170617b5094a80fcf71180a  guix-build-e4ffb44716bb/output/x86_64-linux-gnu/bitcoin-e4ffb44716bb-x86_64-linux-gnu.tar.gz
e7aa34025cb9abf0d22989aff1eb2c640b44d9761d5f06446eb29c5786cb2897  guix-build-e4ffb44716bb/output/x86_64-w64-mingw32/SHA256SUMS.part
b81b790358f89d697777a3c8d46a489013d73546dcc48af98cfc8c3bd23e1ea7  guix-build-e4ffb44716bb/output/x86_64-w64-mingw32/bitcoin-e4ffb44716bb-win-unsigned.tar.gz
bccae9b6dfbe55f33d5432edc323b347e9bd1207bcce8073ae3fa8616e8ec3c9  guix-build-e4ffb44716bb/output/x86_64-w64-mingw32/bitcoin-e4ffb44716bb-win64-debug.zip
c43842779c07a6565d51e4c14c410883540068e4e3fa7e6a5b7cd04a10404b1f  guix-build-e4ffb44716bb/output/x86_64-w64-mingw32/bitcoin-e4ffb44716bb-win64-setup-unsigned.exe
4d439e0a42034789a1bdd6458a837413e3363c79b12663db28076ea419fe5b97  guix-build-e4ffb44716bb/output/x86_64-w64-mingw32/bitcoin-e4ffb44716bb-win64.zip

aarch64 (M1)

d828944f04e3072cd9cd7255daa4f0f19a0edd19003948867ca5857a0ff61b13  guix-build-e4ffb44716bb/output/arm-linux-gnueabihf/SHA256SUMS.part
1a8bc86cf82e0a73795f7d946c0444ef312223d41e08926df813a1b5813eb948  guix-build-e4ffb44716bb/output/arm-linux-gnueabihf/bitcoin-e4ffb44716bb-arm-linux-gnueabihf-debug.tar.gz
a1c9d33bf8bce64b6bbcd8252dc432f1e8b636a50b394d148c089416994f6b9b  guix-build-e4ffb44716bb/output/arm-linux-gnueabihf/bitcoin-e4ffb44716bb-arm-linux-gnueabihf.tar.gz
e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  guix-build-e4ffb44716bb/output/dist-archive/SKIPATTEST.TAG
7e60ba8a81b402504750794122c28686d6806fe31383e13e3aff29129529c03d  guix-build-e4ffb44716bb/output/dist-archive/bitcoin-e4ffb44716bb.tar.gz
cf1fe5f570b6b6da6c3d3ace5da4b38267e3b5f2b5f2878252418f467e87a4ed  guix-build-e4ffb44716bb/output/powerpc64-linux-gnu/SHA256SUMS.part
dd446e473ff5b048810bb8fed0db7fed1aba84eab8188cfff59fcd79e74a635a  guix-build-e4ffb44716bb/output/powerpc64-linux-gnu/bitcoin-e4ffb44716bb-powerpc64-linux-gnu-debug.tar.gz
33eafdc1254b16900e0bf8b5650cc4362d1455c919e823d6ff78478fae8e1d76  guix-build-e4ffb44716bb/output/powerpc64-linux-gnu/bitcoin-e4ffb44716bb-powerpc64-linux-gnu.tar.gz
7a158caf93e5c15112fbfefaecaed365461d7b5f71a3589c70f5e7a3c65cdad4  guix-build-e4ffb44716bb/output/powerpc64le-linux-gnu/SHA256SUMS.part
57b82047c495c4d30530901a565a5d828f4c22fa1e823f580497d2d10fc54f31  guix-build-e4ffb44716bb/output/powerpc64le-linux-gnu/bitcoin-e4ffb44716bb-powerpc64le-linux-gnu-debug.tar.gz
81af2c4a900783be5660505a1e96a825dd1c07bd95cfaf58988f219f5fc553fc  guix-build-e4ffb44716bb/output/powerpc64le-linux-gnu/bitcoin-e4ffb44716bb-powerpc64le-linux-gnu.tar.gz
d6bbf5301fbff11f7a284e5ad1664309cc9cefc20b107fa0acd50f66c31e9948  guix-build-e4ffb44716bb/output/riscv64-linux-gnu/SHA256SUMS.part
d03deafa271fd553fe0779af8a59fa949bf2cf82789d44306360df1cb665c38f  guix-build-e4ffb44716bb/output/riscv64-linux-gnu/bitcoin-e4ffb44716bb-riscv64-linux-gnu-debug.tar.gz
565614601fb34285791e2564809d12c32b01a1f07f3eae9fd62bbd62abdc980a  guix-build-e4ffb44716bb/output/riscv64-linux-gnu/bitcoin-e4ffb44716bb-riscv64-linux-gnu.tar.gz
4cbd4a59b3d6ec23f00ef8c0102769ff6ee02f880c14b8cecd80fcf5d28f6830  guix-build-e4ffb44716bb/output/x86_64-apple-darwin18/SHA256SUMS.part
f5d064ebd62f2b688b82aafa19666f366a69a3879c90356e49a6a8d697a7a0bd  guix-build-e4ffb44716bb/output/x86_64-apple-darwin18/bitcoin-e4ffb44716bb-osx-unsigned.dmg
f74d61620ebd85baeacb49c5d106786f3ded8ae5da33ad038224ad4259a82631  guix-build-e4ffb44716bb/output/x86_64-apple-darwin18/bitcoin-e4ffb44716bb-osx-unsigned.tar.gz
7e7c7059932df60b77df5ecce0d02469111c72f1406905e0331bee568ae9ecf5  guix-build-e4ffb44716bb/output/x86_64-apple-darwin18/bitcoin-e4ffb44716bb-osx64.tar.gz
016804ccda9730c1b1fb42920333ca8d34a8c1b1e0e75aebd7145e4e1f828dc3  guix-build-e4ffb44716bb/output/x86_64-linux-gnu/SHA256SUMS.part
d02a1fb18fd29404ef516eb99b83ea26e8e21701349062ed71bcda31543806bc  guix-build-e4ffb44716bb/output/x86_64-linux-gnu/bitcoin-e4ffb44716bb-x86_64-linux-gnu-debug.tar.gz
b1cfe6787a6f53798f4b445ee41fd50adaf419c670d1d3220fee7a9ecbeb8698  guix-build-e4ffb44716bb/output/x86_64-linux-gnu/bitcoin-e4ffb44716bb-x86_64-linux-gnu.tar.gz
7a9935b43d9022dc4e6dcfadf52075ad6e38db28ec5354ccc7f5bdf20ec88ee2  guix-build-e4ffb44716bb/output/x86_64-w64-mingw32/SHA256SUMS.part
b81b790358f89d697777a3c8d46a489013d73546dcc48af98cfc8c3bd23e1ea7  guix-build-e4ffb44716bb/output/x86_64-w64-mingw32/bitcoin-e4ffb44716bb-win-unsigned.tar.gz
3b7823e01f25ed8f30686f937ec711fdcc03733c200d6d8a98f4a39bec26ce1d  guix-build-e4ffb44716bb/output/x86_64-w64-mingw32/bitcoin-e4ffb44716bb-win64-debug.zip
c43842779c07a6565d51e4c14c410883540068e4e3fa7e6a5b7cd04a10404b1f  guix-build-e4ffb44716bb/output/x86_64-w64-mingw32/bitcoin-e4ffb44716bb-win64-setup-unsigned.exe
4f35a51f0a46dbe6a6e7101ec86f52e22bc410bc1aa833bac987f0d577e88cd2  guix-build-e4ffb44716bb/output/x86_64-w64-mingw32/bitcoin-e4ffb44716bb-win64.zip

hebasto · 2021-07-17T20:33:21Z

Guix builds:

$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
cabeca6ce99f73ae8ba7bcdc13fce8adf6ae2f0e643801183c9ad5026d41c9eb  guix-build-e4ffb44716bb/output/aarch64-linux-gnu/SHA256SUMS.part
11232e3f91ab301519a7afcea03c7811200f94e268585adf4a5cbc4a5728d3c4  guix-build-e4ffb44716bb/output/aarch64-linux-gnu/bitcoin-e4ffb44716bb-aarch64-linux-gnu-debug.tar.gz
b6e8aa68580fd0b33f1cd3a0f5230476b2656d0b4d8e814988a3317af6baa812  guix-build-e4ffb44716bb/output/aarch64-linux-gnu/bitcoin-e4ffb44716bb-aarch64-linux-gnu.tar.gz
a9163d4af3e137ea3b82fa4e73361a9a703aae1f79ed84d59282be01c35bec08  guix-build-e4ffb44716bb/output/arm-linux-gnueabihf/SHA256SUMS.part
2a5dcbdc08307574b5ac526a88a12de6e013263b5f8cc9153136df15a079baa9  guix-build-e4ffb44716bb/output/arm-linux-gnueabihf/bitcoin-e4ffb44716bb-arm-linux-gnueabihf-debug.tar.gz
c27a4a9fdff527b9664328ad58d2e8c66cef6e0c66c2f11555f8961c0d5fce4f  guix-build-e4ffb44716bb/output/arm-linux-gnueabihf/bitcoin-e4ffb44716bb-arm-linux-gnueabihf.tar.gz
e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  guix-build-e4ffb44716bb/output/dist-archive/SKIPATTEST.TAG
7e60ba8a81b402504750794122c28686d6806fe31383e13e3aff29129529c03d  guix-build-e4ffb44716bb/output/dist-archive/bitcoin-e4ffb44716bb.tar.gz
3dbf824390c3e949f71e0839d92b3ea5e6e6d86908c3565847b8848a138d59c7  guix-build-e4ffb44716bb/output/powerpc64-linux-gnu/SHA256SUMS.part
ce0a9eb18671d0a01b47a00cae372aeb40eea902b6b72133aee1154bb69ce782  guix-build-e4ffb44716bb/output/powerpc64-linux-gnu/bitcoin-e4ffb44716bb-powerpc64-linux-gnu-debug.tar.gz
93a23b4bd88e40125d98a363e7ad700ad836d204064e49b3d05253c4be739658  guix-build-e4ffb44716bb/output/powerpc64-linux-gnu/bitcoin-e4ffb44716bb-powerpc64-linux-gnu.tar.gz
8e461df488378a7b815dd3e8fabcc5860eaecd81da1cf79f71ebb0c6ee15aef0  guix-build-e4ffb44716bb/output/powerpc64le-linux-gnu/SHA256SUMS.part
e28e847fd2d51cbd30feb298dcd2c895ae2686aaffd476c263af07971a21bc5d  guix-build-e4ffb44716bb/output/powerpc64le-linux-gnu/bitcoin-e4ffb44716bb-powerpc64le-linux-gnu-debug.tar.gz
214afae9336d12f6a3a830d31b71702ce794dff9332ce9d56aaf11df73d3c531  guix-build-e4ffb44716bb/output/powerpc64le-linux-gnu/bitcoin-e4ffb44716bb-powerpc64le-linux-gnu.tar.gz
06add014d790806009dfc9f897f6ca61272fd0ac0a82eed03aaf9618d3308d22  guix-build-e4ffb44716bb/output/riscv64-linux-gnu/SHA256SUMS.part
d387f6d24f3578e09d55500a7873430b2b677035eff9b5c4b29f420178509c3c  guix-build-e4ffb44716bb/output/riscv64-linux-gnu/bitcoin-e4ffb44716bb-riscv64-linux-gnu-debug.tar.gz
44e41494ae3a9cf9bea7bcd80bb5911a4ded21027711774c7dd227aa16b66fd5  guix-build-e4ffb44716bb/output/riscv64-linux-gnu/bitcoin-e4ffb44716bb-riscv64-linux-gnu.tar.gz
561a8249dad97cf5852a5be2556f3265c29f430c4146d79208255127663ce43c  guix-build-e4ffb44716bb/output/x86_64-apple-darwin18/SHA256SUMS.part
f5d064ebd62f2b688b82aafa19666f366a69a3879c90356e49a6a8d697a7a0bd  guix-build-e4ffb44716bb/output/x86_64-apple-darwin18/bitcoin-e4ffb44716bb-osx-unsigned.dmg
b0cf350b3c23fe9557581d341ee8ea89caf2a25784b68762ede6884c44c5ed90  guix-build-e4ffb44716bb/output/x86_64-apple-darwin18/bitcoin-e4ffb44716bb-osx-unsigned.tar.gz
7e7c7059932df60b77df5ecce0d02469111c72f1406905e0331bee568ae9ecf5  guix-build-e4ffb44716bb/output/x86_64-apple-darwin18/bitcoin-e4ffb44716bb-osx64.tar.gz
3c3d21b6fd398d51670b2927b4a3a899efb14f4e9049f4e3c747e8dacbd449d8  guix-build-e4ffb44716bb/output/x86_64-linux-gnu/SHA256SUMS.part
a5f0011f7b26c89bcb35882dc1a4caa608fa03b526895e7fc15e8791123e1f3e  guix-build-e4ffb44716bb/output/x86_64-linux-gnu/bitcoin-e4ffb44716bb-x86_64-linux-gnu-debug.tar.gz
f620652dbddf467e6b8013a18861e4b0d159a503a170617b5094a80fcf71180a  guix-build-e4ffb44716bb/output/x86_64-linux-gnu/bitcoin-e4ffb44716bb-x86_64-linux-gnu.tar.gz
e7aa34025cb9abf0d22989aff1eb2c640b44d9761d5f06446eb29c5786cb2897  guix-build-e4ffb44716bb/output/x86_64-w64-mingw32/SHA256SUMS.part
b81b790358f89d697777a3c8d46a489013d73546dcc48af98cfc8c3bd23e1ea7  guix-build-e4ffb44716bb/output/x86_64-w64-mingw32/bitcoin-e4ffb44716bb-win-unsigned.tar.gz
bccae9b6dfbe55f33d5432edc323b347e9bd1207bcce8073ae3fa8616e8ec3c9  guix-build-e4ffb44716bb/output/x86_64-w64-mingw32/bitcoin-e4ffb44716bb-win64-debug.zip
c43842779c07a6565d51e4c14c410883540068e4e3fa7e6a5b7cd04a10404b1f  guix-build-e4ffb44716bb/output/x86_64-w64-mingw32/bitcoin-e4ffb44716bb-win64-setup-unsigned.exe
4d439e0a42034789a1bdd6458a837413e3363c79b12663db28076ea419fe5b97  guix-build-e4ffb44716bb/output/x86_64-w64-mingw32/bitcoin-e4ffb44716bb-win64.zip

hebasto · 2021-07-17T20:35:21Z

ACK e4ffb44

…on aarch64 54c7754 build: use aarch64 Clang if cross-compiling for darwin on aarch64 (fanquake) Pull request description: If we're cross-compiling for darwin on aarch64 hardware, we need to use a Clang that will run on that hardware. Only tested in a Linux Docker container (aarch64-unknown-linux-gnu), running on an Apple M1 mac-mini (aarch64-apple-darwin20.5.0). ACKs for top commit: hebasto: ACK 54c7754, I agree it can be merged (fix in #22448 is orthogonal to this one). Tree-SHA512: 66c530097a5dc072a0a00dc22eb3d4a7d923dfa8ab8160f7c3e395cbe58da324f367548d673c0510606f5225d5d37bb5607a76b1703b8b03ac7d2cceeccbd542

…darwin on aarch64 54c7754 build: use aarch64 Clang if cross-compiling for darwin on aarch64 (fanquake) Pull request description: If we're cross-compiling for darwin on aarch64 hardware, we need to use a Clang that will run on that hardware. Only tested in a Linux Docker container (aarch64-unknown-linux-gnu), running on an Apple M1 mac-mini (aarch64-apple-darwin20.5.0). ACKs for top commit: hebasto: ACK 54c7754, I agree it can be merged (fix in bitcoin#22448 is orthogonal to this one). Tree-SHA512: 66c530097a5dc072a0a00dc22eb3d4a7d923dfa8ab8160f7c3e395cbe58da324f367548d673c0510606f5225d5d37bb5607a76b1703b8b03ac7d2cceeccbd542

fanquake

ACK e4ffb44

c020cba Squashed 'src/secp256k1/' changes from efad350..be8d9c2 (Pieter Wuille) Pull request description: This updates our src/secp256k1 subtree to the lastest upstream master. Notable changes: * New schnorrsig API (bitcoin-core/secp256k1#844), which adds support for variable-length messages (not used in BIP341/342 transaction signing, so not relevant for us, but it changes the API, and makes some other simplifications). Some of our call sites had to be adapted. * Don't use asm optimizations for `gen_context` (bitcoin-core/secp256k1#965). This fixes bitcoin#22441. * Various testing/CI improvements ACKs for top commit: hebasto: ACK e4ffb44 jonatack: Light ACK e4ffb44 debug built (debian clang 13.0), ran bitcoind node/tests/git-subtree-check.sh, lightly reviewed the diff and API changes fanquake: ACK e4ffb44 Tree-SHA512: 89a5c3019ec010d578e84bcef756d2c679420c5c768bcdece673405c4e10955179c5a1339aafc68b8b74b1e3912e147bf2f392f44f15af73791d93f6537960b3

…stream c020cba Squashed 'src/secp256k1/' changes from efad350..be8d9c2 (Pieter Wuille) Pull request description: This updates our src/secp256k1 subtree to the lastest upstream master. Notable changes: * New schnorrsig API (bitcoin-core/secp256k1#844), which adds support for variable-length messages (not used in BIP341/342 transaction signing, so not relevant for us, but it changes the API, and makes some other simplifications). Some of our call sites had to be adapted. * Don't use asm optimizations for `gen_context` (bitcoin-core/secp256k1#965). This fixes bitcoin#22441. * Various testing/CI improvements ACKs for top commit: hebasto: ACK e4ffb44 jonatack: Light ACK e4ffb44 debug built (debian clang 13.0), ran bitcoind node/tests/git-subtree-check.sh, lightly reviewed the diff and API changes fanquake: ACK e4ffb44 Tree-SHA512: 89a5c3019ec010d578e84bcef756d2c679420c5c768bcdece673405c4e10955179c5a1339aafc68b8b74b1e3912e147bf2f392f44f15af73791d93f6537960b3

…darwin on aarch64 54c7754 build: use aarch64 Clang if cross-compiling for darwin on aarch64 (fanquake) Pull request description: If we're cross-compiling for darwin on aarch64 hardware, we need to use a Clang that will run on that hardware. Only tested in a Linux Docker container (aarch64-unknown-linux-gnu), running on an Apple M1 mac-mini (aarch64-apple-darwin20.5.0). ACKs for top commit: hebasto: ACK 54c7754, I agree it can be merged (fix in bitcoin#22448 is orthogonal to this one). Tree-SHA512: 66c530097a5dc072a0a00dc22eb3d4a7d923dfa8ab8160f7c3e395cbe58da324f367548d673c0510606f5225d5d37bb5607a76b1703b8b03ac7d2cceeccbd542

This updates libsecp to the latest API. This involves a sketchy (in my view) cast of a const pointer to a const one, but (a) it is safe given the actual usage of this pointer, and (b) I copied it directly from Core -- see the final (20th) commit of the corresponding PR bitcoin/bitcoin#22448

sipa mentioned this pull request Jul 14, 2021

guix: libsecp256k1 build failure on aarch64 (M1) #22441

Closed

jonasnick reviewed Jul 14, 2021

View reviewed changes

DrahtBot added Build system Utils/log/libs labels Jul 14, 2021

maflcko added Upstream Utils/log/libs and removed Build system Utils/log/libs labels Jul 14, 2021

hebasto reviewed Jul 14, 2021

View reviewed changes

Update secp256k1 subtree to latest upstream + adapt API

e4ffb44

The new schnorrsig API requires changing a few arguments.

sipa force-pushed the 202107_secp256k1 branch from 4bf2400 to e4ffb44 Compare July 14, 2021 21:44

jonatack reviewed Jul 15, 2021

View reviewed changes

hebasto mentioned this pull request Jul 17, 2021

build: use aarch64 Clang if cross-compiling for darwin on aarch64 #22436

Merged

hebasto mentioned this pull request Jul 20, 2021

build: Support x86_64 <-> arm64 cross-compiling for macOS #22506

Closed

hebasto mentioned this pull request Jul 23, 2021

build, qt: Fix cross-compiling detection on M1-based macOS (aarch64) #22487

Closed

maflcko removed Upstream Utils/log/libs labels Jul 25, 2021

DrahtBot added Build system Upstream labels Jul 25, 2021

DrahtBot added the Utils/log/libs label Jul 25, 2021

maflcko removed the Build system label Jul 25, 2021

fanquake approved these changes Aug 3, 2021

View reviewed changes

fanquake merged commit 71797be into bitcoin:master Aug 3, 2021

str4d mentioned this pull request Apr 6, 2022

Update libsecp256k1 to be8d9c26 and secp256k1 to 0.22 zcash/zcash#5838

Closed

bitcoin locked as resolved and limited conversation to collaborators Aug 18, 2022

	return secp256k1_schnorrsig_verify(secp256k1_context_verify, sigbytes.data(), msg.begin(), 32, &pubkey);
	return secp256k1_schnorrsig_verify(secp256k1_context_verify, sigbytes.data(), msg.begin(), /* msg_len */ 32, &pubkey);

	bool ret = secp256k1_schnorrsig_sign(secp256k1_context_sign, sig.data(), hash.data(), &keypair, aux ? (unsigned char*)aux->data() : nullptr);
	bool ret = secp256k1_schnorrsig_sign(secp256k1_context_sign, sig.data(), hash.data(), &keypair, /* aux_rand32 / aux ? (unsigned char)aux->data() : nullptr);

Update libsecp256k1 subtree to latest upstream #22448

Update libsecp256k1 subtree to latest upstream #22448

Uh oh!

Conversation

sipa commented Jul 14, 2021

Uh oh!

jonasnick left a comment

Choose a reason for hiding this comment

Uh oh!

maflcko commented Jul 14, 2021

Uh oh!

sipa commented Jul 14, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

maflcko commented Jul 14, 2021

Uh oh!

maflcko commented Jul 14, 2021

Uh oh!

hebasto left a comment

Choose a reason for hiding this comment

Uh oh!

sipa commented Jul 14, 2021

Uh oh!

jonatack left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jonatack Jul 15, 2021

Choose a reason for hiding this comment

Uh oh!

jonatack Jul 15, 2021

Choose a reason for hiding this comment

Uh oh!

fanquake commented Jul 16, 2021

Uh oh!

hebasto commented Jul 17, 2021

Guix builds:

Uh oh!

hebasto commented Jul 17, 2021

Uh oh!

fanquake left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

sipa commented Jul 14, 2021 •

edited

Loading

jonatack left a comment •

edited

Loading