diff --git a/src/darksend.cpp b/src/darksend.cpp index ac39ba0a2..50535bbe0 100644 --- a/src/darksend.cpp +++ b/src/darksend.cpp @@ -1425,8 +1425,8 @@ bool CDarkSendPool::DoAutomaticDenominating(bool fDryRun, bool ready) // If we can find only denominated funds, switch to only-denom mode if (!pwalletMain->SelectCoinsDark(nValueMin, maxAmount*COIN, vCoins, nValueIn, -2, 2, hasFeeInput) && - pwalletMain->SelectCoinsDark(nValueMin, maxAmount*COIN, vCoins, nValueIn, 0, 8, hasFeeInput)) { - minRounds = 0; + pwalletMain->SelectCoinsDark(nValueMin, maxAmount*COIN, vCoins, nValueIn, 2, 8, hasFeeInput)) { + minRounds = 2; maxRounds = nDarksendRounds; } //if we're set to less than a thousand, don't submit for than that to the pool diff --git a/src/main.cpp b/src/main.cpp index 7f668f4a0..df866698f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2297,7 +2297,6 @@ bool ConnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, C view.SetBestBlock(pindex->GetBlockHash()); return true; } - bool fScriptChecks = pindex->nHeight >= Checkpoints::GetTotalBlocksEstimate(); // Do not allow blocks that contain transactions which 'overwrite' older transactions, @@ -2874,7 +2873,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo bool MasternodePayments = false; - if(Params().NetworkID() == CChainParams::TESTNET){ + if(TestNet()){ if(block.nTime > START_MASTERNODE_PAYMENTS_TESTNET) MasternodePayments = true; } else { if(block.nTime > START_MASTERNODE_PAYMENTS) MasternodePayments = true; @@ -2919,7 +2918,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo CBitcoinAddress address2(address1); LogPrintf("CheckBlock() : Couldn't find masternode payment(%d|%d) or payee(%d|%s) nHeight %d. \n", foundPaymentAmount, masternodePaymentAmount, foundPayee, address2.ToString().c_str(), chainActive.Tip()->nHeight+1); - if(!TestNet()) return state.DoS(100, error("CheckBlock() : Couldn't find masternode payment or payee")); + if(!TestNet() && !RegTest()) return state.DoS(100, error("CheckBlock() : Couldn't find masternode payment or payee")); } } } else { diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 27bf714e9..c4c27cec0 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -16,6 +16,7 @@ #include "coincontrol.h" #include "main.h" #include "wallet.h" +#include "darksend.h" #include #include @@ -117,8 +118,9 @@ CoinControlDialog::CoinControlDialog(QWidget *parent) : ui->treeWidget->setColumnWidth(COLUMN_CHECKBOX, 84); ui->treeWidget->setColumnWidth(COLUMN_AMOUNT, 100); ui->treeWidget->setColumnWidth(COLUMN_LABEL, 170); - ui->treeWidget->setColumnWidth(COLUMN_ADDRESS, 290); - ui->treeWidget->setColumnWidth(COLUMN_DATE, 110); + ui->treeWidget->setColumnWidth(COLUMN_ADDRESS, 190); + ui->treeWidget->setColumnWidth(COLUMN_DARKSEND_ROUNDS, 120); + ui->treeWidget->setColumnWidth(COLUMN_DATE, 60); ui->treeWidget->setColumnWidth(COLUMN_CONFIRMATIONS, 100); ui->treeWidget->setColumnWidth(COLUMN_PRIORITY, 100); ui->treeWidget->setColumnHidden(COLUMN_TXHASH, true); // store transacton hash in this column, but dont show it @@ -738,6 +740,15 @@ void CoinControlDialog::updateView() itemOutput->setText(COLUMN_DATE, GUIUtil::dateTimeStr(out.tx->GetTxTime())); itemOutput->setText(COLUMN_DATE_INT64, strPad(QString::number(out.tx->GetTxTime()), 20, " ")); + + // ds+ rounds + CTxIn vin = CTxIn(out.tx->GetHash(), out.i); + int rounds = GetInputDarksendRounds(vin); + + if(rounds >= 0) itemOutput->setText(COLUMN_DARKSEND_ROUNDS, strPad(QString::number(rounds), 15, " ")); + else itemOutput->setText(COLUMN_DARKSEND_ROUNDS, strPad(QString("n/a"), 15, " ")); + + // confirmations itemOutput->setText(COLUMN_CONFIRMATIONS, strPad(QString::number(out.nDepth), 8, " ")); diff --git a/src/qt/coincontroldialog.h b/src/qt/coincontroldialog.h index 465e2a009..9353fd38c 100644 --- a/src/qt/coincontroldialog.h +++ b/src/qt/coincontroldialog.h @@ -59,6 +59,7 @@ private: COLUMN_AMOUNT, COLUMN_LABEL, COLUMN_ADDRESS, + COLUMN_DARKSEND_ROUNDS, COLUMN_DATE, COLUMN_CONFIRMATIONS, COLUMN_PRIORITY, diff --git a/src/qt/forms/coincontroldialog.ui b/src/qt/forms/coincontroldialog.ui index cd1c0ffa1..9fee89a8e 100644 --- a/src/qt/forms/coincontroldialog.ui +++ b/src/qt/forms/coincontroldialog.ui @@ -456,6 +456,11 @@ Address + + + Darksend Rounds + + Date