Merge current secp256k1 subtree #11421

MarcoFalke commented at 2:21 PM on September 29, 2017: member

The subtree should now match upstream again. Check with:

./contrib/devtools/git-subtree-check.sh src/secp256k1

The changes are only documentation/refactoring related.

Squashed 'src/secp256k1/' changes from 84973d393..0b7024185

0b7024185 Merge #474: Fix header guards using reserved identifiers
ab1f89f00 Merge #478: Fixed multiple typos
8c7ea22d5 Fixed multiple typos
abe2d3e84 Fix header guards using reserved identifiers
f532bdc9f Merge #459: Add pubkey prefix constants to include/secp256k1.h
cac7c5559 Merge #470: Fix wnaf_const documentation
768514bac Fix wnaf_const documentation with respect to return value and number of words set
b8c26a399 Merge #458: Fix typo in API documentation
817fb2013 Merge #440: Fix typos
12230f90e Merge #468: Remove redundant conditional expression
2e1ccdca0 Remove redundant conditional expression
bc61b91ac add pubkey prefix constants to include/secp256k1.h
b0452e664 Fix typo in API documentation
4c0f32ed5 Fix typo: "Agressive" → "Aggressive"
73aca8364 Fix typo: "exectured" → "executed"

git-subtree-dir: src/secp256k1
git-subtree-split: 0b7024185045a49a1a6a4c5615bf31c94f63d9c4

fd86f998fc

Bump secp256k1 subtree 999968e416

MarcoFalke added the label Upstream on Sep 29, 2017

sipa commented at 7:04 PM on September 29, 2017: member

utACK 999968e41662c1a676936db423db82af4411d78d

$ ./contrib/devtools/git-subtree-check.sh src/secp256k1
src/secp256k1 in HEAD was last updated to upstream commit 0b7024185045a49a1a6a4c5615bf31c94f63d9c4 (tree af619602c243e0d8fbd5934f375faa4aedb4ca6e)
src/secp256k1 in HEAD currently refers to tree af619602c243e0d8fbd5934f375faa4aedb4ca6e
GOOD

fanquake commented at 7:23 AM on October 2, 2017: member

utACK 999968e

[pull/11421/local-merge ec741b135] Merge [#11421](/bitcoin-bitcoin/11421/): Merge current secp256k1 subtree
 Date: Mon Oct 2 15:13:09 2017 +0800
[#11421](/bitcoin-bitcoin/11421/) Merge current secp256k1 subtree into master
* 999968e41 Bump secp256k1 subtree (MarcoFalke) (pull/11421/head)
* fd86f998f Squashed 'src/secp256k1/' changes from 84973d393..0b7024185 (MarcoFalke)

Dropping you on a shell so you can try building/testing the merged source.
Run 'git diff HEAD~' to show the changes being merged.
Type 'exit' when done.
bash-3.2$ git fetch https://github.com/bitcoin-core/secp256k1.git
warning: no common commits
remote: Counting objects: 4040, done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 4040 (delta 1), reused 5 (delta 1), pack-reused 4034
Receiving objects: 100% (4040/4040), 1.61 MiB | 98.00 KiB/s, done.
Resolving deltas: 100% (2837/2837), done.
From https://github.com/bitcoin-core/secp256k1
 * branch                HEAD       -> FETCH_HEAD
bash-3.2$ contrib/devtools/git-subtree-check.sh src/secp256k1
src/secp256k1 in HEAD was last updated to upstream commit 0b7024185045a49a1a6a4c5615bf31c94f63d9c4 (tree af619602c243e0d8fbd5934f375faa4aedb4ca6e)
src/secp256k1 in HEAD currently refers to tree af619602c243e0d8fbd5934f375faa4aedb4ca6e
GOOD

Compiled and ran through a make check as well.

PASS: qt/test/test_bitcoin-qt
/Applications/Xcode.app/Contents/Developer/usr/bin/make  check-TESTS
PASS: exhaustive_tests
PASS: tests
============================================================================
Testsuite summary for libsecp256k1 0.1
============================================================================
# TOTAL: 2
# PASS:  2
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
============================================================================
  CXX      test/test_unitester-unitester.o
  CXXLD    test/unitester
/Applications/Xcode.app/Contents/Developer/usr/bin/make  check-TESTS
PASS: test/unitester
============================================================================
Testsuite summary for univalue 1.0.2
============================================================================
# TOTAL: 1
# PASS:  1
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
============================================================================
PASS: test/test_bitcoin
============================================================================
Testsuite summary for Bitcoin Core 0.15.99
============================================================================
# TOTAL: 2
# PASS:  2
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
============================================================================
Making check in doc/man
make[1]: Nothing to be done for `check'.
make[1]: Nothing to be done for `check-am'.

MarcoFalke merged this on Oct 4, 2017

MarcoFalke closed this on Oct 4, 2017

MarcoFalke referenced this in commit 9ccafb1d7b on Oct 4, 2017

MarcoFalke deleted the branch on Oct 4, 2017

PastaPastaPasta referenced this in commit be6c8f4394 on Jan 31, 2020

PastaPastaPasta referenced this in commit e5a6a33976 on Jan 31, 2020

PastaPastaPasta referenced this in commit 59d49d5163 on Feb 4, 2020

PastaPastaPasta referenced this in commit 3c5bd7708b on Feb 9, 2020

ckti referenced this in commit d4836dd743 on Mar 28, 2021

gades referenced this in commit 7a687e99a3 on Jun 24, 2021

DrahtBot locked this on Sep 8, 2021