[Wallet] Ignore MarkConflict if block hash is not known #1767
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
>>> 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.
random-zebra
added this to In Progress
in perpetual updating PIVX Core to BTC Core
via automation
furszy
added
the
Needs Backport
Fuzzbawls
approved these changes
Jul 29, 2020
perpetual updating PIVX Core to BTC Core
automation
moved this from In Progress
to Ready
Jul 29, 2020
Fuzzbawls
pushed a commit
to Fuzzbawls/PIVX
that referenced
this pull request
Aug 13, 2020
>>> 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
furszy
added a commit
that referenced
this pull request
Aug 18, 2020
dc0ed71 [BUG][GUI] Don't append cold-stake records twice (random-zebra) 91adcd7 masternode: CalculateScore and GetBlockHash accessing to chainActive without cs_main fix. (furszy) eeb112f GetMasternodeInputAge: Missing cs_main lock (furszy) 52ec12d refactor: decouple decompose coinstake from TransactionRecord::decomposeTransaction. (furszy) 51a8389 [BUG] Properly copy fCoinStake memeber between CTxInUndo and CCoins Github-Pull: #1796 Rebased-From: acf757b (random-zebra) 5c3caa4 lock cs_main for Misbehaving (furszy) 5c629d8 openssl.org dependency download link changed (CryptoDev-Project) 11aa63c Do not try to resend transactions if the node is importing or in IBD. (furszy) c59b62e [Core] Remove BIP30 check (random-zebra) 3f05eba include missing atomic to make CMake linux happy. (furszy) f0cfd88 Make the cs_sendProcessing a LOCK instead of a TRY_LOCK (Matt Corallo) d38e28c Split CNode::cs_vSend: message processing and message sending (Matt Corallo) 7561b18 Remove double brackets in addrman (Matt Corallo) 63c629b Fix AddrMan locking (Matt Corallo) f78cec4 Make fDisconnect an std::atomic (Matt Corallo) ec56cf5 net: fix a few cases where messages were sent rather than dropped upon disconnection (furszy) 7697085 Acquire cs_main lock before cs_wallet during wallet initialization (random-zebra) c796593 Remove bogus assert on number of oubound connections. (Matt Corallo) 7521065 wallet: Ignore MarkConflict if block hash is not known (random-zebra) 72042ac Move disconnectBlocks logging to use __func__ instead of hardcoded method name. (furszy) 0f66764 Simplify DisconnectBlock arguments/return value (furszy) cca4a8c Split logic to undo txin's off DisconnectBlock (furszy) 0f883e6 Cleaner disconnectBlock flow for coinbase and zerocoin txs. (furszy) a7cbc46 Move UndoWriteToDisk() and UndoReadFromDisk() to anon namespace (random-zebra) de5a405 Decouple CBlockUndo from CDiskBlockPos (jtimon) 671143c Decouple miner.o and txmempool.o from CTxUndo (random-zebra) 9419228 Decouple CCoins from CTxInUndo (jtimon) Pull request description: Backports the following PRs to the `4.2` branch: #1746 #1735 #1767 #1769 #1781 #1780 #1775 #1783 #1750 #1785 #1796 #1776 #1791 ACKs for top commit: furszy: Added #1805. utACK dc0ed71. random-zebra: utACK dc0ed71 Tree-SHA512: 0e59c9e751597b1b6f9a419e117946cec468dffdb921c882a44e5770ecb1a36b7d3d25f8c7f97d48bb3d59f136492842c08969901512d957a17bfaec6aece449
random-zebra
removed
the
Needs Backport
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 bitcoin#7491