Upstream PRs 1391, 1290, 1389, 1397, 1399, 1400, 1348, 1402, 1274, 1394, 1404, 1062, 1401, 1373, 1403, 1398, 1405, 1396, 1406, 1410, 1409, 1411, 1412, 1414, 1413, 1415, 1417, 1390, 1416, 1422, 1424, 1395

[jonasnick]

[bitcoin-core/secp256k1#1391]: refactor: take use of secp256k1_scalar_{zero,one} constants (part 2) [bitcoin-core/secp256k1#1290]: cmake: Set ENVIRONMENT property for examples on Windows [bitcoin-core/secp256k1#1389]: ci: Run "Windows (VS 2022)" job on GitHub Actions [bitcoin-core/secp256k1#1397]: ci: Remove "Windows (VS 2022)" task from Cirrus CI [bitcoin-core/secp256k1#1399]: ci, gha: Run "SageMath prover" job on GitHub Actions [bitcoin-core/secp256k1#1400]: ctimetests: Use new SECP256K1_CHECKMEM macros also for ellswift [bitcoin-core/secp256k1#1348]: tighten group magnitude limits, save normalize_weak calls in group add methods (revival of #1032) [bitcoin-core/secp256k1#1402]: ci: Use Homebrew'\''s gcc in native macOS task [bitcoin-core/secp256k1#1274]: test: Silent noisy clang warnings about Valgrind code on macOS x86_64 [bitcoin-core/secp256k1#1394]: ci, gha: Run "x86_64: macOS Ventura" job on GitHub Actions [bitcoin-core/secp256k1#1404]: ci: Remove "arm64: macOS Ventura" task from Cirrus CI [bitcoin-core/secp256k1#1062]: Removes _fe_equal_var, and unwanted _fe_normalize_weak calls (in tests) [bitcoin-core/secp256k1#1401]: ci, gha: Run all MSVC tests on Windows natively [bitcoin-core/secp256k1#1373]: Add invariant checking for scalars [bitcoin-core/secp256k1#1403]: ci, gha: Ensure only a single workflow processes github.ref at a time [bitcoin-core/secp256k1#1398]: ci, gha: Add Windows jobs based on Linux image [bitcoin-core/secp256k1#1405]: ci: Drop no longer needed workaround [bitcoin-core/secp256k1#1396]: ci, gha: Add "x86_64: Linux (Debian stable)" GitHub Actions job [bitcoin-core/secp256k1#1406]: ci, gha: Move more non-x86_64 tasks from Cirrus CI to GitHub Actions [bitcoin-core/secp256k1#1410]: ci: Use concurrency for pull requests only [bitcoin-core/secp256k1#1409]: ci: Move remained task from Cirrus to GitHub Actions [bitcoin-core/secp256k1#1411]: ci: Make repetitive command the default one [bitcoin-core/secp256k1#1412]: ci: Switch macOS from Ventura to Monterey and add Valgrind [bitcoin-core/secp256k1#1414]: ci/gha: Add ARM64 QEMU jobs for clang and clang-snapshot [bitcoin-core/secp256k1#1413]: ci: Add release job [bitcoin-core/secp256k1#1415]: release: Prepare for 0.4.0 [bitcoin-core/secp256k1#1417]: release cleanup: bump version after 0.4.0 [bitcoin-core/secp256k1#1390]: tests: Replace counting_illegal_callbacks with CHECK_ILLEGAL_VOID [bitcoin-core/secp256k1#1416]: doc: Align documented scripts with CI ones [bitcoin-core/secp256k1#1422]: cmake: Install libsecp256k1.pc file [bitcoin-core/secp256k1#1424]: ci: Bump major versions for docker actions [bitcoin-core/secp256k1#1395]: tests: simplify random_fe_non_zero (remove loop limit and unneeded normalize)

This PR can be recreated with ./contrib/sync-upstream.sh -b master range ee7aaf213ea3eb42fc8960c7d178b5ffb286440f. Tip: Use git show --remerge-diff to show the changes manually added to the merge commit.' --web

• Replace fe_equal_var with fe_equal
• Use CHECK_ILLEGAL instead of CHECK/ecount
• Turn on secp256k1-zkp specific modules in CI

[jonasnick]

My fork shows that the branch passes GH Actions CI: https://github.com/jonasnick/secp256k1-zkp/actions

[real-or-random]

• git grep ecount gives me a few remaining cases.
• want to add -zkp modules also for "macos-native" and "win64-native"?

[jonasnick]

The remaining occurances of ecount are intentional. They occur whenever the callback is called more than once.

[real-or-random]

Oh sure