mirror of
https://github.com/dashpay/dash.git
synced 2024-12-28 05:23:01 +01:00
Revert "Formatting, spelling, comment fixes."
This reverts commit 7a19efe040
.
This commit is contained in:
parent
cd057bfd41
commit
ad26dc9c31
@ -83,5 +83,5 @@ Warning
|
|||||||
- Using other relay rules, a double-spender can craft his crime to
|
- Using other relay rules, a double-spender can craft his crime to
|
||||||
resist broadcast
|
resist broadcast
|
||||||
- Miners can choose which conflicting spend to confirm, and some
|
- Miners can choose which conflicting spend to confirm, and some
|
||||||
miners may not confirm the first acceptable spend they see
|
miners may not confirmg the first acceptable spend they see
|
||||||
|
|
||||||
|
@ -898,6 +898,7 @@ bool RateLimitExceeded(double& dCount, int64_t& nLastTime, int64_t nLimit, unsig
|
|||||||
|
|
||||||
LOCK(csLimiter);
|
LOCK(csLimiter);
|
||||||
|
|
||||||
|
// Use an exponentially decaying ~10-minute window:
|
||||||
dCount *= pow(1.0 - 1.0/600.0, (double)(nNow - nLastTime));
|
dCount *= pow(1.0 - 1.0/600.0, (double)(nNow - nLastTime));
|
||||||
nLastTime = nNow;
|
nLastTime = nNow;
|
||||||
if (dCount >= nLimit*10*1000)
|
if (dCount >= nLimit*10*1000)
|
||||||
@ -1018,7 +1019,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
|
|||||||
static int64_t nLastFreeTime;
|
static int64_t nLastFreeTime;
|
||||||
static int64_t nFreeLimit = GetArg("-limitfreerelay", 15);
|
static int64_t nFreeLimit = GetArg("-limitfreerelay", 15);
|
||||||
|
|
||||||
if (RateLimitExceeded(dFreeCount, nLastFreeTime, nFreeLimit, nSize))
|
if (RateLimitExceeded(dFreeCount, nLastFreeTime, nFreeLimit, nSize))
|
||||||
return state.DoS(0, error("AcceptToMemoryPool : free transaction rejected by rate limiter"),
|
return state.DoS(0, error("AcceptToMemoryPool : free transaction rejected by rate limiter"),
|
||||||
REJECT_INSUFFICIENTFEE, "insufficient priority");
|
REJECT_INSUFFICIENTFEE, "insufficient priority");
|
||||||
|
|
||||||
@ -1045,7 +1046,8 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void RelayDoubleSpend(const COutPoint& outPoint, const CTransaction& doubleSpend, bool fInBlock, CBloomFilter& filter)
|
static void
|
||||||
|
RelayDoubleSpend(const COutPoint& outPoint, const CTransaction& doubleSpend, bool fInBlock, CBloomFilter& filter)
|
||||||
{
|
{
|
||||||
// Relaying double-spend attempts to our peers lets them detect when
|
// Relaying double-spend attempts to our peers lets them detect when
|
||||||
// somebody might be trying to cheat them. However, blindly relaying
|
// somebody might be trying to cheat them. However, blindly relaying
|
||||||
|
@ -19,17 +19,10 @@ class TransactionStatus
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
TransactionStatus():
|
TransactionStatus():
|
||||||
countsForBalance(false),
|
countsForBalance(false), sortKey(""),
|
||||||
sortKey(""),
|
matures_in(0), status(Offline), hasConflicting(false), depth(0), open_for(0), cur_num_blocks(-1),
|
||||||
matures_in(0),
|
|
||||||
status(Offline),
|
|
||||||
hasConflicting(false),
|
|
||||||
depth(0),
|
|
||||||
open_for(0),
|
|
||||||
cur_num_blocks(-1),
|
|
||||||
cur_num_conflicts(-1)
|
cur_num_conflicts(-1)
|
||||||
{
|
{ }
|
||||||
}
|
|
||||||
|
|
||||||
enum Status {
|
enum Status {
|
||||||
Confirmed, /**< Have 6 or more confirmations (normal tx) or fully mature (mined tx) **/
|
Confirmed, /**< Have 6 or more confirmations (normal tx) or fully mature (mined tx) **/
|
||||||
|
@ -546,9 +546,9 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
|
|||||||
case Qt::TextAlignmentRole:
|
case Qt::TextAlignmentRole:
|
||||||
return column_alignments[index.column()];
|
return column_alignments[index.column()];
|
||||||
case Qt::BackgroundColorRole:
|
case Qt::BackgroundColorRole:
|
||||||
if (rec->status.hasConflicting)
|
if (rec->status.hasConflicting)
|
||||||
return COLOR_HASCONFLICTING_BG;
|
return COLOR_HASCONFLICTING_BG;
|
||||||
break;
|
break;
|
||||||
case Qt::ForegroundRole:
|
case Qt::ForegroundRole:
|
||||||
if (rec->status.hasConflicting)
|
if (rec->status.hasConflicting)
|
||||||
return COLOR_HASCONFLICTING;
|
return COLOR_HASCONFLICTING;
|
||||||
|
@ -164,13 +164,13 @@ void WalletModel::checkBalanceChanged()
|
|||||||
|
|
||||||
void WalletModel::updateTransaction(const QString &hash, int status)
|
void WalletModel::updateTransaction(const QString &hash, int status)
|
||||||
{
|
{
|
||||||
if (status == CT_GOT_CONFLICT)
|
if (status == CT_GOT_CONFLICT)
|
||||||
{
|
{
|
||||||
emit message(tr("Conflict Received"),
|
emit message(tr("Conflict Received"),
|
||||||
tr("WARNING: Transaction may never be confirmed. Its input was seen being spent by another transaction on the network. Wait for confirmation!"),
|
tr("WARNING: Transaction may never be confirmed. Its input was seen being spent by another transaction on the network. Wait for confirmation!"),
|
||||||
CClientUIInterface::MSG_WARNING);
|
CClientUIInterface::MSG_WARNING);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(transactionTableModel)
|
if(transactionTableModel)
|
||||||
transactionTableModel->updateTransaction(hash, status);
|
transactionTableModel->updateTransaction(hash, status);
|
||||||
|
@ -657,7 +657,7 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pbl
|
|||||||
|
|
||||||
bool fIsConflicting = IsConflicting(tx);
|
bool fIsConflicting = IsConflicting(tx);
|
||||||
if (fIsConflicting)
|
if (fIsConflicting)
|
||||||
nConflictsReceived++;
|
nConflictsReceived++;
|
||||||
|
|
||||||
if (fExisted || IsMine(tx) || IsFromMe(tx) || fIsConflicting)
|
if (fExisted || IsMine(tx) || IsFromMe(tx) || fIsConflicting)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user