[Validation] Reduce cs_main locks during ConnectTip/SyncWithWallets #1721
Conversation
furszy
force-pushed
the
2020_05_wallet_reduce_locks
branch
from
089c5a9
to
2be4426
Compare
furszy
changed the title
furszy
force-pushed
the
2020_05_wallet_reduce_locks
branch
from
46dd507
to
610c7f7
Compare
furszy
changed the title
random-zebra
added this to In Progress
in perpetual updating PIVX Core to BTC Core
via automation
There was a problem hiding this comment.
Seems we are introducing back the unused return value of SetMerkleBranch (and relative chainActive part, bringing back the need for AssertLockHeld(cs_main)).
Someone had removed those already in #1520 :)
Coming from btc@867f842f1e5a385aeb2093f802d6f37a84d0fe5d
Coming from btc@5723bb44ce2c6bb14114aa7f211160702a47ac91
Adapted work coming from btc@b3b3c2a5623d5c942d2b3565cc2d833c65105555
Remove the unused variable "blockTmp" in CMerkleTx::SetMerkleBranch. It was previously used to read the block from disk if not provided as argument, but is no longer needed.
coming from btc@ec81881b86b9680fcdcc42fd3ba31f04b8d09714
furszy
force-pushed
the
2020_05_wallet_reduce_locks
branch
from
610c7f7
to
3b2807f
Compare
|
Update per feedback. One more section without |
|
This will need more work. |
|
Looking good.
|
There was a problem hiding this comment.
tested ACK 4b4858b
(didn't test the zerocoin changes though)
adaptation of btc@989989354b68d3954fe2742b96c53eeb2e8a7670
Work done on top of #1717 .
Essentially an improvement over
SyncWithWallets&SyncTransactionflow to run without lockingcs_main.(made as less modifications as possible over the zpiv wallet/chain files, no real need to improve that code.. most of it will disappear soon)
It's an adapted version of bitcoin#7946.