Update miniscript to bitcoin core e8f85e0e86e92e583b8984455b7bf9d0a777578a(July 18th)#58
Conversation
sanket1729
force-pushed
the
update_bitcoin_master
branch
2 times, most recently
from
017fe31 to
6cbec31
Compare
bitcoin/test/miniscript_tests.cpp
Outdated
| if (hexscript != "?") BOOST_CHECK_MESSAGE(HexStr(computed_script) == hexscript, "Script mismatch: " + ms + " (" + HexStr(computed_script) + " vs " + hexscript + ")"); | ||
| BOOST_CHECK_MESSAGE(node->IsNonMalleable() == !!(mode & TESTMODE_NONMAL), "Malleability mismatch: " + ms); | ||
| BOOST_CHECK_MESSAGE(node->NeedsSignature() == !!(mode & TESTMODE_NEEDSIG), "Signature necessity mismatch: " + ms); | ||
| BOOST_CHECK_MESSAGE(node->CheckTimeLocksMix() == !(mode & TESTMODE_TIMELOCKMIX), "Timelock mix mismatch: " + ms); |
There was a problem hiding this comment.
Missing an exclamation mark :)
There was a problem hiding this comment.
Only one exclamation is required since the ChecktimelocksMix returns if there is a timelock mix. So, the single exclamation mark is correct
There was a problem hiding this comment.
Gotcha, i was confused. You are testing for the presence of locktime mix!
|
It does, but it's sort of more involved. All tests in |
sanket1729
force-pushed
the
update_bitcoin_master
branch
3 times, most recently
from
886f9a8 to
ffc4dc6
Compare
meshcollider
left a comment
meshcollider
left a comment
There was a problem hiding this comment.
Looks good, and commit "Update miniscript to bitcoin core ..." matches exactly what I had to change when rebasing 16800 too
bitcoin/util/spanparsing.h
Outdated
| * | ||
| * If sep does not occur in sp, a singleton with the entirety of sp is returned. | ||
| * | ||
| * Note that this function does not care about braces, so splitting |
There was a problem hiding this comment.
braces -> brackets/parentheses
bitcoin/test/miniscript_tests.cpp
Outdated
| } | ||
| }; | ||
|
|
||
| //! Singleton instance of KeyConverter. |
There was a problem hiding this comment.
outdated typo from copy and paste
e0ddd7c test: sanity checks for pk() and pkh() aliases (Antoine Poinsot) Pull request description: Based on #58. Stole the test cases for a Python implementation i'm working on, noticed these aliases weren't covered. ACKs for top commit: sipa: ACK e0ddd7c Tree-SHA512: 4aab684fb6131b0141a4f5fbb7edfea4bd5062a1b49a561b3ba5941430c533cc8248a7abcc7957fa666914df46565d1b8b99e1a1c3a551abcba90c357908010f
3c9a837 test: inclusive bounds for thresh()'s threshold (Antoine Poinsot) Pull request description: #55 didn't come with any test. This fixes it. Based on #58 to benefit from the update and avoid needless conflicts. ACKs for top commit: sipa: ACK 3c9a837 Tree-SHA512: 38d5a271271c665267d50750b563c4312ccda497f42a6a4bf6750542232880a8839ad68cd0348cb3158b236a51c3439ebee1ee278c0c0a66195acc7606c35a5d
|
Good news is that this update is valid up to Bitcoin Core commit 33e31f8df920acd3a4b13aab5bd6a6733480133a :) |
|
Rebase? |
sanket1729
force-pushed
the
update_bitcoin_master
branch
from
ffc4dc6 to
8c8384c
Compare
|
Rebased |
|
This also fixes the tests on stack height(with the +1) with a minimal diff for now. I think we should resolve #77 (comment) to avoid conflicts with this PR |
sanket1729
force-pushed
the
update_bitcoin_master
branch
from
8c8384c to
5e019ae
Compare
|
This is ready for review. |
sanket1729
force-pushed
the
update_bitcoin_master
branch
from
5e019ae to
d762225
Compare
sanket1729
force-pushed
the
update_bitcoin_master
branch
from
d762225 to
2dba8d6
Compare
|
ACK 2dba8d6 |
4 participants
This builds on top #41. The PR consists also has a second commit that adds tests for timelock mix detection.