[0.16.1] Remaining backports #13317
Merged
[0.16.1] Remaining backports #13317
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Github-Pull: bitcoin#13199 Rebased-From: 11fa6bb
Technically, some internal datastructures may be in an inconsistent state if we do this, though there are no known bugs there. Still, for future safety, its much better to only unlock cs_main if we've made progress (not just tried a reorg which may make progress). Github-Pull: bitcoin#13023 Rebased-From: ecc3c4a
If multiple threads are invoking ActivateBestChain, it was possible to have them working towards different tips, and we could arrive at a less work tip than we should. Fix this by introducing a ChainState lock which must be held for the entire duration of ActivateBestChain to enforce exclusion in ABC. Github-Pull: bitcoin#13023 Rebased-From: a3ae8e6
After a recent bug discovered in callback ordering in MainSignals, this test checks invariants in ordering of BlockConnected / BlockDisconnected / UpdatedChainTip signals Github-Pull: bitcoin#13023 Rebased-From: dd435ad
maflcko
force-pushed
the
Mf1805-016ForBackport
branch
from
5e644fe
to
0ddde84
Compare
This disables OP_CODESEPARATOR in non-segwit scripts (even in an unexecuted branch), and makes a positive FindAndDelete result invalid. This ensures that the scriptCode serialized in SignatureHash() is always the same as the script passing to the EvalScript. Github-Pull: bitcoin#11423 Rebased-From: 9dabfe4
Tests showing that CONST_SCRIPTCODE is applied only to non-segwit transactions Github-Pull: bitcoin#11423 Rebased-From: 0f8719b
A transaction with 1 segwit input and 1 P2WPHK output has non-witness size of 82 bytes. Anything smaller than this have unnecessary malloc overhead and are not relayed/mined. Github-Pull: bitcoin#11423 Rebased-From: 7485488
Github-Pull: bitcoin#11423 Rebased-From: 364bae5
maflcko
force-pushed
the
Mf1805-016ForBackport
branch
from
0ddde84
to
08334b7
Compare
|
utACK 08334b7. |
|
Tested ACK 08334b7 |
|
utACK 08334b7 |
laanwj
added a commit
that referenced
this pull request
May 28, 2018
08334b7 qa: Pad scriptPubKeys to get minimum sized txs (MarcoFalke) 0a000b9 Policy to reject extremely small transactions (Johnson Lau) 1fffc2b Add transaction tests for constant scriptCode (Johnson Lau) d353dd1 Add constant scriptCode policy in non-segwit scripts (Johnson Lau) d6c3a08 Add unit tests for signals generated by ProcessNewBlock() (Jesse Cohen) bb79aaf Fix concurrency-related bugs in ActivateBestChain (Jesse Cohen) 0948153 Do not unlock cs_main in ABC unless we've actually made progress. (Matt Corallo) c71e535 Bugfix: ensure consistency of m_failed_blocks after reconsiderblock (Suhas Daftuar) Pull request description: Tree-SHA512: 7466b8fcc2a1d598102028019d82c581fe985a11679d002c430287851142598c9172249aa9de511a26bd4c92dc4891b5ab597c24af4f591f2158cc2a58ff7beb
This was referenced May 28, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.