neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'v0.11.0.x' of https://github.com/darkcoin/darkcoin into devel-0.9

Browse Source
This commit is contained in:
vertoe 2014-12-27 00:55:52 +01:00
commit ab52409f0e
5 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/darksend.cpp
View File

@ -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

5
src/main.cpp
View File

@ -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 {

15
src/qt/coincontroldialog.cpp
View File

@ -16,6 +16,7 @@
#include "coincontrol.h"
#include "main.h"
#include "wallet.h"
#include "darksend.h"
#include <QApplication>
#include <QCheckBox>
@ -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, " "));

1
src/qt/coincontroldialog.h
View File

@ -59,6 +59,7 @@ private:
COLUMN_AMOUNT,
COLUMN_LABEL,
COLUMN_ADDRESS,
COLUMN_DARKSEND_ROUNDS,
COLUMN_DATE,
COLUMN_CONFIRMATIONS,
COLUMN_PRIORITY,

5
src/qt/forms/coincontroldialog.ui
View File

@ -456,6 +456,11 @@
<string>Address</string>
</property>
</column>
<column>
<property name="text">
<string>Darksend Rounds</string>
</property>
</column>
<column>
<property name="text">
<string>Date</string>