|
|
@ -1141,12 +1141,12 @@ void CWallet::TransactionAddedToMempool(const CTransactionRef& ptx) { |
|
|
|
|
|
|
|
|
|
|
|
void CWallet::BlockConnected(const std::shared_ptr<const CBlock>& pblock, const CBlockIndex *pindex, const std::vector<CTransactionRef>& vtxConflicted) { |
|
|
|
void CWallet::BlockConnected(const std::shared_ptr<const CBlock>& pblock, const CBlockIndex *pindex, const std::vector<CTransactionRef>& vtxConflicted) { |
|
|
|
LOCK2(cs_main, cs_wallet); |
|
|
|
LOCK2(cs_main, cs_wallet); |
|
|
|
// TODO: Tempoarily ensure that mempool removals are notified before
|
|
|
|
// TODO: Temporarily ensure that mempool removals are notified before
|
|
|
|
// connected transactions. This shouldn't matter, but the abandoned
|
|
|
|
// connected transactions. This shouldn't matter, but the abandoned
|
|
|
|
// state of transactions in our wallet is currently cleared when we
|
|
|
|
// state of transactions in our wallet is currently cleared when we
|
|
|
|
// receive another notification and there is a race condition where
|
|
|
|
// receive another notification and there is a race condition where
|
|
|
|
// notification of a connected conflict might cause an outside process
|
|
|
|
// notification of a connected conflict might cause an outside process
|
|
|
|
// to abandon a transaction and then have it inadvertantly cleared by
|
|
|
|
// to abandon a transaction and then have it inadvertently cleared by
|
|
|
|
// the notification that the conflicted transaction was evicted.
|
|
|
|
// the notification that the conflicted transaction was evicted.
|
|
|
|
|
|
|
|
|
|
|
|
for (const CTransactionRef& ptx : vtxConflicted) { |
|
|
|
for (const CTransactionRef& ptx : vtxConflicted) { |
|
|
|