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

Merge current secp256k1 subtree #11421

Merged
merged 2 commits into from Oct 4, 2017

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented Sep 29, 2017

The subtree should now match upstream again. Check with:

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

The changes are only documentation/refactoring related.

MarcoFalke added 2 commits September 29, 2017 16:00
0b70241 Merge bitcoin#474: Fix header guards using reserved identifiers
ab1f89f Merge bitcoin#478: Fixed multiple typos
8c7ea22 Fixed multiple typos
abe2d3e Fix header guards using reserved identifiers
f532bdc Merge bitcoin#459: Add pubkey prefix constants to include/secp256k1.h
cac7c55 Merge bitcoin#470: Fix wnaf_const documentation
768514b Fix wnaf_const documentation with respect to return value and number of words set
b8c26a3 Merge bitcoin#458: Fix typo in API documentation
817fb20 Merge bitcoin#440: Fix typos
12230f9 Merge bitcoin#468: Remove redundant conditional expression
2e1ccdc Remove redundant conditional expression
bc61b91 add pubkey prefix constants to include/secp256k1.h
b0452e6 Fix typo in API documentation
4c0f32e Fix typo: "Agressive" → "Aggressive"
73aca83 Fix typo: "exectured" → "executed"

git-subtree-dir: src/secp256k1
git-subtree-split: 0b70241
@sipa
Copy link
Member

sipa commented Sep 29, 2017

utACK 999968e

$ ./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
Copy link
Member

fanquake commented Oct 2, 2017

utACK 999968e

[pull/11421/local-merge ec741b135] Merge #11421: Merge current secp256k1 subtree
 Date: Mon Oct 2 15:13:09 2017 +0800
#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'.

@maflcko maflcko merged commit 999968e into bitcoin:master Oct 4, 2017
maflcko pushed a commit that referenced this pull request Oct 4, 2017
fd86f99 Squashed 'src/secp256k1/' changes from 84973d3..0b70241 (MarcoFalke)

Pull request description:

  The subtree should now match upstream again. Check with:

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

  The changes are only documentation/refactoring related.

Tree-SHA512: 43e8a95bcbfefef9e19ec38a92d2d57fdd4a16ddf726e036d36a0d806eb6f35b45b40ee69f980430e107895ec8725b5de4e36456b026214675e0b19630bb6fe9
@maflcko maflcko deleted the Mf1709-subtree-secp256k1 branch October 4, 2017 10:40
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jan 31, 2020
fd86f99 Squashed 'src/secp256k1/' changes from 84973d3..0b70241 (MarcoFalke)

Pull request description:

  The subtree should now match upstream again. Check with:

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

  The changes are only documentation/refactoring related.

Tree-SHA512: 43e8a95bcbfefef9e19ec38a92d2d57fdd4a16ddf726e036d36a0d806eb6f35b45b40ee69f980430e107895ec8725b5de4e36456b026214675e0b19630bb6fe9
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jan 31, 2020
fd86f99 Squashed 'src/secp256k1/' changes from 84973d3..0b70241 (MarcoFalke)

Pull request description:

  The subtree should now match upstream again. Check with:

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

  The changes are only documentation/refactoring related.

Tree-SHA512: 43e8a95bcbfefef9e19ec38a92d2d57fdd4a16ddf726e036d36a0d806eb6f35b45b40ee69f980430e107895ec8725b5de4e36456b026214675e0b19630bb6fe9
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Feb 4, 2020
fd86f99 Squashed 'src/secp256k1/' changes from 84973d3..0b70241 (MarcoFalke)

Pull request description:

  The subtree should now match upstream again. Check with:

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

  The changes are only documentation/refactoring related.

Tree-SHA512: 43e8a95bcbfefef9e19ec38a92d2d57fdd4a16ddf726e036d36a0d806eb6f35b45b40ee69f980430e107895ec8725b5de4e36456b026214675e0b19630bb6fe9
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Feb 9, 2020
fd86f99 Squashed 'src/secp256k1/' changes from 84973d3..0b70241 (MarcoFalke)

Pull request description:

  The subtree should now match upstream again. Check with:

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

  The changes are only documentation/refactoring related.

Tree-SHA512: 43e8a95bcbfefef9e19ec38a92d2d57fdd4a16ddf726e036d36a0d806eb6f35b45b40ee69f980430e107895ec8725b5de4e36456b026214675e0b19630bb6fe9
gades pushed a commit to cosanta/cosanta-core that referenced this pull request Jun 24, 2021
fd86f99 Squashed 'src/secp256k1/' changes from 84973d3..0b70241 (MarcoFalke)

Pull request description:

  The subtree should now match upstream again. Check with:

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

  The changes are only documentation/refactoring related.

Tree-SHA512: 43e8a95bcbfefef9e19ec38a92d2d57fdd4a16ddf726e036d36a0d806eb6f35b45b40ee69f980430e107895ec8725b5de4e36456b026214675e0b19630bb6fe9
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants