aboutsummaryrefslogtreecommitdiff
path: root/src/qt/transactiondesc.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-04-15 17:38:25 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-04-18 12:49:41 +0200
commit55a1db4fa2cf62b9766ef382c1e14b3ecbdf67fe (patch)
tree1ff19f533ab0221e27dd16c3d401c4d54dfbca7b /src/qt/transactiondesc.cpp
parente07c943ce8df6c6cb3ece3fc676911ddb43ca184 (diff)
downloadbitcoin-55a1db4fa2cf62b9766ef382c1e14b3ecbdf67fe.tar.xz
Solve chainActive-related locking issues
- In wallet and GUI code LOCK cs_main as well as cs_wallet when necessary - In main.cpp SendMessages move the TRY_LOCK(cs_main) up, to encompass the call to IsInitialBlockDownload. - Make ActivateBestChain, AddToBlockIndex, IsInitialBlockDownload, InitBlockIndex acquire the cs_main lock Fixes #3997
Diffstat (limited to 'src/qt/transactiondesc.cpp')
-rw-r--r--src/qt/transactiondesc.cpp405
1 files changed, 200 insertions, 205 deletions
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
index 6391f9bc19..45fb3d40c2 100644
--- a/src/qt/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
@@ -46,263 +46,258 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, int vout, int u
{
QString strHTML;
+ LOCK2(cs_main, wallet->cs_wallet);
+ strHTML.reserve(4000);
+ strHTML += "<html><font face='verdana, arial, helvetica, sans-serif'>";
+
+ int64_t nTime = wtx.GetTxTime();
+ int64_t nCredit = wtx.GetCredit();
+ int64_t nDebit = wtx.GetDebit();
+ int64_t nNet = nCredit - nDebit;
+
+ strHTML += "<b>" + tr("Status") + ":</b> " + FormatTxStatus(wtx);
+ int nRequests = wtx.GetRequestCount();
+ if (nRequests != -1)
{
- LOCK(wallet->cs_wallet);
- strHTML.reserve(4000);
- strHTML += "<html><font face='verdana, arial, helvetica, sans-serif'>";
-
- int64_t nTime = wtx.GetTxTime();
- int64_t nCredit = wtx.GetCredit();
- int64_t nDebit = wtx.GetDebit();
- int64_t nNet = nCredit - nDebit;
-
- strHTML += "<b>" + tr("Status") + ":</b> " + FormatTxStatus(wtx);
- int nRequests = wtx.GetRequestCount();
- if (nRequests != -1)
- {
- if (nRequests == 0)
- strHTML += tr(", has not been successfully broadcast yet");
- else if (nRequests > 0)
- strHTML += tr(", broadcast through %n node(s)", "", nRequests);
- }
- strHTML += "<br>";
+ if (nRequests == 0)
+ strHTML += tr(", has not been successfully broadcast yet");
+ else if (nRequests > 0)
+ strHTML += tr(", broadcast through %n node(s)", "", nRequests);
+ }
+ strHTML += "<br>";
- strHTML += "<b>" + tr("Date") + ":</b> " + (nTime ? GUIUtil::dateTimeStr(nTime) : "") + "<br>";
+ strHTML += "<b>" + tr("Date") + ":</b> " + (nTime ? GUIUtil::dateTimeStr(nTime) : "") + "<br>";
- //
- // From
- //
- if (wtx.IsCoinBase())
- {
- strHTML += "<b>" + tr("Source") + ":</b> " + tr("Generated") + "<br>";
- }
- else if (wtx.mapValue.count("from") && !wtx.mapValue["from"].empty())
- {
- // Online transaction
- strHTML += "<b>" + tr("From") + ":</b> " + GUIUtil::HtmlEscape(wtx.mapValue["from"]) + "<br>";
- }
- else
+ //
+ // From
+ //
+ if (wtx.IsCoinBase())
+ {
+ strHTML += "<b>" + tr("Source") + ":</b> " + tr("Generated") + "<br>";
+ }
+ else if (wtx.mapValue.count("from") && !wtx.mapValue["from"].empty())
+ {
+ // Online transaction
+ strHTML += "<b>" + tr("From") + ":</b> " + GUIUtil::HtmlEscape(wtx.mapValue["from"]) + "<br>";
+ }
+ else
+ {
+ // Offline transaction
+ if (nNet > 0)
{
- // Offline transaction
- if (nNet > 0)
+ // Credit
+ BOOST_FOREACH(const CTxOut& txout, wtx.vout)
{
- // Credit
- BOOST_FOREACH(const CTxOut& txout, wtx.vout)
+ if (wallet->IsMine(txout))
{
- if (wallet->IsMine(txout))
+ CTxDestination address;
+ if (ExtractDestination(txout.scriptPubKey, address) && IsMine(*wallet, address))
{
- CTxDestination address;
- if (ExtractDestination(txout.scriptPubKey, address) && IsMine(*wallet, address))
+ if (wallet->mapAddressBook.count(address))
{
- if (wallet->mapAddressBook.count(address))
- {
- strHTML += "<b>" + tr("From") + ":</b> " + tr("unknown") + "<br>";
- strHTML += "<b>" + tr("To") + ":</b> ";
- strHTML += GUIUtil::HtmlEscape(CBitcoinAddress(address).ToString());
- if (!wallet->mapAddressBook[address].name.empty())
- strHTML += " (" + tr("own address") + ", " + tr("label") + ": " + GUIUtil::HtmlEscape(wallet->mapAddressBook[address].name) + ")";
- else
- strHTML += " (" + tr("own address") + ")";
- strHTML += "<br>";
- }
+ strHTML += "<b>" + tr("From") + ":</b> " + tr("unknown") + "<br>";
+ strHTML += "<b>" + tr("To") + ":</b> ";
+ strHTML += GUIUtil::HtmlEscape(CBitcoinAddress(address).ToString());
+ if (!wallet->mapAddressBook[address].name.empty())
+ strHTML += " (" + tr("own address") + ", " + tr("label") + ": " + GUIUtil::HtmlEscape(wallet->mapAddressBook[address].name) + ")";
+ else
+ strHTML += " (" + tr("own address") + ")";
+ strHTML += "<br>";
}
- break;
}
+ break;
}
}
}
+ }
+
+ //
+ // To
+ //
+ if (wtx.mapValue.count("to") && !wtx.mapValue["to"].empty())
+ {
+ // Online transaction
+ std::string strAddress = wtx.mapValue["to"];
+ strHTML += "<b>" + tr("To") + ":</b> ";
+ CTxDestination dest = CBitcoinAddress(strAddress).Get();
+ if (wallet->mapAddressBook.count(dest) && !wallet->mapAddressBook[dest].name.empty())
+ strHTML += GUIUtil::HtmlEscape(wallet->mapAddressBook[dest].name) + " ";
+ strHTML += GUIUtil::HtmlEscape(strAddress) + "<br>";
+ }
+ //
+ // Amount
+ //
+ if (wtx.IsCoinBase() && nCredit == 0)
+ {
//
- // To
+ // Coinbase
//
- if (wtx.mapValue.count("to") && !wtx.mapValue["to"].empty())
- {
- // Online transaction
- std::string strAddress = wtx.mapValue["to"];
- strHTML += "<b>" + tr("To") + ":</b> ";
- CTxDestination dest = CBitcoinAddress(strAddress).Get();
- if (wallet->mapAddressBook.count(dest) && !wallet->mapAddressBook[dest].name.empty())
- strHTML += GUIUtil::HtmlEscape(wallet->mapAddressBook[dest].name) + " ";
- strHTML += GUIUtil::HtmlEscape(strAddress) + "<br>";
- }
-
+ int64_t nUnmatured = 0;
+ BOOST_FOREACH(const CTxOut& txout, wtx.vout)
+ nUnmatured += wallet->GetCredit(txout);
+ strHTML += "<b>" + tr("Credit") + ":</b> ";
+ if (wtx.IsInMainChain())
+ strHTML += BitcoinUnits::formatWithUnit(unit, nUnmatured)+ " (" + tr("matures in %n more block(s)", "", wtx.GetBlocksToMaturity()) + ")";
+ else
+ strHTML += "(" + tr("not accepted") + ")";
+ strHTML += "<br>";
+ }
+ else if (nNet > 0)
+ {
//
- // Amount
+ // Credit
//
- if (wtx.IsCoinBase() && nCredit == 0)
- {
- //
- // Coinbase
- //
- int64_t nUnmatured = 0;
- BOOST_FOREACH(const CTxOut& txout, wtx.vout)
- nUnmatured += wallet->GetCredit(txout);
- strHTML += "<b>" + tr("Credit") + ":</b> ";
- if (wtx.IsInMainChain())
- strHTML += BitcoinUnits::formatWithUnit(unit, nUnmatured)+ " (" + tr("matures in %n more block(s)", "", wtx.GetBlocksToMaturity()) + ")";
- else
- strHTML += "(" + tr("not accepted") + ")";
- strHTML += "<br>";
- }
- else if (nNet > 0)
+ strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, 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)
{
//
- // Credit
+ // Debit
//
- strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, 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 (wallet->IsMine(txout))
+ continue;
- if (!wtx.mapValue.count("to") || wtx.mapValue["to"].empty())
+ if (!wtx.mapValue.count("to") || wtx.mapValue["to"].empty())
+ {
+ // Offline transaction
+ CTxDestination address;
+ if (ExtractDestination(txout.scriptPubKey, address))
{
- // Offline transaction
- CTxDestination address;
- if (ExtractDestination(txout.scriptPubKey, address))
- {
- strHTML += "<b>" + tr("To") + ":</b> ";
- if (wallet->mapAddressBook.count(address) && !wallet->mapAddressBook[address].name.empty())
- strHTML += GUIUtil::HtmlEscape(wallet->mapAddressBook[address].name) + " ";
- strHTML += GUIUtil::HtmlEscape(CBitcoinAddress(address).ToString());
- strHTML += "<br>";
- }
+ strHTML += "<b>" + tr("To") + ":</b> ";
+ if (wallet->mapAddressBook.count(address) && !wallet->mapAddressBook[address].name.empty())
+ strHTML += GUIUtil::HtmlEscape(wallet->mapAddressBook[address].name) + " ";
+ strHTML += GUIUtil::HtmlEscape(CBitcoinAddress(address).ToString());
+ strHTML += "<br>";
}
-
- strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -txout.nValue) + "<br>";
- }
-
- if (fAllToMe)
- {
- // Payment to self
- int64_t nChange = wtx.GetChange();
- int64_t nValue = nCredit - nChange;
- strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -nValue) + "<br>";
- strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, nValue) + "<br>";
}
- int64_t nTxFee = nDebit - wtx.GetValueOut();
- if (nTxFee > 0)
- strHTML += "<b>" + tr("Transaction fee") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -nTxFee) + "<br>";
+ strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -txout.nValue) + "<br>";
}
- else
+
+ if (fAllToMe)
{
- //
- // Mixed debit transaction
- //
- BOOST_FOREACH(const CTxIn& txin, wtx.vin)
- if (wallet->IsMine(txin))
- strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -wallet->GetDebit(txin)) + "<br>";
- BOOST_FOREACH(const CTxOut& txout, wtx.vout)
- if (wallet->IsMine(txout))
- strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, wallet->GetCredit(txout)) + "<br>";
+ // Payment to self
+ int64_t nChange = wtx.GetChange();
+ int64_t nValue = nCredit - nChange;
+ strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -nValue) + "<br>";
+ strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, nValue) + "<br>";
}
+
+ int64_t nTxFee = nDebit - wtx.GetValueOut();
+ if (nTxFee > 0)
+ strHTML += "<b>" + tr("Transaction fee") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -nTxFee) + "<br>";
}
+ else
+ {
+ //
+ // Mixed debit transaction
+ //
+ BOOST_FOREACH(const CTxIn& txin, wtx.vin)
+ if (wallet->IsMine(txin))
+ strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -wallet->GetDebit(txin)) + "<br>";
+ BOOST_FOREACH(const CTxOut& txout, wtx.vout)
+ if (wallet->IsMine(txout))
+ strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, wallet->GetCredit(txout)) + "<br>";
+ }
+ }
- strHTML += "<b>" + tr("Net amount") + ":</b> " + BitcoinUnits::formatWithUnit(unit, nNet, true) + "<br>";
+ strHTML += "<b>" + tr("Net amount") + ":</b> " + BitcoinUnits::formatWithUnit(unit, nNet, true) + "<br>";
- //
- // Message
- //
- if (wtx.mapValue.count("message") && !wtx.mapValue["message"].empty())
- strHTML += "<br><b>" + tr("Message") + ":</b><br>" + GUIUtil::HtmlEscape(wtx.mapValue["message"], true) + "<br>";
- if (wtx.mapValue.count("comment") && !wtx.mapValue["comment"].empty())
- strHTML += "<br><b>" + tr("Comment") + ":</b><br>" + GUIUtil::HtmlEscape(wtx.mapValue["comment"], true) + "<br>";
+ //
+ // Message
+ //
+ if (wtx.mapValue.count("message") && !wtx.mapValue["message"].empty())
+ strHTML += "<br><b>" + tr("Message") + ":</b><br>" + GUIUtil::HtmlEscape(wtx.mapValue["message"], true) + "<br>";
+ if (wtx.mapValue.count("comment") && !wtx.mapValue["comment"].empty())
+ strHTML += "<br><b>" + tr("Comment") + ":</b><br>" + GUIUtil::HtmlEscape(wtx.mapValue["comment"], true) + "<br>";
- strHTML += "<b>" + tr("Transaction ID") + ":</b> " + TransactionRecord::formatSubTxId(wtx.GetHash(), vout) + "<br>";
+ strHTML += "<b>" + tr("Transaction ID") + ":</b> " + TransactionRecord::formatSubTxId(wtx.GetHash(), vout) + "<br>";
- // Message from normal bitcoin:URI (bitcoin:123...?message=example)
- foreach (const PAIRTYPE(string, string)& r, wtx.vOrderForm)
- if (r.first == "Message")
- strHTML += "<br><b>" + tr("Message") + ":</b><br>" + GUIUtil::HtmlEscape(r.second, true) + "<br>";
+ // Message from normal bitcoin:URI (bitcoin:123...?message=example)
+ foreach (const PAIRTYPE(string, string)& r, wtx.vOrderForm)
+ if (r.first == "Message")
+ strHTML += "<br><b>" + tr("Message") + ":</b><br>" + GUIUtil::HtmlEscape(r.second, true) + "<br>";
- //
- // PaymentRequest info:
- //
- foreach (const PAIRTYPE(string, string)& r, wtx.vOrderForm)
+ //
+ // PaymentRequest info:
+ //
+ foreach (const PAIRTYPE(string, string)& r, wtx.vOrderForm)
+ {
+ if (r.first == "PaymentRequest")
{
- if (r.first == "PaymentRequest")
- {
- PaymentRequestPlus req;
- req.parse(QByteArray::fromRawData(r.second.data(), r.second.size()));
- QString merchant;
- if (req.getMerchant(PaymentServer::getCertStore(), merchant))
- strHTML += "<b>" + tr("Merchant") + ":</b> " + GUIUtil::HtmlEscape(merchant) + "<br>";
- }
+ PaymentRequestPlus req;
+ req.parse(QByteArray::fromRawData(r.second.data(), r.second.size()));
+ QString merchant;
+ if (req.getMerchant(PaymentServer::getCertStore(), merchant))
+ strHTML += "<b>" + tr("Merchant") + ":</b> " + GUIUtil::HtmlEscape(merchant) + "<br>";
}
+ }
- if (wtx.IsCoinBase())
- {
- quint32 numBlocksToMaturity = COINBASE_MATURITY + 1;
- strHTML += "<br>" + tr("Generated coins must mature %1 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, its state will change to \"not accepted\" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.").arg(QString::number(numBlocksToMaturity)) + "<br>";
- }
+ if (wtx.IsCoinBase())
+ {
+ quint32 numBlocksToMaturity = COINBASE_MATURITY + 1;
+ strHTML += "<br>" + tr("Generated coins must mature %1 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, its state will change to \"not accepted\" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.").arg(QString::number(numBlocksToMaturity)) + "<br>";
+ }
- //
- // Debug view
- //
- if (fDebug)
- {
- strHTML += "<hr><br>" + tr("Debug information") + "<br><br>";
- BOOST_FOREACH(const CTxIn& txin, wtx.vin)
- if(wallet->IsMine(txin))
- strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -wallet->GetDebit(txin)) + "<br>";
- BOOST_FOREACH(const CTxOut& txout, wtx.vout)
- if(wallet->IsMine(txout))
- strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, wallet->GetCredit(txout)) + "<br>";
+ //
+ // Debug view
+ //
+ if (fDebug)
+ {
+ strHTML += "<hr><br>" + tr("Debug information") + "<br><br>";
+ BOOST_FOREACH(const CTxIn& txin, wtx.vin)
+ if(wallet->IsMine(txin))
+ strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -wallet->GetDebit(txin)) + "<br>";
+ BOOST_FOREACH(const CTxOut& txout, wtx.vout)
+ if(wallet->IsMine(txout))
+ strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, wallet->GetCredit(txout)) + "<br>";
+
+ strHTML += "<br><b>" + tr("Transaction") + ":</b><br>";
+ strHTML += GUIUtil::HtmlEscape(wtx.ToString(), true);
- strHTML += "<br><b>" + tr("Transaction") + ":</b><br>";
- strHTML += GUIUtil::HtmlEscape(wtx.ToString(), true);
+ strHTML += "<br><b>" + tr("Inputs") + ":</b>";
+ strHTML += "<ul>";
- strHTML += "<br><b>" + tr("Inputs") + ":</b>";
- strHTML += "<ul>";
+ BOOST_FOREACH(const CTxIn& txin, wtx.vin)
+ {
+ COutPoint prevout = txin.prevout;
+ CCoins prev;
+ if(pcoinsTip->GetCoins(prevout.hash, prev))
{
- LOCK(wallet->cs_wallet);
- BOOST_FOREACH(const CTxIn& txin, wtx.vin)
+ if (prevout.n < prev.vout.size())
{
- COutPoint prevout = txin.prevout;
-
- CCoins prev;
- if(pcoinsTip->GetCoins(prevout.hash, prev))
+ strHTML += "<li>";
+ const CTxOut &vout = prev.vout[prevout.n];
+ CTxDestination address;
+ if (ExtractDestination(vout.scriptPubKey, address))
{
- if (prevout.n < prev.vout.size())
- {
- strHTML += "<li>";
- const CTxOut &vout = prev.vout[prevout.n];
- CTxDestination address;
- if (ExtractDestination(vout.scriptPubKey, address))
- {
- if (wallet->mapAddressBook.count(address) && !wallet->mapAddressBook[address].name.empty())
- strHTML += GUIUtil::HtmlEscape(wallet->mapAddressBook[address].name) + " ";
- strHTML += QString::fromStdString(CBitcoinAddress(address).ToString());
- }
- strHTML = strHTML + " " + tr("Amount") + "=" + BitcoinUnits::formatWithUnit(unit, vout.nValue);
- strHTML = strHTML + " IsMine=" + (wallet->IsMine(vout) ? tr("true") : tr("false")) + "</li>";
- }
+ if (wallet->mapAddressBook.count(address) && !wallet->mapAddressBook[address].name.empty())
+ strHTML += GUIUtil::HtmlEscape(wallet->mapAddressBook[address].name) + " ";
+ strHTML += QString::fromStdString(CBitcoinAddress(address).ToString());
}
+ strHTML = strHTML + " " + tr("Amount") + "=" + BitcoinUnits::formatWithUnit(unit, vout.nValue);
+ strHTML = strHTML + " IsMine=" + (wallet->IsMine(vout) ? tr("true") : tr("false")) + "</li>";
}
}
-
- strHTML += "</ul>";
}
- strHTML += "</font></html>";
+ strHTML += "</ul>";
}
+
+ strHTML += "</font></html>";
return strHTML;
}
generated by cgit v1.2.3 (git 2.26.2) at 2024-07-15 13:25:33 +0000