From 1d23c7436164faa0b1822acf5ce9507bf6ff257a Mon Sep 17 00:00:00 2001 From: Gavin Andresen Date: Wed, 19 Jan 2011 16:50:20 -0500 Subject: [PATCH] ReacceptWalletTransactions bugfix Fix two bugs that can happen if you copy your wallet to another machine and perform transactions on both. First, ReacceptWalletTransactions would notice if the other wallet spent coins, and would correctly mark the receiving transaction spent. However, it did not add the spending transaction to the wallet. Now it does. Second, account balances could get out of sync with 'getbalance' because coins received by the other copy of the wallet were not necessarily detected. Now ReacceptWalletTransactions will scan the entire blockchain for transactions that should be in the wallet if it runs across a 'spent in the other wallet' transaction. Finally, there was a small bug in the accounts getbalance code-- generated coins with between 100 and 119 confirmations were not being counted in the balance of account "". --- main.cpp | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++------ main.h | 1 + rpc.cpp | 24 +++++++++++++++++++ 3 files changed, 91 insertions(+), 7 deletions(-) diff --git a/main.cpp b/main.cpp index b7dfd9fab..ac0c563ec 100644 --- a/main.cpp +++ b/main.cpp @@ -187,6 +187,19 @@ bool AddToWalletIfMine(const CTransaction& tx, const CBlock* pblock) return true; } +bool AddToWalletIfFromMe(const CTransaction& tx, const CBlock* pblock) +{ + if (tx.IsFromMe() || mapWallet.count(tx.GetHash())) + { + CWalletTx wtx(tx); + // Get merkle branch if transaction was found in a block + if (pblock) + wtx.SetMerkleBranch(pblock); + return AddToWallet(wtx); + } + return true; +} + bool EraseFromWallet(uint256 hash) { CRITICAL_BLOCK(cs_mapWallet) @@ -404,7 +417,7 @@ void CWalletTx::GetAmounts(int64& nGenerated, list >& listRe if (IsCoinBase()) { - if (GetBlocksToMaturity() == 0) + if (GetDepthInMainChain() >= COINBASE_MATURITY) nGenerated = GetCredit(); return; } @@ -849,11 +862,50 @@ bool CWalletTx::AcceptWalletTransaction(CTxDB& txdb, bool fCheckInputs) return false; } +int ScanForWalletTransactions(CBlockIndex* pindexStart) +{ + int ret = 0; + + CBlockIndex* pindex = pindexStart; + CRITICAL_BLOCK(cs_mapWallet) + { + while (pindex) + { + CBlock block; + block.ReadFromDisk(pindex, true); + foreach(CTransaction& tx, block.vtx) + { + uint256 hash = tx.GetHash(); + if (mapWallet.count(hash)) continue; + AddToWalletIfMine(tx, &block); + if (mapWallet.count(hash)) + { + ++ret; + printf("Added missing RECEIVE %s\n", hash.ToString().c_str()); + continue; + } + AddToWalletIfFromMe(tx, &block); + if (mapWallet.count(hash)) + { + ++ret; + printf("Added missing SEND %s\n", hash.ToString().c_str()); + continue; + } + } + pindex = pindex->pnext; + } + } + return ret; +} + void ReacceptWalletTransactions() { CTxDB txdb("r"); - CRITICAL_BLOCK(cs_mapWallet) + bool fRepeat = true; + while (fRepeat) CRITICAL_BLOCK(cs_mapWallet) { + fRepeat = false; + vector vMissingTx; foreach(PAIRTYPE(const uint256, CWalletTx)& item, mapWallet) { CWalletTx& wtx = item.second; @@ -875,12 +927,15 @@ void ReacceptWalletTransactions() { if (!txindex.vSpent[i].IsNull() && wtx.vout[i].IsMine()) { - printf("ReacceptWalletTransactions found spent coin %sbc %s\n", FormatMoney(wtx.GetCredit()).c_str(), wtx.GetHash().ToString().c_str()); wtx.fSpent = true; - wtx.WriteToDisk(); - break; + vMissingTx.push_back(txindex.vSpent[i]); } } + if (wtx.fSpent) + { + printf("ReacceptWalletTransactions found spent coin %sbc %s\n", FormatMoney(wtx.GetCredit()).c_str(), wtx.GetHash().ToString().c_str()); + wtx.WriteToDisk(); + } } } else @@ -890,6 +945,12 @@ void ReacceptWalletTransactions() wtx.AcceptWalletTransaction(txdb, false); } } + if (!vMissingTx.empty()) + { + // TODO: optimize this to scan just part of the block chain? + if (ScanForWalletTransactions(pindexGenesisBlock)) + fRepeat = true; // Found missing transactions: re-do Reaccept. + } } } @@ -1361,8 +1422,6 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex) return true; } - - bool Reorganize(CTxDB& txdb, CBlockIndex* pindexNew) { printf("REORGANIZE\n"); diff --git a/main.h b/main.h index 3c7bcb22f..a7ef336e0 100644 --- a/main.h +++ b/main.h @@ -69,6 +69,7 @@ bool AddKey(const CKey& key); vector GenerateNewKey(); bool AddToWallet(const CWalletTx& wtxIn); void WalletUpdateSpent(const COutPoint& prevout); +int ScanForWalletTransactions(CBlockIndex* pindexStart); void ReacceptWalletTransactions(); bool LoadBlockIndex(bool fAllowNew=true); void PrintBlockTree(); diff --git a/rpc.cpp b/rpc.cpp index f80b24ea7..286ddcd0b 100644 --- a/rpc.cpp +++ b/rpc.cpp @@ -621,6 +621,30 @@ Value getbalance(const Array& params, bool fHelp) if (params.size() == 0) return ((double)GetBalance() / (double)COIN); + if (params[0].get_str() == "*") { + // Calculate total balance a different way from GetBalance() + // (GetBalance() sums up all unspent TxOuts) + // getbalance and getbalance '*' should always return the same number. + int64 nBalance = 0; + for (map::iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) + { + const CWalletTx& wtx = (*it).second; + int64 allGenerated, allFee; + allGenerated = allFee = 0; + string strSentAccount; + list > listReceived; + list > listSent; + wtx.GetAmounts(allGenerated, listReceived, listSent, allFee, strSentAccount); + foreach(const PAIRTYPE(string,int64)& r, listReceived) + nBalance += r.second; + foreach(const PAIRTYPE(string,int64)& r, listSent) + nBalance -= r.second; + nBalance -= allFee; + nBalance += allGenerated; + } + return (double)nBalance / (double)COIN; + } + string strAccount = AccountFromValue(params[0]); int nMinDepth = 1; if (params.size() > 1)