diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -1482,11 +1482,10 @@ int nMinDepth, bool fLong, UniValue &ret, const isminefilter &filter) { Amount nFee; - std::string dummy_account; std::list listReceived; std::list listSent; - wtx.GetAmounts(listReceived, listSent, nFee, dummy_account, filter); + wtx.GetAmounts(listReceived, listSent, nFee, filter); bool involvesWatchonly = wtx.IsFromMe(ISMINE_WATCH_ONLY); diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -391,7 +391,6 @@ * externally and came in through the network or sendrawtransaction RPC. */ char fFromMe; - std::string strFromAccount; //! position in ordered transaction list int64_t nOrderPos; std::multimap::const_iterator m_it_wtxOrdered; @@ -430,7 +429,6 @@ nTimeReceived = 0; nTimeSmart = 0; fFromMe = false; - strFromAccount.clear(); fDebitCached = false; fCreditCached = false; fImmatureCreditCached = false; @@ -457,7 +455,7 @@ char fSpent = false; mapValue_t mapValueCopy = mapValue; - mapValueCopy["fromaccount"] = strFromAccount; + mapValueCopy["fromaccount"] = ""; WriteOrderPos(nOrderPos, mapValueCopy); if (nTimeSmart) { mapValueCopy["timesmart"] = strprintf("%u", nTimeSmart); @@ -480,7 +478,6 @@ s >> vUnused >> mapValue >> vOrderForm >> fTimeReceivedIsTxTime >> nTimeReceived >> fFromMe >> fSpent; - strFromAccount = std::move(mapValue["fromaccount"]); ReadOrderPos(nOrderPos, mapValue); nTimeSmart = mapValue.count("timesmart") ? (unsigned int)atoi64(mapValue["timesmart"]) @@ -538,7 +535,6 @@ void GetAmounts(std::list &listReceived, std::list &listSent, Amount &nFee, - std::string &strSentAccount, const isminefilter &filter) const; bool IsFromMe(const isminefilter &filter) const { diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -709,7 +709,6 @@ // on purpose. copyTo->nTimeSmart = copyFrom->nTimeSmart; copyTo->fFromMe = copyFrom->fFromMe; - copyTo->strFromAccount = copyFrom->strFromAccount; // nOrderPos not copied on purpose cached members not copied on purpose. } } @@ -1722,12 +1721,10 @@ void CWalletTx::GetAmounts(std::list &listReceived, std::list &listSent, Amount &nFee, - std::string &strSentAccount, const isminefilter &filter) const { nFee = Amount::zero(); listReceived.clear(); listSent.clear(); - strSentAccount = strFromAccount; // Compute fee: Amount nDebit = GetDebit(filter); @@ -4736,7 +4733,6 @@ copyTo->nTimeReceived = copyFrom->nTimeReceived; copyTo->nTimeSmart = copyFrom->nTimeSmart; copyTo->fFromMe = copyFrom->fFromMe; - copyTo->strFromAccount = copyFrom->strFromAccount; copyTo->nOrderPos = copyFrom->nOrderPos; batch.WriteTx(*copyTo); } diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -19,6 +19,7 @@ #include #include +#include // // WalletBatch @@ -223,11 +224,11 @@ if (!ssValue.empty()) { char fTmp; char fUnused; - ssValue >> fTmp >> fUnused >> wtx.strFromAccount; - strErr = - strprintf("LoadWallet() upgrading tx ver=%d %d '%s' %s", - wtx.fTimeReceivedIsTxTime, fTmp, - wtx.strFromAccount, txid.ToString()); + std::string unused_string; + ssValue >> fTmp >> fUnused >> unused_string; + strErr = strprintf("LoadWallet() upgrading tx ver=%d %d %s", + wtx.fTimeReceivedIsTxTime, fTmp, + txid.ToString()); wtx.fTimeReceivedIsTxTime = fTmp; } else { strErr =