Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

doc: Add undocumented "-showorphans" GUI option to help text #2058

Merged
merged 2 commits into from
Mar 20, 2021
Merged

doc: Add undocumented "-showorphans" GUI option to help text #2058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bbf8e9
Add undocumented "-showorphans" GUI config option to help text
cyrossignol Mar 18, 2021
552955c
Change "-showorphans" option to a real boolean
cyrossignol Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,8 @@ std::string HelpMessage()
" -mininput=<amt> " + _("When creating transactions, ignore inputs with value less than this (default: 0.01)") + "\n";
if(fQtActive)
strUsage +=
" -server " + _("Accept command line and JSON-RPC commands") + "\n";
" -server " + _("Accept command line and JSON-RPC commands") + "\n" +
" -showorphans " + _("Include stale (orphaned) coinstake transactions in the transaction list") + "\n";
#if !defined(WIN32)
if(!fQtActive)
strUsage +=
Expand Down
3 changes: 1 addition & 2 deletions src/qt/transactionfilterproxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ bool TransactionFilterProxy::filterAcceptsRow(int sourceRow, const QModelIndex &
if(!showInactive && (status == TransactionStatus::Conflicted || status == TransactionStatus::NotAccepted))
return false;
//1-2-2015 Halford - Mask Orphans from User View so they do not complain
std::string orphan_mask = GetArg("-showorphans", "false");
if (orphan_mask != "true")
if (!GetBoolArg("-showorphans", false))
if (status == TransactionStatus::Conflicted || status == TransactionStatus::NotAccepted)
return false;
if(!(TYPE(type) & typeFilter))
Expand Down
12 changes: 4 additions & 8 deletions src/qt/transactionrecord.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,16 @@
/* Return positive answer if transaction should be shown in list. */
bool TransactionRecord::showTransaction(const CWalletTx &wtx, bool datetime_limit_flag, const int64_t &datetime_limit)
{

// Do not show transactions earlier than the datetime_limit if the flag is set.
if (datetime_limit_flag && (int64_t) wtx.nTime < datetime_limit)
{
return false;
}

std::string ShowOrphans = GetArg("-showorphans", "false");

//R Halford - POS Transactions - If Orphaned follow showorphans directive:
if (wtx.IsCoinStake() && !wtx.IsInMainChain())
{
//Orphaned tx
return (ShowOrphans=="true" ? true : false);
if (wtx.IsCoinStake() && !wtx.IsInMainChain())
{
// Show stale (orphaned) staking transactions if requested:
return GetBoolArg("-showorphans", false);
}

if (wtx.IsCoinBase())
Expand Down