Merge branch 'master' of https://github.com/bitcoin/bitcoin
authorWladimir J. van der Laan <laanwj@gmail.com>
Wed, 27 Jul 2011 19:44:55 +0000 (21:44 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Wed, 27 Jul 2011 19:44:55 +0000 (21:44 +0200)
Conflicts:
src/script.cpp

1  2 
src/qt/transactiondesc.cpp
src/qt/transactionrecord.cpp
src/script.cpp
src/wallet.cpp

index 7f4bebb,0000000..625b8e3
mode 100644,000000..100644
--- /dev/null
@@@ -1,311 -1,0 +1,311 @@@
 +#include <transactiondesc.h>
 +
 +#include "guiutil.h"
 +
 +#include "headers.h"
 +#include "qtui.h"
 +
 +#include <QString>
 +
 +// Taken straight from ui.cpp
 +// TODO: Convert to use QStrings, Qt::Escape and tr()
 +//   or: refactor and put describeAsHTML() into bitcoin core but that is unneccesary with better
 +//       UI<->core API, no need to put display logic in core.
 +
 +using namespace std;
 +
 +static string HtmlEscape(const char* psz, bool fMultiLine=false)
 +{
 +    int len = 0;
 +    for (const char* p = psz; *p; p++)
 +    {
 +             if (*p == '<') len += 4;
 +        else if (*p == '>') len += 4;
 +        else if (*p == '&') len += 5;
 +        else if (*p == '"') len += 6;
 +        else if (*p == ' ' && p > psz && p[-1] == ' ' && p[1] == ' ') len += 6;
 +        else if (*p == '\n' && fMultiLine) len += 5;
 +        else
 +            len++;
 +    }
 +    string str;
 +    str.reserve(len);
 +    for (const char* p = psz; *p; p++)
 +    {
 +             if (*p == '<') str += "&lt;";
 +        else if (*p == '>') str += "&gt;";
 +        else if (*p == '&') str += "&amp;";
 +        else if (*p == '"') str += "&quot;";
 +        else if (*p == ' ' && p > psz && p[-1] == ' ' && p[1] == ' ') str += "&nbsp;";
 +        else if (*p == '\n' && fMultiLine) str += "<br>\n";
 +        else
 +            str += *p;
 +    }
 +    return str;
 +}
 +
 +static string HtmlEscape(const string& str, bool fMultiLine=false)
 +{
 +    return HtmlEscape(str.c_str(), fMultiLine);
 +}
 +
 +static string FormatTxStatus(const CWalletTx& wtx)
 +{
 +    // Status
 +    if (!wtx.IsFinal())
 +    {
 +        if (wtx.nLockTime < 500000000)
 +            return strprintf(_("Open for %d blocks"), nBestHeight - wtx.nLockTime);
 +        else
 +            return strprintf(_("Open until %s"), GUIUtil::DateTimeStr(wtx.nLockTime).toStdString().c_str());
 +    }
 +    else
 +    {
 +        int nDepth = wtx.GetDepthInMainChain();
 +        if (GetAdjustedTime() - wtx.nTimeReceived > 2 * 60 && wtx.GetRequestCount() == 0)
 +            return strprintf(_("%d/offline?"), nDepth);
 +        else if (nDepth < 6)
 +            return strprintf(_("%d/unconfirmed"), nDepth);
 +        else
 +            return strprintf(_("%d confirmations"), nDepth);
 +    }
 +}
 +
 +string TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx)
 +{
 +    string strHTML;
 +    CRITICAL_BLOCK(wallet->cs_mapAddressBook)
 +    {
 +        strHTML.reserve(4000);
 +        strHTML += "<html><font face='verdana, arial, helvetica, sans-serif'>";
 +
 +        int64 nTime = wtx.GetTxTime();
 +        int64 nCredit = wtx.GetCredit();
 +        int64 nDebit = wtx.GetDebit();
 +        int64 nNet = nCredit - nDebit;
 +
 +
 +
 +        strHTML += _("<b>Status:</b> ") + FormatTxStatus(wtx);
 +        int nRequests = wtx.GetRequestCount();
 +        if (nRequests != -1)
 +        {
 +            if (nRequests == 0)
 +                strHTML += _(", has not been successfully broadcast yet");
 +            else if (nRequests == 1)
 +                strHTML += strprintf(_(", broadcast through %d node"), nRequests);
 +            else
 +                strHTML += strprintf(_(", broadcast through %d nodes"), nRequests);
 +        }
 +        strHTML += "<br>";
 +
 +        strHTML += _("<b>Date:</b> ") + (nTime ? GUIUtil::DateTimeStr(nTime).toStdString() : "") + "<br>";
 +
 +
 +        //
 +        // From
 +        //
 +        if (wtx.IsCoinBase())
 +        {
 +            strHTML += _("<b>Source:</b> Generated<br>");
 +        }
 +        else if (!wtx.mapValue["from"].empty())
 +        {
 +            // Online transaction
 +            if (!wtx.mapValue["from"].empty())
 +                strHTML += _("<b>From:</b> ") + HtmlEscape(wtx.mapValue["from"]) + "<br>";
 +        }
 +        else
 +        {
 +            // Offline transaction
 +            if (nNet > 0)
 +            {
 +                // Credit
 +                BOOST_FOREACH(const CTxOut& txout, wtx.vout)
 +                {
 +                    if (wallet->IsMine(txout))
 +                    {
 +                        CBitcoinAddress address;
 +                        if (ExtractAddress(txout.scriptPubKey, wallet, address))
 +                        {
 +                            if (wallet->mapAddressBook.count(address))
 +                            {
 +                                strHTML += string() + _("<b>From:</b> ") + _("unknown") + "<br>";
 +                                strHTML += _("<b>To:</b> ");
 +                                strHTML += HtmlEscape(address.ToString());
 +                                if (!wallet->mapAddressBook[address].empty())
 +                                    strHTML += _(" (yours, label: ") + wallet->mapAddressBook[address] + ")";
 +                                else
 +                                    strHTML += _(" (yours)");
 +                                strHTML += "<br>";
 +                            }
 +                        }
 +                        break;
 +                    }
 +                }
 +            }
 +        }
 +
 +
 +        //
 +        // To
 +        //
 +        string strAddress;
 +        if (!wtx.mapValue["to"].empty())
 +        {
 +            // Online transaction
 +            strAddress = wtx.mapValue["to"];
 +            strHTML += _("<b>To:</b> ");
 +            if (wallet->mapAddressBook.count(strAddress) && !wallet->mapAddressBook[strAddress].empty())
 +                strHTML += wallet->mapAddressBook[strAddress] + " ";
 +            strHTML += HtmlEscape(strAddress) + "<br>";
 +        }
 +
 +
 +        //
 +        // Amount
 +        //
 +        if (wtx.IsCoinBase() && nCredit == 0)
 +        {
 +            //
 +            // Coinbase
 +            //
 +            int64 nUnmatured = 0;
 +            BOOST_FOREACH(const CTxOut& txout, wtx.vout)
 +                nUnmatured += wallet->GetCredit(txout);
 +            strHTML += _("<b>Credit:</b> ");
 +            if (wtx.IsInMainChain())
 +                strHTML += strprintf(_("(%s matures in %d more blocks)"), FormatMoney(nUnmatured).c_str(), wtx.GetBlocksToMaturity());
 +            else
 +                strHTML += _("(not accepted)");
 +            strHTML += "<br>";
 +        }
 +        else if (nNet > 0)
 +        {
 +            //
 +            // Credit
 +            //
 +            strHTML += _("<b>Credit:</b> ") + FormatMoney(nNet) + "<br>";
 +        }
 +        else
 +        {
 +            bool fAllFromMe = true;
 +            BOOST_FOREACH(const CTxIn& txin, wtx.vin)
 +                fAllFromMe = fAllFromMe && wallet->IsMine(txin);
 +
 +            bool fAllToMe = true;
 +            BOOST_FOREACH(const CTxOut& txout, wtx.vout)
 +                fAllToMe = fAllToMe && wallet->IsMine(txout);
 +
 +            if (fAllFromMe)
 +            {
 +                //
 +                // Debit
 +                //
 +                BOOST_FOREACH(const CTxOut& txout, wtx.vout)
 +                {
 +                    if (wallet->IsMine(txout))
 +                        continue;
 +
 +                    if (wtx.mapValue["to"].empty())
 +                    {
 +                        // Offline transaction
 +                        CBitcoinAddress address;
-                         if (ExtractAddress(txout.scriptPubKey, wallet, address))
++                        if (ExtractAddress(txout.scriptPubKey, 0, address))
 +                        {
 +                            strHTML += _("<b>To:</b> ");
 +                            if (wallet->mapAddressBook.count(address) && !wallet->mapAddressBook[address].empty())
 +                                strHTML += wallet->mapAddressBook[address] + " ";
 +                            strHTML += address.ToString();
 +                            strHTML += "<br>";
 +                        }
 +                    }
 +
 +                    strHTML += _("<b>Debit:</b> ") + FormatMoney(-txout.nValue) + "<br>";
 +                }
 +
 +                if (fAllToMe)
 +                {
 +                    // Payment to self
 +                    int64 nChange = wtx.GetChange();
 +                    int64 nValue = nCredit - nChange;
 +                    strHTML += _("<b>Debit:</b> ") + FormatMoney(-nValue) + "<br>";
 +                    strHTML += _("<b>Credit:</b> ") + FormatMoney(nValue) + "<br>";
 +                }
 +
 +                int64 nTxFee = nDebit - wtx.GetValueOut();
 +                if (nTxFee > 0)
 +                    strHTML += _("<b>Transaction fee:</b> ") + FormatMoney(-nTxFee) + "<br>";
 +            }
 +            else
 +            {
 +                //
 +                // Mixed debit transaction
 +                //
 +                BOOST_FOREACH(const CTxIn& txin, wtx.vin)
 +                    if (wallet->IsMine(txin))
 +                        strHTML += _("<b>Debit:</b> ") + FormatMoney(-wallet->GetDebit(txin)) + "<br>";
 +                BOOST_FOREACH(const CTxOut& txout, wtx.vout)
 +                    if (wallet->IsMine(txout))
 +                        strHTML += _("<b>Credit:</b> ") + FormatMoney(wallet->GetCredit(txout)) + "<br>";
 +            }
 +        }
 +
 +        strHTML += _("<b>Net amount:</b> ") + FormatMoney(nNet, true) + "<br>";
 +
 +
 +        //
 +        // Message
 +        //
 +        if (!wtx.mapValue["message"].empty())
 +            strHTML += string() + "<br><b>" + _("Message:") + "</b><br>" + HtmlEscape(wtx.mapValue["message"], true) + "<br>";
 +        if (!wtx.mapValue["comment"].empty())
 +            strHTML += string() + "<br><b>" + _("Comment:") + "</b><br>" + HtmlEscape(wtx.mapValue["comment"], true) + "<br>";
 +
 +        if (wtx.IsCoinBase())
 +            strHTML += string() + "<br>" + _("Generated coins must wait 120 blocks before they can be spent.  When you generated this block, it was broadcast to the network to be added to the block chain.  If it fails to get into the chain, it will change to \"not accepted\" and not be spendable.  This may occasionally happen if another node generates a block within a few seconds of yours.") + "<br>";
 +
 +
 +        //
 +        // Debug view
 +        //
 +        if (fDebug)
 +        {
 +            strHTML += "<hr><br>debug print<br><br>";
 +            BOOST_FOREACH(const CTxIn& txin, wtx.vin)
 +                if(wallet->IsMine(txin))
 +                    strHTML += "<b>Debit:</b> " + FormatMoney(-wallet->IsMine(txin)) + "<br>";
 +            BOOST_FOREACH(const CTxOut& txout, wtx.vout)
 +                if(wallet->IsMine(txout))
 +                    strHTML += "<b>Credit:</b> " + FormatMoney(wallet->IsMine(txout)) + "<br>";
 +
 +            strHTML += "<br><b>Transaction:</b><br>";
 +            strHTML += HtmlEscape(wtx.ToString(), true);
 +
 +            strHTML += "<br><b>Inputs:</b><br>";
 +            CRITICAL_BLOCK(wallet->cs_mapWallet)
 +            {
 +                BOOST_FOREACH(const CTxIn& txin, wtx.vin)
 +                {
 +                    COutPoint prevout = txin.prevout;
 +                    map<uint256, CWalletTx>::iterator mi = wallet->mapWallet.find(prevout.hash);
 +                    if (mi != wallet->mapWallet.end())
 +                    {
 +                        const CWalletTx& prev = (*mi).second;
 +                        if (prevout.n < prev.vout.size())
 +                        {
 +                            strHTML += HtmlEscape(prev.ToString(), true);
 +                            strHTML += " &nbsp;&nbsp; " + FormatTxStatus(prev) + ", ";
 +                            strHTML = strHTML + "IsMine=" + (wallet->IsMine(prev.vout[prevout.n]) ? "true" : "false") + "<br>";
 +                        }
 +                    }
 +                }
 +            }
 +        }
 +
 +
 +
 +        strHTML += "</font></html>";
 +    }
 +    return strHTML;
 +}
