Skip to content

Commit fe52346

Browse files
committed
Do not treat fFromMe transaction differently when broadcasting
1 parent 0d09b3e commit fe52346

File tree

3 files changed

+0
-35
lines changed

3 files changed

+0
-35
lines changed

src/main.cpp

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,6 @@ void UnregisterAllWallets()
9797
setpwalletRegistered.clear();
9898
}
9999

100-
// get the wallet transaction with the given hash (if it exists)
101-
bool static GetTransaction(const uint256& hashTx, CWalletTx& wtx)
102-
{
103-
LOCK(cs_setpwalletRegistered);
104-
BOOST_FOREACH(CWallet* pwallet, setpwalletRegistered)
105-
if (pwallet->GetTransaction(hashTx,wtx))
106-
return true;
107-
return false;
108-
}
109-
110100
// erases transaction with the given hash from all wallets
111101
void static EraseFromWallets(uint256 hash)
112102
{
@@ -4241,15 +4231,6 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
42414231
hashRand = Hash(BEGIN(hashRand), END(hashRand));
42424232
bool fTrickleWait = ((hashRand & 3) != 0);
42434233

4244-
// always trickle our own transactions
4245-
if (!fTrickleWait)
4246-
{
4247-
CWalletTx wtx;
4248-
if (GetTransaction(inv.hash, wtx))
4249-
if (wtx.fFromMe)
4250-
fTrickleWait = true;
4251-
}
4252-
42534234
if (fTrickleWait)
42544235
{
42554236
vInvWait.push_back(inv);

src/wallet.cpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,20 +1498,6 @@ void CWallet::PrintWallet(const CBlock& block)
14981498
LogPrintf("\n");
14991499
}
15001500

1501-
bool CWallet::GetTransaction(const uint256 &hashTx, CWalletTx& wtx)
1502-
{
1503-
{
1504-
LOCK(cs_wallet);
1505-
map<uint256, CWalletTx>::iterator mi = mapWallet.find(hashTx);
1506-
if (mi != mapWallet.end())
1507-
{
1508-
wtx = (*mi).second;
1509-
return true;
1510-
}
1511-
}
1512-
return false;
1513-
}
1514-
15151501
bool CWallet::SetDefaultKey(const CPubKey &vchPubKey)
15161502
{
15171503
if (fFileBacked)

src/wallet.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,6 @@ class CWallet : public CCryptoKeyStore
319319
return setKeyPool.size();
320320
}
321321

322-
bool GetTransaction(const uint256 &hashTx, CWalletTx& wtx);
323-
324322
bool SetDefaultKey(const CPubKey &vchPubKey);
325323

326324
// signify that a particular wallet feature is now used. this may change nWalletVersion and nWalletMaxVersion if those are lower

0 commit comments

Comments
 (0)