3 files changed, 91 insertions, 7 deletions

diff --git a/main.cpp b/main.cpp
index b7dfd9fabe..ac0c563ece 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<pair<string, int64> >& 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<CDiskTxPos> 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 3c7bcb22f0..a7ef336e00 100644
--- a/main.h
+++ b/main.h
@@ -69,6 +69,7 @@ bool AddKey(const CKey& key);
 vector<unsigned char> 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 f80b24ea72..286ddcd0b0 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<uint256, CWalletTx>::iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)
+        {
+            const CWalletTx& wtx = (*it).second;
+            int64 allGenerated, allFee;
+            allGenerated = allFee = 0;
+            string strSentAccount;
+            list<pair<string, int64> > listReceived;
+            list<pair<string, int64> > 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)