Skip to content

Conversation

@elichai
Copy link
Member

@elichai elichai commented Aug 22, 2019

This is a rebase of https://github.com/sipa/bitcoin/tree/taproot ontop of the latest master

This time in the correct repo heh

elichai and others added 12 commits August 22, 2019 14:04
e729cc7 Merge bitcoin#657: Fix a nit in the recovery tests
b64a2e2 Fix a nit in the recovery tests
e028aa3 Merge bitcoin#650: secp256k1/src/tests.c:  Properly handle sscanf return value
f1e11d3 Merge bitcoin#654: Fix typo (∞)
ef83281 Merge pull request bitcoin#656 from real-or-random/patch-1
556caad Fix typo in docs for _context_set_illegal_callback
786dfb4 Merge bitcoin#583: JNI: fix use sig array
e95f8ab Merge bitcoin#644: Avoid optimizing out a verify_check
384f556 Merge bitcoin#652: README.md: update instruction to run tests
ee56acc Merge bitcoin#651: Fix typo in secp256k1_preallocated.h
7b9b117 Merge bitcoin#640: scalar_impl.h: fix includes
d99bec2 Merge bitcoin#655: jni: Use only Guava for hex encoding and decoding
2abcf95 jni: Use only Guava for hex encoding and decoding
271582b Fix typo
ce6d438 README.md: update instruction to run tests
b1e68cb Fix typo in secp256k1_preallocated.h
a11c76c secp256k1/src/tests.c:  Properly handle sscanf return value
94ae7cb Moved a dereference so the null check will be before the dereferencing
2cb73b1 scalar_impl.h: fix includes
fa33017 Merge bitcoin#634: Add a descriptive comment for secp256k1_ecmult_const.
ee9e68c Add a descriptive comment for secp256k1_ecmult_const.
d0d738d Merge bitcoin#631: typo in comment for secp256k1_ec_pubkey_tweak_mul ()
6914c25 typo in comment for secp256k1_ec_pubkey_tweak_mul ()
e541a90 Merge bitcoin#629: Avoid calling _is_zero when _set_b32 fails.
f34b0c3 Merge bitcoin#630: Note intention of timing sidechannel freeness.
8d1563b Note intention of timing sidechannel freeness.
1669bb2 Merge bitcoin#628: Fix ability to compile tests without -DVERIFY.
ecc94ab Merge bitcoin#627: Guard memcmp in tests against mixed size inputs.
544435f Merge bitcoin#578: Avoid implementation-defined and undefined behavior when dealing with sizes
143dc6e Merge bitcoin#595: Allow to use external default callbacks
e49f799 Add missing #(un)defines to base-config.h
77defd2 Add secp256k1_ prefix to default callback functions
908bdce Include stdio.h and stdlib.h explicitly in secp256k1.c
5db782e Allow usage of external default callbacks
6095a86 Replace CHECKs for no_precomp ctx by ARG_CHECKs without a return
cd473e0 Avoid calling secp256k1_*_is_zero when secp256k1_*_set_b32 fails.
6c36de7 Merge bitcoin#600: scratch space: use single allocation
98836b1 scratch: replace frames with "checkpoint" system
7623cf2 scratch: save a couple bytes of unnecessarily-allocated memory
a7a164f scratch: rename `max_size` to `size`, document that extra will actually be allocated
5a4bc0b scratch: unify allocations
c2b028a scratch space: thread `error_callback` into all scratch space functions
0be1a4a scratch: add magic bytes to beginning of structure
92a48a7 scratch space: use single allocation
40839e2 Merge bitcoin#592: Use trivial algorithm in ecmult_multi if scratch space is small
dcf3920 Fix ability to compile tests without -DVERIFY.
a484e00 Merge bitcoin#566: Enable context creation in preallocated memory
0522caa Explain caller's obligations for preallocated memory
238305f Move _preallocated functions to separate header
695feb6 Export _preallocated functions
814cc78 Add tests for contexts in preallocated memory
ba12dd0 Check arguments of _preallocated functions
5feadde Support cloning a context into preallocated memory
c4fd5da Switch to a single malloc call
ef020de Add size constants for preallocated memory
1bf7c05 Prepare for manual memory management in preallocated memory
248bffb Guard memcmp in tests against mixed size inputs.
36698dc Merge bitcoin#596: Make WINDOW_G configurable
a61a93f Clean up ./configure help strings
2842dc5 Make WINDOW_G configurable
1a02d6c Merge bitcoin#626: Revert "Merge bitcoin#620: Install headers automatically"
662918c Revert "Merge bitcoin#620: Install headers automatically"
14c7dbd Simplify control flow in DER parsing
ec8f20b Avoid out-of-bound pointers and integer overflows in size comparisons
01ee1b3 Parse DER-enconded length into a size_t instead of an int
912680e Merge bitcoin#561: Respect LDFLAGS and #undef STATIC_PRECOMPUTATION if using basic config
91fae3a Merge bitcoin#620: Install headers automatically
5df77a0 Merge bitcoin#533: Make sure we're not using an uninitialized variable in secp256k1_wnaf_const(...)
975e51e Merge bitcoin#617: Pass scalar by reference in secp256k1_wnaf_const()
735fbde Merge bitcoin#619: Clear a copied secret key after negation
16e8615 Install headers automatically
069870d Clear a copied secret key after negation
8979ec0 Pass scalar by reference in secp256k1_wnaf_const()
84a8085 Merge bitcoin#612: Allow field_10x26_arm.s to compile for ARMv7 architecture
d4d270a Allow field_10x26_arm.s to compile for ARMv7 architecture
248f046 Make sure we're not using an uninitialized variable in secp256k1_wnaf_const(...)
9ab96f7 Use trivial algorithm in ecmult_multi if scratch space is small
dbed75d Undefine `STATIC_PRECOMPUTATION` if using the basic config
310111e Keep LDFLAGS if `--coverage`
74e2dbd JNI: fix use sig array
3cb057f Fix possible integer overflow in DER parsing

