|
|
@ -97,16 +97,6 @@ void UnregisterAllWallets() |
|
|
|
setpwalletRegistered.clear(); |
|
|
|
setpwalletRegistered.clear(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// get the wallet transaction with the given hash (if it exists)
|
|
|
|
|
|
|
|
bool static GetTransaction(const uint256& hashTx, CWalletTx& wtx) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
LOCK(cs_setpwalletRegistered); |
|
|
|
|
|
|
|
BOOST_FOREACH(CWallet* pwallet, setpwalletRegistered) |
|
|
|
|
|
|
|
if (pwallet->GetTransaction(hashTx,wtx)) |
|
|
|
|
|
|
|
return true; |
|
|
|
|
|
|
|
return false; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// erases transaction with the given hash from all wallets
|
|
|
|
// erases transaction with the given hash from all wallets
|
|
|
|
void static EraseFromWallets(uint256 hash) |
|
|
|
void static EraseFromWallets(uint256 hash) |
|
|
|
{ |
|
|
|
{ |
|
|
@ -4241,15 +4231,6 @@ bool SendMessages(CNode* pto, bool fSendTrickle) |
|
|
|
hashRand = Hash(BEGIN(hashRand), END(hashRand)); |
|
|
|
hashRand = Hash(BEGIN(hashRand), END(hashRand)); |
|
|
|
bool fTrickleWait = ((hashRand & 3) != 0); |
|
|
|
bool fTrickleWait = ((hashRand & 3) != 0); |
|
|
|
|
|
|
|
|
|
|
|
// always trickle our own transactions
|
|
|
|
|
|
|
|
if (!fTrickleWait) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
CWalletTx wtx; |
|
|
|
|
|
|
|
if (GetTransaction(inv.hash, wtx)) |
|
|
|
|
|
|
|
if (wtx.fFromMe) |
|
|
|
|
|
|
|
fTrickleWait = true; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (fTrickleWait) |
|
|
|
if (fTrickleWait) |
|
|
|
{ |
|
|
|
{ |
|
|
|
vInvWait.push_back(inv); |
|
|
|
vInvWait.push_back(inv); |
|
|
|