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

Shift PS denoms (#1292)

Browse Source 
* Shift PS denoms

* fix ui PS restrictions
This commit is contained in:
UdjinM6 2017-02-02 12:50:21 +04:00 committed by GitHub
parent a73185d939
commit cfc8954b42
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/darksend.cpp
View File

@ -436,12 +436,14 @@ void CDarksendPool::InitDenominations()
1DRK+1000 == (.1DRK+100)*10 1DRK+1000 == (.1DRK+100)*10
10DRK+10000 == (1DRK+1000)*10 10DRK+10000 == (1DRK+1000)*10
*/ */
/* Disabled
vecPrivateSendDenominations.push_back( (100 * COIN)+100000 ); vecPrivateSendDenominations.push_back( (100 * COIN)+100000 );
*/
vecPrivateSendDenominations.push_back( (10 * COIN)+10000 ); vecPrivateSendDenominations.push_back( (10 * COIN)+10000 );
vecPrivateSendDenominations.push_back( (1 * COIN)+1000 ); vecPrivateSendDenominations.push_back( (1 * COIN)+1000 );
vecPrivateSendDenominations.push_back( (.1 * COIN)+100 ); vecPrivateSendDenominations.push_back( (.1 * COIN)+100 );
/* Disabled till we need them
vecPrivateSendDenominations.push_back( (.01 * COIN)+10 ); vecPrivateSendDenominations.push_back( (.01 * COIN)+10 );
/* Disabled till we need them
vecPrivateSendDenominations.push_back( (.001 * COIN)+1 ); vecPrivateSendDenominations.push_back( (.001 * COIN)+1 );
*/ */
} }

2
src/darksend.h
View File

@ -19,7 +19,7 @@ static const int PRIVATESEND_QUEUE_TIMEOUT = 30;
static const int PRIVATESEND_SIGNING_TIMEOUT = 15; static const int PRIVATESEND_SIGNING_TIMEOUT = 15;
//! minimum peer version accepted by mixing pool //! minimum peer version accepted by mixing pool
static const int MIN_PRIVATESEND_PEER_PROTO_VERSION = 70204; static const int MIN_PRIVATESEND_PEER_PROTO_VERSION = 70206;
static const CAmount PRIVATESEND_COLLATERAL = 0.001 * COIN; static const CAmount PRIVATESEND_COLLATERAL = 0.001 * COIN;
static const CAmount PRIVATESEND_POOL_MAX = 999.999 * COIN; static const CAmount PRIVATESEND_POOL_MAX = 999.999 * COIN;

7
src/qt/overviewpage.cpp
View File

@ -597,10 +597,9 @@ void OverviewPage::togglePrivateSend(){
settings.setValue("hasMixed", "hasMixed"); settings.setValue("hasMixed", "hasMixed");
} }
if(!fEnablePrivateSend){ if(!fEnablePrivateSend){
int64_t balance = currentBalance; CAmount nMinAmount = vecPrivateSendDenominations.back() + PRIVATESEND_COLLATERAL*4;
float minAmount = 1.49 * COIN; if(currentBalance < nMinAmount){
if(balance < minAmount){ QString strMinAmount(BitcoinUnits::formatWithUnit(nDisplayUnit, nMinAmount));
QString strMinAmount(BitcoinUnits::formatWithUnit(nDisplayUnit, minAmount));
QMessageBox::warning(this, tr("PrivateSend"), QMessageBox::warning(this, tr("PrivateSend"),
tr("PrivateSend requires at least %1 to use.").arg(strMinAmount), tr("PrivateSend requires at least %1 to use.").arg(strMinAmount),
QMessageBox::Ok, QMessageBox::Ok); QMessageBox::Ok, QMessageBox::Ok);

2
src/version.h
View File

@ -10,7 +10,7 @@
* network protocol versioning * network protocol versioning
*/ */
static const int PROTOCOL_VERSION = 70205; static const int PROTOCOL_VERSION = 70206;
//! initial proto version, to be increased after version/verack negotiation //! initial proto version, to be increased after version/verack negotiation
static const int INIT_PROTO_VERSION = 209; static const int INIT_PROTO_VERSION = 209;