Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update libsecp256k1 subtree to latest master #29803

Merged
merged 2 commits into from Apr 6, 2024

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Apr 4, 2024

@DrahtBot
Copy link
Contributor

DrahtBot commented Apr 4, 2024

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK jonasnick, theuni
Concept ACK real-or-random

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #29675 (wallet: Be able to receive and spend inputs involving MuSig2 aggregate keys by achow101)
  • #29491 ([DO NOT MERGE] Schnorr batch verification for blocks by fjahr)
  • #28122 (Silent Payments: Implement BIP352 by josibake)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@fanquake
Copy link
Member Author

fanquake commented Apr 4, 2024

cc @real-or-random @jonasnick

Copy link
Contributor

@real-or-random real-or-random left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Concept ACK -- there's nothing on our side that speaks against updating

d8311688bd Merge bitcoin-core/secp256k1#1515: ci: Note affected clangs in comment on ASLR quirk
a85e2233e7 ci: Note affected clangs in comment on ASLR quirk
4b77fec67a Merge bitcoin-core/secp256k1#1512: msan: notate more variable assignments from assembly code
f7f0184ba1 msan: notate more variable assignments from assembly code
a61339149f change inconsistent array param to pointer
05bfab69ae Merge bitcoin-core/secp256k1#1507: ci: Add workaround for ASLR bug in sanitizers
a5e8ab2484 ci: Add sanitizer env variables to debug output
84a93de4d2 ci: Add workaround for ASLR bug in sanitizers
427e86b9ed Merge bitcoin-core/secp256k1#1490: tests: improve fe_sqr test (issue bitcoin#1472)
2028069df2 doc: clarify input requirements for secp256k1_fe_mul
11420a7a28 tests: improve fe_sqr test
cdc9a6258e Merge bitcoin-core/secp256k1#1489: tests: add missing fe comparison checks for inverse field test cases
d926510cf7 Merge bitcoin-core/secp256k1#1496: msan: notate variable assignments from assembly code
31ba404944 msan: notate variable assignments from assembly code
e7ea32e30a msan: Add SECP256K1_CHECKMEM_MSAN_DEFINE which applies to memory sanitizer and not valgrind
e7bdddd9c9 refactor: rename `check_fe_equal` -> `fe_equal`
00111c9c56 tests: add missing fe comparison checks for inverse field test cases
0653a25d50 Merge bitcoin-core/secp256k1#1486: ci: Update cache action
94a14d5290 ci: Update cache action
2483627299 Merge bitcoin-core/secp256k1#1483: cmake: Recommend native CMake commands in README
5ad3aa3dcd Merge bitcoin-core/secp256k1#1484: tests: Drop redundant _scalar_check_overflow calls
51df2d9ab3 tests: Drop redundant _scalar_check_overflow calls
3777e3f36a cmake: Recommend native CMake commands in README
e4af41c61b Merge bitcoin-core/secp256k1#1249: cmake: Add `SECP256K1_LATE_CFLAGS` configure option
3bf4d68fc0 Merge bitcoin-core/secp256k1#1482: build: Clean up handling of module dependencies
e6822678ea build: Error if required module explicitly off
89ec583ccf build: Clean up handling of module dependencies
44378867a0 Merge bitcoin-core/secp256k1#1468: v0.4.1 release aftermath
a9db9f2d75 Merge bitcoin-core/secp256k1#1480: Get rid of untested sizeof(secp256k1_ge_storage) == 64 code path
74b7c3b53e Merge bitcoin-core/secp256k1#1476: include: make docs more consistent
b37fdb28ce check-abi: Minor UI improvements
ad5f589a94 check-abi: Default to HEAD for new version
9fb7e2f156 release process: Style and formatting nits
ba5d72d626 assumptions: Use new STATIC_ASSERT macro
e53c2d9ffc Require that sizeof(secp256k1_ge_storage) == 64
d0ba2abbff util: Add STATIC_ASSERT macro
da7bc1b803 include: in doc, remove article in front of "pointer"
aa3dd5280b include: make doc about ctx more consistent
e3f690015a include: remove obvious "cannot be NULL" doc
d373bf6d08 Merge bitcoin-core/secp256k1#1474: tests: restore scalar_mul test
79e094517c Merge bitcoin-core/secp256k1#1473: Fix typos
3dbfb48946 tests: restore scalar_mul test
d77170a88d Fix typos
e7053d065b release process: Add email step
429d21dc79 release process: Run sanity checks on release PR
42f8c51402 cmake: Add `SECP256K1_LATE_CFLAGS` configure option

