forked from dashpay/dash
-
Notifications
You must be signed in to change notification settings - Fork 725
[Backport] 4.2.1 backports #1807
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
Merged
Merged
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
Github-Pull: PIVX-Project#1746 Rebased-From: cdc8cdc
[backports bitcoin/bitcoin@d7621cc] Github-Pull: PIVX-Project#1746 Rebased-From: 9703b0e
Github-Pull: PIVX-Project#1746 Rebased-From: 4fe609f
[backports bitcoin/bitcoin@87fb310] Github-Pull: PIVX-Project#1746 Rebased-From: 9670a84
Github-Pull: PIVX-Project#1735 Rebased-From: a3a4ab5
coming from btc@eb1c2cd37f75cf4d0e85970932b9774b2d073225 Github-Pull: PIVX-Project#1735 Rebased-From: 6d2ea62
coming from btc@db994b2de93f52c9e7bed8529ca925de5064a46f Github-Pull: PIVX-Project#1735 Rebased-From: 17e9b8e
…thod name. Github-Pull: PIVX-Project#1735 Rebased-From: d4cf6c8
>>> backports bitcoin/bitcoin@40e7b61 If number of conflict confirms cannot be determined, this means that the block is still unknown or not yet part of the main chain, for example during a reindex. Do nothing in that case, instead of crash with an assertion. Fixes bitcoin#7234. Github-Pull: PIVX-Project#1767 Rebased-From: f90fa08
This value can be significantly higher if the users uses addnode Github-Pull: PIVX-Project#1769 Rebased-From: 8d71860
>>> backports bitcoin/bitcoin@de9a1db CWallet::MarkConflicted may acquire the cs_main lock after CWalletDB::LoadWallet acquires the cs_wallet lock during wallet initialization. (CWalletDB::LoadWallet calls ReadKeyValue which calls CWallet::LoadToWallet which calls CWallet::MarkConflicted). This is the opposite order that cs_main and cs_wallet locks are acquired in the rest of the code, and so leads to POTENTIAL DEADLOCK DETECTED errors if bitcoin is built with -DDEBUG_LOCKORDER. This commit changes CWallet::LoadWallet (which calls CWalletDB::LoadWallet) to acquire both locks in the standard order. It also fixes some tests that were acquiring wallet and main locks out of order and failed with the new locking in CWallet::LoadWallet. Error was reported by Luke Dashjr <[email protected]> in https://botbot.me/freenode/bitcoin-core-dev/msg/90244330/ Github-Pull: PIVX-Project#1781 Rebased-From: 675ab11
…n disconnection coming from btc@905bc68d05595f41cca36b3df83accd10c00cc48 Github-Pull: PIVX-Project#1780 Rebased-From: 0544cc6
Github-Pull: PIVX-Project#1780 Rebased-From: 2d71f05
Github-Pull: PIVX-Project#1780 Rebased-From: e48c0d3
Github-Pull: PIVX-Project#1780 Rebased-From: f9c458a
cs_vSend is used for two purposes - to lock the datastructures used to queue messages to place on the wire and to only call SendMessages once at a time per-node. I believe SendMessages used to access some of the vSendMsg stuff, but it doesn't anymore, so these locks do not need to be on the same mutex, and also make deadlocking much more likely. Github-Pull: PIVX-Project#1780 Rebased-From: ec23964
Technically cs_sendProcessing is entirely useless now because it is only ever taken on the one MessageHandler thread, but because there may be multiple of those in the future, it is left in place Github-Pull: PIVX-Project#1780 Rebased-From: c452676
Github-Pull: PIVX-Project#1780 Rebased-From: b954796
Not needed as BIP34 is enforced since the genesis (bitcoin/bitcoin@06d81ad) Github-Pull: PIVX-Project#1775 Rebased-From: c894e8f
Github-Pull: PIVX-Project#1783 Rebased-From: 260930e
Github-Pull: PIVX-Project#1750 Rebased-From: be33eb0
Github-Pull: PIVX-Project#1785 Rebased-From: bc04b4d
Github-Pull: PIVX-Project#1796 Rebased-From: acf757b
…oseTransaction. decomposeCoinStake: Moved stake output address extraction to where it's used. decomposeCoinStake: clarity on not performing any action if tx is not a coinstake. refactor: decouple decompose zc spend tx from TransactionRecord::decomposeTransaction decomposeTransaction: if there is no value on the map, return an empty string instead of crashing. decomposeTransaction: decouple cold staking related tx decomposing from the monolithic method (for now). In the future, this code should be merged with the credit/debit tx decomposing code to be able to show each output as a different record. decomposeTransaction: removing unneded and duplicated IsMine method call. decomposeTransaction: decouple credit transaction decomposing into its own method. decomposeTransaction: decouple sendToSelf tx decomposing into its own method. decomposeTransaction: duplicate isMine on MN record removed + few compiler warnings fixed. decomposeTransaction: decouple debit transaction decomposing into its own method decomposeTransaction: added some comments + removed code extra spacing. decomposeTransaction: do not recalculate the tx size on every input/output loop. decomposeTransaction: minor methods call standardization. decomposeCreditTransaction: clean cached tx size. If it reached to this point, then the tx has credit and at least one output from the wallet Github-Pull: PIVX-Project#1776 Rebased-From: 65a50c1
Github-Pull: PIVX-Project#1791 Rebased-From: 224c8fd
…without cs_main fix. Github-Pull: PIVX-Project#1791 Rebased-From: a14aba3
|
Need to add #1805 as well. |
furszy
approved these changes
Aug 17, 2020
furszy
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
random-zebra
approved these changes
Aug 18, 2020
random-zebra
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK dc0ed71
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Backports the following PRs to the
4.2branch:#1746
#1735
#1767
#1769
#1781
#1780
#1775
#1783
#1750
#1785
#1796
#1776
#1791