index 50767d3,0000000..77c5a01
mode 100644,000000..100644
--- /dev/null
@@@ -1,264 -1,0 +1,264 @@@
 +#include "transactionrecord.h"
 +
 +#include "headers.h"
 +
 +/* Return positive answer if transaction should be shown in list.
 + */
 +bool TransactionRecord::showTransaction(const CWalletTx &wtx)
 +{
 +    if (wtx.IsCoinBase())
 +    {
 +        // Don't show generated coin until confirmed by at least one block after it
 +        // so we don't get the user's hopes up until it looks like it's probably accepted.
 +        //
 +        // It is not an error when generated blocks are not accepted.  By design,
 +        // some percentage of blocks, like 10% or more, will end up not accepted.
 +        // This is the normal mechanism by which the network copes with latency.
 +        //
 +        // We display regular transactions right away before any confirmation
 +        // because they can always get into some block eventually.  Generated coins
 +        // are special because if their block is not accepted, they are not valid.
 +        //
 +        if (wtx.GetDepthInMainChain() < 2)
 +        {
 +            return false;
 +        }
 +    }
 +    return true;
 +}
 +
 +/*
 + * Decompose CWallet transaction to model transaction records.
 + */
 +QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *wallet, const CWalletTx &wtx)
 +{
 +    QList<TransactionRecord> parts;
 +    int64 nTime = wtx.nTimeDisplayed = wtx.GetTxTime();
 +    int64 nCredit = wtx.GetCredit(true);
 +    int64 nDebit = wtx.GetDebit();
 +    int64 nNet = nCredit - nDebit;
 +    uint256 hash = wtx.GetHash();
 +    std::map<std::string, std::string> mapValue = wtx.mapValue;
 +
 +    if (showTransaction(wtx))
 +    {
 +        if (nNet > 0 || wtx.IsCoinBase())
 +        {
 +            //
 +            // Credit
 +            //
 +            TransactionRecord sub(hash, nTime);
 +
 +            sub.credit = nNet;
 +
 +            if (wtx.IsCoinBase())
 +            {
 +                // Generated
 +                sub.type = TransactionRecord::Generated;
 +
 +                if (nCredit == 0)
 +                {
 +                    int64 nUnmatured = 0;
 +                    BOOST_FOREACH(const CTxOut& txout, wtx.vout)
 +                        nUnmatured += wallet->GetCredit(txout);
 +                    sub.credit = nUnmatured;
 +                }
 +            }
 +            else if (!mapValue["from"].empty() || !mapValue["message"].empty())
 +            {
 +                // Received by IP connection
 +                sub.type = TransactionRecord::RecvFromIP;
 +                if (!mapValue["from"].empty())
 +                    sub.address = mapValue["from"];
 +            }
 +            else
 +            {
 +                // Received by Bitcoin Address
 +                sub.type = TransactionRecord::RecvWithAddress;
 +                BOOST_FOREACH(const CTxOut& txout, wtx.vout)
 +                {
 +                    if(wallet->IsMine(txout))
 +                    {
 +                        CBitcoinAddress address;
 +                        if (ExtractAddress(txout.scriptPubKey, wallet, address))
 +                        {
 +                            sub.address = address.ToString();
 +                        }
 +                        break;
 +                    }
 +                }
 +            }
 +            parts.append(sub);
 +        }
 +        else
 +        {
 +            bool fAllFromMe = true;
 +            BOOST_FOREACH(const CTxIn& txin, wtx.vin)
 +                fAllFromMe = fAllFromMe && wallet->IsMine(txin);
 +
 +            bool fAllToMe = true;
 +            BOOST_FOREACH(const CTxOut& txout, wtx.vout)
 +                fAllToMe = fAllToMe && wallet->IsMine(txout);
 +
 +            if (fAllFromMe && fAllToMe)
 +            {
 +                // Payment to self
 +                int64 nChange = wtx.GetChange();
 +
 +                parts.append(TransactionRecord(hash, nTime, TransactionRecord::SendToSelf, "",
 +                                -(nDebit - nChange), nCredit - nChange));
 +            }
 +            else if (fAllFromMe)
 +            {
 +                //
 +                // Debit
 +                //
 +                int64 nTxFee = nDebit - wtx.GetValueOut();
 +
 +                for (int nOut = 0; nOut < wtx.vout.size(); nOut++)
 +                {
 +                    const CTxOut& txout = wtx.vout[nOut];
 +                    TransactionRecord sub(hash, nTime);
 +                    sub.idx = parts.size();
 +
 +                    if(wallet->IsMine(txout))
 +                    {
 +                        // Ignore parts sent to self, as this is usually the change
 +                        // from a transaction sent back to our own address.
 +                        continue;
 +                    }
 +                    else if(!mapValue["to"].empty())
 +                    {
 +                        // Sent to IP
 +                        sub.type = TransactionRecord::SendToIP;
 +                        sub.address = mapValue["to"];
 +                    }
 +                    else
 +                    {
 +                        // Sent to Bitcoin Address
 +                        sub.type = TransactionRecord::SendToAddress;
 +                        CBitcoinAddress address;
-                         if (ExtractAddress(txout.scriptPubKey, wallet, address))
++                        if (ExtractAddress(txout.scriptPubKey, 0, address))
 +                        {
 +                            sub.address = address.ToString();
 +                        }
 +                    }
 +
 +                    int64 nValue = txout.nValue;
 +                    /* Add fee to first output */
 +                    if (nTxFee > 0)
 +                    {
 +                        nValue += nTxFee;
 +                        nTxFee = 0;
 +                    }
 +                    sub.debit = -nValue;
 +
 +                    parts.append(sub);
 +                }
 +            }
 +            else
 +            {
 +                //
 +                // Mixed debit transaction, can't break down payees
 +                //
 +                bool fAllMine = true;
 +                BOOST_FOREACH(const CTxOut& txout, wtx.vout)
 +                    fAllMine = fAllMine && wallet->IsMine(txout);
 +                BOOST_FOREACH(const CTxIn& txin, wtx.vin)
 +                    fAllMine = fAllMine && wallet->IsMine(txin);
 +
 +                parts.append(TransactionRecord(hash, nTime, TransactionRecord::Other, "", nNet, 0));
 +            }
 +        }
 +    }
 +
 +    return parts;
 +}
 +
 +void TransactionRecord::updateStatus(const CWalletTx &wtx)
 +{
 +    // Determine transaction status
 +
 +    // Find the block the tx is in
 +    CBlockIndex* pindex = NULL;
 +    std::map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(wtx.hashBlock);
 +    if (mi != mapBlockIndex.end())
 +        pindex = (*mi).second;
 +
 +    // Sort order, unrecorded transactions sort to the top
 +    status.sortKey = strprintf("%010d-%01d-%010u-%03d",
 +        (pindex ? pindex->nHeight : INT_MAX),
 +        (wtx.IsCoinBase() ? 1 : 0),
 +        wtx.nTimeReceived,
 +        idx);
 +    status.confirmed = wtx.IsConfirmed();
 +    status.depth = wtx.GetDepthInMainChain();
 +    status.cur_num_blocks = nBestHeight;
 +
 +    if (!wtx.IsFinal())
 +    {
 +        if (wtx.nLockTime < LOCKTIME_THRESHOLD)
 +        {
 +            status.status = TransactionStatus::OpenUntilBlock;
 +            status.open_for = nBestHeight - wtx.nLockTime;
 +        }
 +        else
 +        {
 +            status.status = TransactionStatus::OpenUntilDate;
 +            status.open_for = wtx.nLockTime;
 +        }
 +    }
 +    else
 +    {
 +        if (GetAdjustedTime() - wtx.nTimeReceived > 2 * 60 && wtx.GetRequestCount() == 0)
 +        {
 +            status.status = TransactionStatus::Offline;
 +        }
 +        else if (status.depth < NumConfirmations)
 +        {
 +            status.status = TransactionStatus::Unconfirmed;
 +        }
 +        else
 +        {
 +            status.status = TransactionStatus::HaveConfirmations;
 +        }
 +    }
 +
 +    // For generated transactions, determine maturity
 +    if(type == TransactionRecord::Generated)
 +    {
 +        int64 nCredit = wtx.GetCredit(true);
 +        if (nCredit == 0)
 +        {
 +            status.maturity = TransactionStatus::Immature;
 +
 +            if (wtx.IsInMainChain())
 +            {
 +                status.matures_in = wtx.GetBlocksToMaturity();
 +
 +                // Check if the block was requested by anyone
 +                if (GetAdjustedTime() - wtx.nTimeReceived > 2 * 60 && wtx.GetRequestCount() == 0)
 +                    status.maturity = TransactionStatus::MaturesWarning;
 +            }
 +            else
 +            {
 +                status.maturity = TransactionStatus::NotAccepted;
 +            }
 +        }
 +        else
 +        {
 +            status.maturity = TransactionStatus::Mature;
 +        }
 +    }
 +}
 +
 +bool TransactionRecord::statusUpdateNeeded()
 +{
 +    return status.cur_num_blocks != nBestHeight;
 +}
 +
 +std::string TransactionRecord::getTxID()
 +{
 +    return hash.ToString() + strprintf("-%03d", idx);
 +}
 +
diff --cc src/script.cpp
@@@ -1129,20 -1129,15 +1129,16 @@@ bool static ExtractAddressInner(const C
      if (!Solver(scriptPubKey, vSolution))
          return false;
  
-     CRITICAL_BLOCK(keystore->cs_KeyStore)
+     BOOST_FOREACH(PAIRTYPE(opcodetype, valtype)& item, vSolution)
      {
-         BOOST_FOREACH(PAIRTYPE(opcodetype, valtype)& item, vSolution)
-         {
-             uint160 hash160;
-             if (item.first == OP_PUBKEY)
-                 addressRet.SetPubKey(item.second);
-             else if (item.first == OP_PUBKEYHASH)
-                 addressRet.SetHash160((uint160)item.second);
-             //if (keystore == NULL || keystore->HaveKey(addressRet))
-                 return true;
-         }
+         if (item.first == OP_PUBKEY)
+             addressRet.SetPubKey(item.second);
+         else if (item.first == OP_PUBKEYHASH)
+             addressRet.SetHash160((uint160)item.second);
+         if (keystore == NULL || keystore->HaveKey(addressRet))
+             return true;
      }
 +
      return false;
  }
  
diff --cc src/wallet.cpp
Simple merge