git-subtree-dir: src/secp256k1
git-subtree-split: e729cc7
a228e2f54 Add schnorrsig module which implements BIP-schnorr [0] compatible signing, verification and batch verification.
f129809a6 add chacha20 function
REVERT: e729cc7 Merge bitcoin#657: Fix a nit in the recovery tests
REVERT: b64a2e2 Fix a nit in the recovery tests
REVERT: e028aa3 Merge bitcoin#650: secp256k1/src/tests.c:  Properly handle sscanf return value
REVERT: f1e11d3 Merge bitcoin#654: Fix typo (∞)
REVERT: ef83281 Merge pull request bitcoin#656 from real-or-random/patch-1
REVERT: 556caad Fix typo in docs for _context_set_illegal_callback
REVERT: 786dfb4 Merge bitcoin#583: JNI: fix use sig array
REVERT: e95f8ab Merge bitcoin#644: Avoid optimizing out a verify_check
REVERT: 384f556 Merge bitcoin#652: README.md: update instruction to run tests
REVERT: ee56acc Merge bitcoin#651: Fix typo in secp256k1_preallocated.h
REVERT: 7b9b117 Merge bitcoin#640: scalar_impl.h: fix includes
REVERT: d99bec2 Merge bitcoin#655: jni: Use only Guava for hex encoding and decoding
REVERT: 2abcf95 jni: Use only Guava for hex encoding and decoding
REVERT: 271582b Fix typo
REVERT: ce6d438 README.md: update instruction to run tests
REVERT: b1e68cb Fix typo in secp256k1_preallocated.h
REVERT: a11c76c secp256k1/src/tests.c:  Properly handle sscanf return value
REVERT: 94ae7cb Moved a dereference so the null check will be before the dereferencing
REVERT: 2cb73b1 scalar_impl.h: fix includes
REVERT: fa33017 Merge bitcoin#634: Add a descriptive comment for secp256k1_ecmult_const.
REVERT: ee9e68c Add a descriptive comment for secp256k1_ecmult_const.
REVERT: d0d738d Merge bitcoin#631: typo in comment for secp256k1_ec_pubkey_tweak_mul ()
REVERT: 6914c25 typo in comment for secp256k1_ec_pubkey_tweak_mul ()
REVERT: 74e2dbd JNI: fix use sig array

git-subtree-dir: src/secp256k1
git-subtree-split: a228e2f54d64692230ccb2937b12dd746c5157ed
* Integration into CheckSig by Pieter Wuille.
This includes key path spending and script path spending, but not the
Tapscript execution implementation.
@elichai elichai force-pushed the taproot-rebase-52b9797 branch from 00708a2 to 0423cd2 Compare August 22, 2019 22:25
@jnewbery
Copy link

utACK 0423cd2

I redid all of the rebase except for the subtree update and got the same result. All tests pass.

@jnewbery
Copy link

sipa used this rebase as the base for his taproot updates. Thank you for doing this, @elichai !

@jnewbery jnewbery closed this Oct 30, 2019
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.

4 participants