|
|
@ -966,8 +966,9 @@ bool CWallet::LoadToWallet(const CWalletTx& wtxIn) |
|
|
|
* Abandoned state should probably be more carefully tracked via different |
|
|
|
* Abandoned state should probably be more carefully tracked via different |
|
|
|
* posInBlock signals or by checking mempool presence when necessary. |
|
|
|
* posInBlock signals or by checking mempool presence when necessary. |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlockIndex* pIndex, int posInBlock, bool fUpdate) |
|
|
|
bool CWallet::AddToWalletIfInvolvingMe(const CTransactionRef& ptx, const CBlockIndex* pIndex, int posInBlock, bool fUpdate) |
|
|
|
{ |
|
|
|
{ |
|
|
|
|
|
|
|
const CTransaction& tx = *ptx; |
|
|
|
{ |
|
|
|
{ |
|
|
|
AssertLockHeld(cs_wallet); |
|
|
|
AssertLockHeld(cs_wallet); |
|
|
|
|
|
|
|
|
|
|
@ -988,7 +989,7 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlockIndex |
|
|
|
if (fExisted && !fUpdate) return false; |
|
|
|
if (fExisted && !fUpdate) return false; |
|
|
|
if (fExisted || IsMine(tx) || IsFromMe(tx)) |
|
|
|
if (fExisted || IsMine(tx) || IsFromMe(tx)) |
|
|
|
{ |
|
|
|
{ |
|
|
|
CWalletTx wtx(this, MakeTransactionRef(tx)); |
|
|
|
CWalletTx wtx(this, ptx); |
|
|
|
|
|
|
|
|
|
|
|
// Get merkle branch if transaction was found in a block
|
|
|
|
// Get merkle branch if transaction was found in a block
|
|
|
|
if (posInBlock != -1) |
|
|
|
if (posInBlock != -1) |
|
|
@ -1119,7 +1120,7 @@ void CWallet::MarkConflicted(const uint256& hashBlock, const uint256& hashTx) |
|
|
|
void CWallet::SyncTransaction(const CTransactionRef& ptx, const CBlockIndex *pindexBlockConnected, int posInBlock) { |
|
|
|
void CWallet::SyncTransaction(const CTransactionRef& ptx, const CBlockIndex *pindexBlockConnected, int posInBlock) { |
|
|
|
const CTransaction& tx = *ptx; |
|
|
|
const CTransaction& tx = *ptx; |
|
|
|
|
|
|
|
|
|
|
|
if (!AddToWalletIfInvolvingMe(tx, pindexBlockConnected, posInBlock, true)) |
|
|
|
if (!AddToWalletIfInvolvingMe(ptx, pindexBlockConnected, posInBlock, true)) |
|
|
|
return; // Not one of ours
|
|
|
|
return; // Not one of ours
|
|
|
|
|
|
|
|
|
|
|
|
// If a transaction changes 'conflicted' state, that changes the balance
|
|
|
|
// If a transaction changes 'conflicted' state, that changes the balance
|
|
|
@ -1542,7 +1543,7 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool f |
|
|
|
CBlock block; |
|
|
|
CBlock block; |
|
|
|
if (ReadBlockFromDisk(block, pindex, Params().GetConsensus())) { |
|
|
|
if (ReadBlockFromDisk(block, pindex, Params().GetConsensus())) { |
|
|
|
for (size_t posInBlock = 0; posInBlock < block.vtx.size(); ++posInBlock) { |
|
|
|
for (size_t posInBlock = 0; posInBlock < block.vtx.size(); ++posInBlock) { |
|
|
|
AddToWalletIfInvolvingMe(*block.vtx[posInBlock], pindex, posInBlock, fUpdate); |
|
|
|
AddToWalletIfInvolvingMe(block.vtx[posInBlock], pindex, posInBlock, fUpdate); |
|
|
|
} |
|
|
|
} |
|
|
|
if (!ret) { |
|
|
|
if (!ret) { |
|
|
|
ret = pindex; |
|
|
|
ret = pindex; |
|
|
|