Do not treat fFromMe transaction differently when broadcasting
This commit is contained in:
parent
0d09b3e8b0
commit
fe52346450
19
src/main.cpp
19
src/main.cpp
@ -97,16 +97,6 @@ void UnregisterAllWallets()
|
||||
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
|
||||
void static EraseFromWallets(uint256 hash)
|
||||
{
|
||||
@ -4241,15 +4231,6 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
|
||||
hashRand = Hash(BEGIN(hashRand), END(hashRand));
|
||||
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)
|
||||
{
|
||||
vInvWait.push_back(inv);
|
||||
|
@ -1498,20 +1498,6 @@ void CWallet::PrintWallet(const CBlock& block)
|
||||
LogPrintf("\n");
|
||||
}
|
||||
|
||||
bool CWallet::GetTransaction(const uint256 &hashTx, CWalletTx& wtx)
|
||||
{
|
||||
{
|
||||
LOCK(cs_wallet);
|
||||
map<uint256, CWalletTx>::iterator mi = mapWallet.find(hashTx);
|
||||
if (mi != mapWallet.end())
|
||||
{
|
||||
wtx = (*mi).second;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CWallet::SetDefaultKey(const CPubKey &vchPubKey)
|
||||
{
|
||||
if (fFileBacked)
|
||||
|
@ -319,8 +319,6 @@ public:
|
||||
return setKeyPool.size();
|
||||
}
|
||||
|
||||
bool GetTransaction(const uint256 &hashTx, CWalletTx& wtx);
|
||||
|
||||
bool SetDefaultKey(const CPubKey &vchPubKey);
|
||||
|
||||
// signify that a particular wallet feature is now used. this may change nWalletVersion and nWalletMaxVersion if those are lower
|
||||
|
Loading…
Reference in New Issue
Block a user