git-subtree-dir: src/secp256k1
git-subtree-split: d8311688bd383d3a923a1b11789cded3cc8e5e03
Copy link
Contributor

@jonasnick jonasnick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 4654cc3

There should be no changes in libsecp that would require a change in the Bitcoin codebase.

@theuni
Copy link
Member

theuni commented Apr 5, 2024

Subtree merge looks clean and not backdoored:

$ test/lint/git-subtree-check.sh -r src/secp256k1
src/secp256k1 in HEAD currently refers to tree c3c4db9c0e4636135963272b005b11a451303feb
src/secp256k1 in HEAD was last updated in commit 53eec53dca1cb677d11564b055d3b8581ddd6747 (tree c3c4db9c0e4636135963272b005b11a451303feb)
src/secp256k1 in HEAD was last updated to upstream commit d8311688bd383d3a923a1b11789cded3cc8e5e03 (tree c3c4db9c0e4636135963272b005b11a451303feb)
GOOD

secp changes themselves look mostly boring for us (that's a good thing :) with the exception of msan.

ACK 4654cc3

@fanquake
Copy link
Member Author

fanquake commented Apr 6, 2024

Guix Build (x86_64):

6fc6f674442384b91a0cf4468b6f8d956c3afdf59aaf83209f3d40a679a9e1d1  guix-build-4654cc32248d/output/aarch64-linux-gnu/SHA256SUMS.part
61138eb29efab5cc44045c2e9d5eae2fda2fc6f476239a667e592b8495fcd912  guix-build-4654cc32248d/output/aarch64-linux-gnu/bitcoin-4654cc32248d-aarch64-linux-gnu-debug.tar.gz
b7c534363dbf7d2e9984a17f66d5535a884ced3d94cb93d63aa59dd2f15e3874  guix-build-4654cc32248d/output/aarch64-linux-gnu/bitcoin-4654cc32248d-aarch64-linux-gnu.tar.gz
8a8a81fc704b961cca34187d4ba19e7e8b641062a7fdcf6238f96cdb9a092f1f  guix-build-4654cc32248d/output/arm-linux-gnueabihf/SHA256SUMS.part
c25f122b4182741a195eaaae376d696873304ecab15af4d1b5de5bd0ee2f0adf  guix-build-4654cc32248d/output/arm-linux-gnueabihf/bitcoin-4654cc32248d-arm-linux-gnueabihf-debug.tar.gz
9f20a96e8f2b86665868bc1d21afff02772117fa5a41d46c9ac3e157a4c8aad0  guix-build-4654cc32248d/output/arm-linux-gnueabihf/bitcoin-4654cc32248d-arm-linux-gnueabihf.tar.gz
5ff5dd88fbb2a3e367ab38fc28c4474016f705198c9b285667d797f00eaeede1  guix-build-4654cc32248d/output/dist-archive/bitcoin-4654cc32248d.tar.gz
a77030f0460810690f84e53f4bcdf051418f70315f828e120bdf1fac0e8f9b11  guix-build-4654cc32248d/output/powerpc64-linux-gnu/SHA256SUMS.part
467c370d77f251d6f3acff6d1d8dafd9f3fe8cbf56a2eea8154518390b984de7  guix-build-4654cc32248d/output/powerpc64-linux-gnu/bitcoin-4654cc32248d-powerpc64-linux-gnu-debug.tar.gz
f89759d805504c8b272cf616f1ed8648650e78c8071f47946275bfbef98666d1  guix-build-4654cc32248d/output/powerpc64-linux-gnu/bitcoin-4654cc32248d-powerpc64-linux-gnu.tar.gz
71d6dc91f0abdf1d347cce8538f02c4052511a5484c1af8f9d617eef0cd1556b  guix-build-4654cc32248d/output/riscv64-linux-gnu/SHA256SUMS.part
8c3a7542408cbc3f19ba61f45eb4ef042eba4327229f76e1b356ef688cb15578  guix-build-4654cc32248d/output/riscv64-linux-gnu/bitcoin-4654cc32248d-riscv64-linux-gnu-debug.tar.gz
f0bf6fcbc4947dd507418e7fabbcc5d03f0517f5deb03041937379e1d5305d13  guix-build-4654cc32248d/output/riscv64-linux-gnu/bitcoin-4654cc32248d-riscv64-linux-gnu.tar.gz
9d2cb7c7bdd2290877188219e4c67fbf4695c4c4ea82fe717a0394841c9db61a  guix-build-4654cc32248d/output/x86_64-apple-darwin/SHA256SUMS.part
ef4e479a3a58e35af34260b5b61739bac31e723bc99e29a6ee4c917a33fe94b3  guix-build-4654cc32248d/output/x86_64-apple-darwin/bitcoin-4654cc32248d-x86_64-apple-darwin-unsigned.tar.gz
c2e2ccf933af57d93530f73bf3f505866ae7cce876154c38c5039128fa9d685a  guix-build-4654cc32248d/output/x86_64-apple-darwin/bitcoin-4654cc32248d-x86_64-apple-darwin-unsigned.zip
828589e961fdadc60072a62d31fc72b55591a4d264a5ac6636e10ddb77defdb1  guix-build-4654cc32248d/output/x86_64-apple-darwin/bitcoin-4654cc32248d-x86_64-apple-darwin.tar.gz
d5e383b4e57c06137eb1f08513a1bf34d60966142b9d3dca48884f9f664f8fe6  guix-build-4654cc32248d/output/x86_64-linux-gnu/SHA256SUMS.part
ffbb7658cc26bad58f1c023fd62c8ee1419370a3c6acc985de1f2b115beb1103  guix-build-4654cc32248d/output/x86_64-linux-gnu/bitcoin-4654cc32248d-x86_64-linux-gnu-debug.tar.gz
e7d899f29f4cca659ede9212b5cc91668d06fab45230b32be83052d50720b843  guix-build-4654cc32248d/output/x86_64-linux-gnu/bitcoin-4654cc32248d-x86_64-linux-gnu.tar.gz
c869f7c313a110b0ec06c372799b14b9233065496d6f599152f6f90820cee50d  guix-build-4654cc32248d/output/x86_64-w64-mingw32/SHA256SUMS.part
ff565a9daf86d9102c4bd4681e0d3cede4f31cc618973f3bb8a0e3405e67987a  guix-build-4654cc32248d/output/x86_64-w64-mingw32/bitcoin-4654cc32248d-win64-debug.zip
c76e4620b50f4f0cb5c823dded402240b0705019217d11046443fb8c906b80c1  guix-build-4654cc32248d/output/x86_64-w64-mingw32/bitcoin-4654cc32248d-win64-setup-unsigned.exe
3f1306e8c38b42b245792f94466f4c15349a84327aad86f07a4430d5497409f0  guix-build-4654cc32248d/output/x86_64-w64-mingw32/bitcoin-4654cc32248d-win64-unsigned.tar.gz
4e1c3cce4fac40d7f85c09ceb7cb12ed52f8db67962467a6b94fdf5227c3b0d7  guix-build-4654cc32248d/output/x86_64-w64-mingw32/bitcoin-4654cc32248d-win64.zip

@fanquake fanquake merged commit b5d2118 into bitcoin:master Apr 6, 2024
16 checks passed
@fanquake fanquake deleted the secp256k1_subtree_4b77fe branch April 6, 2024 08:42
fanquake added a commit to fanquake/oss-fuzz that referenced this pull request Apr 6, 2024
fanquake added a commit that referenced this pull request Apr 7, 2024
61641e2 ci: remove --with-asm usage (secp256k1) (fanquake)
c7efee5 ci: use LLVM 18.1.3 in MSAN jobs (fanquake)

Pull request description:

  Bumps LLVM to `18.1.3`:
  * Includes llvm/llvm-project#86201, which is useful as it removes the need to (possibly) apply a work around when running the CI locally.

  Drops `--with-asm=no` (only being passed to secp256k1) from the MSAN CI. New MSAN annotations were pulled in as part of #29803.

ACKs for top commit:
  maflcko:
    lgtm ACK 61641e2
  hebasto:
    ACK 61641e2.

Tree-SHA512: da51c9f08a9aacb9dd936c47ef47777a8c84234e4df5b9776647ac94ebe88084b5e7b8182af90cfa01ae183072f6ce5915b73825f66b2567214ab270b2ff7837
jonathanmetzman pushed a commit to google/oss-fuzz that referenced this pull request Apr 8, 2024
Pttn added a commit to RiecoinTeam/Riecoin that referenced this pull request Apr 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants