Sync Upgrades, part 2. #1336
Merged
Sync Upgrades, part 2. #1336
Conversation
This file contains hidden or 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
Merged
Author
|
Only thing missing here is the cmake new files dependencies, will need to rebase this again on top of #1335 once it's merged to pass travis. |
random-zebra
left a comment
random-zebra
left a comment
There was a problem hiding this comment.
Code ACK. sync_tests passing nicely both with and without -DDEBUG_LOCKORDER
|
#1333 must be merged before, otherwise 329a20da83ddc2ed91c182990f1e3e8c72e36a4f will give issues ( |
furszy
force-pushed
the
2020_sync_update_2
branch
from
5395b50 to
cfac9cf
Compare
Author
|
rebased on top of master after 1335 merge. Ready for review. |
random-zebra
approved these changes
Feb 27, 2020
random-zebra
left a comment
random-zebra
left a comment
There was a problem hiding this comment.
ACK cfac9cf
No issue after resync on testnet and mainnet.
furszy
added a commit
that referenced
this pull request
Mar 4, 2020
7e493df Using WAIT_LOCK macro instead of WaitableLock. (furszy) a0d0e33 [Refactor] Complete move from CCriticalSection to identical RecursiveMutex (both are AnnotatedMixin<std::recursive_mutex>). (furszy) 6608757 doc: Add comment to cs_main and mempool::cs (furszy) Pull request description: This was done on top of #1335 and #1336 (Starting in bb575f8). Effort to bring us up up-to-date with upstream's sync.h/cpp sources. This PR contains: * A complete move from CCriticalSection to identical RecursiveMutex (both are AnnotatedMixin<std::recursive_mutex>). * Using WAIT_LOCK macro instead of WaitableLock. ACKs for top commit: random-zebra: utACK 7e493df Fuzzbawls: utACK 7e493df Tree-SHA512: 539fe93566f90246409606acb0aaeb3a5f839110cb96af7868654738685a07b9e1332f8362a04d328825291007d24c80d0b34b1318edc4afe84a8ac8e5affe61
furszy
added a commit
that referenced
this pull request
Oct 30, 2020
d8f803a [BUG][RPC] Add missing lock in sendrawtransaction (random-zebra) Pull request description: #1336 Introduced a "lock-not-held" assertion in `sendrawtransaction` RPC as per upstream. But, while in Bitcoin `sendrawtransaction` calls `BroadcastTransaction`, which then locks `cs_main` before `AcceptToMemoryPool`, we call directly ATMP without any lock. This fixes it. ACKs for top commit: furszy: utACK d8f803a Fuzzbawls: utACK d8f803a Tree-SHA512: aeac65a86750b0353b7e75d78d145a179d08c2917b664afb9d0bccdef21b09261c9c0b89d5578b2d0ef4a69de3ba8ce0ec73c9562a22c08cf2d971b6176e8647
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This was done on top of #1335 (Starts on 7921802). Effort to bring us up-to-date with upstream's sync.h/cpp sources.
The only task that left to be fully up-to-date with upstream, that will leave for a third PR because it touches other areas of the sources and want to keep this as small as possible, is the
CCriticalSectionremoval and replacement with theRecursiveMutextypedef.