LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity
lbrycrd/src/qt/transactiondesc.cpp

308 lines
12 KiB
C++
Raw Normal View History

Copyright header updates s/2013/2014 on files whose last git commit was done in 2014. contrib/devtools/fix-copyright-headers.py script to be able to perform this maintenance task with ease during the rest of the year, every year. Modifications to contrib/devtools/README.md to document what fix-copyright-headers.py does.
2014-02-08 22:50:24 +01:00
// Copyright (c) 2011-2014 The Bitcoin developers
qt: add license header to source files Closes #839
2013-11-04 16:20:43 +01:00
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
VC2010 compile fixes
2012-03-18 23:14:03 +01:00
#include "transactiondesc.h"
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
QtUI code cleanup / comment improvements
2011-08-08 17:38:17 +02:00
#include "bitcoinunits.h"
Cleanup code using forward declarations. Use misc methods of avoiding unnecesary header includes. Replace int typedefs with int##_t from stdint.h. Replace PRI64[xdu] with PRI[xdu]64 from inttypes.h. Normalize QT_VERSION ifs where possible. Resolve some indirect dependencies as direct ones. Remove extern declarations from .cpp files.
2013-04-13 07:13:08 +02:00
#include "guiutil.h"
Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress This introduces internal types: * CKeyID: reference (hash160) of a key * CScriptID: reference (hash160) of a script * CTxDestination: a boost::variant of the former two CBitcoinAddress is retrofitted to be a Base58 encoding of a CTxDestination. This allows all internal code to only use the internal types, and only have RPC and GUI depend on the base58 code. Furthermore, the header dependencies are a lot saner now. base58.h is at the top (right below rpc and gui) instead of at the bottom. For the rest: wallet -> script -> keystore -> key. Only keystore still requires a forward declaration of CScript. Solving that would require splitting script into two layers.
2012-05-14 23:44:52 +02:00
#include "base58.h"
Cleanup code using forward declarations. Use misc methods of avoiding unnecesary header includes. Replace int typedefs with int##_t from stdint.h. Replace PRI64[xdu] with PRI[xdu]64 from inttypes.h. Normalize QT_VERSION ifs where possible. Resolve some indirect dependencies as direct ones. Remove extern declarations from .cpp files.
2013-04-13 07:13:08 +02:00
#include "db.h"
#include "main.h"
Payment Protocol: X509-validated payment requests Add support for a Payment Protocol to Bitcoin-Qt. Payment messages are protocol-buffer encoded and communicated over http(s), so this adds a dependency on the Google protocol buffer library, and requires Qt with OpenSSL support.
2013-07-22 08:50:39 +02:00
#include "paymentserver.h"
qt: add vout index to transaction id in transactions details dialog
2013-09-05 12:23:08 +02:00
#include "transactionrecord.h"
Cleanup code using forward declarations. Use misc methods of avoiding unnecesary header includes. Replace int typedefs with int##_t from stdint.h. Replace PRI64[xdu] with PRI[xdu]64 from inttypes.h. Normalize QT_VERSION ifs where possible. Resolve some indirect dependencies as direct ones. Remove extern declarations from .cpp files.
2013-04-13 07:13:08 +02:00
#include "ui_interface.h"
#include "wallet.h"
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
Cleanup code using forward declarations. Use misc methods of avoiding unnecesary header includes. Replace int typedefs with int##_t from stdint.h. Replace PRI64[xdu] with PRI[xdu]64 from inttypes.h. Normalize QT_VERSION ifs where possible. Resolve some indirect dependencies as direct ones. Remove extern declarations from .cpp files.
2013-04-13 07:13:08 +02:00
#include <stdint.h>
Bitcoin-Qt: massive header and cpp cleanup - try to enforce the same style to all Qt related files - remove unneeded includes from the files - add missing Q_OBJECT, QT_BEGIN_NAMESPACE / QT_END_NAMESPACE - prepares for a pull-req to include Qt5 compatibility
2013-01-23 21:51:02 +01:00
#include <string>
QtUI code cleanup / comment improvements
2011-08-08 17:38:17 +02:00
QString TransactionDesc::FormatTxStatus(const CWalletTx& wtx)
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
{
Fix off-by-one errors in use of IsFinalTx() Previously CreateNewBlock() didn't take into account the fact that IsFinalTx() without any arguments tests if the transaction is considered final in the *current* block, when both those functions really needed to know if the transaction would be final in the *next* block. Additionally the UI had a similar misunderstanding. Also adds some basic tests to check that CreateNewBlock() is in fact mining nLockTime-using transactions correctly. Thanks to Wladimir J. van der Laan for rebase.
2014-01-27 03:50:15 +01:00
if (!IsFinalTx(wtx, chainActive.Height() + 1))
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
{
QtUI code cleanup / comment improvements
2011-08-08 17:38:17 +02:00
if (wtx.nLockTime < LOCKTIME_THRESHOLD)
Fix off-by-one errors in use of IsFinalTx() Previously CreateNewBlock() didn't take into account the fact that IsFinalTx() without any arguments tests if the transaction is considered final in the *current* block, when both those functions really needed to know if the transaction would be final in the *next* block. Additionally the UI had a similar misunderstanding. Also adds some basic tests to check that CreateNewBlock() is in fact mining nLockTime-using transactions correctly. Thanks to Wladimir J. van der Laan for rebase.
2014-01-27 03:50:15 +01:00
return tr("Open for %n more block(s)", "", wtx.nLockTime - chainActive.Height());
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
else
QtUI code cleanup / comment improvements
2011-08-08 17:38:17 +02:00
return tr("Open until %1").arg(GUIUtil::dateTimeStr(wtx.nLockTime));
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
}
else
{
int nDepth = wtx.GetDepthInMainChain();
Handle "conflicted" transactions properly Extend CMerkleTx::GetDepthInMainChain with the concept of a "conflicted" transaction-- a transaction generated by the wallet that is not in the main chain or in the mempool, and, therefore, will likely never be confirmed. GetDepthInMainChain() now returns -1 for conflicted transactions (0 for unconfirmed-but-in-the-mempool, and >1 for confirmed). This makes getbalance, getbalance '*', and listunspent all agree when there are mutated transactions in the wallet. Before: listunspent: one 49BTC output getbalance: 96 BTC (change counted twice) getbalance '*': 46 BTC (spends counted twice) After: all agree, 49 BTC available to spend.
2014-02-12 19:43:07 +01:00
if (nDepth < 0)
return tr("conflicted");
else if (GetAdjustedTime() - wtx.nTimeReceived > 2 * 60 && wtx.GetRequestCount() == 0)
enhance translation possibilities in TransactionDesc / misc other changes - remove "#include <QString>" as this is included in the header - add some missing plural forms that can be translated - change "yours" into "own address", which is easier to understand and translate in that context - cleanup translatable strings to not include HTML or unneeded chars (e.g. ":") - resize TransactionDescDialog a little (remove unwanted line-breaks with non english translations)
2012-07-03 14:37:51 +02:00
return tr("%1/offline").arg(nDepth);
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
else if (nDepth < 6)
QtUI code cleanup / comment improvements
2011-08-08 17:38:17 +02:00
return tr("%1/unconfirmed").arg(nDepth);
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
else
QtUI code cleanup / comment improvements
2011-08-08 17:38:17 +02:00
return tr("%1 confirmations").arg(nDepth);
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
}
}
qt: add vout index to transaction id in transactions details dialog
2013-09-05 12:23:08 +02:00
QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, int vout, int unit)
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
{
QtUI code cleanup / comment improvements
2011-08-08 17:38:17 +02:00
QString strHTML;
Use scoped locks instead of CRITICAL_BLOCK
2012-04-06 18:39:12 +02:00
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
{
Use scoped locks instead of CRITICAL_BLOCK
2012-04-06 18:39:12 +02:00
LOCK(wallet->cs_wallet);
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
strHTML.reserve(4000);
strHTML += "<html><font face='verdana, arial, helvetica, sans-serif'>";
Cleanup code using forward declarations. Use misc methods of avoiding unnecesary header includes. Replace int typedefs with int##_t from stdint.h. Replace PRI64[xdu] with PRI[xdu]64 from inttypes.h. Normalize QT_VERSION ifs where possible. Resolve some indirect dependencies as direct ones. Remove extern declarations from .cpp files.
2013-04-13 07:13:08 +02:00
int64_t nTime = wtx.GetTxTime();
int64_t nCredit = wtx.GetCredit();
int64_t nDebit = wtx.GetDebit();
int64_t nNet = nCredit - nDebit;
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
enhance translation possibilities in TransactionDesc / misc other changes - remove "#include <QString>" as this is included in the header - add some missing plural forms that can be translated - change "yours" into "own address", which is easier to understand and translate in that context - cleanup translatable strings to not include HTML or unneeded chars (e.g. ":") - resize TransactionDescDialog a little (remove unwanted line-breaks with non english translations)
2012-07-03 14:37:51 +02:00
strHTML += "<b>" + tr("Status") + ":</b> " + FormatTxStatus(wtx);
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
int nRequests = wtx.GetRequestCount();
if (nRequests != -1)
{
if (nRequests == 0)
QtUI code cleanup / comment improvements
2011-08-08 17:38:17 +02:00
strHTML += tr(", has not been successfully broadcast yet");
enhance translation possibilities in TransactionDesc / misc other changes - remove "#include <QString>" as this is included in the header - add some missing plural forms that can be translated - change "yours" into "own address", which is easier to understand and translate in that context - cleanup translatable strings to not include HTML or unneeded chars (e.g. ":") - resize TransactionDescDialog a little (remove unwanted line-breaks with non english translations)
2012-07-03 14:37:51 +02:00
else if (nRequests > 0)
strHTML += tr(", broadcast through %n node(s)", "", nRequests);
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
}
strHTML += "<br>";
enhance translation possibilities in TransactionDesc / misc other changes - remove "#include <QString>" as this is included in the header - add some missing plural forms that can be translated - change "yours" into "own address", which is easier to understand and translate in that context - cleanup translatable strings to not include HTML or unneeded chars (e.g. ":") - resize TransactionDescDialog a little (remove unwanted line-breaks with non english translations)
2012-07-03 14:37:51 +02:00
strHTML += "<b>" + tr("Date") + ":</b> " + (nTime ? GUIUtil::dateTimeStr(nTime) : "") + "<br>";
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
//
// From
//
if (wtx.IsCoinBase())
{
enhance translation possibilities in TransactionDesc / misc other changes - remove "#include <QString>" as this is included in the header - add some missing plural forms that can be translated - change "yours" into "own address", which is easier to understand and translate in that context - cleanup translatable strings to not include HTML or unneeded chars (e.g. ":") - resize TransactionDescDialog a little (remove unwanted line-breaks with non english translations)
2012-07-03 14:37:51 +02:00
strHTML += "<b>" + tr("Source") + ":</b> " + tr("Generated") + "<br>";
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
}
toHTML won't add empty wtx.mapValue elements As the code was before, toHTML added empty elements to mapValue to check for their existance. Now first it check for their existance and then for their non-emptiness. Removed a duplicated identical if There are two equal ifs, one inside another. If the first one is true, then the second one is true.
2012-09-28 13:57:07 +02:00
else if (wtx.mapValue.count("from") && !wtx.mapValue["from"].empty())
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
{
// Online transaction
toHTML won't add empty wtx.mapValue elements As the code was before, toHTML added empty elements to mapValue to check for their existance. Now first it check for their existance and then for their non-emptiness. Removed a duplicated identical if There are two equal ifs, one inside another. If the first one is true, then the second one is true.
2012-09-28 13:57:07 +02:00
strHTML += "<b>" + tr("From") + ":</b> " + GUIUtil::HtmlEscape(wtx.mapValue["from"]) + "<br>";
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
}
else
{
// Offline transaction
if (nNet > 0)
{
// Credit
BOOST_FOREACH(const CTxOut& txout, wtx.vout)
{
update core to d0d80170a2ca73004e08fb85007fe055cbf4e411 (CWallet class)
2011-06-26 19:23:24 +02:00
if (wallet->IsMine(txout))
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
{
Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress This introduces internal types: * CKeyID: reference (hash160) of a key * CScriptID: reference (hash160) of a script * CTxDestination: a boost::variant of the former two CBitcoinAddress is retrofitted to be a Base58 encoding of a CTxDestination. This allows all internal code to only use the internal types, and only have RPC and GUI depend on the base58 code. Furthermore, the header dependencies are a lot saner now. base58.h is at the top (right below rpc and gui) instead of at the bottom. For the rest: wallet -> script -> keystore -> key. Only keystore still requires a forward declaration of CScript. Solving that would require splitting script into two layers.
2012-05-14 23:44:52 +02:00
CTxDestination address;
if (ExtractDestination(txout.scriptPubKey, address) && IsMine(*wallet, address))
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
{
Merge remote branch 'upstream/master' Conflicts: src/bitcoinrpc.cpp
2011-07-26 15:38:31 +02:00
if (wallet->mapAddressBook.count(address))
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
{
enhance translation possibilities in TransactionDesc / misc other changes - remove "#include <QString>" as this is included in the header - add some missing plural forms that can be translated - change "yours" into "own address", which is easier to understand and translate in that context - cleanup translatable strings to not include HTML or unneeded chars (e.g. ":") - resize TransactionDescDialog a little (remove unwanted line-breaks with non english translations)
2012-07-03 14:37:51 +02:00
strHTML += "<b>" + tr("From") + ":</b> " + tr("unknown") + "<br>";
strHTML += "<b>" + tr("To") + ":</b> ";
Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress This introduces internal types: * CKeyID: reference (hash160) of a key * CScriptID: reference (hash160) of a script * CTxDestination: a boost::variant of the former two CBitcoinAddress is retrofitted to be a Base58 encoding of a CTxDestination. This allows all internal code to only use the internal types, and only have RPC and GUI depend on the base58 code. Furthermore, the header dependencies are a lot saner now. base58.h is at the top (right below rpc and gui) instead of at the bottom. For the rest: wallet -> script -> keystore -> key. Only keystore still requires a forward declaration of CScript. Solving that would require splitting script into two layers.
2012-05-14 23:44:52 +02:00
strHTML += GUIUtil::HtmlEscape(CBitcoinAddress(address).ToString());
Refactor: CAddressBookData for mapAddressBook Straight refactor, so mapAddressBook stores a CAddressBookData (which just contains a std::string) instead of a std::string. Preparation for payment protocol work, which will add the notion of refund addresses to the address book.
2013-07-15 07:20:50 +02:00
if (!wallet->mapAddressBook[address].name.empty())
strHTML += " (" + tr("own address") + ", " + tr("label") + ": " + GUIUtil::HtmlEscape(wallet->mapAddressBook[address].name) + ")";
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
else
enhance translation possibilities in TransactionDesc / misc other changes - remove "#include <QString>" as this is included in the header - add some missing plural forms that can be translated - change "yours" into "own address", which is easier to understand and translate in that context - cleanup translatable strings to not include HTML or unneeded chars (e.g. ":") - resize TransactionDescDialog a little (remove unwanted line-breaks with non english translations)
2012-07-03 14:37:51 +02:00
strHTML += " (" + tr("own address") + ")";
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
strHTML += "<br>";
}
}
break;
}
}
}
}
//
// To
//
toHTML won't add empty wtx.mapValue elements As the code was before, toHTML added empty elements to mapValue to check for their existance. Now first it check for their existance and then for their non-emptiness. Removed a duplicated identical if There are two equal ifs, one inside another. If the first one is true, then the second one is true.
2012-09-28 13:57:07 +02:00
if (wtx.mapValue.count("to") && !wtx.mapValue["to"].empty())
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
{
// Online transaction
enhance translation possibilities in TransactionDesc / misc other changes - remove "#include <QString>" as this is included in the header - add some missing plural forms that can be translated - change "yours" into "own address", which is easier to understand and translate in that context - cleanup translatable strings to not include HTML or unneeded chars (e.g. ":") - resize TransactionDescDialog a little (remove unwanted line-breaks with non english translations)
2012-07-03 14:37:51 +02:00
std::string strAddress = wtx.mapValue["to"];
strHTML += "<b>" + tr("To") + ":</b> ";
Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress This introduces internal types: * CKeyID: reference (hash160) of a key * CScriptID: reference (hash160) of a script * CTxDestination: a boost::variant of the former two CBitcoinAddress is retrofitted to be a Base58 encoding of a CTxDestination. This allows all internal code to only use the internal types, and only have RPC and GUI depend on the base58 code. Furthermore, the header dependencies are a lot saner now. base58.h is at the top (right below rpc and gui) instead of at the bottom. For the rest: wallet -> script -> keystore -> key. Only keystore still requires a forward declaration of CScript. Solving that would require splitting script into two layers.
2012-05-14 23:44:52 +02:00
CTxDestination dest = CBitcoinAddress(strAddress).Get();
Refactor: CAddressBookData for mapAddressBook Straight refactor, so mapAddressBook stores a CAddressBookData (which just contains a std::string) instead of a std::string. Preparation for payment protocol work, which will add the notion of refund addresses to the address book.
2013-07-15 07:20:50 +02:00
if (wallet->mapAddressBook.count(dest) && !wallet->mapAddressBook[dest].name.empty())
strHTML += GUIUtil::HtmlEscape(wallet->mapAddressBook[dest].name) + " ";
Move HtmlEscape (escape for qt rich text controls) to qt gui utilities
2011-11-11 10:13:25 +01:00
strHTML += GUIUtil::HtmlEscape(strAddress) + "<br>";
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
}
//
// Amount
//
if (wtx.IsCoinBase() && nCredit == 0)
{
//
// Coinbase
//
Cleanup code using forward declarations. Use misc methods of avoiding unnecesary header includes. Replace int typedefs with int##_t from stdint.h. Replace PRI64[xdu] with PRI[xdu]64 from inttypes.h. Normalize QT_VERSION ifs where possible. Resolve some indirect dependencies as direct ones. Remove extern declarations from .cpp files.
2013-04-13 07:13:08 +02:00
int64_t nUnmatured = 0;
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
BOOST_FOREACH(const CTxOut& txout, wtx.vout)
update core to d0d80170a2ca73004e08fb85007fe055cbf4e411 (CWallet class)
2011-06-26 19:23:24 +02:00
nUnmatured += wallet->GetCredit(txout);
enhance translation possibilities in TransactionDesc / misc other changes - remove "#include <QString>" as this is included in the header - add some missing plural forms that can be translated - change "yours" into "own address", which is easier to understand and translate in that context - cleanup translatable strings to not include HTML or unneeded chars (e.g. ":") - resize TransactionDescDialog a little (remove unwanted line-breaks with non english translations)
2012-07-03 14:37:51 +02:00
strHTML += "<b>" + tr("Credit") + ":</b> ";
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
if (wtx.IsInMainChain())
Bitcoin-Qt: fixes for using display unit from options - extend PaymentServer with setOptionsModel() and rework initNetManager() to make use of that - fix all other places in the code to use display unit from options and no hard-coded unit
2013-08-24 15:07:17 +02:00
strHTML += BitcoinUnits::formatWithUnit(unit, nUnmatured)+ " (" + tr("matures in %n more block(s)", "", wtx.GetBlocksToMaturity()) + ")";
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
else
enhance translation possibilities in TransactionDesc / misc other changes - remove "#include <QString>" as this is included in the header - add some missing plural forms that can be translated - change "yours" into "own address", which is easier to understand and translate in that context - cleanup translatable strings to not include HTML or unneeded chars (e.g. ":") - resize TransactionDescDialog a little (remove unwanted line-breaks with non english translations)
2012-07-03 14:37:51 +02:00
strHTML += "(" + tr("not accepted") + ")";
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
strHTML += "<br>";
}
else if (nNet > 0)
{
//
// Credit
//
Bitcoin-Qt: fixes for using display unit from options - extend PaymentServer with setOptionsModel() and rework initNetManager() to make use of that - fix all other places in the code to use display unit from options and no hard-coded unit
2013-08-24 15:07:17 +02:00
strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, nNet) + "<br>";
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
}
else
{
bool fAllFromMe = true;
BOOST_FOREACH(const CTxIn& txin, wtx.vin)
update core to d0d80170a2ca73004e08fb85007fe055cbf4e411 (CWallet class)
2011-06-26 19:23:24 +02:00
fAllFromMe = fAllFromMe && wallet->IsMine(txin);
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
bool fAllToMe = true;
BOOST_FOREACH(const CTxOut& txout, wtx.vout)
update core to d0d80170a2ca73004e08fb85007fe055cbf4e411 (CWallet class)
2011-06-26 19:23:24 +02:00
fAllToMe = fAllToMe && wallet->IsMine(txout);
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
if (fAllFromMe)
{
//
// Debit
//
BOOST_FOREACH(const CTxOut& txout, wtx.vout)
{
update core to d0d80170a2ca73004e08fb85007fe055cbf4e411 (CWallet class)
2011-06-26 19:23:24 +02:00
if (wallet->IsMine(txout))
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
continue;
toHTML won't add empty wtx.mapValue elements As the code was before, toHTML added empty elements to mapValue to check for their existance. Now first it check for their existance and then for their non-emptiness. Removed a duplicated identical if There are two equal ifs, one inside another. If the first one is true, then the second one is true.
2012-09-28 13:57:07 +02:00
if (!wtx.mapValue.count("to") || wtx.mapValue["to"].empty())
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
{
// Offline transaction
Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress This introduces internal types: * CKeyID: reference (hash160) of a key * CScriptID: reference (hash160) of a script * CTxDestination: a boost::variant of the former two CBitcoinAddress is retrofitted to be a Base58 encoding of a CTxDestination. This allows all internal code to only use the internal types, and only have RPC and GUI depend on the base58 code. Furthermore, the header dependencies are a lot saner now. base58.h is at the top (right below rpc and gui) instead of at the bottom. For the rest: wallet -> script -> keystore -> key. Only keystore still requires a forward declaration of CScript. Solving that would require splitting script into two layers.
2012-05-14 23:44:52 +02:00
CTxDestination address;
if (ExtractDestination(txout.scriptPubKey, address))
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
{
enhance translation possibilities in TransactionDesc / misc other changes - remove "#include <QString>" as this is included in the header - add some missing plural forms that can be translated - change "yours" into "own address", which is easier to understand and translate in that context - cleanup translatable strings to not include HTML or unneeded chars (e.g. ":") - resize TransactionDescDialog a little (remove unwanted line-breaks with non english translations)
2012-07-03 14:37:51 +02:00
strHTML += "<b>" + tr("To") + ":</b> ";
Refactor: CAddressBookData for mapAddressBook Straight refactor, so mapAddressBook stores a CAddressBookData (which just contains a std::string) instead of a std::string. Preparation for payment protocol work, which will add the notion of refund addresses to the address book.
2013-07-15 07:20:50 +02:00
if (wallet->mapAddressBook.count(address) && !wallet->mapAddressBook[address].name.empty())
strHTML += GUIUtil::HtmlEscape(wallet->mapAddressBook[address].name) + " ";
Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress This introduces internal types: * CKeyID: reference (hash160) of a key * CScriptID: reference (hash160) of a script * CTxDestination: a boost::variant of the former two CBitcoinAddress is retrofitted to be a Base58 encoding of a CTxDestination. This allows all internal code to only use the internal types, and only have RPC and GUI depend on the base58 code. Furthermore, the header dependencies are a lot saner now. base58.h is at the top (right below rpc and gui) instead of at the bottom. For the rest: wallet -> script -> keystore -> key. Only keystore still requires a forward declaration of CScript. Solving that would require splitting script into two layers.
2012-05-14 23:44:52 +02:00
strHTML += GUIUtil::HtmlEscape(CBitcoinAddress(address).ToString());
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
strHTML += "<br>";
}
}
Bitcoin-Qt: fixes for using display unit from options - extend PaymentServer with setOptionsModel() and rework initNetManager() to make use of that - fix all other places in the code to use display unit from options and no hard-coded unit
2013-08-24 15:07:17 +02:00
strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -txout.nValue) + "<br>";
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
}
if (fAllToMe)
{
// Payment to self
Cleanup code using forward declarations. Use misc methods of avoiding unnecesary header includes. Replace int typedefs with int##_t from stdint.h. Replace PRI64[xdu] with PRI[xdu]64 from inttypes.h. Normalize QT_VERSION ifs where possible. Resolve some indirect dependencies as direct ones. Remove extern declarations from .cpp files.
2013-04-13 07:13:08 +02:00
int64_t nChange = wtx.GetChange();
int64_t nValue = nCredit - nChange;
Bitcoin-Qt: fixes for using display unit from options - extend PaymentServer with setOptionsModel() and rework initNetManager() to make use of that - fix all other places in the code to use display unit from options and no hard-coded unit
2013-08-24 15:07:17 +02:00
strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -nValue) + "<br>";
strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, nValue) + "<br>";
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
}
Refactor: move GetValueIn(tx) to tx.GetValueIn() GetValueIn makes more sense as a CTransaction member.
2013-11-11 07:03:51 +01:00
int64_t nTxFee = nDebit - wtx.GetValueOut();
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
if (nTxFee > 0)
Bitcoin-Qt: fixes for using display unit from options - extend PaymentServer with setOptionsModel() and rework initNetManager() to make use of that - fix all other places in the code to use display unit from options and no hard-coded unit
2013-08-24 15:07:17 +02:00
strHTML += "<b>" + tr("Transaction fee") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -nTxFee) + "<br>";
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
}
else
{
//
// Mixed debit transaction
//
BOOST_FOREACH(const CTxIn& txin, wtx.vin)
update core to d0d80170a2ca73004e08fb85007fe055cbf4e411 (CWallet class)
2011-06-26 19:23:24 +02:00
if (wallet->IsMine(txin))
Bitcoin-Qt: fixes for using display unit from options - extend PaymentServer with setOptionsModel() and rework initNetManager() to make use of that - fix all other places in the code to use display unit from options and no hard-coded unit
2013-08-24 15:07:17 +02:00
strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -wallet->GetDebit(txin)) + "<br>";
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
BOOST_FOREACH(const CTxOut& txout, wtx.vout)
update core to d0d80170a2ca73004e08fb85007fe055cbf4e411 (CWallet class)
2011-06-26 19:23:24 +02:00
if (wallet->IsMine(txout))
Bitcoin-Qt: fixes for using display unit from options - extend PaymentServer with setOptionsModel() and rework initNetManager() to make use of that - fix all other places in the code to use display unit from options and no hard-coded unit
2013-08-24 15:07:17 +02:00
strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, wallet->GetCredit(txout)) + "<br>";
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
}
}
Bitcoin-Qt: fixes for using display unit from options - extend PaymentServer with setOptionsModel() and rework initNetManager() to make use of that - fix all other places in the code to use display unit from options and no hard-coded unit
2013-08-24 15:07:17 +02:00
strHTML += "<b>" + tr("Net amount") + ":</b> " + BitcoinUnits::formatWithUnit(unit, nNet, true) + "<br>";
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
//
// Message
//
toHTML won't add empty wtx.mapValue elements As the code was before, toHTML added empty elements to mapValue to check for their existance. Now first it check for their existance and then for their non-emptiness. Removed a duplicated identical if There are two equal ifs, one inside another. If the first one is true, then the second one is true.
2012-09-28 13:57:07 +02:00
if (wtx.mapValue.count("message") && !wtx.mapValue["message"].empty())
enhance translation possibilities in TransactionDesc / misc other changes - remove "#include <QString>" as this is included in the header - add some missing plural forms that can be translated - change "yours" into "own address", which is easier to understand and translate in that context - cleanup translatable strings to not include HTML or unneeded chars (e.g. ":") - resize TransactionDescDialog a little (remove unwanted line-breaks with non english translations)
2012-07-03 14:37:51 +02:00
strHTML += "<br><b>" + tr("Message") + ":</b><br>" + GUIUtil::HtmlEscape(wtx.mapValue["message"], true) + "<br>";
toHTML won't add empty wtx.mapValue elements As the code was before, toHTML added empty elements to mapValue to check for their existance. Now first it check for their existance and then for their non-emptiness. Removed a duplicated identical if There are two equal ifs, one inside another. If the first one is true, then the second one is true.
2012-09-28 13:57:07 +02:00
if (wtx.mapValue.count("comment") && !wtx.mapValue["comment"].empty())
enhance translation possibilities in TransactionDesc / misc other changes - remove "#include <QString>" as this is included in the header - add some missing plural forms that can be translated - change "yours" into "own address", which is easier to understand and translate in that context - cleanup translatable strings to not include HTML or unneeded chars (e.g. ":") - resize TransactionDescDialog a little (remove unwanted line-breaks with non english translations)
2012-07-03 14:37:51 +02:00
strHTML += "<br><b>" + tr("Comment") + ":</b><br>" + GUIUtil::HtmlEscape(wtx.mapValue["comment"], true) + "<br>";
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
qt: add vout index to transaction id in transactions details dialog
2013-09-05 12:23:08 +02:00
strHTML += "<b>" + tr("Transaction ID") + ":</b> " + TransactionRecord::formatSubTxId(wtx.GetHash(), vout) + "<br>";
Qt: Show transaction ID in details
2012-01-10 19:25:02 +01:00
[Qt] Show and store message of normal bitcoin:URI
2014-01-21 23:39:29 +01:00
// 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>";
Payment Protocol: X509-validated payment requests Add support for a Payment Protocol to Bitcoin-Qt. Payment messages are protocol-buffer encoded and communicated over http(s), so this adds a dependency on the Google protocol buffer library, and requires Qt with OpenSSL support.
2013-07-22 08:50:39 +02:00
//
// PaymentRequest info:
//
foreach (const PAIRTYPE(string, string)& r, wtx.vOrderForm)
{
if (r.first == "PaymentRequest")
{
PaymentRequestPlus req;
qt: add vout index to transaction id in transactions details dialog
2013-09-05 12:23:08 +02:00
req.parse(QByteArray::fromRawData(r.second.data(), r.second.size()));
Payment Protocol: X509-validated payment requests Add support for a Payment Protocol to Bitcoin-Qt. Payment messages are protocol-buffer encoded and communicated over http(s), so this adds a dependency on the Google protocol buffer library, and requires Qt with OpenSSL support.
2013-07-22 08:50:39 +02:00
QString merchant;
if (req.getMerchant(PaymentServer::getCertStore(), merchant))
strHTML += "<b>" + tr("Merchant") + ":</b> " + GUIUtil::HtmlEscape(merchant) + "<br>";
}
}
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
if (wtx.IsCoinBase())
[Qt]: fix num Blocks to maturity in Tx description - as we have main.h included in transactiondesc.cpp, we now also use COINBASE_MATURITY + 1 for the descriptive string - fixes #3131
2013-10-24 09:04:46 +02:00
{
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>";
}
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
//
// Debug view
//
if (fDebug)
{
enhance translation possibilities in TransactionDesc / misc other changes - remove "#include <QString>" as this is included in the header - add some missing plural forms that can be translated - change "yours" into "own address", which is easier to understand and translate in that context - cleanup translatable strings to not include HTML or unneeded chars (e.g. ":") - resize TransactionDescDialog a little (remove unwanted line-breaks with non english translations)
2012-07-03 14:37:51 +02:00
strHTML += "<hr><br>" + tr("Debug information") + "<br><br>";
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
BOOST_FOREACH(const CTxIn& txin, wtx.vin)
update core to d0d80170a2ca73004e08fb85007fe055cbf4e411 (CWallet class)
2011-06-26 19:23:24 +02:00
if(wallet->IsMine(txin))
Bitcoin-Qt: fixes for using display unit from options - extend PaymentServer with setOptionsModel() and rework initNetManager() to make use of that - fix all other places in the code to use display unit from options and no hard-coded unit
2013-08-24 15:07:17 +02:00
strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -wallet->GetDebit(txin)) + "<br>";
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
BOOST_FOREACH(const CTxOut& txout, wtx.vout)
update core to d0d80170a2ca73004e08fb85007fe055cbf4e411 (CWallet class)
2011-06-26 19:23:24 +02:00
if(wallet->IsMine(txout))
Bitcoin-Qt: fixes for using display unit from options - extend PaymentServer with setOptionsModel() and rework initNetManager() to make use of that - fix all other places in the code to use display unit from options and no hard-coded unit
2013-08-24 15:07:17 +02:00
strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, wallet->GetCredit(txout)) + "<br>";
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
enhance translation possibilities in TransactionDesc / misc other changes - remove "#include <QString>" as this is included in the header - add some missing plural forms that can be translated - change "yours" into "own address", which is easier to understand and translate in that context - cleanup translatable strings to not include HTML or unneeded chars (e.g. ":") - resize TransactionDescDialog a little (remove unwanted line-breaks with non english translations)
2012-07-03 14:37:51 +02:00
strHTML += "<br><b>" + tr("Transaction") + ":</b><br>";
Move HtmlEscape (escape for qt rich text controls) to qt gui utilities
2011-11-11 10:13:25 +01:00
strHTML += GUIUtil::HtmlEscape(wtx.ToString(), true);
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
enhance translation possibilities in TransactionDesc / misc other changes - remove "#include <QString>" as this is included in the header - add some missing plural forms that can be translated - change "yours" into "own address", which is easier to understand and translate in that context - cleanup translatable strings to not include HTML or unneeded chars (e.g. ":") - resize TransactionDescDialog a little (remove unwanted line-breaks with non english translations)
2012-07-03 14:37:51 +02:00
strHTML += "<br><b>" + tr("Inputs") + ":</b>";
Make debug info more interesting (show SHA160 addresses for inputs)
2011-07-29 23:11:40 +02:00
strHTML += "<ul>";
Use scoped locks instead of CRITICAL_BLOCK
2012-04-06 18:39:12 +02:00
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
{
Use scoped locks instead of CRITICAL_BLOCK
2012-04-06 18:39:12 +02:00
LOCK(wallet->cs_wallet);
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
BOOST_FOREACH(const CTxIn& txin, wtx.vin)
{
COutPoint prevout = txin.prevout;
Make debug info more interesting (show SHA160 addresses for inputs)
2011-07-29 23:11:40 +02:00
Ultraprune This switches bitcoin's transaction/block verification logic to use a "coin database", which contains all unredeemed transaction output scripts, amounts and heights. The name ultraprune comes from the fact that instead of a full transaction index, we only (need to) keep an index with unspent outputs. For now, the blocks themselves are kept as usual, although they are only necessary for serving, rescanning and reorganizing. The basic datastructures are CCoins (representing the coins of a single transaction), and CCoinsView (representing a state of the coins database). There are several implementations for CCoinsView. A dummy, one backed by the coins database (coins.dat), one backed by the memory pool, and one that adds a cache on top of it. FetchInputs, ConnectInputs, ConnectBlock, DisconnectBlock, ... now operate on a generic CCoinsView. The block switching logic now builds a single cached CCoinsView with changes to be committed to the database before any changes are made. This means no uncommitted changes are ever read from the database, and should ease the transition to another database layer which does not support transactions (but does support atomic writes), like LevelDB. For the getrawtransaction() RPC call, access to a txid-to-disk index would be preferable. As this index is not necessary or even useful for any other part of the implementation, it is not provided. Instead, getrawtransaction() uses the coin database to find the block height, and then scans that block to find the requested transaction. This is slow, but should suffice for debug purposes.
2012-07-01 18:54:00 +02:00
CCoins prev;
Batch block connection during IBD During the initial block download (or -loadblock), delay connection of new blocks a bit, and perform them in a single action. This reduces the load on the database engine, as subsequent blocks often update an earlier block's transaction already.
2012-07-06 16:33:34 +02:00
if(pcoinsTip->GetCoins(prevout.hash, prev))
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
{
if (prevout.n < prev.vout.size())
{
Make debug info more interesting (show SHA160 addresses for inputs)
2011-07-29 23:11:40 +02:00
strHTML += "<li>";
const CTxOut &vout = prev.vout[prevout.n];
Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress This introduces internal types: * CKeyID: reference (hash160) of a key * CScriptID: reference (hash160) of a script * CTxDestination: a boost::variant of the former two CBitcoinAddress is retrofitted to be a Base58 encoding of a CTxDestination. This allows all internal code to only use the internal types, and only have RPC and GUI depend on the base58 code. Furthermore, the header dependencies are a lot saner now. base58.h is at the top (right below rpc and gui) instead of at the bottom. For the rest: wallet -> script -> keystore -> key. Only keystore still requires a forward declaration of CScript. Solving that would require splitting script into two layers.
2012-05-14 23:44:52 +02:00
CTxDestination address;
if (ExtractDestination(vout.scriptPubKey, address))
Make debug info more interesting (show SHA160 addresses for inputs)
2011-07-29 23:11:40 +02:00
{
Refactor: CAddressBookData for mapAddressBook Straight refactor, so mapAddressBook stores a CAddressBookData (which just contains a std::string) instead of a std::string. Preparation for payment protocol work, which will add the notion of refund addresses to the address book.
2013-07-15 07:20:50 +02:00
if (wallet->mapAddressBook.count(address) && !wallet->mapAddressBook[address].name.empty())
strHTML += GUIUtil::HtmlEscape(wallet->mapAddressBook[address].name) + " ";
Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress This introduces internal types: * CKeyID: reference (hash160) of a key * CScriptID: reference (hash160) of a script * CTxDestination: a boost::variant of the former two CBitcoinAddress is retrofitted to be a Base58 encoding of a CTxDestination. This allows all internal code to only use the internal types, and only have RPC and GUI depend on the base58 code. Furthermore, the header dependencies are a lot saner now. base58.h is at the top (right below rpc and gui) instead of at the bottom. For the rest: wallet -> script -> keystore -> key. Only keystore still requires a forward declaration of CScript. Solving that would require splitting script into two layers.
2012-05-14 23:44:52 +02:00
strHTML += QString::fromStdString(CBitcoinAddress(address).ToString());
Make debug info more interesting (show SHA160 addresses for inputs)
2011-07-29 23:11:40 +02:00
}
Bitcoin-Qt: fixes for using display unit from options - extend PaymentServer with setOptionsModel() and rework initNetManager() to make use of that - fix all other places in the code to use display unit from options and no hard-coded unit
2013-08-24 15:07:17 +02:00
strHTML = strHTML + " " + tr("Amount") + "=" + BitcoinUnits::formatWithUnit(unit, vout.nValue);
enhance translation possibilities in TransactionDesc / misc other changes - remove "#include <QString>" as this is included in the header - add some missing plural forms that can be translated - change "yours" into "own address", which is easier to understand and translate in that context - cleanup translatable strings to not include HTML or unneeded chars (e.g. ":") - resize TransactionDescDialog a little (remove unwanted line-breaks with non english translations)
2012-07-03 14:37:51 +02:00
strHTML = strHTML + " IsMine=" + (wallet->IsMine(vout) ? tr("true") : tr("false")) + "</li>";
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
}
}
}
}
enhance translation possibilities in TransactionDesc / misc other changes - remove "#include <QString>" as this is included in the header - add some missing plural forms that can be translated - change "yours" into "own address", which is easier to understand and translate in that context - cleanup translatable strings to not include HTML or unneeded chars (e.g. ":") - resize TransactionDescDialog a little (remove unwanted line-breaks with non english translations)
2012-07-03 14:37:51 +02:00
Make debug info more interesting (show SHA160 addresses for inputs)
2011-07-29 23:11:40 +02:00
strHTML += "</ul>";
transaction details dialog on doubleclick
2011-06-10 15:05:51 +02:00
}
strHTML += "</font></html>";
}
return strHTML;
}
Reference in a new issue Copy permalink