X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fwallet.cpp;h=d63db2a83cf4f81a30deddb3ee7a0d42ec72ac7e;hb=fc5ac139a14154d6c87f6f6df6cca5288b131565;hp=8e01f64c49a1b20105685ac7a8dde1b161d69c81;hpb=cd01fa99e3350e8b1ca7ed5cbf631703dfc9c54f;p=novacoin.git diff --git a/src/wallet.cpp b/src/wallet.cpp index 8e01f64..d63db2a 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -3,6 +3,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include + #include "txdb.h" #include "wallet.h" #include "walletdb.h" @@ -11,7 +13,6 @@ #include "base58.h" #include "kernel.h" #include "coincontrol.h" -#include #include #include "main.h" @@ -24,6 +25,35 @@ extern int64_t nReserveBalance; // mapWallet // +CWallet::CWallet() +{ + SetNull(); +} + +CWallet::CWallet(std::string strWalletFileIn) +{ + SetNull(); + + strWalletFile = strWalletFileIn; + fFileBacked = true; +} + +void CWallet::SetNull() +{ + nWalletVersion = FEATURE_BASE; + nWalletMaxVersion = FEATURE_BASE; + fFileBacked = false; + nMasterKeyMaxID = 0; + pwalletdbEncryption = NULL; + pwalletdbDecryption = NULL; + nNextResend = 0; + nLastResend = 0; + nOrderPosNext = 0; + nKernelsTried = 0; + nCoinDaysTried = 0; + nTimeFirstKey = 0; +} + struct CompareValueOnly { bool operator()(const pair >& t1, @@ -57,13 +87,13 @@ CPubKey CWallet::GenerateNewKey() auto pubkey = key.GetPubKey(); // Create new metadata - int64_t nCreationTime = GetTime(); + auto nCreationTime = GetTime(); mapKeyMetadata[CBitcoinAddress(pubkey.GetID())] = CKeyMetadata(nCreationTime); if (!nTimeFirstKey || nCreationTime < nTimeFirstKey) nTimeFirstKey = nCreationTime; if (!AddKey(key)) - throw std::runtime_error("CWallet::GenerateNewKey() : AddKey failed"); + throw runtime_error("CWallet::GenerateNewKey() : AddKey failed"); return key.GetPubKey(); } @@ -79,13 +109,13 @@ CMalleableKeyView CWallet::GenerateNewMalleableKey() const CMalleableKeyView &keyView(mKey); // Create new metadata - int64_t nCreationTime = GetTime(); + auto nCreationTime = GetTime(); mapKeyMetadata[CBitcoinAddress(keyView.GetMalleablePubKey())] = CKeyMetadata(nCreationTime); if (!nTimeFirstKey || nCreationTime < nTimeFirstKey) nTimeFirstKey = nCreationTime; if (!AddKey(mKey)) - throw std::runtime_error("CWallet::GenerateNewMalleableKey() : AddKey failed"); + throw runtime_error("CWallet::GenerateNewMalleableKey() : AddKey failed"); return CMalleableKeyView(mKey); } @@ -114,7 +144,7 @@ bool CWallet::AddKey(const CMalleableKey& mKey) return true; } -bool CWallet::AddCryptedMalleableKey(const CMalleableKeyView& keyView, const std::vector &vchCryptedSecretH) +bool CWallet::AddCryptedMalleableKey(const CMalleableKeyView& keyView, const vector &vchCryptedSecretH) { if (!CCryptoKeyStore::AddCryptedMalleableKey(keyView, vchCryptedSecretH)) return false; @@ -176,6 +206,13 @@ bool CWallet::LoadKeyMetadata(const CMalleableKeyView &keyView, const CKeyMetada return true; } +bool CWallet::LoadMinVersion(int nVersion) +{ + nWalletVersion = nVersion; + nWalletMaxVersion = max(nWalletMaxVersion, nVersion); + return true; +} + bool CWallet::AddCScript(const CScript& redeemScript) { if (!CCryptoKeyStore::AddCScript(redeemScript)) @@ -192,7 +229,7 @@ bool CWallet::LoadCScript(const CScript& redeemScript) * these. Do not add them to the wallet and warn. */ if (redeemScript.size() > MAX_SCRIPT_ELEMENT_SIZE) { - std::string strAddr = CBitcoinAddress(redeemScript.GetID()).ToString(); + auto strAddr = CBitcoinAddress(redeemScript.GetID()).ToString(); printf("LoadCScript() : Warning: This wallet contains a redeemScript of size %" PRIszu " which exceeds maximum size %i thus can never be redeemed. Do not use address %s.\n", redeemScript.size(), MAX_SCRIPT_ELEMENT_SIZE, strAddr.c_str()); return true; @@ -277,7 +314,7 @@ bool CWallet::ChangeWalletPassphrase(const SecureString& strOldWalletPassphrase, return false; if (CCryptoKeyStore::Unlock(vMasterKey)) { - int64_t nStartTime = GetTimeMillis(); + auto nStartTime = GetTimeMillis(); crypter.SetKeyFromPassphrase(strNewWalletPassphrase, pMasterKey.second.vchSalt, pMasterKey.second.nDeriveIterations, pMasterKey.second.nDerivationMethod); double nFirstMultiplier = 1e2 / (GetTimeMillis() - nStartTime); pMasterKey.second.nDeriveIterations = (uint32_t)(pMasterKey.second.nDeriveIterations *nFirstMultiplier); @@ -380,9 +417,9 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase) RAND_bytes(&kMasterKey.vchSalt[0], WALLET_CRYPTO_SALT_SIZE); CCrypter crypter; - int64_t nStartTime = GetTimeMillis(); + auto nStartTime = GetTimeMillis(); crypter.SetKeyFromPassphrase(strWalletPassphrase, kMasterKey.vchSalt, 25000, kMasterKey.nDerivationMethod); - int64_t nDivider = GetTimeMillis() - nStartTime; + auto nDivider = GetTimeMillis() - nStartTime; kMasterKey.nDeriveIterations = (uint32_t)(25e5 / (double)(nDivider)); nStartTime = GetTimeMillis(); @@ -482,7 +519,7 @@ bool CWallet::DecryptWallet(const SecureString& strWalletPassphrase) if (fFileBacked) { // Overwrite crypted keys - KeyMap::const_iterator mi = mapKeys.begin(); + auto mi = mapKeys.begin(); while (mi != mapKeys.end()) { CKey key; @@ -492,18 +529,18 @@ bool CWallet::DecryptWallet(const SecureString& strWalletPassphrase) mi++; } - MalleableKeyMap::const_iterator mi2 = mapMalleableKeys.begin(); + auto mi2 = mapMalleableKeys.begin(); while (mi2 != mapMalleableKeys.end()) { - const CSecret &vchSecretH = mi2->second; - const CMalleableKeyView &keyView = mi2->first; + const auto &vchSecretH = mi2->second; + const auto &keyView = mi2->first; pwalletdbDecryption->EraseCryptedMalleableKey(keyView); pwalletdbDecryption->WriteMalleableKey(keyView, vchSecretH, mapKeyMetadata[CBitcoinAddress(keyView.GetMalleablePubKey())]); mi2++; } // Erase master keys - MasterKeyMap::const_iterator mk = mapMasterKeys.begin(); + auto mk = mapMasterKeys.begin(); while (mk != mapMasterKeys.end()) { pwalletdbDecryption->EraseMasterKey((*mk).first); @@ -526,7 +563,7 @@ bool CWallet::DecryptWallet(const SecureString& strWalletPassphrase) return true; } -bool CWallet::GetPEM(const CKeyID &keyID, const std::string &fileName, const SecureString &strPassKey) const +bool CWallet::GetPEM(const CKeyID &keyID, const string &fileName, const SecureString &strPassKey) const { BIO *pemOut = BIO_new_file(fileName.c_str(), "w"); if (pemOut == NULL) @@ -550,7 +587,7 @@ int64_t CWallet::IncOrderPosNext(CWalletDB *pwalletdb) return nRet; } -CWallet::TxItems CWallet::OrderedTxItems(std::list& acentries, std::string strAccount) +CWallet::TxItems CWallet::OrderedTxItems(list& acentries, string strAccount) { CWalletDB walletdb(strWalletFile); @@ -562,13 +599,13 @@ CWallet::TxItems CWallet::OrderedTxItems(std::list& acentries, for (auto it = mapWallet.begin(); it != mapWallet.end(); ++it) { CWalletTx* wtx = &((*it).second); - txOrdered.insert(make_pair(wtx->nOrderPos, TxPair(wtx, (CAccountingEntry*)0))); + txOrdered.insert({ wtx->nOrderPos, { wtx, (CAccountingEntry*)0 } }); } acentries.clear(); walletdb.ListAccountCreditDebit(strAccount, acentries); for(auto& entry : acentries) { - txOrdered.insert(make_pair(entry.nOrderPos, TxPair((CWalletTx*)0, &entry))); + txOrdered.insert({ entry.nOrderPos, { (CWalletTx*)0, &entry } }); } return txOrdered; @@ -632,11 +669,11 @@ void CWallet::MarkDirty() bool CWallet::AddToWallet(const CWalletTx& wtxIn) { - uint256 hash = wtxIn.GetHash(); + auto hash = wtxIn.GetHash(); { LOCK(cs_wallet); // Inserts only if not already there, returns tx inserted or tx found - auto ret = mapWallet.insert(make_pair(hash, wtxIn)); + auto ret = mapWallet.insert({ hash, wtxIn }); auto& wtx = (*ret.first).second; wtx.BindWallet(this); bool fInsertedNew = ret.second; @@ -655,7 +692,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn) { // Tolerate times up to the last timestamp in the wallet not more than 5 minutes into the future int64_t latestTolerated = latestNow + 300; - std::list acentries; + list acentries; auto txOrdered = OrderedTxItems(acentries); for (auto it = txOrdered.rbegin(); it != txOrdered.rend(); ++it) { @@ -683,7 +720,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn) } unsigned int& blocktime = mapBlockIndex[wtxIn.hashBlock]->nTime; - wtx.nTimeSmart = std::max(latestEntry, std::min(blocktime, latestNow)); + wtx.nTimeSmart = max(latestEntry, min(blocktime, latestNow)); } else printf("AddToWallet() : found %s in block %s not in index\n", @@ -746,13 +783,11 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn) NotifyTransactionChanged(this, hash, fInsertedNew ? CT_NEW : CT_UPDATED); vMintingWalletUpdated.push_back(hash); // notify an external script when a wallet transaction comes in or is updated - std::string strCmd = GetArg("-walletnotify", ""); + auto strCmd = GetArg("-walletnotify", ""); - if ( !strCmd.empty()) - { - boost::replace_all(strCmd, "%s", wtxIn.GetHash().GetHex()); - boost::thread t(runCommand, strCmd); // thread runs free - } + if (!strCmd.empty()) + // thread runs free + boost::thread t(runCommand, regex_replace(strCmd, static_cast("%s"), wtxIn.GetHash().GetHex())); } return true; @@ -763,7 +798,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn) // If fUpdate is true, existing transactions will be updated. bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, bool fUpdate) { - uint256 hash = tx.GetHash(); + auto hash = tx.GetHash(); { LOCK(cs_wallet); bool fExisted = mapWallet.count(hash) != 0; @@ -810,9 +845,63 @@ isminetype CWallet::IsMine(const CTxIn &txin) const return MINE_NO; } + +CWalletTx::CWalletTx() +{ + Init(NULL); +} + +CWalletTx::CWalletTx(const CWallet* pwalletIn) +{ + Init(pwalletIn); +} + +CWalletTx::CWalletTx(const CWallet* pwalletIn, const CMerkleTx& txIn) : CMerkleTx(txIn) +{ + Init(pwalletIn); +} + +CWalletTx::CWalletTx(const CWallet* pwalletIn, const CTransaction& txIn) : CMerkleTx(txIn) +{ + Init(pwalletIn); +} + +void CWalletTx::Init(const CWallet* pwalletIn) +{ + pwallet = pwalletIn; + vtxPrev.clear(); + mapValue.clear(); + vOrderForm.clear(); + fTimeReceivedIsTxTime = false; + nTimeReceived = 0; + nTimeSmart = 0; + fFromMe = false; + strFromAccount.clear(); + vfSpent.clear(); + fDebitCached = false; + fWatchDebitCached = false; + fCreditCached = false; + fWatchCreditCached = false; + fAvailableCreditCached = false; + fAvailableWatchCreditCached = false; + fImmatureCreditCached = false; + fImmatureWatchCreditCached = false; + fChangeCached = false; + nDebitCached = 0; + nWatchDebitCached = 0; + nCreditCached = 0; + nWatchCreditCached = 0; + nAvailableCreditCached = 0; + nAvailableWatchCreditCached = 0; + nImmatureCreditCached = 0; + nImmatureWatchCreditCached = 0; + nChangeCached = 0; + nOrderPos = -1; +} + // marks certain txout's as spent // returns true if any update took place -bool CWalletTx::UpdateSpent(const std::vector& vfNewSpent) +bool CWalletTx::UpdateSpent(const vector& vfNewSpent) { bool fReturn = false; for (unsigned int i = 0; i < vfNewSpent.size(); i++) @@ -848,7 +937,7 @@ void CWalletTx::BindWallet(CWallet *pwalletIn) void CWalletTx::MarkSpent(unsigned int nOut) { if (nOut >= vout.size()) - throw std::runtime_error("CWalletTx::MarkSpent() : nOut out of range"); + throw runtime_error("CWalletTx::MarkSpent() : nOut out of range"); vfSpent.resize(vout.size()); if (!vfSpent[nOut]) { @@ -860,7 +949,7 @@ void CWalletTx::MarkSpent(unsigned int nOut) void CWalletTx::MarkUnspent(unsigned int nOut) { if (nOut >= vout.size()) - throw std::runtime_error("CWalletTx::MarkUnspent() : nOut out of range"); + throw runtime_error("CWalletTx::MarkUnspent() : nOut out of range"); vfSpent.resize(vout.size()); if (vfSpent[nOut]) { @@ -872,7 +961,7 @@ void CWalletTx::MarkUnspent(unsigned int nOut) bool CWalletTx::IsSpent(unsigned int nOut) const { if (nOut >= vout.size()) - throw std::runtime_error("CWalletTx::IsSpent() : nOut out of range"); + throw runtime_error("CWalletTx::IsSpent() : nOut out of range"); if (nOut >= vfSpent.size()) return false; return (!!vfSpent[nOut]); @@ -902,7 +991,7 @@ isminetype CWallet::IsMine(const CTxOut& txout) const int64_t CWallet::GetCredit(const CTxOut& txout, const isminefilter& filter) const { if (!MoneyRange(txout.nValue)) - throw std::runtime_error("CWallet::GetCredit() : value out of range"); + throw runtime_error("CWallet::GetCredit() : value out of range"); return (IsMine(txout) & filter ? txout.nValue : 0); } @@ -931,7 +1020,7 @@ bool CWallet::IsChange(const CTxOut& txout) const int64_t CWallet::GetChange(const CTxOut& txout) const { if (!MoneyRange(txout.nValue)) - throw std::runtime_error("CWallet::GetChange() : value out of range"); + throw runtime_error("CWallet::GetChange() : value out of range"); return (IsChange(txout) ? txout.nValue : 0); } @@ -950,38 +1039,41 @@ bool CWallet::IsFromMe(const CTransaction& tx) const int64_t CWallet::GetDebit(const CTransaction& tx, const isminefilter& filter) const { - int64_t nDebit = 0; + CBigNum nDebit = 0; for(const CTxIn& txin : tx.vin) { - nDebit += GetDebit(txin, filter); - if (!MoneyRange(nDebit)) - throw std::runtime_error("CWallet::GetDebit() : value out of range"); + auto nValue = GetDebit(txin, filter); + nDebit += nValue; + if (!MoneyRange(nValue) || !MoneyRange(nDebit)) + throw runtime_error("CWallet::GetDebit() : value out of range"); } - return nDebit; + return nDebit.getint64(); } int64_t CWallet::GetCredit(const CTransaction& tx, const isminefilter& filter) const { - int64_t nCredit = 0; + CBigNum nCredit = 0; for(const CTxOut& txout : tx.vout) { - nCredit += GetCredit(txout, filter); - if (!MoneyRange(nCredit)) - throw std::runtime_error("CWallet::GetCredit() : value out of range"); + auto nValue = GetCredit(txout, filter); + nCredit += nValue; + if (!MoneyRange(nValue) || !MoneyRange(nCredit)) + throw runtime_error("CWallet::GetCredit() : value out of range"); } - return nCredit; + return nCredit.getint64(); } int64_t CWallet::GetChange(const CTransaction& tx) const { - int64_t nChange = 0; + CBigNum nChange = 0; for(const CTxOut& txout : tx.vout) { - nChange += GetChange(txout); - if (!MoneyRange(nChange)) - throw std::runtime_error("CWallet::GetChange() : value out of range"); + int64_t nValue = GetChange(txout); + nChange += nValue; + if (!MoneyRange(nValue) || !MoneyRange(nChange)) + throw runtime_error("CWallet::GetChange() : value out of range"); } - return nChange; + return nChange.getint64(); } int64_t CWalletTx::GetTxTime() const @@ -1172,22 +1264,23 @@ int64_t CWalletTx::GetAvailableCredit(bool fUseCache) const return nAvailableCreditCached; } - int64_t nCredit = 0; - for (unsigned int i = 0; i < vout.size(); i++) + CBigNum nCredit = 0; + for (uint32_t i = 0; i < vout.size(); i++) { if (!IsSpent(i)) { const CTxOut &txout = vout[i]; - nCredit += pwallet->GetCredit(txout, MINE_SPENDABLE); - if (!MoneyRange(nCredit)) - throw std::runtime_error("CWalletTx::GetAvailableCredit() : value out of range"); + int64_t nValue = pwallet->GetCredit(txout, MINE_SPENDABLE); + nCredit += nValue; + if (!MoneyRange(nValue) || !MoneyRange(nCredit)) + throw runtime_error("CWalletTx::GetAvailableCredit() : value out of range"); } } - nAvailableCreditCached = nCredit; + nAvailableCreditCached = nCredit.getint64(); fAvailableCreditCached = true; - return nCredit; + return nCredit.getint64(); } int64_t CWalletTx::GetAvailableWatchCredit(bool fUseCache) const @@ -1201,22 +1294,23 @@ int64_t CWalletTx::GetAvailableWatchCredit(bool fUseCache) const return nAvailableWatchCreditCached; } - int64_t nCredit = 0; + CBigNum nCredit = 0; for (unsigned int i = 0; i < vout.size(); i++) { if (!IsSpent(i)) { const CTxOut &txout = vout[i]; - nCredit += pwallet->GetCredit(txout, MINE_WATCH_ONLY); - if (!MoneyRange(nCredit)) - throw std::runtime_error("CWalletTx::GetAvailableCredit() : value out of range"); + int64_t nValue = pwallet->GetCredit(txout, MINE_WATCH_ONLY); + nCredit += nValue; + if (!MoneyRange(nValue) || !MoneyRange(nCredit)) + throw runtime_error("CWalletTx::GetAvailableCredit() : value out of range"); } } - nAvailableWatchCreditCached = nCredit; + nAvailableWatchCreditCached = nCredit.getint64(); fAvailableWatchCreditCached = true; - return nCredit; + return nCredit.getint64(); } int64_t CWalletTx::GetChange() const @@ -1246,10 +1340,10 @@ void CWalletTx::GetAmounts(int64_t& nGeneratedImmature, int64_t& nGeneratedMatur } // Compute fee: - int64_t nDebit = GetDebit(filter); + auto nDebit = GetDebit(filter); if (nDebit > 0) // debit>0 means we signed/sent this transaction { - int64_t nValueOut = GetValueOut(); + auto nValueOut = GetValueOut(); nFee = nDebit - nValueOut; } @@ -1280,11 +1374,11 @@ void CWalletTx::GetAmounts(int64_t& nGeneratedImmature, int64_t& nGeneratedMatur // If we are debited by the transaction, add the output as a "sent" entry if (nDebit > 0) - listSent.push_back(make_pair(address, txout.nValue)); + listSent.push_back({ address, txout.nValue }); // If we are receiving the output, add it as a "received" entry if (fIsMine & filter) - listReceived.push_back(make_pair(address, txout.nValue)); + listReceived.push_back({ address, txout.nValue }); } } @@ -1345,7 +1439,7 @@ void CWalletTx::AddSupportingTransactions(CTxDB& txdb) set setAlreadyDone; for (unsigned int i = 0; i < vWorkQueue.size(); i++) { - uint256 hash = vWorkQueue[i]; + auto hash = vWorkQueue[i]; if (setAlreadyDone.count(hash)) continue; setAlreadyDone.insert(hash); @@ -1487,14 +1581,14 @@ void CWallet::ReacceptWalletTransactions() bool CWalletTx::RelayWalletTransaction(CTxDB& txdb) { - uint256 hash = GetHash(); + auto hash = GetHash(); if (IsCoinBase() || IsCoinStake() || txdb.ContainsTx(hash) || !InMempool()) return false; for(auto it = vtxPrev.begin(); it != vtxPrev.end(); it++) { const CMerkleTx& tx = *it; - uint256 hash = tx.GetHash(); + auto hash = tx.GetHash(); if (tx.IsCoinBase() || tx.IsCoinStake()) continue; @@ -1514,9 +1608,9 @@ bool CWalletTx::RelayWalletTransaction() return RelayWalletTransaction(txdb); } -std::vector CWallet::ResendWalletTransactionsBefore(int64_t nTime) +vector CWallet::ResendWalletTransactionsBefore(int64_t nTime) { - std::vector result; + vector result; LOCK(cs_wallet); // Sort them in chronological order @@ -1527,7 +1621,7 @@ std::vector CWallet::ResendWalletTransactionsBefore(int64_t nTime) // Don't rebroadcast if newer than nTime: if (wtx.nTimeReceived > nTime) continue; - mapSorted.insert(make_pair(wtx.nTimeReceived, &wtx)); + mapSorted.insert({ wtx.nTimeReceived, &wtx }); } for(auto& item : mapSorted) { @@ -1540,7 +1634,7 @@ std::vector CWallet::ResendWalletTransactionsBefore(int64_t nTime) void CWallet::ResendWalletTransactions(int64_t nBestBlockTime) { - int64_t nNow = GetTime(); + auto nNow = GetTime(); // Do this infrequently and randomly to avoid giving away // that these are our transactions. @@ -1558,7 +1652,7 @@ void CWallet::ResendWalletTransactions(int64_t nBestBlockTime) // Rebroadcast unconfirmed txes older than 5 minutes before the last // block was found: - std::vector relayed = ResendWalletTransactionsBefore(nBestBlockTime - 5*60); + auto relayed = ResendWalletTransactionsBefore(nBestBlockTime - 5*60); if (!relayed.empty()) printf("CWallet::ResendWalletTransactions: rebroadcast %" PRIszu " unconfirmed transactions\n", relayed.size()); } @@ -1824,7 +1918,7 @@ bool CWallet::SelectCoinsMinConf(int64_t nTargetValue, unsigned int nSpendTime, // List of values less than target pair > coinLowestLarger; - coinLowestLarger.first = std::numeric_limits::max(); + coinLowestLarger.first = numeric_limits::max(); coinLowestLarger.second.first = NULL; vector > > vValue; int64_t nTotalLower = 0; @@ -1847,9 +1941,8 @@ bool CWallet::SelectCoinsMinConf(int64_t nTargetValue, unsigned int nSpendTime, if (pcoin->nTime > nSpendTime) continue; - int64_t n = pcoin->vout[i].nValue; - - pair > coin = make_pair(n,make_pair(pcoin, i)); + auto n = pcoin->vout[i].nValue; + auto coin = make_pair(n, make_pair(pcoin, i)); if (n == nTargetValue) { @@ -1939,7 +2032,7 @@ bool CWallet::SelectCoins(int64_t nTargetValue, unsigned int nSpendTime, setvout[out.i].nValue; - setCoinsRet.insert(make_pair(out.tx, out.i)); + setCoinsRet.insert({ out.tx, out.i }); } return (nValueRet >= nTargetValue); } @@ -1977,9 +2070,8 @@ bool CWallet::SelectCoinsSimple(int64_t nTargetValue, int64_t nMinValue, int64_t if (pcoin->nTime > nSpendTime) continue; - int64_t n = pcoin->vout[i].nValue; - - pair > coin = make_pair(n,make_pair(pcoin, i)); + auto n = pcoin->vout[i].nValue; + auto coin = make_pair(n, make_pair(pcoin, i)); if (n >= nTargetValue) { @@ -2025,7 +2117,7 @@ bool CWallet::CreateTransaction(const vector >& vecSend, wtxNew.vout.clear(); wtxNew.fFromMe = true; - int64_t nTotalValue = nValue + nFeeRet; + auto nTotalValue = nValue + nFeeRet; double dPriority = 0; // vouts to the payees for(const auto& s : vecSend) @@ -2038,11 +2130,11 @@ bool CWallet::CreateTransaction(const vector >& vecSend, return false; for(auto& pcoin : setCoins) { - int64_t nCredit = pcoin.first->vout[pcoin.second].nValue; + auto nCredit = pcoin.first->vout[pcoin.second].nValue; dPriority += (double)nCredit * pcoin.first->GetDepthInMainChain(); } - int64_t nChange = nValueIn - nValue - nFeeRet; + auto nChange = nValueIn - nValue - nFeeRet; if (nChange > 0) { // Fill a vout to ourself @@ -2082,7 +2174,7 @@ bool CWallet::CreateTransaction(const vector >& vecSend, wtxNew.vin.push_back(CTxIn(coin.first->GetHash(),coin.second)); // Sign - int nIn = 0; + uint32_t nIn = 0; for(const auto& coin : setCoins) if (!SignSignature(*this, *coin.first, wtxNew, nIn++)) return false; @@ -2095,8 +2187,8 @@ bool CWallet::CreateTransaction(const vector >& vecSend, // Check that enough fee is included bool fAllowFree = CTransaction::AllowFree(dPriority); - int64_t nPayFee = nTransactionFee * (1 + (int64_t)nBytes / 1000); - int64_t nMinFee = wtxNew.GetMinFee(1, fAllowFree, GMF_SEND, nBytes); + auto nPayFee = nTransactionFee * (1 + (int64_t)nBytes / 1000); + auto nMinFee = wtxNew.GetMinFee(1, fAllowFree, GMF_SEND, nBytes); if (nFeeRet < max(nPayFee, nMinFee)) { @@ -2118,13 +2210,13 @@ bool CWallet::CreateTransaction(const vector >& vecSend, bool CWallet::CreateTransaction(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNew, CReserveKey& reservekey, int64_t& nFeeRet, const CCoinControl* coinControl) { vector< pair > vecSend; - vecSend.push_back(make_pair(scriptPubKey, nValue)); + vecSend.push_back({ scriptPubKey, nValue }); return CreateTransaction(vecSend, wtxNew, reservekey, nFeeRet, coinControl); } void CWallet::GetStakeWeightFromValue(const int64_t& nTime, const int64_t& nValue, uint64_t& nWeight) { - int64_t nTimeWeight = GetWeight(nTime, GetTime()); + auto nTimeWeight = GetWeight(nTime, GetTime()); // If time weight is lower or equal to zero then weight is zero. if (nTimeWeight <= 0) @@ -2139,7 +2231,7 @@ void CWallet::GetStakeWeightFromValue(const int64_t& nTime, const int64_t& nValu bool CWallet::MergeCoins(const int64_t& nAmount, const int64_t& nMinValue, const int64_t& nOutputValue, list& listMerged) { - int64_t nBalance = GetBalance(); + auto nBalance = GetBalance(); if (nAmount > nBalance) return false; @@ -2172,7 +2264,7 @@ bool CWallet::MergeCoins(const int64_t& nAmount, const int64_t& nMinValue, const double dWeight = 0; for(auto& pcoin : setCoins) { - int64_t nCredit = pcoin.first->vout[pcoin.second].nValue; + auto nCredit = pcoin.first->vout[pcoin.second].nValue; // Add current coin to inputs list and add its credit to transaction output wtxNew.vin.push_back(CTxIn(pcoin.first->GetHash(), pcoin.second)); @@ -2192,14 +2284,14 @@ bool CWallet::MergeCoins(const int64_t& nAmount, const int64_t& nMinValue, const */ // Assuming that average scriptsig size is 110 bytes - int64_t nBytes = ::GetSerializeSize(*(CTransaction*)&wtxNew, SER_NETWORK, PROTOCOL_VERSION) + wtxNew.vin.size() * 110; + auto nBytes = ::GetSerializeSize(*(CTransaction*)&wtxNew, SER_NETWORK, PROTOCOL_VERSION) + wtxNew.vin.size() * 110; dWeight += (double)nCredit * pcoin.first->GetDepthInMainChain(); double dFinalPriority = dWeight /= nBytes; bool fAllowFree = CTransaction::AllowFree(dFinalPriority); // Get actual transaction fee according to its estimated size and priority - int64_t nMinFee = wtxNew.GetMinFee(1, fAllowFree, GMF_SEND, nBytes); + auto nMinFee = wtxNew.GetMinFee(1, fAllowFree, GMF_SEND, nBytes); // Prepare transaction for commit if sum is enough ot its size is too big if (nBytes >= MAX_BLOCK_SIZE_GEN/6 || wtxNew.vout[0].nValue >= nOutputValue) @@ -2235,14 +2327,14 @@ bool CWallet::MergeCoins(const int64_t& nAmount, const int64_t& nMinValue, const bool fAllowFree = CTransaction::AllowFree(dFinalPriority); // Get actual transaction fee according to its size and priority - int64_t nMinFee = wtxNew.GetMinFee(1, fAllowFree, GMF_SEND, nBytes); + auto nMinFee = wtxNew.GetMinFee(1, fAllowFree, GMF_SEND, nBytes); wtxNew.vout[0].nValue -= nMinFee; // Set actual fee if (wtxNew.vout[0].nValue <= 0) return false; - for (unsigned int i = 0; i < wtxNew.vin.size(); i++) { + for (uint32_t i = 0; i < wtxNew.vin.size(); i++) { const CWalletTx *txin = vwtxPrev[i]; // Sign all scripts again @@ -2289,7 +2381,7 @@ bool CWallet::CreateCoinStake(uint256 &hashTx, uint32_t nOut, uint32_t nGenerati } if (whichType == TX_PUBKEY) { - valtype& vchPubKey = vSolutions[0]; + auto& vchPubKey = vSolutions[0]; if (!GetKey(Hash160(vchPubKey), key)) return error("CreateCoinStake : failed to get key for kernel type=%d\n", whichType); if (key.GetPubKey() != vchPubKey) @@ -2299,10 +2391,10 @@ bool CWallet::CreateCoinStake(uint256 &hashTx, uint32_t nOut, uint32_t nGenerati // The following combine threshold is important to security // Should not be adjusted if you don't understand the consequences - int64_t nCombineThreshold = GetProofOfWorkReward(GetLastBlockIndex(pindexBest, false)->nBits) / 3; + auto nCombineThreshold = GetProofOfWorkReward(GetLastBlockIndex(pindexBest, false)->nBits) / 3; - int64_t nBalance = GetBalance(); - int64_t nCredit = wtx.vout[nOut].nValue; + auto nBalance = GetBalance(); + auto nCredit = wtx.vout[nOut].nValue; txNew.vin.clear(); txNew.vout.clear(); @@ -2354,7 +2446,7 @@ bool CWallet::CreateCoinStake(uint256 &hashTx, uint32_t nOut, uint32_t nGenerati if (nCredit + pcoin->first->vout[pcoin->second].nValue > nBalance - nReserveBalance) break; - int64_t nTimeWeight = GetWeight((int64_t)pcoin->first->nTime, (int64_t)nGenerationTime); + auto nTimeWeight = GetWeight((int64_t)pcoin->first->nTime, (int64_t)nGenerationTime); // Do not add input that is still too young if (nTimeWeight < nStakeMaxAge) @@ -2378,7 +2470,7 @@ bool CWallet::CreateCoinStake(uint256 &hashTx, uint32_t nOut, uint32_t nGenerati } else { - int64_t nSplitThreshold = GetArg("-splitthreshold", nCombineThreshold); + auto nSplitThreshold = GetArg("-splitthreshold", nCombineThreshold); if (fDebug && GetBoolArg("-printcoinstake")) printf("CreateCoinStake : nSplitThreshold=%" PRId64 "\n", nSplitThreshold); @@ -2419,7 +2511,7 @@ bool CWallet::CreateCoinStake(uint256 &hashTx, uint32_t nOut, uint32_t nGenerati } // Sign - int nIn = 0; + uint32_t nIn = 0; for(const CWalletTx* pcoin : vwtxPrev) { if (!SignSignature(*this, *pcoin, txNew, nIn++)) @@ -2427,7 +2519,7 @@ bool CWallet::CreateCoinStake(uint256 &hashTx, uint32_t nOut, uint32_t nGenerati } // Limit size - unsigned int nBytes = ::GetSerializeSize(txNew, SER_NETWORK, PROTOCOL_VERSION); + auto nBytes = ::GetSerializeSize(txNew, SER_NETWORK, PROTOCOL_VERSION); if (nBytes >= MAX_BLOCK_SIZE_GEN/5) return error("CreateCoinStake : exceeded coinstake size limit\n"); @@ -2638,6 +2730,16 @@ void CWallet::PrintWallet(const CBlock& block) printf("\n"); } +void CWallet::Inventory(const uint256 &hash) +{ + { + LOCK(cs_wallet); + auto mi = mapRequestCount.find(hash); + if (mi != mapRequestCount.end()) + (*mi).second++; + } +} + bool CWallet::GetTransaction(const uint256 &hashTx, CWalletTx& wtx) { { @@ -2695,7 +2797,7 @@ bool CWallet::NewKeyPool(unsigned int nSize) for (uint64_t i = 0; i < nKeys; i++) { - uint64_t nIndex = i+1; + auto nIndex = i+1; walletdb.WritePool(nIndex, CKeyPool(GenerateNewKey())); setKeyPool.insert(nIndex); } @@ -2836,7 +2938,7 @@ int64_t CWallet::GetOldestKeyPoolTime() return keypool.nTime; } -std::map CWallet::GetAddressBalances() +map CWallet::GetAddressBalances() { map balances; @@ -2864,7 +2966,7 @@ std::map CWallet::GetAddressBalances() if(!ExtractAddress(*this, pcoin->vout[i].scriptPubKey, addr)) continue; - int64_t n = pcoin->IsSpent(i) ? 0 : pcoin->vout[i].nValue; + auto n = pcoin->IsSpent(i) ? 0 : pcoin->vout[i].nValue; if (!balances.count(addr)) balances[addr] = 0; @@ -2885,29 +2987,38 @@ set< set > CWallet::GetAddressGroupings() { CWalletTx *pcoin = &walletEntry.second; - if (pcoin->vin.size() > 0 && IsMine(pcoin->vin[0])) + if (pcoin->vin.size() > 0) { + bool any_mine = false; // group all input addresses with each other for(CTxIn txin : pcoin->vin) { CBitcoinAddress address; + if(!IsMine(txin)) // If this input isn't mine, ignore it + continue; if(!ExtractAddress(*this, mapWallet[txin.prevout.hash].vout[txin.prevout.n].scriptPubKey, address)) continue; grouping.insert(address); + any_mine = true; } // group change with input addresses + if (any_mine) + { for(CTxOut txout : pcoin->vout) if (IsChange(txout)) { - auto tx = mapWallet[pcoin->vin[0].prevout.hash]; CBitcoinAddress txoutAddr; if(!ExtractAddress(*this, txout.scriptPubKey, txoutAddr)) continue; grouping.insert(txoutAddr); } - groupings.insert(grouping); - grouping.clear(); + } + if (!grouping.empty()) + { + groupings.insert(grouping); + grouping.clear(); + } } // group lone addrs by themselves @@ -3109,7 +3220,7 @@ void CWallet::UpdatedTransaction(const uint256 &hashTx) } } -void CWallet::GetAddresses(std::map &mapAddresses) const { +void CWallet::GetAddresses(map &mapAddresses) const { mapAddresses.clear(); // get birth times for keys with metadata @@ -3133,7 +3244,7 @@ void CWallet::GetAddresses(std::map &mapAddresses) con } else { // multisig output affects more than one key - std::vector vAffected; + vector vAffected; ::ExtractAffectedKeys(*this, out.scriptPubKey, vAffected); for(auto it3 = vAffected.begin(); it3 != vAffected.end(); it3++) {