Commit 5670406f authored by Ashot's avatar Ashot

Removed TransactionRecord::MasterNodeReward, TransactionRecord::SystemNodeReward. #307

parent eee8e126
Pipeline #910 failed with stage
in 20 minutes and 12 seconds
......@@ -76,19 +76,8 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
sub.type = TransactionRecord::RecvFromOther;
sub.address = mapValue["from"];
}
if (wtx.IsCoinBase())
if (wtx.IsCoinBase() || wtx.IsCoinStake())
{
if (isPoSActive) {
//After PoS activates, only MN/SN rewards (and budget too) will be in coinbase tx
if (i == MN_PMT_SLOT)
sub.type = TransactionRecord::MasterNodeReward;
else if (i == SN_PMT_SLOT)
sub.type = TransactionRecord::SystemNodeReward;
} else {
//PoS not active, just consider this 'generated'
sub.type = TransactionRecord::Generated;
}
} else if (wtx.IsCoinStake()) {
sub.type = TransactionRecord::Generated;
}
......
......@@ -75,8 +75,6 @@ public:
{
Other,
Generated,
MasterNodeReward,
SystemNodeReward,
SendToAddress,
SendToOther,
RecvWithAddress,
......
......@@ -360,10 +360,6 @@ QString TransactionTableModel::formatTxType(const TransactionRecord *wtx) const
return tr("Payment to yourself");
case TransactionRecord::Generated:
return tr("Mined");
case TransactionRecord::MasterNodeReward:
return tr("Masternode Reward");
case TransactionRecord::SystemNodeReward:
return tr("Systemnode Reward");
default:
return QString();
......@@ -378,8 +374,6 @@ QVariant TransactionTableModel::txAddressDecoration(const TransactionRecord *wtx
return QIcon(":/icons/tx_mined");
case TransactionRecord::RecvWithAddress:
case TransactionRecord::RecvFromOther:
case TransactionRecord::MasterNodeReward:
case TransactionRecord::SystemNodeReward:
return QIcon(":/icons/tx_input");
case TransactionRecord::SendToAddress:
case TransactionRecord::SendToOther:
......@@ -404,8 +398,6 @@ QString TransactionTableModel::formatTxToAddress(const TransactionRecord *wtx, b
case TransactionRecord::RecvWithAddress:
case TransactionRecord::SendToAddress:
case TransactionRecord::Generated:
case TransactionRecord::MasterNodeReward:
case TransactionRecord::SystemNodeReward:
return lookupAddress(wtx->address, tooltip) + watchAddress;
case TransactionRecord::SendToOther:
return QString::fromStdString(wtx->address) + watchAddress;
......@@ -423,8 +415,6 @@ QVariant TransactionTableModel::addressColor(const TransactionRecord *wtx) const
case TransactionRecord::RecvWithAddress:
case TransactionRecord::SendToAddress:
case TransactionRecord::Generated:
case TransactionRecord::MasterNodeReward:
case TransactionRecord::SystemNodeReward:
{
QString label = walletModel->getAddressTableModel()->labelForAddress(QString::fromStdString(wtx->address));
if(label.isEmpty())
......
......@@ -91,8 +91,6 @@ TransactionView::TransactionView(QWidget *parent) :
TransactionFilterProxy::TYPE(TransactionRecord::SendToOther));
typeWidget->addItem(tr("To yourself"), TransactionFilterProxy::TYPE(TransactionRecord::SendToSelf));
typeWidget->addItem(tr("Mined"), TransactionFilterProxy::TYPE(TransactionRecord::Generated));
typeWidget->addItem(tr("Masternode Reward"), TransactionFilterProxy::TYPE(TransactionRecord::MasterNodeReward));
typeWidget->addItem(tr("Systemnode Reward"), TransactionFilterProxy::TYPE(TransactionRecord::SystemNodeReward));
typeWidget->addItem(tr("Other"), TransactionFilterProxy::TYPE(TransactionRecord::Other));
typeWidget->setCurrentIndex(settings.value("transactionType").toInt());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment