Browse Source

Do not treat fFromMe transaction differently when broadcasting

pull/1/head
Pieter Wuille 9 years ago
parent
commit
fe52346450
  1. 19
      src/main.cpp
  2. 14
      src/wallet.cpp
  3. 2
      src/wallet.h

19
src/main.cpp

@ -97,16 +97,6 @@ void UnregisterAllWallets() @@ -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) @@ -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);

14
src/wallet.cpp

@ -1498,20 +1498,6 @@ void CWallet::PrintWallet(const CBlock& block) @@ -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)

2
src/wallet.h

@ -319,8 +319,6 @@ public: @@ -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…
Cancel
Save