Skip to content

Commit 55619cc

Browse files
furszyfurszy
committed
GUI: Differentiate Budget payment transaction records from MNs block reward records.
Github-Pull: #2671 Rebased-From: 8be73ac
1 parent 139596e commit 55619cc

File tree

6 files changed

+12
-2
lines changed

6 files changed

+12
-2
lines changed

‎src/qt/pivx/qtutils.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ void setSortTxTypeFilter(QComboBox* filter, SortEdit* lineEditType)
182182
filter->addItem(QObject::tr("Hot stakes"), TransactionFilterProxy::TYPE(TransactionRecord::StakeHot));
183183
filter->addItem(QObject::tr("Delegated"), TransactionFilterProxy::TYPE(TransactionRecord::P2CSDelegationSent) | TransactionFilterProxy::TYPE(TransactionRecord::P2CSDelegationSentOwner));
184184
filter->addItem(QObject::tr("Delegations"), TransactionFilterProxy::TYPE(TransactionRecord::P2CSDelegation));
185+
filter->addItem(QObject::tr("DAO payment"), TransactionFilterProxy::TYPE(TransactionRecord::BudgetPayment));
185186
}
186187

187188
void setupSettings(QSettings* settings)

‎src/qt/pivx/txrow.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ void TxRow::setType(bool isLightTheme, int type, bool isConfirmed)
7878
case TransactionRecord::StakeZPIV:
7979
case TransactionRecord::MNReward:
8080
case TransactionRecord::StakeMint:
81+
case TransactionRecord::BudgetPayment:
8182
path = "://ic-transaction-staked";
8283
css = "text-list-amount-receive";
8384
break;

‎src/qt/transactionfilterproxy.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,6 @@ int TransactionFilterProxy::rowCount(const QModelIndex& parent) const
113113
bool TransactionFilterProxy::isOrphan(const int status, const int type)
114114
{
115115
return ( (type == TransactionRecord::Generated || type == TransactionRecord::StakeMint ||
116-
type == TransactionRecord::StakeZPIV || type == TransactionRecord::MNReward)
116+
type == TransactionRecord::StakeZPIV || type == TransactionRecord::MNReward || type == TransactionRecord::BudgetPayment)
117117
&& (status == TransactionStatus::Conflicted || status == TransactionStatus::NotAccepted) );
118118
}

‎src/qt/transactionrecord.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,11 @@ bool TransactionRecord::decomposeCoinStake(const CWallet* wallet, const CWalletT
5555
int nIndexMN = (int) wtx.tx->vout.size() - 1;
5656
if (ExtractDestination(wtx.tx->vout[nIndexMN].scriptPubKey, destMN) && (mine = IsMine(*wallet, destMN)) ) {
5757
sub.involvesWatchAddress = mine & ISMINE_WATCH_ONLY;
58-
sub.type = TransactionRecord::MNReward;
5958
sub.address = EncodeDestination(destMN);
6059
sub.credit = wtx.tx->vout[nIndexMN].nValue;
60+
// Simple way to differentiate budget payments from MN rewards.
61+
CAmount mn_reward = Params().GetConsensus().nMNBlockReward;
62+
sub.type = sub.credit > mn_reward ? TransactionRecord::BudgetPayment : TransactionRecord::MNReward;
6163
}
6264
}
6365

@@ -612,6 +614,7 @@ void TransactionRecord::updateStatus(const CWalletTx& wtx, int chainHeight)
612614
type == TransactionRecord::StakeMint ||
613615
type == TransactionRecord::StakeZPIV ||
614616
type == TransactionRecord::MNReward ||
617+
type == TransactionRecord::BudgetPayment ||
615618
type == TransactionRecord::StakeDelegated ||
616619
type == TransactionRecord::StakeHot) {
617620

‎src/qt/transactionrecord.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ class TransactionRecord
8181
SendToOther,
8282
RecvWithAddress,
8383
MNReward,
84+
BudgetPayment,
8485
RecvFromOther,
8586
SendToSelf,
8687
ZerocoinMint,

‎src/qt/transactiontablemodel.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,8 @@ QString TransactionTableModel::formatTxType(const TransactionRecord* wtx) const
435435
return tr("Received with");
436436
case TransactionRecord::MNReward:
437437
return tr("Masternode Reward");
438+
case TransactionRecord::BudgetPayment:
439+
return tr("Budget Payment");
438440
case TransactionRecord::RecvFromOther:
439441
return tr("Received from");
440442
case TransactionRecord::SendToAddress:
@@ -493,6 +495,7 @@ QVariant TransactionTableModel::txAddressDecoration(const TransactionRecord* wtx
493495
case TransactionRecord::StakeMint:
494496
case TransactionRecord::StakeZPIV:
495497
case TransactionRecord::MNReward:
498+
case TransactionRecord::BudgetPayment:
496499
return QIcon(":/icons/tx_mined");
497500
case TransactionRecord::RecvWithAddress:
498501
case TransactionRecord::RecvFromOther:
@@ -520,6 +523,7 @@ QString TransactionTableModel::formatTxToAddress(const TransactionRecord* wtx, b
520523
return QString::fromStdString(wtx->address) + watchAddress;
521524
case TransactionRecord::RecvWithAddress:
522525
case TransactionRecord::MNReward:
526+
case TransactionRecord::BudgetPayment:
523527
case TransactionRecord::SendToAddress:
524528
case TransactionRecord::Generated:
525529
case TransactionRecord::StakeMint:

0 commit comments

Comments
 (0)